[Libreoffice-commits] core.git: 4 commits - configure.ac external/firebird RepositoryExternal.mk scp2/source solenv/gbuild

[Michael Stahl]

 RepositoryExternal.mk                     |    2 +-
 configure.ac                              |    7 ++++++-
 external/firebird/firebird-vs2017.patch.1 |    6 ++----
 scp2/source/ooo/vc_redist.scp             |   19 +++++++++++++++++++
 solenv/gbuild/Output.mk                   |    3 +++
 5 files changed, 31 insertions(+), 6 deletions(-)

New commits:
commit 2a055c05381824644cc9c71615578dbb9c6976e3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 19 20:47:03 2018 +0100

    scp2: also try VC141_CRT_*.msm
    
    Apparently the MSMs have been renamed in Visual Studio 2017.3 but only
    configure was adapted, not scp2.
    
    Not sure if these MSMs are still relevant given the new
    gid_File_Vcredist_Exe thing.
    
    Change-Id: I4fe27c8298b3a2024acc62d12ce8ea67e2eca80d

diff --git a/configure.ac b/configure.ac
index 72774d715efd..e60822d9df26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6535,7 +6535,12 @@ if test $_os = "WINNT"; then
     MSVC_DLL_PATH="$msvcdllpath"
     MSVC_DLLS="$msvcdlls"
     MSM_PATH="$msmdir"
-    SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
+    # MSVC 15.3 changed it to VC141
+    if echo "$MSVC_DLL_PATH" | grep -q "VC141.CRT$"; then
+        SCPDEFS="$SCPDEFS -DWITH_VC141_REDIST"
+    else
+        SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
+    fi
     if test "$VCREDIST_DIR" = "no"; then
         dnl explicitly disabled
         VCREDIST_DIR=""
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 40c6a7e8902e..9b414b8e39fa 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -58,6 +58,25 @@ End
 
 #endif
 
+#if defined(WITH_VC141_REDIST)
+
+#if defined WINDOWS_X64
+MergeModule gid_MergeModule_Microsoft_VC141_CRT_x64
+#else
+MergeModule gid_MergeModule_Microsoft_VC141_CRT_x86
+#endif
+    Feature = gm_Root;
+#if defined WINDOWS_X64
+    Name = "Microsoft_VC141_CRT_x64.msm";
+#else
+    Name = "Microsoft_VC141_CRT_x86.msm";
+#endif
+    RootDir = "TARGETDIR";
+    ComponentCondition = "VC_REDIST=1";
+End
+
+#endif
+
 #endif // MSM_PATH
 
 #if defined(VCREDIST_EXE_NAME)
commit c799f159c541fe4835eb02c2e518b54a55d392bb
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 19 14:53:57 2018 +0100

    firebird: recognise MSVC 2017.5 (which defines _MSC_VER=1912)
    
    Change-Id: Ic526bc3babfd342fd2ebb10003639d600a668ae5

diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1
index b1d6b1b6b49e..7d140589c881 100644
--- a/external/firebird/firebird-vs2017.patch.1
+++ b/external/firebird/firebird-vs2017.patch.1
@@ -1,13 +1,11 @@
 diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp firebird/src/common/os/win32/mod_loader.cpp
 --- firebird.orig/src/common/os/win32/mod_loader.cpp	2017-02-15 22:11:48.939042400 +0100
 +++ firebird/src/common/os/win32/mod_loader.cpp	2017-02-15 22:12:30.062262700 +0100
-@@ -103,6 +103,10 @@
+@@ -103,6 +103,8 @@
  					"msvcr120.dll",
  #elif _MSC_VER == 1900
  					"vcruntime140.dll",
-+#elif _MSC_VER == 1910
-+					"vcruntime140.dll",
-+#elif _MSC_VER == 1911
++#elif _MSC_VER == 1910 || _MSC_VER == 1911 || _MSC_VER == 1912
 +					"vcruntime140.dll",
  #else
                      #error Specify CRT DLL name here !
commit 0c3838bd080b47c935f26aed23d6c086fa87b27c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 19 14:13:34 2018 +0100

    fix libxml2 dependency on icu
    
    liblangtag build runs a "reg2xml.exe" which requires the ICU dlls in
    instdir.
    
    Change-Id: Icf44c51e802636de613f76a25fb16a567a8d982d

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 30709792c010..a795db70e4a0 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -845,7 +845,7 @@ define gb_ExternalProject__use_libxml2
 $(call gb_ExternalProject_use_package,$(1),libxml2)
 
 ifeq ($(COM),MSC)
-$(call gb_ExternalProject_use_external_project,$(1),icu)
+$(call gb_ExternalProject_use_packages,$(1),icu icu_ure)
 endif
 
 endef
commit b4a7cd3014344d53497283610ce6a06dbc51f053
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 19 12:03:28 2018 +0100

    gbuild: disable gb_COLOR on WNT for now
    
    The Cygwin terminal swallows colorful error messages, which is unhelpful.
    
    Change-Id: I2005994eb76fdba1dc49efc2988e38ac460d6724

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 92a277c24561..4fbefdea57a7 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -51,9 +51,12 @@ gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
 # default to color output, if interactive
 ifeq ($(origin gb_COLOR),undefined)
 ifneq ($(MAKE_TERMOUT),)
+# Cygwin mintty has issues where gb_Output_error is swallowed
+ifneq ($(OS),WNT)
 gb_COLOR=$(true)
 endif
 endif
+endif
 
 # only enable colorized output if
 # - gb_COLOR is set