[Vm-dev] [commit][2995] Fix the newspeak linux build mvm & editnewspeakinstall. sh interaction.

commits at squeakvm.org commits at squeakvm.org
Thu Jun 12 17:04:17 UTC 2014


Revision: 2995
Author:   eliot
Date:     2014-06-12 10:03:48 -0700 (Thu, 12 Jun 2014)
Log Message:
-----------
Fix the newspeak linux build mvm & editnewspeakinstall.sh interaction.
Format the introductory text in the README nicer in uploadvms

Modified Paths:
--------------
    branches/Cog/build.linux32x86/editnewspeakinstall.sh
    branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm
    branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm
    branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm
    branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm
    branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm
    branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm
    branches/Cog/build.linux32x86/newspeak.cog.v3/build/mvm
    branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/mvm
    branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/mvm
    branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/mvm
    branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/mvm
    branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/mvm
    branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm
    branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm
    branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm
    branches/Cog/build.linux32x86/newspeak.stack.v3/build/mvm
    branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/mvm
    branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/mvm
    branches/Cog/scripts/uploadvms

Modified: branches/Cog/build.linux32x86/editnewspeakinstall.sh
===================================================================
--- branches/Cog/build.linux32x86/editnewspeakinstall.sh	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/editnewspeakinstall.sh	2014-06-12 17:03:48 UTC (rev 2995)
@@ -17,7 +17,7 @@
 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 [ "$1" = -copysource ]; then
+if [ "$2" = -copysource ]; then
 	cp $SOURCE $LIBDIR
 elif [ -h $SOURCE ]; then
 	ln "`readlink $SOURCE`" $LIBDIR

Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -33,4 +33,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -29,4 +29,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -27,4 +27,4 @@
 rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../products/$INSTALLDIR
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -29,4 +29,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -27,4 +27,4 @@
 rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../products/$INSTALLDIR
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -31,4 +31,4 @@
 rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../products/$INSTALLDIR
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.v3/build/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.v3/build/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -32,4 +32,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -28,4 +28,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -28,4 +28,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -28,4 +28,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -28,4 +28,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -32,4 +32,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -33,4 +33,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -29,4 +29,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -29,4 +29,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.stack.v3/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.v3/build/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.stack.v3/build/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -33,4 +33,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -29,4 +29,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/mvm	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/mvm	2014-06-12 17:03:48 UTC (rev 2995)
@@ -29,4 +29,4 @@
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh "$@" ../../../products/$INSTALLDIR
+../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"

Modified: branches/Cog/scripts/uploadvms
===================================================================
--- branches/Cog/scripts/uploadvms	2014-06-12 04:09:48 UTC (rev 2994)
+++ branches/Cog/scripts/uploadvms	2014-06-12 17:03:48 UTC (rev 2995)
@@ -101,28 +101,28 @@
      for Newspeak and are missing plugins required by Squeak/Pharo/Croquet.
      VMs with "mt" or "MT" in the name are multi-threaded VMs which support
      non-blocking FFI calls.  The archives containing "Spur" or "spur" are
-	 VMs using the new Spur object representation and garbage collector and
-	 should be used with Spur-format Squeak/Pharo/Croquet or Newspeak images.
+     VMs using the new Spur object representation and garbage collector and
+     should be used with Spur-format Squeak/Pharo/Croquet or Newspeak images.
 
-	There are two variants of the Linux VMs; those ending in "ht" have a
-	heartbeat thread, while those that don't, use an interval timer for the
-	heartbeat (the Windows and Mac VMs have a threaded heartbeat).  The
-	threaded heartbeat is better (for example, signals from the interval timer
-	interfere with system calls, etc), but to use it one must have a kernel
-	later than 2.6.12 and configure linux to allow the VM to use multiple
-	thread priorities.  To do so, create a file called VM.conf where VM is
-	the name of the vm executable ("squeak" for the Squeak vm, "nsvm" for
-	the Newspeak vm) in /etc/security/limits.d/ with contents:
+     There are two variants of the Linux VMs; those ending in "ht" have a
+     heartbeat thread, while those that don't, use an interval timer for the
+     heartbeat (the Windows and Mac VMs have a threaded heartbeat).  The
+     threaded heartbeat is better (for example, signals from the interval timer
+     interfere with system calls, etc), but to use it one must have a kernel
+     later than 2.6.12 and configure linux to allow the VM to use multiple
+     thread priorities.  To do so, create a file called VM.conf where VM is
+     the name of the vm executable ("squeak" for the Squeak vm, "nsvm" for
+     the Newspeak vm) in /etc/security/limits.d/ with contents:
 *       hard    rtprio  2
 *       soft    rtprio  2
 
-	e.g.
+     e.g.
 sudo cat >/etc/security/limits.d/squeak.conf <<END
 *       hard    rtprio  2
 *       soft    rtprio  2
 END
 sudo cp /etc/security/limits.d/squeak.conf /etc/security/limits.d/nsvm.conf
-	Then log out and log back in for the limits to take effect.
+     Then log out and log back in for the limits to take effect.
 
 THEEND
 	echo getting svn log



More information about the Vm-dev mailing list