Kaydet (Commit) 0b1e380e authored tarafından Michael Stahl's avatar Michael Stahl

try to fix --with-solver-and-workdir-root on Windows

idlc breaks because sal considers X:\\foo an invalid system path
üst a7098c77
...@@ -2206,7 +2206,12 @@ if test -n "${with_solver_and_workdir_root}"; then ...@@ -2206,7 +2206,12 @@ if test -n "${with_solver_and_workdir_root}"; then
AC_MSG_ERROR([directory does not exist: ${with_solver_and_workdir_root}]) AC_MSG_ERROR([directory does not exist: ${with_solver_and_workdir_root}])
fi fi
PathFormat "${with_solver_and_workdir_root}" PathFormat "${with_solver_and_workdir_root}"
SOLARVER=${formatted_path}/solver # IsValidFilePath in /sal/osl/w32/file_url.cxx rejects "X:\\" breaking idlc
if echo ${formatted_path} | $GREP -q '/$'; then
SOLARVER=${formatted_path}solver
else
SOLARVER=${formatted_path}/solver
fi
else else
SOLARVER=${SRC_ROOT}/solver SOLARVER=${SRC_ROOT}/solver
fi fi
...@@ -3396,7 +3401,12 @@ fi ...@@ -3396,7 +3401,12 @@ fi
INPATH="${OUTPATH}${PROEXT}" INPATH="${OUTPATH}${PROEXT}"
if test -n "${with_solver_and_workdir_root}"; then if test -n "${with_solver_and_workdir_root}"; then
PathFormat "${with_solver_and_workdir_root}" PathFormat "${with_solver_and_workdir_root}"
WORKDIR=${formatted_path}/workdir/${INPATH} # IsValidFilePath in /sal/osl/w32/file_url.cxx rejects "X:\\" breaking idlc
if echo ${formatted_path} | $GREP -q '/$'; then
WORKDIR=${formatted_path}workdir/${INPATH}
else
WORKDIR=${formatted_path}/workdir/${INPATH}
fi
else else
WORKDIR=${SRC_ROOT}/workdir/${INPATH} WORKDIR=${SRC_ROOT}/workdir/${INPATH}
fi fi
......
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