diff options
| author | Andrew Thompson <[email protected]> | 2009-12-15 13:12:09 -0500 |
|---|---|---|
| committer | Andrew Thompson <[email protected]> | 2009-12-15 13:12:09 -0500 |
| commit | 98751d52659b0f6d6193326cb1debea7a5628a74 (patch) | |
| tree | 0331e25706c1cf91bd804c194595c0114f4bff7c | |
| parent | cb62972ca24198cc13e030adbd0b8a757bdb293c (diff) | |
| download | otp-98751d52659b0f6d6193326cb1debea7a5628a74.tar.gz otp-98751d52659b0f6d6193326cb1debea7a5628a74.tar.bz2 otp-98751d52659b0f6d6193326cb1debea7a5628a74.zip | |
Allow mc.sh and rc.sh to work when path to mc/rc.exe has spaces
The eval call in these scripts was failing for me because the path to
them on my windows machine contained spaces. I also fixed some
copy/paste-os from when (evidently) the mc.sh script was created by
copying the rc.sh script and modifying it.
| -rwxr-xr-x | erts/etc/win32/cygwin_tools/vc/mc.sh | 8 | ||||
| -rwxr-xr-x | erts/etc/win32/cygwin_tools/vc/rc.sh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/erts/etc/win32/cygwin_tools/vc/mc.sh b/erts/etc/win32/cygwin_tools/vc/mc.sh index 813b59947b..676b072655 100755 --- a/erts/etc/win32/cygwin_tools/vc/mc.sh +++ b/erts/etc/win32/cygwin_tools/vc/mc.sh @@ -24,7 +24,7 @@ CMD="" OUTPUT_DIRNAME="" # Find the correct mc.exe. This could be done by the configure script, -# But as we seldom use the resource compiler, it might as well be done here... +# But as we seldom use the message compiler, it might as well be done here... MCC="" save_ifs=$IFS IFS=: @@ -32,7 +32,7 @@ for p in $PATH; do if [ -f $p/mc.exe ]; then if [ -n "`$p/mc.exe -? 2>&1 >/dev/null </dev/null \ | grep -i \"message compiler\"`" ]; then - MCC=$p/mc.exe + MCC=`echo "$p/mc.exe" | sed 's/ /\\\\ /g'` fi fi done @@ -68,8 +68,8 @@ while test -n "$1" ; do done p=$$ if [ "X$MC_SH_DEBUG_LOG" != "X" ]; then - echo rc.sh "$SAVE" >>$MC_SH_DEBUG_LOG - echo rc.exe $CMD >>$MC_SH_DEBUG_LOG + echo mc.sh "$SAVE" >>$MC_SH_DEBUG_LOG + echo mc.exe $CMD >>$MC_SH_DEBUG_LOG fi if [ -n "$OUTPUT_DIRNAME" ]; then cd $OUTPUT_DIRNAME diff --git a/erts/etc/win32/cygwin_tools/vc/rc.sh b/erts/etc/win32/cygwin_tools/vc/rc.sh index 748de48890..6a6921c49e 100755 --- a/erts/etc/win32/cygwin_tools/vc/rc.sh +++ b/erts/etc/win32/cygwin_tools/vc/rc.sh @@ -30,8 +30,8 @@ save_ifs=$IFS IFS=: for p in $PATH; do if [ -f $p/rc.exe ]; then - if [ -n "`$p/rc.exe -? 2>&1 | grep -i "resource compiler"`" ]; then - RCC=$p/rc.exe + if [ -n "`$p/rc.exe -? 2>&1 | grep -i "resource compiler"`" ]; then + RCC=`echo "$p/rc.exe" | sed 's/ /\\\\ /g'` fi fi done |