diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-29 19:39:38 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-30 00:01:35 +0100 |
| commit | 228313f32c472da1cb2f7cacf53a25fcd3e12fb3 (patch) | |
| tree | 180b62630e607c167b7fa0a3d6e799f70ee89cb6 | |
| parent | df432e40d82ffd0c5ece36905bc67f3a7a667179 (diff) | |
msc-externals: remove Package_msms, use MSM directly from MSVC dir
Change-Id: I2e35810312ed140e393311569de7abd6f4676b63
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | external/msc-externals/Module_msc-externals.mk | 1 | ||||
| -rw-r--r-- | external/msc-externals/Package_msms.mk | 18 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/mergemodule.pm | 6 |
4 files changed, 4 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index b88d2e28d906..8f408f3041fb 100644 --- a/configure.ac +++ b/configure.ac @@ -5170,8 +5170,7 @@ find_msms() AC_MSG_NOTICE([no registry entry for Merge Module directory - trying "$COMMONPROGRAMFILES\Merge Modules"]) msmdir="$COMMONPROGRAMFILES\Merge Modules" fi - msmdir=`cygpath -d "$msmdir"` - msmdir=`cygpath -u "$msmdir"` + msmdir=`cygpath -m "$msmdir"` if test -z "$msmdir"; then if test "$ENABLE_RELEASE_BUILD" = "TRUE" ; then AC_MSG_ERROR([Merge modules not found in $msmdir]) diff --git a/external/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk index 275c9ff07c80..8790e4fd310e 100644 --- a/external/msc-externals/Module_msc-externals.mk +++ b/external/msc-externals/Module_msc-externals.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,msc-externals)) $(eval $(call gb_Module_add_targets,msc-externals,\ $(if $(ENABLE_CRASHDUMP),Package_dbghelp) \ - $(if $(MSM_PATH),Package_msms) \ Package_msvc_dlls \ $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \ )) diff --git a/external/msc-externals/Package_msms.mk b/external/msc-externals/Package_msms.mk deleted file mode 100644 index 9ffa294cf414..000000000000 --- a/external/msc-externals/Package_msms.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,msms,$(MSM_PATH))) - -$(eval $(call gb_Package_set_outdir,msms,$(OUTDIR))) - -$(eval $(call gb_Package_add_files,msms,bin,\ - $(MERGE_MODULES) \ -)) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm index ee02abb2e439..3989e26e408b 100644 --- a/solenv/bin/modules/installer/windows/mergemodule.pm +++ b/solenv/bin/modules/installer/windows/mergemodule.pm @@ -75,10 +75,10 @@ sub merge_mergemodules_into_msi_database foreach $mergemodule ( @{$mergemodules} ) { my $filename = $mergemodule->{'Name'}; - my $mergefile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1); + my $mergefile = $ENV{'MSM_PATH'} . $filename; - if ( ! -f $$mergefile ) { installer::exiter::exit_program("ERROR: msm file not found: $filename !", "merge_mergemodules_into_msi_database"); } - my $completesource = $$mergefile; + if ( ! -f $mergefile ) { installer::exiter::exit_program("ERROR: msm file not found: $filename ($mergefile)!", "merge_mergemodules_into_msi_database"); } + my $completesource = $mergefile; my $mergegid = $mergemodule->{'gid'}; my $workdir = $mergemoduledir . $installer::globals::separator . $mergegid; |