Revision: 3066 Author: eliot Date: 2014-08-28 05:38:54 -0700 (Thu, 28 Aug 2014) Log Message: ----------- Fix the getGooVM generators for the SPuyr VM version number change (4.0 => 5.0)

Modified Paths: -------------- branches/Cog/image/getGoodCogVM.sh branches/Cog/image/getGoodSpurVM.sh branches/Cog/image/makegetnsvmscripts.sh branches/Cog/image/makegetvmscripts.sh

Modified: branches/Cog/image/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh 2014-08-28 12:17:19 UTC (rev 3065) +++ branches/Cog/image/getGoodCogVM.sh 2014-08-28 12:38:54 UTC (rev 3066) @@ -16,11 +16,11 @@ Linux) if expr $OSREL > 2.6.12; then get_vm_from_tar \ - coglinuxht/lib/squeak/4.0-$REV/squeak badd6e33775c1176e478b2262cffe177 \ + coglinuxht/lib/squeak/$LCBINDIR/squeak badd6e33775c1176e478b2262cffe177 \ coglinuxht-$TAG.tgz 1b58e26c4c6c92ca8b141e94c04b0ed9 else get_vm_from_tar \ - coglinux/lib/squeak/4.0-$REV/squeak 817f87fa0cf4b7d90ef9599d7b762fe5 \ + coglinux/lib/squeak/$LCBINDIR/squeak 817f87fa0cf4b7d90ef9599d7b762fe5 \ coglinux-$TAG.tgz 1394d1bfd1749b711a2266621dc8ff5b fi;; CYGWIN*) get_vm_from_zip \

Modified: branches/Cog/image/getGoodSpurVM.sh =================================================================== --- branches/Cog/image/getGoodSpurVM.sh 2014-08-28 12:17:19 UTC (rev 3065) +++ branches/Cog/image/getGoodSpurVM.sh 2014-08-28 12:38:54 UTC (rev 3066) @@ -14,8 +14,9 @@ CogSpur.app-$TAG.tgz 741a5355c22f20cda33db969bb5e3d7a VM=CogSpur.app/Contents/MacOS/Squeak;; Linux) get_vm_from_tar \ - cogspurlinuxht/lib/squeak/4.0-$REV/squeak \ - cogspurlinuxht-$TAG.tgz af8988545c1042a9813e3166390af6cb VM=cogspurlinuxht/squeak;; + cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 22e8dfc3409a79155f79b2943c834572 \ + cogspurlinuxht-$TAG.tgz af8988545c1042a9813e3166390af6cb + VM=cogspurlinuxht/squeak;; CYGWIN*) get_vm_from_zip \ cogspurwin/SqueakConsole.exe a7bc32115050dab7e9060e8391025c4e \ cogspurwin-$TAG.zip 6945ef0ff89bc5c1da00f6076868f3e6

