From 115d15ace966e1b18c8015959e8bc79437936149 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 1 Jul 2011 16:39:42 +0300 Subject: Build multi-lingual LO and SDK installers for Windows From instsetoo_native-win32-packaging.diff in the build repo. Signed-off-by: Tor Lillqvist --- instsetoo_native/util/makefile.mk | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'instsetoo_native/util') diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index d4fa58a1698b..2f0dd9e37dea 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -89,10 +89,18 @@ ALLTAR : $(LOCALPYFILES) .ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)" +.IF "$(GUI)"=="WNT" +ALLTAR : openofficeall ooohelppack +.ELSE ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) +.ENDIF +.ELSE +.IF "$(GUI)"=="WNT" +ALLTAR : openofficeall ooohelppack sdkooall .ELSE 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)"=="" -- cgit From 02772509b9ba5a799f5110500c205f7e58cfbedc Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 12 Jul 2011 13:14:24 +0200 Subject: bump product version to 3.4.2-rc1, release number to 201 --- instsetoo_native/util/openoffice.lst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'instsetoo_native/util') diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 67b8b8ab9764..44fc23c2c2cb 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -5,8 +5,8 @@ Globals variables { OOOBASEVERSION 3.4 - OOOPACKAGEVERSION 3.4.1 - UREPACKAGEVERSION 3.4.1 + OOOPACKAGEVERSION 3.4.2 + UREPACKAGEVERSION 3.4.2 URELAYERVERSION 1 BASISROOTNAME LibreOffice UNIXBASISROOTNAME libreoffice3.4 @@ -62,7 +62,7 @@ LibreOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.1 + ABOUTBOXPRODUCTVERSION 3.4.2 BASEPRODUCTVERSION 3.4 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update @@ -74,7 +74,7 @@ LibreOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.1 + PACKAGEVERSION 3.4.2 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -130,7 +130,7 @@ LibreOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.1 + ABOUTBOXPRODUCTVERSION 3.4.2 BASEPRODUCTVERSION 3.4 UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF @@ -141,7 +141,7 @@ LibreOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.1 + PACKAGEVERSION 3.4.2 PACKAGEREVISION {buildid} LICENSENAME LGPL WITHJREPRODUCT 1 @@ -196,7 +196,7 @@ LibreOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.1 + ABOUTBOXPRODUCTVERSION 3.4.2 BASEPRODUCTVERSION 3.4 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX libobasis-dev @@ -211,7 +211,7 @@ LibreOffice_Dev FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.1 + PACKAGEVERSION 3.4.2 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -309,7 +309,7 @@ LibreOffice_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.4 - PACKAGEVERSION 3.4.1 + PACKAGEVERSION 3.4.2 PACKAGEREVISION {buildid} PACK_INSTALLED 1 POOLPRODUCT 0 @@ -357,7 +357,7 @@ LibreOffice_Dev_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.4 - PACKAGEVERSION 3.4.1 + PACKAGEVERSION 3.4.2 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX libobasis-dev UREPACKAGEPREFIX lodev @@ -408,7 +408,7 @@ OxygenOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.1 + ABOUTBOXPRODUCTVERSION 3.4.2 BASEPRODUCTVERSION 3.4 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update @@ -420,7 +420,7 @@ OxygenOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.1 + PACKAGEVERSION 3.4.2 PACKAGEREVISION {buildid} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -478,7 +478,7 @@ OxygenOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.1 + ABOUTBOXPRODUCTVERSION 3.4.2 BASEPRODUCTVERSION 3.4 UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF @@ -489,7 +489,7 @@ OxygenOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.1 + PACKAGEVERSION 3.4.2 PACKAGEREVISION {buildid} LICENSENAME LGPL SERVICESPROJEKT 1 -- cgit From 0bd12a3f5f95a1334827471fa70bef6881a7446d Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 19 Jul 2011 15:46:22 +0200 Subject: bump product version to 3.4.2-rc2, release number to 202 --- instsetoo_native/util/openoffice.lst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'instsetoo_native/util') diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 44fc23c2c2cb..20d76c558939 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -57,7 +57,7 @@ LibreOffice PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 @@ -125,7 +125,7 @@ LibreOffice_wJRE PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 @@ -189,7 +189,7 @@ LibreOffice_Dev PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION @@ -266,7 +266,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.4 LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -305,7 +305,7 @@ LibreOffice_SDK PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.4 @@ -351,7 +351,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION SDK @@ -403,7 +403,7 @@ OxygenOffice PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 @@ -473,7 +473,7 @@ OxygenOffice_wJRE PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 -- cgit From f97edd0dbcb56de0a8bb64bd3226c34a457954d3 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Mon, 25 Jul 2011 20:06:05 +0200 Subject: bump product version to 3.4.2-rc3, release number to 203 --- instsetoo_native/util/openoffice.lst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'instsetoo_native/util') diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 20d76c558939..8ca1ebc614a2 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -57,7 +57,7 @@ LibreOffice PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 @@ -125,7 +125,7 @@ LibreOffice_wJRE PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 @@ -189,7 +189,7 @@ LibreOffice_Dev PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION @@ -266,7 +266,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.4 LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -305,7 +305,7 @@ LibreOffice_SDK PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.4 @@ -351,7 +351,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION SDK @@ -403,7 +403,7 @@ OxygenOffice PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 @@ -473,7 +473,7 @@ OxygenOffice_wJRE PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 -- cgit