summaryrefslogtreecommitdiff
path: root/solenv/bin/modules/installer/windows/mergemodule.pm
AgeCommit message (Collapse)Author
2014-12-09A bit better error message.Jan Holesovsky
Change-Id: Ia3ea8ae38aab0080d01932d586b921599adbaf21
2013-11-08installer: the perl is borkedMichael Stahl
Apparently the $$languagesref in create_directories results in the full path to services.rdb when called from mergemodules.pm as my $unpackdir = installer::systemactions::create_directories("cab", ""); ... which apparently means that there's some variable whose name is the empty string and whose value is the path to services.rdb. Add some mysterious workaround suggested by mmeeks. Change-Id: I6ba203f5cc44786969795eebab5359d5e9a8a12a
2013-10-30msc-externals: remove Package_msms, use MSM directly from MSVC dirMichael Stahl
Change-Id: I2e35810312ed140e393311569de7abd6f4676b63
2013-06-03re-base on ALv2 code. Includes:Michael Meeks
Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 http://svn.apache.org/viewvc?view=revision&revision=1397337 http://svn.apache.org/viewvc?view=revision&revision=1397315 http://svn.apache.org/viewvc?view=revision&revision=1396797 Patches contributed by Andre Fischer Fixed getcsym.awk to handle #-comments that contain special regexp chars. http://svn.apache.org/viewvc?view=revision&revision=1230971 118778: Added ADDITIONAL_REPOSITORIES environment variable and its automatic setup in configure. http://svn.apache.org/viewvc?view=revision&revision=1232004 118160: Added external CoinMP library. http://svn.apache.org/viewvc?view=revision&revision=1233909 Patches contributed by Herbert Duerr #i119168# use generic LICENSE file for langpacks and sdks http://svn.apache.org/viewvc?view=revision&revision=1310178 macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars http://svn.apache.org/viewvc?view=revision&revision=1183367 allow gbuild with empty sysroot on linux http://svn.apache.org/viewvc?view=revision&revision=1179186 Patches contributed by Ingo Schmidt native373: #164472# improvements for msi database http://svn.apache.org/viewvc?view=revision&revision=1167540 http://svn.apache.org/viewvc?view=revision&revision=1167539 Patches contributed by Jurgen Schmidt adapt setup package scripts to handle special DS_Store file for developer snapshot builds http://svn.apache.org/viewvc?view=revision&revision=1232430 imported patch extensions_i117681.patch http://svn.apache.org/viewvc?view=revision&revision=1172102 Patches contributed by Michael Stahl gbuild: RepositoryFixes.mk should be optional http://svn.apache.org/viewvc?view=revision&revision=1166123 xslt filter: remove the FLA horror wordml import filter: replace FLA usage with plain XSLT http://svn.apache.org/viewvc?view=revision&revision=1363727 Patch contributed by Oliver-Rainer Wittmann i#88652: applied patch, remove unicows deps http://svn.apache.org/viewvc?view=revision&revision=1177585 Remove lots of OS2 conditionals, re-extract Rhino Java, unwind cppunit pieces, cleanup Mac image bits, remove coin-mp and re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand MPLv2 subset checking. Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
2013-01-10Kill the ancient StarOffice "patch" conceptTor Lillqvist
For Windows, superseded by Windows Installer patching (i.e., creating .msp files), which is something completely different. (And quite hard to get working... but still a saner approach, I think.) For Linux, many distros use delta RPMs or similar, so no home-grown LO-specific patching mechanism is needed. Remove the -patch and -patchinc command-line options to make_installer.pl and all code that was invoked only when using those. Remove the PATCH and PATCH_ONLY flags in scp2. Remove the patchmsi.dll Windows Installer custom action. Change-Id: I09e949e601a969f88eff60067faa2352f4f89537 Reviewed-on: https://gerrit.libreoffice.org/1605 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-09-23merge_mergemodules_into_msi_database: ditch unused function argumentsAndras Timar
Change-Id: I33ea8817dcbd184cf824fc7252def5e3e9dfa3da
2012-06-05silence warningsAndras Timar
Change-Id: Ibc6addfe5eacf4a9e23f6f26830f5a1f9bf77594
2012-05-15fix log entry of mergemodule conditionAndras Timar
Change-Id: Id88f38fb806c6178240eb69da69c2e633c2033da
2012-05-14fdo#46519 workaround of MSI installer error 1935Andras Timar
In some circumstances installation of embedded VC++ runtime fails with error code 1935. This usually occurs, when there are many different versions of VC++ runtimes installed on the computer, including beta versions. We can workaround this Microsoft bug, if we don't install our VC++ runtime. A new property was introduced. It is called VC_REDIST, and installation of VC++ runtime depends on its value. (BTW the solution is general, ComponentCondition can be used for any merge module, now we have only the VC++ runtime merge module.) When the user experiences error code 1935, he should try to install LibreOffice with the following command line: msiexec /i <msi file name> VC_REDIST=0 The patch fixes another minor issue. 64-bit VC++ runtime will not be installed on 32-bit systems any more. Change-Id: I I6c5e066c6e60b011235e6019a8a35c9e953209bc
2010-12-20Merge commit 'libreoffice-3.3.0.2'Jan Holesovsky
Conflicts: configure.in scp2/source/extensions/directory_extensions.scp scp2/source/extensions/module_extensions.scp scp2/source/ooo/file_ooo.scp set_soenv.in solenv/bin/modules/installer/download.pm solenv/bin/modules/installer/helppack.pm solenv/bin/modules/installer/windows/createfolder.pm solenv/bin/modules/installer/worker.pm solenv/bin/ooinstall
2010-12-17more langpacks installer hacks ported for helppacksFridrich Strba
2010-11-18Perl Installer: Remove commented out code.Jordan Ayers
2010-09-14build-fix-win32.diff: Fix Windows build on partition without short namesTor Lillqvist
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun ↵Jens-Heiner Rechtien
Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
2008-12-16CWS-TOOLING: integrate CWS odfp30_DEV300Rüdiger Timm
2008-10-16CWS-TOOLING: integrate CWS native197_DEV300Oliver Bolte
2008-09-05INTEGRATION: CWS kendy21 (1.6.8); FILE MERGEDRüdiger Timm
2008/09/03 15:39:07 thb 1.6.8.1: #i93435# Cleansing all paths with cygpath (conditionalized for cygwin builds)
2008-08-27INTEGRATION: CWS native188_DEV300 (1.5.36.1.6); FILE MERGEDRüdiger Timm
2008/08/25 09:07:39 is 1.5.36.1.6.1: #i93065# patch for expand.exe in cygwin
2008-08-18INTEGRATION: CWS native180 (1.5.46); FILE MERGEDVladimir Glazounov
2008/08/05 14:00:02 is 1.5.46.1: #i91954# prepare products for msp usage
2008-07-10#i91498# msidb.exe really wants backslashes.Rüdiger Timm
2008-06-30INTEGRATION: CWS native160 (1.3.104); FILE MERGEDVladimir Glazounov
2008/06/26 10:42:47 is 1.3.104.2: #i91050# merging customactions into execute tables 2008/06/24 10:36:21 is 1.3.104.1: #i88671# merging msvc90 libraries
2008-04-10INTEGRATION: CWS changefileheader (1.2.180); FILE MERGEDRüdiger Timm
2008/03/28 15:55:45 rt 1.2.180.1: #i87441# Change license header to LPGL v3.
2007-11-23INTEGRATION: CWS native116 (1.1.2); FILE ADDEDIvo Hinkelmann
2007/10/10 15:13:50 is 1.1.2.1: #i82313# preparing merge module integration
generated by cgit (git 2.34.1) at 2024-08-21 11:42:24 +0000