Mercurial > hg > truffle
diff make/windows/get_msc_ver.sh @ 1328:39e409a664b3
6938185: 3/4 6923488 breaks Windows command shell builds
Summary: Fix build.bat so invoking command shell doesn't exit on error. Fix dirname assumptions. Document some MKS environment dependencies.
Reviewed-by: coleenp
| author | dcubed |
|---|---|
| date | Thu, 25 Mar 2010 16:27:12 -0700 |
| parents | 21141e23627a |
| children | c18cbe5936b8 |
line wrap: on
line diff
--- a/make/windows/get_msc_ver.sh Tue Mar 16 17:47:03 2010 -0600 +++ b/make/windows/get_msc_ver.sh Thu Mar 25 16:27:12 2010 -0700 @@ -48,6 +48,7 @@ TOOL_DIR=`dirname "$SH"` fi +DIRNAME="$TOOL_DIR/dirname" HEAD="$TOOL_DIR/head" ECHO="$TOOL_DIR/echo" EXPR="$TOOL_DIR/expr" @@ -76,8 +77,13 @@ else # use the "link" command that is co-located with the "cl" command cl_cmd=`which cl` - cl_dir=`dirname $cl_cmd` - LINK_VER_RAW=`$cl_dir/link 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'` + if [ "x$cl_cmd" != "x" ]; then + link_cmd=`$DIRNAME "$cl_cmd"`/link + else + # which can't find "cl" so just use which ever "link" we find + link_cmd="link" + fi + LINK_VER_RAW=`"$link_cmd" 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'` LINK_VER_MAJOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f1` LINK_VER_MINOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f2` LINK_VER_MICRO=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f3`