Modified: branches/Cog/image/makegetnsvmscripts.sh =================================================================== --- branches/Cog/image/makegetnsvmscripts.sh 2014-08-28 12:17:19 UTC (rev 3065) +++ branches/Cog/image/makegetnsvmscripts.sh 2014-08-28 12:38:54 UTC (rev 3066) @@ -21,6 +21,8 @@ | sed 's/^.*Rev: ([0-9][0-9]*) $";/\1/'` test -n "$TAG" || TAG=`date +%g.%U.`$REV

+LCBINDIR=4.0-$REV +LSBINDIR=5.0-$REV echo REV=$REV TAG=$TAG

. ./envvars.sh @@ -62,8 +64,8 @@ get_vm_from_tar \ END

-echo -n ' nsvmlinuxht/lib/nsvm/4.0-$REV/nsvm ' >>$GetCogScript -echo -n `quietmd5 ../products/nsvmlinuxht/lib/nsvm/4.0-$REV/nsvm` >>$GetCogScript +echo -n ' nsvmlinuxht/lib/nsvm/$LCBINDIR/nsvm ' >>$GetCogScript +echo -n `quietmd5 ../products/nsvmlinuxht/lib/nsvm/$LCBINDIR/nsvm` >>$GetCogScript echo ' ' >>$GetCogScript echo -n ' nsvmlinuxht-$TAG.tgz ' >>$GetCogScript quietmd5 ../products/nsvmlinuxht-$TAG.tgz >>$GetCogScript @@ -73,8 +75,8 @@ get_vm_from_tar \ END

-echo -n ' nsvmlinux/lib/nsvm/4.0-$REV/nsvm ' >>$GetCogScript -echo -n `quietmd5 ../products/nsvmlinux/lib/nsvm/4.0-$REV/nsvm` >>$GetCogScript +echo -n ' nsvmlinux/lib/nsvm/$LCBINDIR/nsvm ' >>$GetCogScript +echo -n `quietmd5 ../products/nsvmlinux/lib/nsvm/$LCBINDIR/nsvm` >>$GetCogScript echo ' ' >>$GetCogScript echo -n ' nsvmlinux-$TAG.tgz ' >>$GetCogScript quietmd5 ../products/nsvmlinux-$TAG.tgz >>$GetCogScript @@ -123,8 +125,8 @@ Linux) get_vm_from_tar \ END

-echo -n ' nsvmspurlinuxht/lib/nsvm/4.0-$REV/nsvm ' >>$GetSpurScript -echo -n `quietmd5 ../products/nsvmspurlinuxht/lib/nsvm/4.0-$REV/nsvm` >>$GetSpurScript +echo -n ' nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm ' >>$GetSpurScript +echo -n `quietmd5 ../products/nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm` >>$GetSpurScript echo ' ' >>$GetSpurScript echo -n ' nsvmspurlinuxht-$TAG.tgz ' >>$GetSpurScript quietmd5 ../products/nsvmspurlinuxht-$TAG.tgz >>$GetSpurScript

Modified: branches/Cog/image/makegetvmscripts.sh =================================================================== --- branches/Cog/image/makegetvmscripts.sh 2014-08-28 12:17:19 UTC (rev 3065) +++ branches/Cog/image/makegetvmscripts.sh 2014-08-28 12:38:54 UTC (rev 3066) @@ -21,6 +21,8 @@ | sed 's/^.*Rev: ([0-9][0-9]*) $";/\1/'` test -n "$TAG" || TAG=`date +%g.%U.`$REV

+LCBINDIR=4.0-$REV +LSBINDIR=5.0-$REV echo REV=$REV TAG=$TAG

. ./envvars.sh @@ -62,8 +64,8 @@ get_vm_from_tar \ END

-echo -n ' coglinuxht/lib/squeak/4.0-$REV/squeak ' >>$GetCogScript -echo -n `quietmd5 ../products/coglinuxht/lib/squeak/4.0-$REV/squeak` >>$GetCogScript +echo -n ' coglinuxht/lib/squeak/$LCBINDIR/squeak ' >>$GetCogScript +echo -n `quietmd5 ../products/coglinuxht/lib/squeak/$LCBINDIR/squeak` >>$GetCogScript echo ' ' >>$GetCogScript echo -n ' coglinuxht-$TAG.tgz ' >>$GetCogScript quietmd5 ../products/coglinuxht-$TAG.tgz >>$GetCogScript @@ -73,8 +75,8 @@ get_vm_from_tar \ END

-echo -n ' coglinux/lib/squeak/4.0-$REV/squeak ' >>$GetCogScript -echo -n `quietmd5 ../products/coglinux/lib/squeak/4.0-$REV/squeak` >>$GetCogScript +echo -n ' coglinux/lib/squeak/$LCBINDIR/squeak ' >>$GetCogScript +echo -n `quietmd5 ../products/coglinux/lib/squeak/$LCBINDIR/squeak` >>$GetCogScript echo ' ' >>$GetCogScript echo -n ' coglinux-$TAG.tgz ' >>$GetCogScript quietmd5 ../products/coglinux-$TAG.tgz >>$GetCogScript @@ -123,11 +125,11 @@ Linux) get_vm_from_tar \ END

-echo -n ' cogspurlinuxht/lib/squeak/4.0-$REV/squeak ' >>$GetSpurScript -echo -n `quietmd5 ../products/cogspurlinuxht/lib/squeak/4.0-$REV/squeak` >>$GetSpurScript +echo -n ' cogspurlinuxht/lib/squeak/$LSBINDIR/squeak ' >>$GetSpurScript +echo -n `quietmd5 ../products/cogspurlinuxht/lib/squeak/$LSBINDIR/squeak` >>$GetSpurScript echo ' ' >>$GetSpurScript echo -n ' cogspurlinuxht-$TAG.tgz ' >>$GetSpurScript -echo -n `quietmd5 ../products/cogspurlinuxht-$TAG.tgz` >>$GetSpurScript +quietmd5 ../products/cogspurlinuxht-$TAG.tgz >>$GetSpurScript

cat >>$GetSpurScript <<END VM=cogspurlinuxht/squeak;;