summaryrefslogtreecommitdiff
path: root/instsetoo_native/util
diff options
context:
space:
mode:
Diffstat (limited to 'instsetoo_native/util')
-rw-r--r--instsetoo_native/util/makefile.mk78
-rw-r--r--instsetoo_native/util/openoffice.lst108
2 files changed, 66 insertions, 120 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 2f0dd9e37dea..8132e8c72cd5 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -42,12 +42,7 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$
.ENDIF # "$(GUI)"=="WNT"
.EXPORT: PYTHONPATH
-.IF "$(CWS_WORK_STAMP)"=="" || "$(UPDATER)"!=""
ENABLE_DOWNLOADSETS*=TRUE
-.ENDIF # "$(CWS_WORK_STAMP)"=="" || "$(UPDATER)"!=""
-.IF "$(FORCE_DOWNLOADSETS)"!=""
-ENABLE_DOWNLOADSETS=TRUE
-.ENDIF # "$(FORCE_DOWNLOADSETS)"!=""
.EXPORT: ENABLE_DOWNLOADSETS
.EXPORT: LAST_MINOR
@@ -73,21 +68,22 @@ LOCALPYFILES= \
$(BIN)$/unohelper.py \
$(BIN)$/pythonloader.py \
$(BIN)$/officehelper.py \
- $(BIN)$/mailmerge.py
+ $(BIN)$/mailmerge.py \
+ $(BIN)$/msgbox.py
.ENDIF
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL))))
xxxx:
echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
-.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO"
ALLTAR : $(LOCALPYFILES)
@echo "No EPM: do no packaging at this stage"
-.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
-.IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO"
+.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
.IF "$(GUI)"=="WNT"
ALLTAR : openofficeall ooohelppack
@@ -101,10 +97,14 @@ ALLTAR : openofficeall ooohelppack sdkooall
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US ure_en-US
.ENDIF
.ENDIF
-.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
-ALLTAR : updatepack
-.ENDIF # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
-.ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+.ELSE
+.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack)
+.ELSE
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US ure_en-US
+.ENDIF
+.ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
+.ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO"
.IF "$(FORCE2ARCHIVE)" == "TRUE"
PKGFORMAT = archive
@@ -151,14 +151,6 @@ sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
ure: $(foreach,i,$(alllangiso) ure_$i)
-broffice: $(foreach,i,$(alllangiso) broffice_$i)
-
-brofficedev: $(foreach,i,$(alllangiso) brofficedev_$i)
-
-brofficewithjre: $(foreach,i,$(alllangiso) brofficewithjre_$i)
-
-broolanguagepack : $(foreach,i,$(alllangiso) broolanguagepack_$i)
-
oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i)
@@ -214,14 +206,6 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
-$(foreach,i,$(alllangiso) broffice_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) brofficedev_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) brofficewithjre_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) broolanguagepack_$i) : $(ADDDEPS)
-
$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS)
@@ -291,30 +275,6 @@ ure_%{$(PKGFORMAT:^".")} :
-msilanguage $(COMMONMISC)$/win_ulffiles
.ENDIF
-$(foreach,i,$(alllangiso) broffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!=""
-.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
-$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
-.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF # "$(MAKETARGETS)"!=""
-broffice_%{$(PKGFORMAT:^".")} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) brofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-brofficewithjre_%{$(PKGFORMAT:^".")} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) brofficedev_$i) : $$@{$(PKGFORMAT:^".")}
-brofficedev_%{$(PKGFORMAT:^".")} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-broolanguagepack_%{$(PKGFORMAT:^".")} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
$(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
@@ -346,7 +306,7 @@ openoffice:
.IF "$(DISABLE_PYTHON)" != "TRUE"
.IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
@@ -360,14 +320,6 @@ $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand_dev$/intro.zip
@-$(MKDIR) $(@:d)
$(COPY) $< $@
-$(BIN)$/broffice_dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_dev_nologo$/intro.zip
- @-$(MKDIR) $(@:d)
- $(COPY) $< $@
-
-$(BIN)$/broffice$/images_brand.zip : $(SOLARCOMMONBINDIR)$/broffice_nologo$/images_brand.zip
- @-$(MKDIR) $(@:d)
- $(COPY) $< $@
-
hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 8ca1ebc614a2..35c927d39963 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,15 +4,15 @@ Globals
{
variables
{
- OOOBASEVERSION 3.4
- OOOPACKAGEVERSION 3.4.2
- UREPACKAGEVERSION 3.4.2
+ OOOBASEVERSION 3.5
+ OOOPACKAGEVERSION 3.5.0
+ UREPACKAGEVERSION 3.5.0
URELAYERVERSION 1
BASISROOTNAME LibreOffice
- UNIXBASISROOTNAME libreoffice3.4
- SERVICETAG_PRODUCTNAME LibreOffice 3.4
- SERVICETAG_PRODUCTVERSION 3.4
- SERVICETAG_PARENTNAME LibreOffice 3.4
+ UNIXBASISROOTNAME libreoffice3.5
+ SERVICETAG_PRODUCTNAME LibreOffice 3.5
+ SERVICETAG_PRODUCTVERSION 3.5
+ SERVICETAG_PARENTNAME LibreOffice 3.5
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
HIDELICENSEDIALOG 1
@@ -53,17 +53,16 @@ LibreOffice
variables
{
PRODUCTNAME LibreOffice
- PRODUCTNAME_BR LibreOffice
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION alpha0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.4
+ BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.2
- BASEPRODUCTVERSION 3.4
+ ABOUTBOXPRODUCTVERSION 3.5.0
+ BASEPRODUCTVERSION 3.5
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -74,7 +73,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -92,8 +91,6 @@ LibreOffice
PATCHCODEFILE ooo_patchcodes.txt
DOWNLOADBANNER ooobanner.bmp
DOWNLOADBITMAP ooobitmap.bmp
- DOWNLOADBANNER_BR ooobanner.bmp
- DOWNLOADBITMAP_BR ooobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
@@ -121,17 +118,16 @@ LibreOffice_wJRE
variables
{
PRODUCTNAME LibreOffice
- PRODUCTNAME_BR LibreOffice
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION alpha0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.4
+ BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.2
- BASEPRODUCTVERSION 3.4
+ ABOUTBOXPRODUCTVERSION 3.5.0
+ BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -141,7 +137,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -186,18 +182,18 @@ LibreOffice_Dev
variables
{
PRODUCTNAME LibO-dev
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION alpha0
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.4
+ BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.2
- BASEPRODUCTVERSION 3.4
+ ABOUTBOXPRODUCTVERSION 3.5.0
+ BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX libobasis-dev
UREPACKAGEPREFIX lodev
@@ -211,7 +207,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -220,12 +216,11 @@ LibreOffice_Dev
OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
- XPDINSTALLER 1
+ XPDINSTALLER 0
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- JAVAPRODUCT 1
LIBRARYVERSION 9.4.0
PATCHCODEFILE ooodev_patchcodes.txt
CODEFILENAME codes_ooodev.txt
@@ -244,7 +239,7 @@ LibreOffice_Dev
}
active 1
compression 5
- script setup_osljre
+ script setup_osl
downloadname LibO-dev_{productversion}_{os}_install_{languages}
langpackdownloadname LibO_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibO_{productversion}_helppack_{os}_install_{languages}
@@ -260,13 +255,13 @@ URE
variables
{
PRODUCTNAME URE
- PRODUCTVERSION 3.4
- PACKAGEVERSION 3.4
+ PRODUCTVERSION 3.5
+ PACKAGEVERSION 3.5
PACKAGEREVISION 1
PRODUCTEXTENSION
- BRANDPACKAGEVERSION 3.4
+ BRANDPACKAGEVERSION 3.5
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION alpha0
LICENSENAME LGPL
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
@@ -301,15 +296,14 @@ LibreOffice_SDK
variables
{
PRODUCTNAME LibreOffice
- PRODUCTNAME_BR LibreOffice
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION alpha0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 3.4
- PACKAGEVERSION 3.4.2
+ BRANDPACKAGEVERSION 3.5
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -348,16 +342,16 @@ LibreOffice_Dev_SDK
variables
{
PRODUCTNAME LibO-dev
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION alpha0
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 3.4
- PACKAGEVERSION 3.4.2
+ BRANDPACKAGEVERSION 3.5
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX libobasis-dev
UREPACKAGEPREFIX lodev
@@ -400,16 +394,16 @@ OxygenOffice
variables
{
PRODUCTNAME OxygenOffice
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION alpha0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.4
+ BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.2
- BASEPRODUCTVERSION 3.4
+ ABOUTBOXPRODUCTVERSION 3.5.0
+ BASEPRODUCTVERSION 3.5
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -420,7 +414,7 @@ OxygenOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -470,16 +464,16 @@ OxygenOffice_wJRE
variables
{
PRODUCTNAME OxygenOffice
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION alpha0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.4
+ BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.2
- BASEPRODUCTVERSION 3.4
+ ABOUTBOXPRODUCTVERSION 3.5.0
+ BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -489,7 +483,7 @@ OxygenOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1