[Vm-dev] [commit][2742] Fix snafu in newspeak build scripts.

[commits at squeakvm.org]

Revision: 2742
Author:   eliot
Date:     2013-06-12 14:59:13 -0700 (Wed, 12 Jun 2013)
Log Message:
-----------
Fix snafu in newspeak build scripts.  Can't assume install directory exists
when parsing possible -copysource arg.

Modified Paths:
--------------
    branches/Cog/nscogbuild/unixbuild/astbld/mvm
    branches/Cog/nscogbuild/unixbuild/astbldt/mvm
    branches/Cog/nscogbuild/unixbuild/bld/mvm
    branches/Cog/nscogbuild/unixbuild/bldt/mvm
    branches/Cog/nscogbuild/unixbuild/dbgbld/mvm
    branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm

Modified: branches/Cog/nscogbuild/unixbuild/astbld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/astbld/mvm	2013-06-12 19:40:48 UTC (rev 2741)
+++ branches/Cog/nscogbuild/unixbuild/astbld/mvm	2013-06-12 21:59:13 UTC (rev 2742)
@@ -1,7 +1,10 @@
 #!/bin/bash
 INSTALLDIR=nsvmlinuxast
-if [ $# -ge 1 -a -d "$1" ]; then
-	INSTALLDIR="$1"; shift
+if [ $# -ge 1 ]; then
+	case "$1" in
+	-*)	;;
+	*)	INSTALLDIR="$1"; shift
+	esac
 fi
 OPT=-O1
 

Modified: branches/Cog/nscogbuild/unixbuild/astbldt/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/astbldt/mvm	2013-06-12 19:40:48 UTC (rev 2741)
+++ branches/Cog/nscogbuild/unixbuild/astbldt/mvm	2013-06-12 21:59:13 UTC (rev 2742)
@@ -1,8 +1,11 @@
 #!/bin/bash
 # VM with VM profiler and threaded heartbeat assuming multiple thread priorities
 INSTALLDIR=nsvmlinuxastpt
-if [ $# -ge 1 -a -d "$1" ]; then
-	INSTALLDIR="$1"; shift
+if [ $# -ge 1 ]; then
+	case "$1" in
+	-*)	;;
+	*)	INSTALLDIR="$1"; shift
+	esac
 fi
 OPT=-O1
 

Modified: branches/Cog/nscogbuild/unixbuild/bld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/bld/mvm	2013-06-12 19:40:48 UTC (rev 2741)
+++ branches/Cog/nscogbuild/unixbuild/bld/mvm	2013-06-12 21:59:13 UTC (rev 2742)
@@ -1,7 +1,10 @@
 #!/bin/bash
 INSTALLDIR=nsvmlinux
-if [ $# -ge 1 -a -d "$1" ]; then
-	INSTALLDIR="$1"; shift
+if [ $# -ge 1 ]; then
+	case "$1" in
+	-*)	;;
+	*)	INSTALLDIR="$1"; shift
+	esac
 fi
 # Some gcc versions create a broken VM using -O2
 case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in

Modified: branches/Cog/nscogbuild/unixbuild/bldt/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/bldt/mvm	2013-06-12 19:40:48 UTC (rev 2741)
+++ branches/Cog/nscogbuild/unixbuild/bldt/mvm	2013-06-12 21:59:13 UTC (rev 2742)
@@ -1,8 +1,11 @@
 #!/bin/bash
 # VM with VM profiler and threaded heartbeat assuming multiple thread priorities
 INSTALLDIR=nsvmlinuxpt
-if [ $# -ge 1 -a -d "$1" ]; then
-	INSTALLDIR="$1"; shift
+if [ $# -ge 1 ]; then
+	case "$1" in
+	-*)	;;
+	*)	INSTALLDIR="$1"; shift
+	esac
 fi
 # Some gcc versions create a broken VM using -O2
 case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in

Modified: branches/Cog/nscogbuild/unixbuild/dbgbld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/dbgbld/mvm	2013-06-12 19:40:48 UTC (rev 2741)
+++ branches/Cog/nscogbuild/unixbuild/dbgbld/mvm	2013-06-12 21:59:13 UTC (rev 2742)
@@ -1,7 +1,10 @@
 #!/bin/bash
 INSTALLDIR=nsvmlinuxdbg
-if [ $# -ge 1 -a -d "$1" ]; then
-	INSTALLDIR="$1"; shift
+if [ $# -ge 1 ]; then
+	case "$1" in
+	-*)	;;
+	*)	INSTALLDIR="$1"; shift
+	esac
 fi
 OPT=-O0
 

Modified: branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm	2013-06-12 19:40:48 UTC (rev 2741)
+++ branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm	2013-06-12 21:59:13 UTC (rev 2742)
@@ -1,8 +1,11 @@
 #!/bin/bash
 # VM with VM profiler and threaded heartbeat assuming multiple thread priorities
 INSTALLDIR=nsvmlinuxdbgpt
-if [ $# -ge 1 -a -d "$1" ]; then
-	INSTALLDIR="$1"; shift
+if [ $# -ge 1 ]; then
+	case "$1" in
+	-*)	;;
+	*)	INSTALLDIR="$1"; shift
+	esac
 fi
 OPT=-O0