diff options
author | Andras Timar <andras.timar@collabora.com> | 2014-01-12 13:41:18 -0800 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-09-04 13:56:37 -0700 |
commit | 97657b7235aff5cb5190248e8483848b89097efa (patch) | |
tree | 5359858ff0d8769fa4bc3885474f866c02d92bf9 | |
parent | 6ade2bdd434a1b9a53da1c7a0753b4983c14313d (diff) |
enable MSP creation
Change-Id: I3d28cae66d8658505e2339d22304c1b3852fbb43
-rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 2 | ||||
-rw-r--r-- | setup_native/source/packinfo/finals_instsetoo.txt | 1 | ||||
-rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 9117dca61fe9..efd5a1e1441c 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -26,7 +26,7 @@ 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 @LIBO_VERSION_PATCH@ diff --git a/setup_native/source/packinfo/finals_instsetoo.txt b/setup_native/source/packinfo/finals_instsetoo.txt index d5a68d369f7b..b7331226cfde 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,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW c:\lo\src\cp-4.4-2\LibreOffice_4.4-2_Win_x86.msi diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 5a7423aa48f8..40c48236f6d1 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -221,7 +221,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 = ""; |