Makefile.in | 6 - RepositoryExternal.mk | 6 - cli_ure/Module_cli_ure.mk | 4 cli_ure/Package_version.mk | 16 --- config_host.mk.in | 1 configure.ac | 10 -- connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h | 1 desktop/WinResTarget_quickstart.mk | 2 desktop/WinResTarget_soffice.mk | 4 desktop/WinResTarget_sofficebin.mk | 28 +++++ desktop/win32/source/QuickStart/QuickStart.rc | 2 dev/null |binary external/moz/ExternalPackage_moz_lib.mk | 21 ---- external/moz/Module_moz.mk | 1 external/msc-externals/Makefile | 7 + external/msc-externals/Module_msc-externals.mk | 3 external/msc-externals/Package_dbghelp.mk | 4 external/msc-externals/Package_msms.mk | 18 --- external/msc-externals/Package_msvc80_dlls.mk | 4 external/msc-externals/README | 1 instsetoo_native/util/openoffice.lst.in | 4 l10ntools/Module_l10ntools.mk | 4 l10ntools/Package_ulfconv.mk | 16 --- scp2/source/ooo/vc_redist.scp | 39 ------- solenv/CustomTarget_gdb.mk | 22 ---- solenv/Module_solenv.mk | 8 - solenv/Package_gdb.mk | 38 ------- solenv/bin/install-gdb-printers | 10 +- solenv/bin/modules/installer/control.pm | 7 - solenv/bin/modules/installer/globals.pm | 2 solenv/bin/modules/installer/windows/mergemodule.pm | 6 - solenv/bin/modules/installer/windows/shortcut.pm | 10 +- solenv/bin/modules/installer/worker.pm | 8 - sysui/Module_sysui.mk | 5 - sysui/Package_icons.mk | 55 ----------- sysui/desktop/icons/soffice.ico |binary unoil/Module_unoil.mk | 4 unoil/Package_clioootypesversion.mk | 16 --- vcl/Library_vcl.mk | 4 39 files changed, 78 insertions(+), 319 deletions(-)
New commits: commit 8817dcb8f43051d352c0caed6eebf29c6b0192b8 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 23:18:50 2013 +0100 l10ntools: remove Package_ulfconv Change-Id: I7a8c3fdf34951e00fca8c0a2543f33817fa874fa diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index 771e717..9797252 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -25,8 +25,4 @@ $(eval $(call gb_Module_add_targets_for_build,l10ntools,\ StaticLibrary_transex \ )) -$(eval $(call gb_Module_add_targets,l10ntools,\ - Package_ulfconv \ -)) - # vim:set noet sw=4 ts=4: diff --git a/l10ntools/Package_ulfconv.mk b/l10ntools/Package_ulfconv.mk deleted file mode 100644 index 18be8b4..0000000 --- a/l10ntools/Package_ulfconv.mk +++ /dev/null @@ -1,16 +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,l10ntools_ulfconv,$(SRCDIR)/l10ntools/source/ulfconv)) - -$(eval $(call gb_Package_set_outdir,l10ntools_ulfconv,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,l10ntools_ulfconv,bin/msi-encodinglist.txt,msi-encodinglist.txt)) - -# vim: set noet sw=4 ts=4: diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 955158d..6e81431 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -408,14 +408,13 @@ sub check_logfile sub read_lcidlist { my ($patharrayref) = @_; - my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::lcidlistname, $patharrayref , 0); - if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Did not find Windows LCID list $installer::globals::lcidlistname!", "read_lcidlist"); } + if ( ! -f $installer::globals::lcidlistname ) { installer::exiter::exit_program("ERROR: Did not find Windows LCID list $installer::globals::lcidlistname!", "read_lcidlist"); } - my $infoline = "Found LCID file: $$fileref\n"; + my $infoline = "Found LCID file: $installer::globals::lcidlistname\n"; push(@installer::globals::globallogfileinfo, $infoline); - my $lcidlist = installer::files::read_file($$fileref); + my $lcidlist = installer::files::read_file($installer::globals::lcidlistname); my %msilanguage = (); for ( my $i = 0; $i <= $#{$lcidlist}; $i++ ) diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 29ca75d..23b76d0 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -81,7 +81,7 @@ BEGIN $templatefoldername = "Templates"; $programmenufolder = "ProgramMenuFolder"; $systemfolder = "SystemFolder"; - $lcidlistname = "msi-encodinglist.txt"; + $lcidlistname = $ENV{'SRCDIR'} . "/l10ntools/source/ulfconv/msi-encodinglist.txt"; $msilanguage = ""; # hash reference for msi languages LCID $sofficeiconadded = 0; $temppath = ""; commit 5503a68395641d8ae927c635eec2960c617ddbc3 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 22:54:32 2013 +0100 cli_ure: remove CLI version Packages Tweak the installer so it reads the included files from SRCDIR. Change-Id: Ic4d3d2c003c2d0c5aebea6dd32f5989f3d4f04e4 diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk index 0bd1093..d1ff090 100644 --- a/cli_ure/Module_cli_ure.mk +++ b/cli_ure/Module_cli_ure.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Module_Module,cli_ure)) -$(eval $(call gb_Module_add_targets,cli_ure,\ - Package_version \ -)) - ifeq ($(COM),MSC) $(eval $(call gb_Module_add_targets,cli_ure,\ CliLibrary_cli_basetypes \ diff --git a/cli_ure/Package_version.mk b/cli_ure/Package_version.mk deleted file mode 100644 index 675d32a..0000000 --- a/cli_ure/Package_version.mk +++ /dev/null @@ -1,16 +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,cli_ure_version,$(SRCDIR)/cli_ure/version)) - -$(eval $(call gb_Package_set_outdir,cli_ure_version,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,cli_ure_version,bin/cliureversion.mk,version.txt)) - -# vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index a23b6a1..11b2a6f 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -55,7 +55,7 @@ LibreOffice BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk + ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt ADDSYSTEMINTEGRATION 1 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ PACKAGEREVISION {buildid} @@ -106,7 +106,7 @@ LibreOffice_Dev SOLSUREPACKAGEPREFIX libreofficedev REGISTRYLAYERNAME LayerDev UPDATEURL http://update.libreoffice.org/check.php - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk + ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt ADDSYSTEMINTEGRATION 1 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ PACKAGEREVISION {buildid} diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index 6620695..261bd19 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -542,13 +542,13 @@ sub add_variables_from_inc_to_hashref { $includefilename =~ s/^\s*//; $includefilename =~ s/\s*$//; - $includefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$includefilename, $includepatharrayref, 1); - if ( $$includefilenameref eq "" ) { installer::exiter::exit_program("Include file $includefilename not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); } + $includefilenameref = $ENV{'SRCDIR'} . "/" . $includefilename; + if ( ! -f $includefilenameref ) { installer::exiter::exit_program("Include file $includefilename ($includefilenameref) not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); } - $infoline = "Including inc file: $$includefilenameref \n"; + $infoline = "Including inc file: $includefilenameref \n"; push( @installer::globals::globallogfileinfo, $infoline); - my $includefile = installer::files::read_file($$includefilenameref); + my $includefile = installer::files::read_file($includefilenameref); for ( my $j = 0; $j <= $#{$includefile}; $j++ ) { diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk index f6bdc70..5977368 100644 --- a/unoil/Module_unoil.mk +++ b/unoil/Module_unoil.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Module_Module,unoil)) -$(eval $(call gb_Module_add_targets,unoil,\ - Package_clioootypesversion \ -)) - ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,unoil,\ CustomTarget_javamaker \ diff --git a/unoil/Package_clioootypesversion.mk b/unoil/Package_clioootypesversion.mk deleted file mode 100644 index 5ca871a..0000000 --- a/unoil/Package_clioootypesversion.mk +++ /dev/null @@ -1,16 +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,unoil_clioootypesversion,$(SRCDIR)/unoil/climaker)) - -$(eval $(call gb_Package_set_outdir,unoil_clioootypesversion,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,unoil_clioootypesversion,bin/clioootypesversion.mk,version.txt)) - -# vim:set noet sw=4 ts=4: commit 3df5304ada4cec75072bc71f24ab82fe9b48d97c Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 21:43:41 2013 +0100 sysui: remove Package_icons - rename main_app.ico to soffice.ico (in case the name is relevant?) - installer: hard-code path to sysui/desktop/icons/soffice.ico Change-Id: Iacd6e28201c3f8e69375e0bfc516542e86131912 diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk index 9f80cf6..0c06f59 100644 --- a/desktop/WinResTarget_quickstart.mk +++ b/desktop/WinResTarget_quickstart.mk @@ -16,7 +16,7 @@ $(eval $(call gb_WinResTarget_set_include,quickstart/QuickStart,\ )) $(eval $(call gb_WinResTarget_add_dependencies,quickstart/QuickStart,\ - sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/soffice.ico \ )) $(eval $(call gb_WinResTarget_set_rcfile,quickstart/QuickStart,desktop/win32/source/QuickStart/QuickStart)) diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk index d9e870c..e3b7927 100644 --- a/desktop/WinResTarget_soffice.mk +++ b/desktop/WinResTarget_soffice.mk @@ -17,13 +17,13 @@ $(eval $(call gb_WinResTarget_set_include,soffice/launcher,\ $(eval $(call gb_WinResTarget_add_defs,soffice/launcher,\ -DRES_APP_NAME=soffice \ -DRES_APP_FILEDESC="$(PRODUCTNAME)" \ - -DRES_APP_ICON=icons/main_app.ico \ + -DRES_APP_ICON=icons/soffice.ico \ -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) $(eval $(call gb_WinResTarget_add_dependencies,soffice/launcher,\ - sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/soffice.ico \ )) $(eval $(call gb_WinResTarget_set_rcfile,soffice/launcher,desktop/win32/source/applauncher/launcher)) diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk index d194ef5..e10c259 100644 --- a/desktop/WinResTarget_sofficebin.mk +++ b/desktop/WinResTarget_sofficebin.mk @@ -17,13 +17,13 @@ $(eval $(call gb_WinResTarget_set_include,sofficebin/officeloader,\ $(eval $(call gb_WinResTarget_add_defs,sofficebin/officeloader,\ -DRES_APP_NAME=soffice \ -DRES_APP_FILEDESC="$(PRODUCTNAME)" \ - -DRES_APP_ICON=icons/main_app.ico \ + -DRES_APP_ICON=icons/soffice.ico \ -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) $(eval $(call gb_WinResTarget_add_dependencies,sofficebin/officeloader,\ - sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/soffice.ico \ sysui/desktop/icons/oasis-database.ico \ sysui/desktop/icons/oasis-drawing-template.ico \ sysui/desktop/icons/oasis-drawing.ico \ diff --git a/desktop/win32/source/QuickStart/QuickStart.rc b/desktop/win32/source/QuickStart/QuickStart.rc index 7c2819e..cf91314 100644 --- a/desktop/win32/source/QuickStart/QuickStart.rc +++ b/desktop/win32/source/QuickStart/QuickStart.rc @@ -1,3 +1,3 @@ #include "resource.h" -ICON_ACTIVE ICON DISCARDABLE "icons/main_app.ico" +ICON_ACTIVE ICON DISCARDABLE "icons/soffice.ico" diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm index 421a649..c346908 100644 --- a/solenv/bin/modules/installer/windows/shortcut.pm +++ b/solenv/bin/modules/installer/windows/shortcut.pm @@ -633,17 +633,17 @@ sub create_shortcut_table my $onefile = ""; my $sofficefile = "soffice.ico"; - my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$sofficefile, $includepatharrayref, 0); + my $sourcepathref = $ENV{'SRCDIR'} . "/sysui/desktop/icons/" . $sofficefile; - if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon!", "create_shortcut_table"); } + if (! -f $sourcepathref) { installer::exiter::exit_program("ERROR: Could not find $sofficefile ($sourcepathref) as icon!", "create_shortcut_table"); } - if (! grep {$_ eq $$sourcepathref} @{$iconfilecollector}) + if (! grep {$_ eq $sourcepathref} @{$iconfilecollector}) { - unshift(@{$iconfilecollector}, $$sourcepathref); + unshift(@{$iconfilecollector}, $sourcepathref); $installer::globals::sofficeiconadded = 1; } - my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n"; + my $localinfoline = "Added icon file $sourcepathref for language pack into icon file collector.\n"; push(@installer::globals::logfileinfo, $localinfoline); # Saving the file diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk index 9744ba8..99ea359 100644 --- a/sysui/Module_sysui.mk +++ b/sysui/Module_sysui.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Module_add_targets,sysui,\ $(if $(filter deb,$(PKGFORMAT)),CustomTarget_deb) \ $(if $(filter SOLARIS,$(OS)),CustomTarget_solaris) \ )) - else # OS=MACOSX $(eval $(call gb_Module_add_targets,sysui,\ Package_osxicons \ @@ -27,10 +26,6 @@ $(eval $(call gb_Module_add_targets,sysui,\ Package_infoplist \ )) endif -else # OS=WNT -$(eval $(call gb_Module_add_targets,sysui,\ - Package_icons \ -)) endif # vim: set noet sw=4 ts=4: diff --git a/sysui/Package_icons.mk b/sysui/Package_icons.mk deleted file mode 100644 index e4d60c9..0000000 --- a/sysui/Package_icons.mk +++ /dev/null @@ -1,16 +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,sysui/icons,$(SRCDIR)/sysui/desktop/icons)) - -$(eval $(call gb_Package_set_outdir,sysui/icons,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,sysui/icons,bin/soffice.ico,main_app.ico)) - -# vim: set noet sw=4 ts=4: diff --git a/sysui/desktop/icons/main_app.ico b/sysui/desktop/icons/soffice.ico similarity index 100% rename from sysui/desktop/icons/main_app.ico rename to sysui/desktop/icons/soffice.ico commit 5de3b85f17d90e535f963313b4a645b28dacba33 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 20:55:59 2013 +0100 configure: remove newly unused variable MERGE_MODULES Change-Id: Idb60c578f6dd3412a81b38aaf66d21674387a2e0 diff --git a/config_host.mk.in b/config_host.mk.in index 3c89137..d03b96f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -363,7 +363,6 @@ export BUNDLE_MARIADB=@BUNDLE_MARIADB@ export MD5SUM=@MD5SUM@ export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@ export MERGELIBS=@MERGELIBS@ -export MERGE_MODULES=@MERGE_MODULES@ export MINGWCXX=@MINGWCXX@ export MINGWSTRIP=@MINGWSTRIP@ export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@ diff --git a/configure.ac b/configure.ac index 8f408f3..f10f71d 100644 --- a/configure.ac +++ b/configure.ac @@ -5178,8 +5178,6 @@ find_msms() AC_MSG_WARN([Merge modules not found in $msmdir]) msmdir="" fi - else - msms="Microsoft_VC${VCVER}_CRT_x86.msm" fi } @@ -6600,14 +6598,12 @@ if test $_os = "WINNT" -a "$WITH_MINGW" != yes; then MSVC_DLL_PATH="$msvcdllpath" MSVC_DLLS="$msvcdlls" MSM_PATH="$msmdir" - MERGE_MODULES="$msms" SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST" fi AC_SUBST(MSVC_DLL_PATH) AC_SUBST(MSVC_DLLS) AC_SUBST(MSM_PATH) -AC_SUBST(MERGE_MODULES) dnl =================================================================== dnl Checks for Java commit 228313f32c472da1cb2f7cacf53a25fcd3e12fb3 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 19:39:38 2013 +0100 msc-externals: remove Package_msms, use MSM directly from MSVC dir Change-Id: I2e35810312ed140e393311569de7abd6f4676b63 diff --git a/configure.ac b/configure.ac index b88d2e2..8f408f3 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 275c9ff..8790e4f 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 9ffa294..0000000 --- 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 ee02abb..3989e26 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; commit df432e40d82ffd0c5ece36905bc67f3a7a667179 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 19:04:22 2013 +0100 msc-externals: add missing Makefile and README Change-Id: I2aad0fe01bcfb0552ec54537e89d8b7e90f80a62 diff --git a/external/msc-externals/Makefile b/external/msc-externals/Makefile new file mode 100644 index 0000000..e4968cf --- /dev/null +++ b/external/msc-externals/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/external/msc-externals/README b/external/msc-externals/README new file mode 100644 index 0000000..9ffb415 --- /dev/null +++ b/external/msc-externals/README @@ -0,0 +1 @@ +module msc-externals copies the bundled MSVC runtime DLLs into instdir commit 76e1ff7bc8230d09092a9dae3942f949b388c5eb Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 17:26:45 2013 +0100 configure: mozab-driver does not build with MSVC debug runtimes link.exe complains about different settings of _ITERATOR_DEBUG_LEVEL and RuntimeLibrary in MCatalog.o and other objects (LNK2038). Change-Id: I4a63231c93d34edd3c20b6987ee8c9ed3b072ed5 diff --git a/configure.ac b/configure.ac index c2c8b41..b88d2e2 100644 --- a/configure.ac +++ b/configure.ac @@ -3717,6 +3717,9 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then else with_system_libcmis=no fi + if test "$enable_win_mozab_driver" = "yes"; then + AC_MSG_ERROR([--enable-win-mozab-driver conflicts with --enable-dbgutil]) + fi else ENABLE_DBGUTIL="" MSVC_USE_DEBUG_RUNTIME="" commit ffa7f7b8ac6c6cb292f6b115c0601ac11d7a8f16 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 17:19:20 2013 +0100 connectivity: mozabdrv: avoid warning C4005 macro redefinition Both winnls.h (included via windows.h) and mozilla nsCharTraits.h define macro IS_HIGH_SURROGATE/IS_LOW_SURROGATE; it turns out that the nsEmbedAPI.h that drags in winodws.h is apparently unused. Change-Id: If5189c58dc1fe3a508a360a270337f97333e0ce8 diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h index d5e74f8..935ac3c 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h @@ -39,7 +39,6 @@ #pragma disable_warn // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again #endif -#include "nsEmbedAPI.h" #include "nsDirectoryService.h" commit 3dadfa5afb21f0c7a4095726050c8ff386aaa356 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 14:34:56 2013 +0100 moz: remove Package moz_lib Use xpcom libs from UnpackedTarball; the nsldap32 libs appear to be unused (presumably postgresql uses some MS LDAP libs). Change-Id: I56c6b9d38a11a39b8b0e878c892f30926d50284c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 75d2b52..33c3ffa 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2285,9 +2285,9 @@ $(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - xpcom \ - xpcom_core \ +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom.lib \ + $(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom_core.lib \ ) $(call gb_LinkTarget_add_defs,$(1),\ diff --git a/external/moz/ExternalPackage_moz_lib.mk b/external/moz/ExternalPackage_moz_lib.mk deleted file mode 100644 index 5d21127..0000000 --- a/external/moz/ExternalPackage_moz_lib.mk +++ /dev/null @@ -1,21 +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_ExternalPackage_ExternalPackage,moz_lib,moz_lib)) - -$(eval $(call gb_ExternalPackage_set_outdir,moz_lib,$(OUTDIR))) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,moz_lib,lib,\ - nslber32v50.lib \ - nsldap32v50.lib \ - xpcom.lib \ - xpcom_core.lib \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/moz/Module_moz.mk b/external/moz/Module_moz.mk index d2cad17..9c4a245 100644 --- a/external/moz/Module_moz.mk +++ b/external/moz/Module_moz.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,moz)) ifeq ($(WITH_MOZAB4WIN),YES) $(eval $(call gb_Module_add_targets,moz,\ - ExternalPackage_moz_lib \ ExternalPackage_runtime \ UnpackedTarball_moz_inc \ UnpackedTarball_moz_lib \ commit caf00f04982bf38678b84c159d330179e3205146 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 14:18:16 2013 +0100 sysui: stop delivering icons that are unused Change-Id: Ie85f6dce7d9ff07346e7814f74e01f160bbc3177 diff --git a/sysui/Package_icons.mk b/sysui/Package_icons.mk index eeca096..e4d60c9 100644 --- a/sysui/Package_icons.mk +++ b/sysui/Package_icons.mk @@ -13,12 +13,4 @@ $(eval $(call gb_Package_set_outdir,sysui/icons,$(OUTDIR))) $(eval $(call gb_Package_add_file,sysui/icons,bin/soffice.ico,main_app.ico)) -$(eval $(call gb_Package_add_files,sysui/icons,res/icons,\ - oasis-empty-template.ico \ - oasis-empty-document.ico \ - empty-template.ico \ - empty-document.ico \ - open.ico \ -)) - # vim: set noet sw=4 ts=4: commit a4d8d71c974f4660f6ee772f59e6f1474069ed3b Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 14:17:28 2013 +0100 sysui: stop delivering icons that are used from SRCDIR already Change-Id: I0dfbc23c03f9efe7b0020f15eb7f5312da3e6a80 diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk index 39cfead..d194ef5 100644 --- a/desktop/WinResTarget_sofficebin.mk +++ b/desktop/WinResTarget_sofficebin.mk @@ -24,6 +24,30 @@ $(eval $(call gb_WinResTarget_add_defs,sofficebin/officeloader,\ $(eval $(call gb_WinResTarget_add_dependencies,sofficebin/officeloader,\ sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/oasis-database.ico \ + sysui/desktop/icons/oasis-drawing-template.ico \ + sysui/desktop/icons/oasis-drawing.ico \ + sysui/desktop/icons/oasis-formula.ico \ + sysui/desktop/icons/oasis-master-document.ico \ + sysui/desktop/icons/oasis-presentation-template.ico \ + sysui/desktop/icons/oasis-presentation.ico \ + sysui/desktop/icons/oasis-spreadsheet-template.ico \ + sysui/desktop/icons/oasis-spreadsheet.ico \ + sysui/desktop/icons/oasis-text-template.ico \ + sysui/desktop/icons/oasis-text.ico \ + sysui/desktop/icons/oasis-web-template.ico \ + sysui/desktop/icons/database.ico \ + sysui/desktop/icons/drawing-template.ico \ + sysui/desktop/icons/drawing.ico \ + sysui/desktop/icons/formula.ico \ + sysui/desktop/icons/master-document.ico \ + sysui/desktop/icons/presentation-template.ico \ + sysui/desktop/icons/presentation.ico \ + sysui/desktop/icons/spreadsheet-template.ico \ + sysui/desktop/icons/spreadsheet.ico \ + sysui/desktop/icons/text-template.ico \ + sysui/desktop/icons/text.ico \ + sysui/desktop/icons/oxt-extension.ico \ )) $(eval $(call gb_WinResTarget_set_rcfile,sofficebin/officeloader,desktop/util/officeloader)) diff --git a/sysui/Package_icons.mk b/sysui/Package_icons.mk index 1b1c6a2..eeca096 100644 --- a/sysui/Package_icons.mk +++ b/sysui/Package_icons.mk @@ -14,42 +14,11 @@ $(eval $(call gb_Package_set_outdir,sysui/icons,$(OUTDIR))) $(eval $(call gb_Package_add_file,sysui/icons,bin/soffice.ico,main_app.ico)) $(eval $(call gb_Package_add_files,sysui/icons,res/icons,\ - oasis-database.ico \ - oasis-drawing-template.ico \ - oasis-drawing.ico \ oasis-empty-template.ico \ oasis-empty-document.ico \ - oasis-formula.ico \ - oasis-master-document.ico \ - oasis-presentation-template.ico \ - oasis-presentation.ico \ - oasis-spreadsheet-template.ico \ - oasis-spreadsheet.ico \ - oasis-text-template.ico \ - oasis-text.ico \ - oasis-web-template.ico \ - database.ico \ - drawing-template.ico \ - drawing.ico \ empty-template.ico \ empty-document.ico \ - formula.ico \ - master-document.ico \ - presentation-template.ico \ - presentation.ico \ - spreadsheet-template.ico \ - spreadsheet.ico \ - text-template.ico \ - text.ico \ - impress_app.ico \ - calc_app.ico \ - draw_app.ico \ - base_app.ico \ - writer_app.ico \ - math_app.ico \ - main_app.ico \ open.ico \ - oxt-extension.ico \ )) # vim: set noet sw=4 ts=4: commit c7dd8ccea8b2fc08dd599565409be84941c41705 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 13:26:50 2013 +0100 msc-externals: deliver msvc80_dlls to INSTDIR Change-Id: I9304cd94bc50a3db1abc3a2c4ddfc7388d58505d diff --git a/external/msc-externals/Package_msvc80_dlls.mk b/external/msc-externals/Package_msvc80_dlls.mk index 0a2feed..c15e839 100644 --- a/external/msc-externals/Package_msvc80_dlls.mk +++ b/external/msc-externals/Package_msvc80_dlls.mk @@ -9,9 +9,7 @@ $(eval $(call gb_Package_Package,msvc80_dlls,$(MSVC80_DLL_PATH))) -$(eval $(call gb_Package_set_outdir,msvc80_dlls,$(OUTDIR))) - -$(eval $(call gb_Package_add_files,msvc80_dlls,bin,\ +$(eval $(call gb_Package_add_files,msvc80_dlls,$(LIBO_LIB_FOLDER),\ $(MSVC80_DLLS) \ )) commit 0f5792b8f4aa90a1ca9f1318e635ed101cc00b8a Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 13:23:07 2013 +0100 msc-externals: dbghelp.dll to INSTDIR, and only if ENABLE_CRASHDUMP Change-Id: I3955a163e5a78b445e276eb01d37fca111877d35 diff --git a/external/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk index 1caa327..275c9ff 100644 --- a/external/msc-externals/Module_msc-externals.mk +++ b/external/msc-externals/Module_msc-externals.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,msc-externals)) $(eval $(call gb_Module_add_targets,msc-externals,\ - Package_dbghelp \ + $(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_dbghelp.mk b/external/msc-externals/Package_dbghelp.mk index f6f684a..d039b07 100644 --- a/external/msc-externals/Package_dbghelp.mk +++ b/external/msc-externals/Package_dbghelp.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,dbghelp,$(TARFILE_LOCATION))) -$(eval $(call gb_Package_set_outdir,dbghelp,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,dbghelp,bin/dbghelp.dll,$(DBGHELP_DLL))) +$(eval $(call gb_Package_add_file,dbghelp,$(LIBO_LIB_FOLDER)/dbghelp.dll,$(DBGHELP_DLL))) # vim:set shiftwidth=4 tabstop=4 noexpandtab: commit 542baebc307942d6aa53bd7a11652d689fc69216 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 22:28:25 2013 +0100 avoid build breakage on lame pseudo-OS that cannot unlink open file Delivery of image theme zip can fail when a unit test runs concurrently and has the zip file opened on WNT. Horrible hack to have vcl depend on the image themes should prevent that. Change-Id: I4b65dbb6cae8738d52153eba3397b17e94cdc7c9 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index c8008ae..5dd3356 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -675,4 +675,8 @@ endif # Runtime dependency for unit-tests $(eval $(call gb_Library_use_restarget,vcl,vcl)) +# HACK: dependency on icon themes so running unit tests don't +# prevent delivering these by having open file handles on WNT +$(eval $(call gb_Library_use_package,vcl,postprocess_images)) + # vim: set noet sw=4 ts=4: commit 2cb380bad6e7c8abaf15a7606d8e95ca86d5c8e6 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 17:51:06 2013 +0100 solenv: remove gdb Package and CustomTarget Since it's necessary to call install-gdb-printers anyway (which is what the CustomTarget_gdb does), just do it first thing in "build" target so that unit tests running during a from-scratch build get the pretty printers too. Change-Id: I357dfb828a2e0eed675aa552d3256f96a312a890 diff --git a/Makefile.in b/Makefile.in index 9c78dbf..a3af107 100644 --- a/Makefile.in +++ b/Makefile.in @@ -233,11 +233,11 @@ bootstrap: compilerplugins # Note: if invoked as "make check" this will also run subsequentcheck! # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \ - all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),) - install-gdb-printers -a $(INSTDIR) + mkdir -p $(INSTDIR) && install-gdb-printers -a $(INSTDIR) -c endif + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \ + all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) ifeq ($(OS),IOS) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios endif diff --git a/solenv/CustomTarget_gdb.mk b/solenv/CustomTarget_gdb.mk deleted file mode 100644 index 1884455..0000000 --- a/solenv/CustomTarget_gdb.mk +++ /dev/null @@ -1,22 +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_CustomTarget_CustomTarget,solenv/gdb)) - -$(call gb_CustomTarget_get_target,solenv/gdb) : \ - $(SRCDIR)/solenv/bin/install-gdb-printers \ - $(SRCDIR)/solenv/gdb/autoload.template \ - | $(call gb_CustomTarget_get_workdir,solenv/gdb)/.dir - -$(call gb_CustomTarget_get_target,solenv/gdb) : - $(call gb_Output_announce,solenv/gdb,$(true),SH ,1) - install-gdb-printers -a $(call gb_CustomTarget_get_workdir,solenv/gdb) -f && \ - touch $@ - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index 4e78021..7800898 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -21,12 +21,4 @@ $(eval $(call gb_Module_add_targets,solenv,\ )) endif - -ifneq ($(filter-out WNT IOS ANDROID,$(OS)),) -$(eval $(call gb_Module_add_targets,solenv,\ - CustomTarget_gdb \ - Package_gdb \ -)) -endif - # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk deleted file mode 100644 index aca8286..0000000 --- a/solenv/Package_gdb.mk +++ /dev/null @@ -1,38 +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,solenv_gdb,$(call gb_CustomTarget_get_workdir,solenv/gdb))) - -$(eval $(call gb_Package_set_outdir,solenv_gdb,$(OUTDIR))) - -# keep in sync with solenv/bin/install-gdb-printers -$(eval $(call gb_Package_add_files,solenv_gdb,lib,\ - $(if $(MERGELIBS), \ - $(call gb_Library_get_runtime_filename,merged)-gdb.py \ - $(if $(filter ALL,$(MERGELIBS)), \ - $(call gb_Library_get_runtime_filename,urelibs)-gdb.py \ - , \ - $(call gb_Library_get_runtime_filename,cppu)-gdb.py \ - $(call gb_Library_get_runtime_filename,sal)-gdb.py \ - $(call gb_Library_get_runtime_filename,sw)-gdb.py \ - ) \ - , \ - $(call gb_Library_get_runtime_filename,basegfx)-gdb.py \ - $(call gb_Library_get_runtime_filename,cppu)-gdb.py \ - $(call gb_Library_get_runtime_filename,sal)-gdb.py \ - $(call gb_Library_get_runtime_filename,svl)-gdb.py \ - $(call gb_Library_get_runtime_filename,sw)-gdb.py \ - $(call gb_Library_get_runtime_filename,tl)-gdb.py \ - ) \ - $(call gb_Library_get_runtime_filename,writerfilter)-gdb.py \ -)) - -$(eval $(call gb_Package_use_custom_target,solenv_gdb,solenv/gdb)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: commit 4b3dc6665dfb4a88c3068e769418866993c12b37 Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 23:49:02 2013 +0100 install-gdb-printers: don't use "ure-link" ... which is a symlink and creating it as a directory when "-c" is specified is a bad idea. Change-Id: Idceef60373699c89eb494b212bec84748606f532 diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers index af76390..1b0ff1c 100755 --- a/solenv/bin/install-gdb-printers +++ b/solenv/bin/install-gdb-printers @@ -160,16 +160,16 @@ fi if [[ -n "${MERGELIBS}" ]]; then make_autoload merged program libmergedlo."$DYLIB" merge svl tl basegfx `[[ ${MERGELIBS} == "ALL" ]] && echo sw` if [[ ${MERGELIBS} == "ALL" ]]; then - make_autoload urelibs ure-link/lib liburelibs."$DYLIB" merge cppu sal + make_autoload urelibs ure/lib liburelibs."$DYLIB" merge cppu sal else - make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3 - make_autoload sal ure-link/lib libuno_sal."$DYLIB".3 + make_autoload cppu ure/lib libuno_cppu."$DYLIB".3 + make_autoload sal ure/lib libuno_sal."$DYLIB".3 make_autoload sw program libswlo."$DYLIB" fi else make_autoload basegfx program libbasegfxlo."$DYLIB" - make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3 - make_autoload sal ure-link/lib libuno_sal."$DYLIB".3 + make_autoload cppu ure/lib libuno_cppu."$DYLIB".3 + make_autoload sal ure/lib libuno_sal."$DYLIB".3 make_autoload svl program libsvllo."$DYLIB" make_autoload sw program libswlo."$DYLIB" make_autoload tl program libtllo."$DYLIB" commit 97c62ed88419f7288ce1b365474c65038253608e Author: Michael Stahl <mst...@redhat.com> Date: Tue Oct 29 19:12:56 2013 +0100 scp2: remove obsolete WITH_VC90_REDIST Change-Id: I9f7bbce8096f49851dc643b46ebed8308026c8d2 diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 1965486..e1c114c 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -18,24 +18,6 @@ #include "macros.inc" -#if defined(WITH_VC90_REDIST) - -MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 - Feature = gm_Root; - Name = "Microsoft_VC90_CRT_x86.msm"; - RootDir = "TARGETDIR"; - ComponentCondition = "VC_REDIST=1"; -End - -MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 - Feature = gm_Root; - Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; - RootDir = "TARGETDIR"; - ComponentCondition = "VC_REDIST=1"; -End - -#endif - #if defined(WITH_VC100_REDIST) MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86 @@ -58,24 +40,3 @@ End #endif -#if defined(BUILD_X64) - -#if defined(WITH_VC90_REDIST) - -MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64 - Feature = gm_Root; - Name = "Microsoft_VC90_CRT_x86_x64.msm"; - RootDir = "TARGETDIR"; - ComponentCondition = "(VC_REDIST=1) AND VersionNT64"; -End - -MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64 - Feature = gm_Root; - Name = "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"; - RootDir = "TARGETDIR"; - ComponentCondition = "(VC_REDIST=1) AND VersionNT64"; -End - -#endif - -#endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits