[Libreoffice-commits] core.git: 4 commits - configure.ac jvmfwk/plugins solenv/gbuild

[Michael Stahl]

 configure.ac                                     |    5 ++++-
 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx |    6 +++---
 solenv/gbuild/CppunitTest.mk                     |    2 ++
 solenv/gbuild/platform/com_MSC_class.mk          |    2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 2aa20cfb7a11dd8d86372af4065a5887a0b752ca
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Mar 22 00:35:19 2017 +0100

    jvmfwk: fix JVM detection on 64-bit Windows
    
    _WIN32 is also defined on 64-bit Windows so reorder these ifdefs.
    
    Should i be surprised that this breaks several dbaccess tests
    for me but all tinderboxes are green?
    
    (regression from 9143dd4ebe37b608e43d04434cf831624bf55b65)
    
    Change-Id: Id917952d3135768355af711688ff70bf6c019a6e

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index cb8063e0555e..948c99dfe876 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -211,10 +211,10 @@ bool VendorBase::isValidArch() const
     // It is not defined what the exact values are.
     // Oracle JRE 8 has "x86" and "amd64", the others were found at http://lopica.sourceforge.net/os.html .
     // There might still be missing some options; we need to extend the check once we find out.
-#if defined _WIN32
-    return m_sArch == "x86" || m_sArch == "i386" || m_sArch == "i686";
-#elif defined _WIN64
+#if defined _WIN64
     return m_sArch == "amd64" || m_sArch == "x86_64";
+#elif defined _WIN32
+    return m_sArch == "x86" || m_sArch == "i386" || m_sArch == "i686";
 #else
     (void)this;
     return true;
commit 5277b43814568af84f00d9be1de7f985f758f249
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 21 23:40:25 2017 +0100

    gbuild: PythonTest depends on python.exe wrapper on WNT
    
    Change-Id: Idfd2a6d68fecfb5a473938a74a9020f76fbc2c4b

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 7c0bbbc0e118..2c718ac544f9 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -445,7 +445,7 @@ endef
 # PythonTest class
 
 gb_PythonTest_PRECOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND)
-gb_PythonTest_DEPS := $(call gb_Package_get_target,python3)
+gb_PythonTest_DEPS := $(call gb_Package_get_target,python3) $(call gb_Executable_get_target,python)
 
 ifeq ($(strip $(CPPUNITTRACE)),TRUE)
 gb_CppunitTest_GDBTRACE := '$(DEVENV)' /debugexe
commit 9727857420004905c877963ca62b8b3d88e4afe3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 21 22:05:10 2017 +0100

    configure: MSVC 2017 devenv.exe doesn't start properly
    
    ... from a DOS style 8.3 path, for whatever reason.  Special case DEVENV
    variable so it uses long path.
    
    Change-Id: I03bb20a8f35cd116edd33ec91178f9deddbc4257

diff --git a/configure.ac b/configure.ac
index b50b44521725..fd44c66ba942 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3451,10 +3451,13 @@ if test "$_os" = "WINNT"; then
     fi
 
     # Find the version of devenv.exe
-    DEVENV="$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe"
+    # MSVC 2017 devenv does not start properly from a DOS 8.3 path
+    DEVENV=$(cygpath -lm "$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe")
     if test ! -e "$DEVENV"; then
         AC_MSG_ERROR([No devenv.exe found, Visual Studio installation broken?])
     fi
+    # add quotes around it, this is an ugly hack for convenience
+    DEVENV=\"${DEVENV}\"
 
     dnl ===========================================================
     dnl  Check for the corresponding mspdb*.dll
commit 10aff2905c51319c2cfa5d8f85fc9a32d80c2e25
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 21 21:52:45 2017 +0100

    gbuild: MSVC: unbreak CPPUNITTRACE='$(DEVENV)'
    
    ... which is unlikely to contain the strings "gdb" or "lldb".
    
    (regression from c38a4d9ce248b4b3fcc9208b25dfa599fe506ac0)
    
    Change-Id: I355069ec512232898b246d2b0bf8912831f0c80a

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 23ea06ad5f85..659572668648 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -35,6 +35,8 @@ else ifneq ($(filter lldb,$(CPPUNITTRACE)),)
 gb_CppunitTest_PREGDBTRACE := lo_dyldpathfile=$(call var2file,$(shell $(gb_MKTEMP)),500,settings set target.env-vars $(gb_CppunitTest_CPPTESTPRECOMMAND))
 gb_CppunitTest_GDBTRACE := $(subst lldb,lldb -s $$lo_dyldpathfile,$(CPPUNITTRACE))
 gb_CppunitTest_POSTGDBTRACE := rm $$lo_dyldpathfile
+else
+gb_CppunitTest_GDBTRACE := $(CPPUNITTRACE)
 endif
 gb_CppunitTest__interactive := $(true)
 endif