[Vm-dev] [commit][3604] Fix mkcogvmarchives and use bash for all scripts containing echo -n.

commits at squeakvm.org commits at squeakvm.org
Mon Feb 15 18:58:56 UTC 2016


Revision: 3604
Author:   eliot
Date:     2016-02-15 10:58:55 -0800 (Mon, 15 Feb 2016)
Log Message:
-----------
Fix mkcogvmarchives and use bash for all scripts containing echo -n.

Modified Paths:
--------------
    branches/Cog/image/getGoodCogVM.sh
    branches/Cog/image/getGoodSpurVM.sh
    branches/Cog/image/makegetnsvmscripts.sh
    branches/Cog/image/makegetvmscripts.sh
    branches/Cog/scripts/mkARMstackvmarchives
    branches/Cog/scripts/mkcogvmarchives
    branches/Cog/scripts/mklinuxarchive
    branches/Cog/scripts/mksistaarchives
    branches/Cog/scripts/mkspur64vmarchives
    branches/Cog/scripts/mkspurvmarchives
    branches/Cog/scripts/mkvmarchives
    branches/Cog/scripts/printRevAndTag
    branches/Cog/scripts/svntouch
    branches/Cog/scripts/uploadARMvms
    branches/Cog/scripts/uploadvms

Modified: branches/Cog/image/getGoodCogVM.sh
===================================================================
--- branches/Cog/image/getGoodCogVM.sh	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/image/getGoodCogVM.sh	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,32 +1,31 @@
 #!/bin/sh
-# Sets the VM env var to the r3354 Cog VM for the current platform.
+# Sets the VM env var to the r3602 Cog VM for the current platform.
 # will download and install the VM in this directory if necessary.
 
-TAG=15.20.3354
-REV=3354
-LCBINDIR=4.0-3354
+TAG=16.07.3602
+REV=3602
+LCBINDIR=4.0-3602
 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
 
 . ./envvars.sh
 
 case "$OS" in
 Darwin) get_vm_from_tar \
-            Cog.app/Contents/MacOS/Squeak a6f0ece7775772220e8bfe1e48524959 \
-            Cog.app-$TAG.tgz 269ba0ef5e63aeaa52287834b6242966
-        VM=Cog.app/Contents/MacOS/Squeak;;
+            Cog.app/Contents/MacOS/Squeak  \
+            Cog.app-$TAG.tgz         VM=Cog.app/Contents/MacOS/Squeak;;
 Linux)
     if expr $OSREL \> 2.6.12; then
         get_vm_from_tar \
-        coglinuxht/lib/squeak/$LCBINDIR/squeak 7ed115ceb484859c182ced6541137ce8 \
-        coglinuxht-$TAG.tgz 9f50e0fa254d763fae635eeb98ecdeb0
+        coglinuxht/lib/squeak/$LCBINDIR/squeak  \
+        coglinuxht-$TAG.tgz 5067a62fde21ff4f39181619126b8380
     else
         get_vm_from_tar \
-        coglinux/lib/squeak/$LCBINDIR/squeak 43804a192631dabba11f4051611475b0 \
-        coglinux-$TAG.tgz 16b277420542af403be016dde6769c18
+        coglinux/lib/squeak/$LCBINDIR/squeak  \
+        coglinux-$TAG.tgz 60078d8c3f5d24ea8d8362ffb5bc7b3b
     fi;;
 CYGWIN*) get_vm_from_zip \
-            cogwin/SqueakConsole.exe f55a39e14e6d0228c718f7b868e70bbc \
-            cogwin-$TAG.zip b5253c1675b9e0d3887d50bd050fd75d
+            cogwin/SqueakConsole.exe 5a11b5d0fd2aa32e966cc76d85fd6876 \
+            cogwin-$TAG.zip 4a0b12b67164b788aa615089b5e8cb81
     VM=cogwin/SqueakConsole.exe;;
 *)  echo "don't know how to run Squeak on your system.  bailing out." 1>&2; exit 2
 esac

Modified: branches/Cog/image/getGoodSpurVM.sh
===================================================================
--- branches/Cog/image/getGoodSpurVM.sh	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/image/getGoodSpurVM.sh	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,26 +1,26 @@
 #!/bin/sh
-# Sets the VM env var to the r3427 Cog Spur VM for the current platform.
+# Sets the VM env var to the r3602 Cog Spur VM for the current platform.
 # will download and install the VM in this directory if necessary.
 
-TAG=15.33.3427
-REV=3427
-LSBINDIR=5.0-3427
+TAG=16.07.3602
+REV=3602
+LSBINDIR=5.0-3602
 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
 
 . ./envvars.sh
 
 case "$OS" in
 Darwin) get_vm_from_tar \
