[Vm-dev] [commit][3445] Update the buildspurtrunkvmmakerimage.sh,
buildspurtrunkreaderimage.sh &
commits at squeakvm.org
commits at squeakvm.org
Thu Sep 24 22:00:30 UTC 2015
Revision: 3445
Author: eliot
Date: 2015-09-24 15:00:28 -0700 (Thu, 24 Sep 2015)
Log Message:
-----------
Update the buildspurtrunkvmmakerimage.sh,buildspurtrunkreaderimage.sh &
updatespurimage.sh scripts to build products directly from the Squeak 5.0 release.
Update etGoodSpurVM.sh & getGoodSpurNsvm.sh to get the 15.33.3427 VMs.
Modified Paths:
--------------
branches/Cog/image/UpdateSqueakTrunkImage.st
branches/Cog/image/buildspurtrunkimage.sh
branches/Cog/image/buildspurtrunkreaderimage.sh
branches/Cog/image/buildspurtrunkvmmakerimage.sh
branches/Cog/image/envvars.sh
branches/Cog/image/getGoodSpurNsvm.sh
branches/Cog/image/getGoodSpurVM.sh
branches/Cog/image/updatespurimage.sh
Added Paths:
-----------
branches/Cog/image/getsqueak50.sh
Removed Paths:
-------------
branches/Cog/image/getlatestspurtrunkimage.sh
Modified: branches/Cog/image/UpdateSqueakTrunkImage.st
===================================================================
--- branches/Cog/image/UpdateSqueakTrunkImage.st 2015-09-24 19:19:28 UTC (rev 3444)
+++ branches/Cog/image/UpdateSqueakTrunkImage.st 2015-09-24 22:00:28 UTC (rev 3445)
@@ -1,5 +1,5 @@
-"Simply update, assuming the update stream is set correctly."
+[MCMcmUpdater
+ defaultUpdateURL: 'http://source.squeak.org/trunk';
+ updateFromServer] valueSupplyingAnswer: true.
-[MCMcmUpdater updateFromServer] valueSupplyingAnswer: true.
-
Smalltalk snapshot: true andQuit: true
Modified: branches/Cog/image/buildspurtrunkimage.sh
===================================================================
--- branches/Cog/image/buildspurtrunkimage.sh 2015-09-24 19:19:28 UTC (rev 3444)
+++ branches/Cog/image/buildspurtrunkimage.sh 2015-09-24 22:00:28 UTC (rev 3445)
@@ -1,60 +1,9 @@
#!/bin/sh
-# This is (in a way) obsoleted by getlatestspurtrunkimage.sh
. ./envvars.sh
-./getsqueak45.sh
-. ./getGoodCogVM.sh
-
-if [ "$1" != -skiptrunkbuild ]; then
- cp -p $SQUEAK45.image trunk46forspur.image
- cp -p $SQUEAK45.changes trunk46forspur.changes
-
- echo $VM trunk46forspur.image UpdateSqueakTrunkImage.st
- $VM trunk46forspur.image UpdateSqueakTrunkImage.st
-fi
-
-#Old code pre patchAndUploadUnpatchedInTrunk
-#rm -f temp-spur-repository/* temp-v3-repository/*
-#echo $VM trunk46forspur.image WriteSpurPackagesToTempDir.st
-#$VM trunk46forspur.image WriteSpurPackagesToTempDir.st
-
-# Now choose a suitable VMMaker image (Spur preferred) and get it to convert
-# trunk46forspur to Spur.
-IMAGE=""
-GOTIMAGE=""
-while true; do
- for f in *VMMaker*spur.image SpurVMMaker.image; do
- if test -f "$f"; then
- IMAGE="$f"
-. ./getGoodSpurVM.sh
- break 2
- fi
- done
- if [ -z "$IMAGE" ]; then
- for f in *VMMaker*.image; do
- if test -f "$f"; then
- IMAGE="$f"
-. ./getGoodCogVM.sh
- break 2
- fi
- done
- fi
- if [ -n "$GOTIMAGE" ]; then
- echo hmmm, failed to build a VMMaker image. Bailing out
- exit 1
- fi
- if [ -z "$IMAGE" ]; then
- ./buildsqueaktrunkvmmakerimage.sh
- GOTIMAGE=1
- fi
-done
-echo $VM $IMAGE BuildSpurTrunkImage.st
-$VM $IMAGE BuildSpurTrunkImage.st
-mv trunk46forspur-spur.image trunk46-spur.image
-mv trunk46forspur-spur.changes trunk46-spur.changes
-
-# Now load the modified packages
+./getsqueak50.sh
. ./getGoodSpurVM.sh
-echo $VM -blockonerror trunk46-spur.image LoadSpurPackages.st
-$VM -blockonerror trunk46-spur.image LoadSpurPackages.st
-./resizesqueakwindow.sh trunk46-spur.image 800 600
+echo $VM -blockonerror trunk50.image LoadSpurPackages.st
+$VM -blockonerror trunk50.image LoadSpurPackages.st
+
+./resizesqueakwindow.sh trunk50.image 800 600
Modified: branches/Cog/image/buildspurtrunkreaderimage.sh
===================================================================
--- branches/Cog/image/buildspurtrunkreaderimage.sh 2015-09-24 19:19:28 UTC (rev 3444)
+++ branches/Cog/image/buildspurtrunkreaderimage.sh 2015-09-24 22:00:28 UTC (rev 3445)
@@ -3,14 +3,14 @@
# really useful for VMMaker simulation testing.
. ./envvars.sh
-if [ ! -f trunk46-spur.image -o ! -f trunk46-spur.changes ]; then
- ./getlatestspurtrunkimage.sh
+if [ ! -f trunk50.image -o ! -f trunk50.changes ]; then
+ ./updatespurimage.sh
fi
-./ensureSqueakV41sources.sh
+./ensureSqueakV50sources.sh
-cp -p trunk46-spur.image spurreader.image
-cp -p trunk46-spur.changes spurreader.changes
+cp -p trunk50.image spurreader.image
+cp -p trunk50.changes spurreader.changes
. ./getGoodSpurVM.sh
Modified: branches/Cog/image/buildspurtrunkvmmakerimage.sh
===================================================================
--- branches/Cog/image/buildspurtrunkvmmakerimage.sh 2015-09-24 19:19:28 UTC (rev 3444)
+++ branches/Cog/image/buildspurtrunkvmmakerimage.sh 2015-09-24 22:00:28 UTC (rev 3445)
@@ -3,8 +3,10 @@
./updatespurimage.sh
-cp -p trunk46-spur.image SpurVMMaker.image
-cp -p trunk46-spur.changes SpurVMMaker.changes
+cp -p trunk50.image SpurVMMaker.image
+cp -p trunk50.changes SpurVMMaker.changes
+. ./getGoodSpurVM.sh
+
echo $VM SpurVMMaker.image BuildSqueakSpurTrunkVMMakerImage.st
$VM SpurVMMaker.image BuildSqueakSpurTrunkVMMakerImage.st
Modified: branches/Cog/image/envvars.sh
===================================================================
--- branches/Cog/image/envvars.sh 2015-09-24 19:19:28 UTC (rev 3444)
+++ branches/Cog/image/envvars.sh 2015-09-24 22:00:28 UTC (rev 3445)
@@ -3,6 +3,10 @@
SQUEAK45RESOURCES=$SQUEAK45APP/Contents/Resources
SQUEAK45=$SQUEAK45RESOURCES/Squeak4.5-13680
+SQUEAK50APP=Squeak-5.0-All-in-One/Squeak-5.0-All-in-One.app
+SQUEAK50RESOURCES=$SQUEAK50APP/Contents/Resources
+SQUEAK50=$SQUEAK50RESOURCES/Squeak5.0-15113
+
# N.B. uname -r (OSREL) is not to be trusted on Mac OS X;
# my 10.6.8 system reports its version as 10.8.0. eem, june '14
Modified: branches/Cog/image/getGoodSpurNsvm.sh
===================================================================
--- branches/Cog/image/getGoodSpurNsvm.sh 2015-09-24 19:19:28 UTC (rev 3444)
+++ branches/Cog/image/getGoodSpurNsvm.sh 2015-09-24 22:00:28 UTC (rev 3445)
@@ -1,26 +1,26 @@
#!/bin/sh
-# Sets the VM env var to the r3284 Newspeak Spur VM for the current platform.
+# Sets the VM env var to the r3427 Newspeak Spur VM for the current platform.
# will download and install the VM in this directory if necessary.
-TAG=15.12.3284
-REV=3284
-LSBINDIR=5.0-3284
+TAG=15.33.3427
+REV=3427
+LSBINDIR=5.0-3427
URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
. ./envvars.sh
case "$OS" in
Darwin) get_vm_from_tar \
- "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" a500026c07eabcb7a558b05ef95943de \
- "Newspeak Spur Virtual Machine.app-$TAG.tgz" acd42baf3133d8831cb45d07fcd7de5a
+ "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" 912f3274c7fd81fc681239939a549001 \
+ "Newspeak Spur Virtual Machine.app-$TAG.tgz" d2c8cb923a62c054aa45f776b977dd24
VM="Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";;
Linux) get_vm_from_tar \
nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm \
- nsvmspurlinuxht-$TAG.tgz 45151f84dd435d3c030d21d000aca031
+ nsvmspurlinuxht-$TAG.tgz 46769daa78a05070f175bfd980749a83
VM=nsvmspurlinuxht/nsvm;;
CYGWIN*) get_vm_from_zip \
- nsvmspurwin/nsvmConsole.exe 20041ae1b5a31b0092f93323bfcf2cfe \
- nsvmspurwin-$TAG.zip fdbbfd894fea949871652bcd3138bda1
+ nsvmspurwin/nsvmConsole.exe 76e5468ad604396f35f93fd7a435a117 \
+ nsvmspurwin-$TAG.zip ef126eca43771c61db2819832b853062
VM=nsvmspurwin/nsvmConsole.exe;;
*) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2
esac
Modified: branches/Cog/image/getGoodSpurVM.sh
===================================================================
--- branches/Cog/image/getGoodSpurVM.sh 2015-09-24 19:19:28 UTC (rev 3444)
+++ branches/Cog/image/getGoodSpurVM.sh 2015-09-24 22:00:28 UTC (rev 3445)
@@ -1,26 +1,26 @@
#!/bin/sh
-# Sets the VM env var to the r3354 Cog Spur VM for the current platform.
+# Sets the VM env var to the r3427 Cog Spur VM for the current platform.
# will download and install the VM in this directory if necessary.
-TAG=15.20.3354
-REV=3354
-LSBINDIR=5.0-3354
+TAG=15.33.3427
+REV=3427
+LSBINDIR=5.0-3427
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 4858caf533bcac30301b63b4a2b03dee \
- CogSpur.app-$TAG.tgz 69dfd7c4af7c5c1323b57f8df1945759
+ CogSpur.app/Contents/MacOS/Squeak 2a6014096316edd4ad40d123300513b4 \
+ CogSpur.app-$TAG.tgz be907df0efa93bf6be1a2b42a71a9f8c
VM=CogSpur.app/Contents/MacOS/Squeak;;
Linux) get_vm_from_tar \
- cogspurlinuxht/lib/squeak/$LSBINDIR/squeak e7ef9060beedb0e3d049de685d269eb1 \
- cogspurlinuxht-$TAG.tgz 7d91b75be4f17ea0ea836eba5237fa10
+ cogspurlinuxht/lib/squeak/$LSBINDIR/squeak f41f0912d83dc51b772eb01e96fa4f86 \
+ cogspurlinuxht-$TAG.tgz 3a5007971e3e4f24b4f8404e09a2a5c0
VM=cogspurlinuxht/squeak;;
CYGWIN*) get_vm_from_zip \
- cogspurwin/SqueakConsole.exe f0cf0edce87d42cf1cc7bd8afc4ed8ca \
- cogspurwin-$TAG.zip 75d735ce6f9b4368662e21b26de1ae11
+ cogspurwin/SqueakConsole.exe 91e6d35064ad7153011d36c9e9a81fe6 \
+ cogspurwin-$TAG.zip 8aa98b6261cfe36258d1e09c54143a32
VM=cogspurwin/SqueakConsole.exe;;
*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2
esac
Deleted: branches/Cog/image/getlatestspurtrunkimage.sh
===================================================================
--- branches/Cog/image/getlatestspurtrunkimage.sh 2015-09-24 19:19:28 UTC (rev 3444)
+++ branches/Cog/image/getlatestspurtrunkimage.sh 2015-09-24 22:00:28 UTC (rev 3445)
@@ -1,8 +0,0 @@
-#!/bin/bash
-. ./envvars.sh
-
-geturl http://www.mirandabanda.org/files/Cog/SpurImages/trunk46-spur.image
-geturl http://www.mirandabanda.org/files/Cog/SpurImages/trunk46-spur.changes
-geturl http://www.mirandabanda.org/files/Cog/SpurImages/trunk46-spur.sum
-
-cksum trunk46-spur.changes trunk46-spur.image | diff - trunk46-spur.sum >/dev/null && ls -l trunk46-spur.image trunk46-spur.changes || echo image and/or changes have wrong checksum 1>&2
Added: branches/Cog/image/getsqueak50.sh
===================================================================
--- branches/Cog/image/getsqueak50.sh (rev 0)
+++ branches/Cog/image/getsqueak50.sh 2015-09-24 22:00:28 UTC (rev 3445)
@@ -0,0 +1,23 @@
+#!/bin/bash
+. ./envvars.sh
+
+IMAGEHASH=e6be0ea204a8409dc0976a792502ab65
+ZIPHASH=2f17e1d8eb9bec2b7554d3405652b122
+
+if [ "`quietmd5 \"$SQUEAK50\".image`" != $IMAGEHASH ]; then
+ ZIP=Squeak-5.0-All-in-One.zip
+ if [ "`quietmd5 $ZIP`" != $ZIPHASH ]
+ then
+ geturl http://ftp.squeak.org/5.0/$ZIP
+ fi
+ if unzip --help >/dev/null; then
+ true
+ else
+ echo 'could not find unzip. you can find instructions on how to install it on google.' 1>&2
+ exit 1
+ fi
+ rm -rf __MACOSX
+ unzip $ZIP
+ rm -rf __MACOSX
+fi
+test -f SqueakV50.sources || ln $SQUEAK50RESOURCES/SqueakV50.sources .
Property changes on: branches/Cog/image/getsqueak50.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/Cog/image/updatespurimage.sh
===================================================================
--- branches/Cog/image/updatespurimage.sh 2015-09-24 19:19:28 UTC (rev 3444)
+++ branches/Cog/image/updatespurimage.sh 2015-09-24 22:00:28 UTC (rev 3445)
@@ -1,14 +1,14 @@
#!/bin/sh
# Update the latest Spur image.
. ./envvars.sh
+. ./getsqueak50.sh
-if [ ! -f trunk46-spur.image -o ! -f trunk46-spur.changes ]; then
- ./getlatestspurtrunkimage.sh
+if [ ! -f trunk50.image -o ! -f trunk50.changes ]; then
+ cp -p "$SQUEAK50".changes trunk50.changes
+ cp -p "$SQUEAK50".image trunk50.image
fi
-./ensureSqueakV41sources.sh
-
. ./getGoodSpurVM.sh
-echo $VM trunk46-spur.image UpdateSqueakTrunkImage.st
-$VM trunk46-spur.image UpdateSqueakTrunkImage.st
+echo $VM trunk50.image UpdateSqueakTrunkImage.st
+$VM trunk50.image UpdateSqueakTrunkImage.st
More information about the Vm-dev
mailing list