[Vm-dev] [commit][2734] Allow linux mvm scripts to take a directory
arg, and in addition, the newspeak
commits at squeakvm.org
commits at squeakvm.org
Fri Jun 7 21:12:39 UTC 2013
Revision: 2734
Author: eliot
Date: 2013-06-07 14:12:36 -0700 (Fri, 07 Jun 2013)
Log Message:
-----------
Allow linux mvm scripts to take a directory arg, and in addition, the newspeak
ones to take a -copysource arg. this for jenkins builds.
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
branches/Cog/unixbuild/abld/mvm
branches/Cog/unixbuild/abldt/mvm
branches/Cog/unixbuild/bld/mvm
branches/Cog/unixbuild/bldt/mvm
branches/Cog/unixbuild/dbld/mvm
branches/Cog/unixbuild/dbldt/mvm
branches/Cog/unixbuild/mtbld/mvm
Modified: branches/Cog/nscogbuild/unixbuild/astbld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/astbld/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/nscogbuild/unixbuild/astbld/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,5 +1,8 @@
#!/bin/bash
INSTALLDIR=nsvmlinuxast
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
OPT=-O1
echo -n "clean? "
@@ -33,7 +36,9 @@
test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm
test -d lib/squeak && mv lib/squeak lib/nsvm
LIBDIR="`echo lib/nsvm/[0-9.-]*`"
- if [ -h ~/Squeak/SqueakV41.sources ]; then
+ if [ "$1" = -copysource ]; then
+ cp ~/Squeak/SqueakV41.sources $LIBDIR
+ elif [ -h ~/Squeak/SqueakV41.sources ]; then
ln "`readlink ~/Squeak/SqueakV41.sources`" $LIBDIR
elif [ -f ~/Squeak/SqueakV41.sources ]; then
ln ~/Squeak/SqueakV41.sources $LIBDIR
Modified: branches/Cog/nscogbuild/unixbuild/astbldt/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/astbldt/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/nscogbuild/unixbuild/astbldt/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,6 +1,9 @@
#!/bin/bash
# VM with VM profiler and threaded heartbeat assuming multiple thread priorities
INSTALLDIR=nsvmlinuxastpt
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
OPT=-O1
echo -n "clean? "
@@ -34,7 +37,9 @@
test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm
test -d lib/squeak && mv lib/squeak lib/nsvm
LIBDIR="`echo lib/nsvm/[0-9.-]*`"
- if [ -h ~/Squeak/SqueakV41.sources ]; then
+ if [ "$1" = -copysource ]; then
+ cp ~/Squeak/SqueakV41.sources $LIBDIR
+ elif [ -h ~/Squeak/SqueakV41.sources ]; then
ln "`readlink ~/Squeak/SqueakV41.sources`" $LIBDIR
elif [ -f ~/Squeak/SqueakV41.sources ]; then
ln ~/Squeak/SqueakV41.sources $LIBDIR
Modified: branches/Cog/nscogbuild/unixbuild/bld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/bld/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/nscogbuild/unixbuild/bld/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,5 +1,8 @@
#!/bin/bash
INSTALLDIR=nsvmlinux
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT=-O1;;
@@ -37,7 +40,9 @@
test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm
test -d lib/squeak && mv lib/squeak lib/nsvm
LIBDIR="`echo lib/nsvm/[0-9.-]*`"
- if [ -h ~/Squeak/SqueakV41.sources ]; then
+ if [ "$1" = -copysource ]; then
+ cp ~/Squeak/SqueakV41.sources $LIBDIR
+ elif [ -h ~/Squeak/SqueakV41.sources ]; then
ln "`readlink ~/Squeak/SqueakV41.sources`" $LIBDIR
elif [ -f ~/Squeak/SqueakV41.sources ]; then
ln ~/Squeak/SqueakV41.sources $LIBDIR
Modified: branches/Cog/nscogbuild/unixbuild/bldt/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/bldt/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/nscogbuild/unixbuild/bldt/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,6 +1,9 @@
#!/bin/bash
# VM with VM profiler and threaded heartbeat assuming multiple thread priorities
INSTALLDIR=nsvmlinuxpt
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT=-O1;;
@@ -38,7 +41,9 @@
test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm
test -d lib/squeak && mv lib/squeak lib/nsvm
LIBDIR="`echo lib/nsvm/[0-9.-]*`"
- if [ -h ~/Squeak/SqueakV41.sources ]; then
+ if [ "$1" = -copysource ]; then
+ cp ~/Squeak/SqueakV41.sources $LIBDIR
+ elif [ -h ~/Squeak/SqueakV41.sources ]; then
ln "`readlink ~/Squeak/SqueakV41.sources`" $LIBDIR
elif [ -f ~/Squeak/SqueakV41.sources ]; then
ln ~/Squeak/SqueakV41.sources $LIBDIR
Modified: branches/Cog/nscogbuild/unixbuild/dbgbld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/dbgbld/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/nscogbuild/unixbuild/dbgbld/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,5 +1,8 @@
#!/bin/bash
INSTALLDIR=nsvmlinuxdbg
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
OPT=-O0
echo -n "clean? "
@@ -33,7 +36,9 @@
test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm
test -d lib/squeak && mv lib/squeak lib/nsvm
LIBDIR="`echo lib/nsvm/[0-9.-]*`"
- if [ -h ~/Squeak/SqueakV41.sources ]; then
+ if [ "$1" = -copysource ]; then
+ cp ~/Squeak/SqueakV41.sources $LIBDIR
+ elif [ -h ~/Squeak/SqueakV41.sources ]; then
ln "`readlink ~/Squeak/SqueakV41.sources`" $LIBDIR
elif [ -f ~/Squeak/SqueakV41.sources ]; then
ln ~/Squeak/SqueakV41.sources $LIBDIR
Modified: branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,6 +1,9 @@
#!/bin/bash
# VM with VM profiler and threaded heartbeat assuming multiple thread priorities
INSTALLDIR=nsvmlinuxdbgpt
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
OPT=-O0
echo -n "clean? "
@@ -34,7 +37,9 @@
test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm
test -d lib/squeak && mv lib/squeak lib/nsvm
LIBDIR="`echo lib/nsvm/[0-9.-]*`"
- if [ -h ~/Squeak/SqueakV41.sources ]; then
+ if [ "$1" = -copysource ]; then
+ cp ~/Squeak/SqueakV41.sources $LIBDIR
+ elif [ -h ~/Squeak/SqueakV41.sources ]; then
ln "`readlink ~/Squeak/SqueakV41.sources`" $LIBDIR
elif [ -f ~/Squeak/SqueakV41.sources ]; then
ln ~/Squeak/SqueakV41.sources $LIBDIR
Modified: branches/Cog/unixbuild/abld/mvm
===================================================================
--- branches/Cog/unixbuild/abld/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/unixbuild/abld/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,5 +1,8 @@
#!/bin/sh
INSTALLDIR=cogastlinux
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
echo -n "clean? "
read a
case $a in
Modified: branches/Cog/unixbuild/abldt/mvm
===================================================================
--- branches/Cog/unixbuild/abldt/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/unixbuild/abldt/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,6 +1,9 @@
#!/bin/sh
# VM with VM profiler and threaded heartbeat assuming multiple thread priorities
INSTALLDIR=cogastlinuxpt
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
echo -n "clean? "
read a
case $a in
Modified: branches/Cog/unixbuild/bld/mvm
===================================================================
--- branches/Cog/unixbuild/bld/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/unixbuild/bld/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,5 +1,8 @@
#!/bin/sh
INSTALLDIR=coglinux
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT=-O1;;
Modified: branches/Cog/unixbuild/bldt/mvm
===================================================================
--- branches/Cog/unixbuild/bldt/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/unixbuild/bldt/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,6 +1,9 @@
#!/bin/sh
# VM with VM profiler and threaded heartbeat assuming multiple thread priorities
INSTALLDIR=coglinuxpt
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT=-O1;;
Modified: branches/Cog/unixbuild/dbld/mvm
===================================================================
--- branches/Cog/unixbuild/dbld/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/unixbuild/dbld/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,5 +1,8 @@
#!/bin/sh
INSTALLDIR=cogdbglinux
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
echo -n "clean? "
read a
case $a in
Modified: branches/Cog/unixbuild/dbldt/mvm
===================================================================
--- branches/Cog/unixbuild/dbldt/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/unixbuild/dbldt/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,6 +1,9 @@
#!/bin/sh
# VM with VM profiler and threaded heartbeat assuming multiple thread priorities
INSTALLDIR=cogdbglinuxpt
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
echo -n "clean? "
read a
case $a in
Modified: branches/Cog/unixbuild/mtbld/mvm
===================================================================
--- branches/Cog/unixbuild/mtbld/mvm 2013-06-07 17:53:54 UTC (rev 2733)
+++ branches/Cog/unixbuild/mtbld/mvm 2013-06-07 21:12:36 UTC (rev 2734)
@@ -1,5 +1,8 @@
#!/bin/sh
INSTALLDIR=cogmtlinux
+if [ $# -ge 1 ]; then
+ INSTALLDIR="$1"; shift
+fi
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT=-O1;;
More information about the Vm-dev
mailing list