Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4182

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/4182/1

Build: fix non-existent merge modules for MS Visual Studio Express versions

Change-Id: Id19f3fde0803e9242ca1e7279fd814262c74f6ef
---
M configure.ac
M external/Module_external.mk
M scp2/InstallModule_windows.mk
3 files changed, 12 insertions(+), 5 deletions(-)



diff --git a/configure.ac b/configure.ac
index ff19a0d..410aeb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4831,6 +4831,7 @@
 
 find_msms()
 {
+AC_MSG_NOTICE([checking msms ======================================================])
     for ver in 10.0 11.0; do
         reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
         if test -n "$regvalue"; then
@@ -4847,10 +4848,15 @@
     msmdir=`cygpath -d "$msmdir"`
     msmdir=`cygpath -u "$msmdir"`
     if test -z "$msmdir"; then
-        AC_MSG_ERROR([Merge modules not found])
+        if test "$ENABLE_RELEASE_BUILD" = "FALSE" ; then
+            AC_MSG_WARN([Merge modules not found in $msmdir])
+            msmdir=""
+        else
+            AC_MSG_ERROR([Merge modules not found in $msmdir])
+        fi
+    else
+        msms="Microsoft_VC${VCVER}_CRT_x86.msm"
     fi
-
-    msms="Microsoft_VC${VCVER}_CRT_x86.msm"
 }
 
 find_msvc_x64_dlls()
@@ -6052,6 +6058,7 @@
     MERGE_MODULES="$msms"
     SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
 fi
+
 AC_SUBST(MSVC_DLL_PATH)
 AC_SUBST(MSVC_DLLS)
 AC_SUBST(MSVC_DEBUG_DLL_PATH)
diff --git a/external/Module_external.mk b/external/Module_external.mk
index b81654a..8cda13e 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -24,7 +24,7 @@
 ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_targets,external,\
        Package_dbghelp \
-       Package_msms \
+       $(if $(MSM_PATH),Package_msms) \
        Package_msvc_dlls \
        $(if $(MSVC_USE_DEBUG_RUNTIME),Package_msvc_dlls_debug) \
        $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \
diff --git a/scp2/InstallModule_windows.mk b/scp2/InstallModule_windows.mk
index 0caaa47..296f7fc 100644
--- a/scp2/InstallModule_windows.mk
+++ b/scp2/InstallModule_windows.mk
@@ -21,7 +21,7 @@
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/windows,\
     scp2/source/ooo/folder_ooo \
-    scp2/source/ooo/vc_redist \
+    $(if $(MSM_PATH),scp2/source/ooo/vc_redist) \
     scp2/source/ooo/windowscustomaction_ooo \
 ))
 

-- 
To view, visit https://gerrit.libreoffice.org/4182
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id19f3fde0803e9242ca1e7279fd814262c74f6ef
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias M <matm@gmx.fr>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.