instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 2 instsetoo_native/util/openoffice.lst | 26 +++++----- setup_native/source/packinfo/finals_instsetoo.txt | 1 solenv/bin/modules/installer/globals.pm | 2 solenv/inc/minor.mk | 4 - 5 files changed, 18 insertions(+), 17 deletions(-)
New commits: commit f47f6e0dea37622735184f045c1dc70c0f8b8537 Author: Andras Timar <[email protected]> Date: Thu Jul 4 03:54:29 2013 -0700 enable MSP creation and bump version number for 1st PTF Change-Id: I3f86bdf65f9cc38d4ae8b51afe5264e118132b39 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 828e80f..39b427e 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -15,7 +15,7 @@ FileCost 400 FindRelatedProducts NOT ISSETUPDRIVEN 100 InstallFiles 1950 InstallFinalize 3150 -PatchInstall PATCH 699 +PatchInstall PATCH 49 InstallInitialize 700 InstallODBC 2600 InstallServices VersionNT 2750 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 591b430..eb7aecd 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -30,10 +30,10 @@ Globals REGISTRYLAYERNAME Layers SERVICEPACK 1 UPDATE_DATABASE 1 - CREATE_MSP_INSTALLSET 0 + CREATE_MSP_INSTALLSET 1 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL 8 + WINDOWSPATCHLEVEL 6 OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} @@ -50,13 +50,13 @@ LibreOffice { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 - PRODUCTEXTENSION -4 + PRODUCTEXTENSION -6 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-304 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-306 BASEPRODUCTVERSION 4.0 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -100,14 +100,14 @@ LibreOffice_Dev { PRODUCTNAME LOdev PRODUCTVERSION 4.0 - PRODUCTEXTENSION -4 + PRODUCTEXTENSION -6 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-304 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-306 BASEPRODUCTVERSION 4.0 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -161,7 +161,7 @@ URE PRODUCTVERSION 4.0 PACKAGEVERSION 4.0 PACKAGEREVISION 1 - PRODUCTEXTENSION -4 + PRODUCTEXTENSION -6 BRANDPACKAGEVERSION 4.0 LICENSENAME LGPL NOVERSIONINDIRNAME 1 @@ -192,7 +192,7 @@ LibreOffice_SDK { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 - PRODUCTEXTENSION -4 + PRODUCTEXTENSION -6 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4.0 @@ -231,7 +231,7 @@ LibreOffice_Dev_SDK { PRODUCTNAME LOdev PRODUCTVERSION 4.0 - PRODUCTEXTENSION -4 + PRODUCTEXTENSION -6 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -276,7 +276,7 @@ LibreOffice_Test { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 - PRODUCTEXTENSION -4 + PRODUCTEXTENSION -6 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 4.0 @@ -315,7 +315,7 @@ LibreOffice_Dev_Test { PRODUCTNAME LOdev PRODUCTVERSION 4.0 - PRODUCTEXTENSION -4 + PRODUCTEXTENSION -6 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -359,13 +359,13 @@ OxygenOffice { PRODUCTNAME OxygenOffice PRODUCTVERSION 4.0 - PRODUCTEXTENSION -4 + PRODUCTEXTENSION -6 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-304 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-306 BASEPRODUCTVERSION 4.0 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php diff --git a/setup_native/source/packinfo/finals_instsetoo.txt b/setup_native/source/packinfo/finals_instsetoo.txt index d5a68d36..4fafe3f 100644 --- a/setup_native/source/packinfo/finals_instsetoo.txt +++ b/setup_native/source/packinfo/finals_instsetoo.txt @@ -30,3 +30,4 @@ # OpenOffice pro de \\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi # OpenOfficeLanguagePack pro es \\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi # URE pro en-US \\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi +LibreOffice pro en-US,af,ar,bn,ca,cs,da,de,el,en-GB,en-ZA,es,fi,fr,gu,he,hi,hu,it,ja,ko,mr,nb,nl,nn,pl,pt,pt-BR,ru,sk,sl,sv,ta,tr,xh,zh-CN,zh-TW,zu c:\lo\src\suse-4.0-5\LibreOffice_4.0-5.msi diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 8cf519d..5687b43 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -230,7 +230,7 @@ BEGIN $fix_number_of_cab_files = 1; $cabfilecompressionlevel = 21; # Using LZX compression, possible values are: 15 | 16 | ... | 21 (best compression) $number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1 - $include_cab_in_msi = 1; + $include_cab_in_msi = 0; $msidatabasename = ""; $prepare_winpatch = 0; $previous_idt_dir = ""; diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index f6260a6..e664d16 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,6 +1,6 @@ RSCVERSION=400 -RSCREVISION=400m1(Build:304) -BUILD=304 +RSCREVISION=400m1(Build:306) +BUILD=306 LAST_MINOR=m0 SOURCEVERSION=OOO400 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
