diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-05-22 07:38:50 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-05-26 03:01:38 -0700 |
| commit | b41c569ab782041b81032de85b0617df881d8ae3 (patch) | |
| tree | 67c7a73884605c7a40ad434972a5444e893f52f1 | |
| parent | a85641c044a9f5c1104cef07059f56b45518d968 (diff) | |
enable MSP creation
Change-Id: Ifb90fd638a2316ed1726a64fd70de09727f25219
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 2 | ||||
| -rw-r--r-- | setup_native/source/packinfo/finals_instsetoo.txt | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 8083d562b6c3..58ea4fc85ca6 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 d1d9241ef2d1..28ed77465c47 100644 --- a/setup_native/source/packinfo/finals_instsetoo.txt +++ b/setup_native/source/packinfo/finals_instsetoo.txt @@ -30,4 +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-XV,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,sh,sk,sl,sr,sv,ta,te,tr,uk,vi,zh-CN,zh-TW c:\lo\src\cp-4.1-3\LibreOffice_4.1-3_Win_x86.msi +LibreOffice pro en-US,ar,as,ast,bg,bn-IN,br,ca,ca-XV,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,sh,sk,sl,sr,sv,ta,te,tr,uk,vi,zh-CN,zh-TW c:\lo\src\cp-4.1-7\LibreOffice_4.1-7_Win_x86.msi diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index b3088c80ad4f..94e69121accb 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -222,7 +222,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 = ""; |