mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msc-externals: remove Package_msms, use MSM directly from MSVC dir

Browse Source 
Change-Id: I2e35810312ed140e393311569de7abd6f4676b63
This commit is contained in:
Michael Stahl 2013-10-29 19:39:38 +01:00
parent df432e40d8
commit 228313f32c
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -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])

1
external/msc-externals/Module_msc-externals.mk vendored
View File

@ -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) \
))

18
external/msc-externals/Package_msms.mk vendored
View File

@ -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:

6
solenv/bin/modules/installer/windows/mergemodule.pm
View File

@ -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;