-            CogSpur.app/Contents/MacOS/Squeak 2a6014096316edd4ad40d123300513b4 \
-            CogSpur.app-$TAG.tgz be907df0efa93bf6be1a2b42a71a9f8c
+            CogSpur.app/Contents/MacOS/Squeak 3c4491f496e2d8cc4d46b65c6c26808a \
+            CogSpur.app-$TAG.tgz 5a29a80a4492ac2a2cc7106e2a3157e1
         VM=CogSpur.app/Contents/MacOS/Squeak;;
 Linux) get_vm_from_tar \
-        cogspurlinuxht/lib/squeak/$LSBINDIR/squeak f41f0912d83dc51b772eb01e96fa4f86 \
-        cogspurlinuxht-$TAG.tgz 3a5007971e3e4f24b4f8404e09a2a5c0
+        cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 072645c861b7cf692373c6e0a7170e06 \
+        cogspurlinuxht-$TAG.tgz c79a7e43dfa19a04ebb3a1d197f998dc
     VM=cogspurlinuxht/squeak;;
 CYGWIN*) get_vm_from_zip \
-            cogspurwin/SqueakConsole.exe 91e6d35064ad7153011d36c9e9a81fe6 \
-            cogspurwin-$TAG.zip 8aa98b6261cfe36258d1e09c54143a32
+            cogspurwin/SqueakConsole.exe e802302bab1d7264eef1d5f7e99d938b \
+            cogspurwin-$TAG.zip bc9a7078ef93bb357c5265d69ef66dae
     VM=cogspurwin/SqueakConsole.exe;;
 *)  echo "don't know how to run Squeak on your system.  bailing out." 1>&2; exit 2
 esac

Modified: branches/Cog/image/makegetnsvmscripts.sh
===================================================================
--- branches/Cog/image/makegetnsvmscripts.sh	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/image/makegetnsvmscripts.sh	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Create the getGoodSpurNsvm.sh script.
 GetSpurScript=getGoodSpurNsvm.sh
 

Modified: branches/Cog/image/makegetvmscripts.sh
===================================================================
--- branches/Cog/image/makegetvmscripts.sh	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/image/makegetvmscripts.sh	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Create the getGoodCogVM.sh & getGoodSpurVM.sh scripts.
 GetCogScript=getGoodCogVM.sh
 GetSpurScript=getGoodSpurVM.sh

Modified: branches/Cog/scripts/mkARMstackvmarchives
===================================================================
--- branches/Cog/scripts/mkARMstackvmarchives	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/mkARMstackvmarchives	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Create the ARM Stack VM archives in products.  Output a check of version numbers
 # etc to products/MASVALOG
 IFS="	

Modified: branches/Cog/scripts/mkcogvmarchives
===================================================================
--- branches/Cog/scripts/mkcogvmarchives	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/mkcogvmarchives	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,19 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 # Create the Cog VM archives in products.  Output a check of version numbers
 # etc to products/MCVALOG
 IFS="	
 "
 cd `dirname $0`/../products
-NSB=newspeak.cog.v3
 SQB=squeak.cog.v3
 REV=
 TAG=
 EXES=
 
-# By default the Newspeak Cog VMs are not built; superceded by Spur.
-NL=
-NM=
-NW=
 if [ $# = 0 ]; then
 CL=1
 CM=1
@@ -26,20 +21,12 @@
 CW=
 	while [ -n "$1" ]; do
 		case $1 in
-		-c)		CL=1;CM=1;CW=1;;
-		-cl)	CL=1;;
-		-cm)	CM=1;;
-		-cw)	CW=1;;
-		-n)		NL=1;NM=1;NW=1;;
-		-nl)	NL=1;;
-		-nm)	NM=1;;
-		-nw)	NW=1;;
-		-l)		CL=1;NL=1;;
-		-m)		CM=1;NM=1;;
-		-w)		CW=1;NW=1;;
-		-r)		shift;REV="$1";;
-		-t)		shift;TAG="$1";;
-		-?|-h)  echo usage: $0 [-c -n -l -m -w -c[lmw] -n[lmw] -r REV -t TAG]
+		-l)	CL=1;;
+		-m)	CM=1;;
+		-w)	CW=1;;
+		-r) shift;REV="$1";;
+		-t) shift;TAG="$1";;
+		-?|-h)  echo usage: $0 [-l -m -w -r REV -t TAG]
 				exit 0
 		esac
 		shift
@@ -61,21 +48,8 @@
 		done)
 	done
 fi
-if [ -n "$NL" ]; then
-	for d in . assert debug; do
-		(cd $d
-		set -- nscoglinux nscoglinuxht
-		for archive in nsvmlinux nsvmlinuxht; do
-			rm -rf $archive-$TAG.tgz
-			echo $1 '=>' $archive-$TAG.tgz
-			COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $1
-			EXES="$EXES	$1/lib/nsvm/[0-9.-]*/nsvm"
-			shift
-		done)
-	done
-fi
 if [ -n "$CM" ]; then
