Kaydet (Commit) cd1b89a2 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

Path format issue with cygwin... try to restore the original behavior

üst 36ff1439
...@@ -13,6 +13,33 @@ SCPDEFS="" ...@@ -13,6 +13,33 @@ SCPDEFS=""
GIT_REPO_NAMES="" GIT_REPO_NAMES=""
MINGW_EXTERNAL_DLLS="" MINGW_EXTERNAL_DLLS=""
PathFormat()
{
formatted_path="$1"
if test "$host_os" = "cygwin" ; then
pf_part1=
pf_conv_to_dos=
for pf_part in $formated_path ; do
if test -z "$pf_part1" ; then
pf_part1="$pf_part"
else
pf_conv_to_dos="yes"
fi
done
if test "$pf_conv_to_dos" = "yes" ; then
formatted_path=`cygpath -d "$formatted_path"`
fi
fp_count_colon=`cat "$formattted_path" | grep -c "[:]"`
fp_count_slash=`cat "$formattted_path" | grep -c "[/]"`
if test "$fp_count_slash$fp_count_colon" != "00" ; then
if test "$fp_count_colon" = "0" ; then
formatted_path=`realpath "$formatted_path"`
fi
formatted_path=`cygpath -m "$formatted_path"`
fi
fi
}
if test -n "$SOLARENV" ; then if test -n "$SOLARENV" ; then
AC_MSG_ERROR([You have sourced Env.Host.sh in this shell. This may lead to trouble, please run in a fresh (login) shell.]) AC_MSG_ERROR([You have sourced Env.Host.sh in this shell. This may lead to trouble, please run in a fresh (login) shell.])
fi fi
...@@ -41,8 +68,8 @@ AC_SUBST(CROSS_COMPILING) ...@@ -41,8 +68,8 @@ AC_SUBST(CROSS_COMPILING)
if test "$build_os" = "cygwin"; then if test "$build_os" = "cygwin"; then
EXEEXT_FOR_BUILD=.exe EXEEXT_FOR_BUILD=.exe
SRC_ROOT=`pwd` SRC_ROOT=`pwd`
SRC_ROOT=`cygpath -d "$SRC_ROOT"` PathFormat "$SRC_ROOT"
SRC_ROOT=`cygpath -u "$SRC_ROOT"` SRC_ROOT="$formatted_path"
else else
EXEEXT_FOR_BUILD= EXEEXT_FOR_BUILD=
SRC_ROOT=`pwd` SRC_ROOT=`pwd`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment