Revision: 3062 Author: eliot Date: 2014-08-07 10:23:08 -0700 (Thu, 07 Aug 2014) Log Message: ----------- Add some validation to makegetvmscripts.sh. Update getGoodSpurVM.sh & getGoodCogVM.sh to the 3060 VMs.
Modified Paths: -------------- branches/Cog/image/getGoodCogVM.sh branches/Cog/image/getGoodSpurVM.sh branches/Cog/image/makegetvmscripts.sh
Modified: branches/Cog/image/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh 2014-08-07 15:22:32 UTC (rev 3061) +++ branches/Cog/image/getGoodCogVM.sh 2014-08-07 17:23:08 UTC (rev 3062) @@ -1,9 +1,9 @@ #!/bin/sh -# Sets the VM env var to the r3029 Cog VM for the current platform. +# Sets the VM env var to the r3060 Cog VM for the current platform. # will download and install the VM in this directory if necessary.
-TAG=14.26.3029 -REV=3029 +TAG=14.31.3060 +REV=3060 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
. ./envvars.sh @@ -17,22 +17,22 @@
case "$OS" in Darwin) get_vm_from_tar \ - Cog.app/Contents/MacOS/Squeak a8836be2d6d62bd5711dbfdd043757b4 \ - Cog.app-$TAG.tgz d7a301c471515ea90c69f62225a93555 + Cog.app/Contents/MacOS/Squeak b9d79576423fe79f9f77383f676d37d6 \ + Cog.app-$TAG.tgz 2d93340bed9902bd8913067f372c7371 VM=Cog.app/Contents/MacOS/Squeak;; Linux) if expr $OSREL > 2.6.12; then get_vm_from_tar \ - coglinuxht/lib/squeak/4.0-$REV/squeak 9d0f27d9b71f1dacc31b8beafa4c3b6d \ - coglinuxht-$TAG.tgz 2300e4d895b26bfcc6a652841781ac90 + coglinuxht/lib/squeak/4.0-$REV/squeak 35c003d9bd2c614850ca5b99c86155e9 \ + coglinuxht-$TAG.tgz a9e34f56f4923fff1ab4fc82f6ec93a0 else get_vm_from_tar \ - coglinux/lib/squeak/4.0-$REV/squeak eff9d1c4b5c64c23109dff0f0d634ae9 \ - coglinux-$TAG.tgz 655db6462a9d804983dffd3eda4d0531 + coglinux/lib/squeak/4.0-$REV/squeak 8327eef0d7dda150f3fcf809df940bf5 \ + coglinux-$TAG.tgz 81466c4732d2fa5d8aec991938e714c8 fi;; CYGWIN*) get_vm_from_zip \ - cogwin/SqueakConsole.exe e6ebcb8a8c3f585cad66c7a54e47206f \ - cogwin-$TAG.zip cea244b795ac9cebc7b47ac94af6a5a2 + cogwin/SqueakConsole.exe 6655d9ea5c7f0919f61a9cf5ad58b202 \ + cogwin-$TAG.zip 8fa6ba2df26e72342889b0279f17bb6d 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 2014-08-07 15:22:32 UTC (rev 3061) +++ branches/Cog/image/getGoodSpurVM.sh 2014-08-07 17:23:08 UTC (rev 3062) @@ -1,9 +1,9 @@ #!/bin/sh -# Sets the VM env var to the r3029 Cog Spur VM for the current platform. +# Sets the VM env var to the r3060 Cog Spur VM for the current platform. # will download and install the VM in this directory if necessary.
-TAG=14.26.3029 -REV=3029 +TAG=14.31.3060 +REV=3060 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
. ./envvars.sh @@ -17,16 +17,16 @@
case "$OS" in Darwin) get_vm_from_tar \ - CogSpur.app/Contents/MacOS/Squeak 19a64f72acb1e2d3d6f2d47410e6e26a \ - CogSpur.app-$TAG.tgz bbf5edcee366fd4e0f0340ff9fbcfcb3 + CogSpur.app/Contents/MacOS/Squeak d71657f3596108f1ee26ddde98d2a6e1 \ + CogSpur.app-$TAG.tgz 775fc34a65293eb7c6b1fe585b29343c VM=CogSpur.app/Contents/MacOS/Squeak;; Linux) get_vm_from_tar \ - cogspurlinuxht/lib/squeak/4.0-$REV/squeak eb322de8e2bd4ce388573733f8f01405 \ - cogspurlinuxht-$TAG.tgz ae8abc7d0d4c7d7c4290a93d173179f3 + cogspurlinuxht/lib/squeak/4.0-$REV/squeak c0df39147de2ac7d76aee7d7aa073f36 \ + cogspurlinuxht-$TAG.tgz 70421b720be1f5f843c96b48fbe8d07e VM=cogspurlinuxht/squeak;; CYGWIN*) get_vm_from_zip \ - cogspurwin/SqueakConsole.exe 4bc6353fa35fa60e7bd2dfc3ec2fa4a8 \ - cogspurwin-$TAG.zip b3d0fd96e0d17fdb79f9c9d31f816fde + cogspurwin/SqueakConsole.exe 83454062da3b7855b81e3fb5a8c6d360 \ + cogspurwin-$TAG.zip 463d2fe92c95f4c7083ac37cd9baf84f 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/makegetvmscripts.sh =================================================================== --- branches/Cog/image/makegetvmscripts.sh 2014-08-07 15:22:32 UTC (rev 3061) +++ branches/Cog/image/makegetvmscripts.sh 2014-08-07 17:23:08 UTC (rev 3062) @@ -4,11 +4,26 @@ cd `dirname $0` REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \ | sed 's/^.*Rev: ([0-9][0-9]*) $";/\1/'` + +if [ "$1" = "-r" -a -n "$2" ]; then + REV="$2" + shift;shift +fi + TAG=`date +%g.%U.`$REV echo REV=$REV TAG=$TAG
. ./envvars.sh
+ABORT= +for a in Cog.app-$TAG.tgz coglinuxht-$TAG.tgz coglinux-$TAG.tgz cogwin-$TAG.zip\ + CogSpur.app-$TAG.tgz cogspurlinuxht-$TAG.tgz cogspurwin-$TAG.zip +do + test -f ../products/$a || echo $a does not exist + ABORT=true +done +test -n "$ABORT" || exit 1 + cat >getGoodCogVM.sh <<END #!/bin/sh # Sets the VM env var to the r$REV Cog VM for the current platform.
vm-dev@lists.squeakfoundation.org