-	set -- Fast.app FastMT.app
+	set -- CocoaFast.app CocoaFastMT.app
 	for app in Cog.app CogMT.app; do
 		test -d $app || mkdir $app
 		if [ -d ../build.macos32x86/$SQB/$1 ]; then
@@ -91,23 +65,6 @@
 		shift
 	done
 fi
-if [ -n "$NM" ]; then
-	set -- Fast.app
-	for app in Newspeak\ Virtual\ Machine.app; do
-		test -d $app || mkdir $app
-		if [ -d ../build.macos32x86/$NSB/$1 ]; then
-			rm -rf $app/* $app-$TAG.tgz
-			echo build.macos32x86/$NSB/$1 '=>' $app '=>' $app-$TAG.tgz
-			(cd ../build.macos32x86/$NSB/$1 >/dev/null;tar cf - *) \
-			| (cd $app;tar xf -)
-			tar czf $app-$TAG.tgz $app
-			EXES="$EXES	$app/Contents/MacOS/Newspeak Virtual Machine"
-		else
-			echo build.macos32x86/$NSB/$1 is missing
-		fi
-		shift
-	done
-fi
 if [ -n "$CW" ]; then
 	set -- build/vm buildmt/vm
 	for dir in cogwin cogmtwin; do
@@ -128,24 +85,6 @@
 		shift
 	done
 fi
-if [ -n "$NW" ]; then
-	set -- build/vm
-	for dir in nsvmwin; do
-		test -d $dir || mkdir $dir
-		if [ -d ../build.win32x86/$NSB/$1 ]; then
-			rm -rf $dir/* $dir-$TAG.zip
-			echo build.win32x86/$NSB/$1 '=>' $dir '=>' $dir-$TAG.zip
-			(cd ../build.win32x86/$NSB/$1 >/dev/null; \
-			 tar cf - nsvm*.exe nsvm*.map nsvm*.exe.manifest ) \
-			| (cd $dir;tar xf -)
-			zip -qr $dir-$TAG.zip $dir
-			EXES="$EXES	$dir/nsvm.exe	$dir/nsvmConsole.exe"
-		else
-			echo build.win32x86/$NSB/$1 is missing
-		fi
-		shift
-	done
-fi
 for vm in $EXES
 do
 	echo

Modified: branches/Cog/scripts/mklinuxarchive
===================================================================
--- branches/Cog/scripts/mklinuxarchive	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/mklinuxarchive	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Create one or more linux archives from VM trees in products.
 # Output a check of version numbers etc to products/MLALOG
 IFS="	

Modified: branches/Cog/scripts/mksistaarchives
===================================================================
--- branches/Cog/scripts/mksistaarchives	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/mksistaarchives	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Create the Sista Spur VM archives in products.  Output a check of version
 # numbers etc to products/MIVALOG
 IFS="	

Modified: branches/Cog/scripts/mkspur64vmarchives
===================================================================
--- branches/Cog/scripts/mkspur64vmarchives	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/mkspur64vmarchives	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Create the 64-bit Spur VM archives in products.  Output a check of version
 # numbers etc to products/MSVALOG
 IFS="	

Modified: branches/Cog/scripts/mkspurvmarchives
===================================================================
--- branches/Cog/scripts/mkspurvmarchives	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/mkspurvmarchives	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Create the Spur VM archives in products.  Output a check of version numbers
 # etc to products/MSVALOG
 IFS="	

Modified: branches/Cog/scripts/mkvmarchives
===================================================================
--- branches/Cog/scripts/mkvmarchives	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/mkvmarchives	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Create the Cog VM archives in products.  Check the log files in products for
 # agreement
 `dirname $0`/mkcogvmarchives $@

Modified: branches/Cog/scripts/printRevAndTag
===================================================================
--- branches/Cog/scripts/printRevAndTag	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/printRevAndTag	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Print REV and TAG as defined in platforms/Cross/vm/sqSCCSVersion.h
 
 cd `dirname $0`/../products

Modified: branches/Cog/scripts/svntouch
===================================================================
--- branches/Cog/scripts/svntouch	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/svntouch	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Touch file(s) or all modified files in a directory back to the checkin date
 for f in "$@"
 do

Modified: branches/Cog/scripts/uploadARMvms
===================================================================
--- branches/Cog/scripts/uploadARMvms	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/uploadARMvms	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Upload archives from products to a web/ftp site via ssh.
 RemoteUser=eliotmiranda at highland-park.dreamhost.com
 RemoteRoot=mirandabanda.org/files/Cog/VM

Modified: branches/Cog/scripts/uploadvms
===================================================================
--- branches/Cog/scripts/uploadvms	2016-02-15 18:21:31 UTC (rev 3603)
+++ branches/Cog/scripts/uploadvms	2016-02-15 18:58:55 UTC (rev 3604)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Upload archives from products to a web/ftp site via ssh.
 RemoteUser=eliotmiranda at highland-park.dreamhost.com
 RemoteRoot=mirandabanda.org/files/Cog/VM



More information about the Vm-dev mailing list