Hi, After my last mail I created the required patches (3) for already built LibO. A diffed against 3-3. Please test is if possible. Please check the attached patches. -- Best regards, Kálmán „KAMI” Szalai | 神 | kami911 [at] gmail [dot] com My favorite projects: OxygenOffice Professional <http://ooop.sf.net/> - office suite - for everybody | Magyarul <http://hun.sf.net/> - In Hungarian Blog <http://bit.ly/10ucTR> | Support <http://bit.ly/eYZO6> Follow me <http://bit.ly/gJuJZ>, if you can <http://bit.ly/kDocB>
--- solenv/bin/modules/installer/windows/msiglobal.pm +++ solenv/bin/modules/installer/windows/msiglobal.pm @@ -64,7 +64,7 @@ sub write_ddf_file_header push(@{$ddffileref} ,$oneline); $oneline = ".Set Compress=ON\n"; push(@{$ddffileref} ,$oneline); - $oneline = ".Set CompressionLevel=$installer::globals::cabfilecompressionlevel\n"; + $oneline = ".Set CompressionMemory= 21\n"; push(@{$ddffileref} ,$oneline); $oneline = ".Set Cabinet=ON\n"; push(@{$ddffileref} ,$oneline); --- setup_native/source/win32/nsis/downloadtemplate.nsi +++ setup_native/source/win32/nsis/downloadtemplate.nsi @@ -3,7 +3,8 @@ !define PRODUCT_PUBLISHER "PUBLISHERPLACEHOLDER" !define PRODUCT_WEB_SITE "WEBSITEPLACEHOLDER" -SetCompressor lzma +SetCompress Off +SetDatablockOptimize On ; SetCompressor zlib ; Helpful for debugging, disable for products ; RequestExecutionLevel user
--- solenv/bin/modules/installer/windows/msiglobal.pm +++ solenv/bin/modules/installer/windows/msiglobal.pm @@ -64,7 +64,7 @@ sub write_ddf_file_header push(@{$ddffileref} ,$oneline); $oneline = ".Set Compress=ON\n"; push(@{$ddffileref} ,$oneline); - $oneline = ".Set CompressionLevel=$installer::globals::cabfilecompressionlevel\n"; + $oneline = ".Set CompressionMemory= 21\n"; push(@{$ddffileref} ,$oneline); $oneline = ".Set Cabinet=ON\n"; push(@{$ddffileref} ,$oneline); --- setup_native/source/win32/nsis/downloadtemplate.nsi +++ setup_native/source/win32/nsis/downloadtemplate.nsi @@ -3,7 +3,9 @@ !define PRODUCT_PUBLISHER "PUBLISHERPLACEHOLDER" !define PRODUCT_WEB_SITE "WEBSITEPLACEHOLDER" -SetCompressor lzma +SetCompress Force +SetCompressor zlib +SetDatablockOptimize On ; SetCompressor zlib ; Helpful for debugging, disable for products ; RequestExecutionLevel user
--- solenv/bin/modules/installer/windows/msiglobal.pm +++ solenv/bin/modules/installer/windows/msiglobal.pm @@ -60,11 +60,7 @@ sub write_ddf_file_header push(@{$ddffileref} ,$oneline); $oneline = ".Set MaxDiskSize=2147483648\n"; # This allows the .cab file to get a size of 2 GB. push(@{$ddffileref} ,$oneline); - $oneline = ".Set CompressionType=LZX\n"; - push(@{$ddffileref} ,$oneline); - $oneline = ".Set Compress=ON\n"; - push(@{$ddffileref} ,$oneline); - $oneline = ".Set CompressionLevel=$installer::globals::cabfilecompressionlevel\n"; + $oneline = ".Set Compress=OFF\n"; push(@{$ddffileref} ,$oneline); $oneline = ".Set Cabinet=ON\n"; push(@{$ddffileref} ,$oneline); --- setup_native/source/win32/nsis/downloadtemplate.nsi +++ setup_native/source/win32/nsis/downloadtemplate.nsi @@ -3,7 +3,10 @@ !define PRODUCT_PUBLISHER "PUBLISHERPLACEHOLDER" !define PRODUCT_WEB_SITE "WEBSITEPLACEHOLDER" -SetCompressor lzma +SetCompress Auto +SetCompressor /SOLID lzma +SetCompressorDictSize 64 +SetDatablockOptimize On ; SetCompressor zlib ; Helpful for debugging, disable for products ; RequestExecutionLevel user
Attachment:
signature.asc
Description: OpenPGP digital signature