[Libreoffice-commits] core.git: 3 commits - configure.ac

[Norbert Thiebaud]

 configure.ac |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit e6fe8387788b98b4bae43b466075f3938f3fb50c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 18 15:07:19 2014 -0500

    we should convert to DOS path for other exotic things than spaces too
    
    backslases and other 'special' characters can mess with
    later path handling
    
    Change-Id: Ic21b0eb82b60ffb2e286706be00148582ff9ad58

diff --git a/configure.ac b/configure.ac
index 05e8d55..b763b96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,15 +29,14 @@ PathFormat()
 {
     formatted_path="$1"
     if test "$build_os" = "cygwin"; then
-        pf_part1=
         pf_conv_to_dos=
-        for pf_part in $formatted_path; do
-            if test -z "$pf_part1"; then
-                pf_part1="$pf_part"
-            else
+        # spaces,parentheses,brackets,braces are problematic in pathname
+        # so are backslashes
+        case "$formatted_path" in
+            *\ * | *\)* | *\(* | *\{* | *\}* | *\[* | *\]* | *\\* )
                 pf_conv_to_dos="yes"
-            fi
-        done
+            ;;
+        esac
         if test "$pf_conv_to_dos" = "yes"; then
             if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
                 formatted_path=`cygpath -sm "$formatted_path"`
commit ebc9ca1d41e84a895a080933b94422d6bddb7ceb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 18 15:05:23 2014 -0500

    fix typo in TARFILE_LOCATION handling in the lode case
    
    Change-Id: I11831583a0288a07fd6279411069d169ab854882

diff --git a/configure.ac b/configure.ac
index adef7d2..05e8d55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4671,7 +4671,7 @@ dnl whether to find & fetch external tarballs?
 dnl ===================================================================
 if test -z "$TARFILE_LOCATION" -a -n "$LODE_HOME" ; then
    if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
-       TARFILE_LOCATION="`cypath -m $LODE_HOME/ext_tar`"
+       TARFILE_LOCATION="`cygpath -m $LODE_HOME/ext_tar`"
    else
        TARFILE_LOCATION="$LODE_HOME/ext_tar"
    fi
commit d4d85fb9fc5daef5d89a8e42b68ce4a873bcf084
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 18 15:04:43 2014 -0500

    format MSBuild path appropriately
    
    Change-Id: I38ed000a0f9c07fe8e1ed26752af8e172998bf2c

diff --git a/configure.ac b/configure.ac
index 25ff959..adef7d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3472,7 +3472,7 @@ if test "$_os" = "WINNT"; then
         # Find the proper version of MSBuild.exe to use based on the VS version
         reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MSBuild/$vcnumwithdot/MSBuildOverrideTasksPath
         if test -n "$regvalue" ; then
-            MSBUILD_PATH="$regvalue"
+            MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
         fi
 
         dnl ===========================================================