[commit][3699] Get the image building scripts to use the updated trunk image from squeak. org, - Vm-dev

6 May 2016

Revision: 3699
Author:   eliot
Date:     2016-05-05 15:28:56 -0700 (Thu, 05 May 2016)
Log Message:
-----------
Get the image building scripts to use the updated trunk image from squeak.org,
update the VMs used to 3692, and comment the ARC vs weak difference for the
64-bit vs 32-bit Mac OS X Cocoa VMs.
Modified Paths:
--------------
    branches/Cog/build.macos32x86/common/Makefile.flags
    branches/Cog/build.macos64x64/common/Makefile.flags
    branches/Cog/image/getGoodCogVM.sh
    branches/Cog/image/getGoodSpurNsvm.sh
    branches/Cog/image/getGoodSpurVM.sh
    branches/Cog/image/updatespurimage.sh
Modified: branches/Cog/build.macos32x86/common/Makefile.flags
===================================================================

--- branches/Cog/build.macos32x86/common/Makefile.flags	2016-05-05 19:29:09 UTC (rev 3698)
+++ branches/Cog/build.macos32x86/common/Makefile.flags	2016-05-05 22:28:56 UTC (rev 3699)
@@ -11,6 +11,8 @@
 TARGET_ARCH:=i386
 TARGET_VERSION_MIN:=10.7
+# N.B. ARC isn't supported by the os-x 32-bit legacy Objective-C runtime kernel.
+# ARC is supported only on 64-bits, and then only for the 10.7 SDK and later.
 CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \
    	-arch $(TARGET_ARCH) \
    	-mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \
Modified: branches/Cog/build.macos64x64/common/Makefile.flags
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.flags	2016-05-05 19:29:09 UTC (rev 3698)
+++ branches/Cog/build.macos64x64/common/Makefile.flags	2016-05-05 22:28:56 UTC (rev 3699)
@@ -11,6 +11,8 @@
 TARGET_ARCH:=x86_64
 TARGET_VERSION_MIN:=10.7
+# N.B. ARC isn't supported by the os-x 32-bit legacy Objective-C runtime kernel.
+# ARC is supported only on 64-bits, and then only for the 10.7 SDK and later.
 CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \
    	-arch $(TARGET_ARCH) \
    	-mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \
Modified: branches/Cog/image/getGoodCogVM.sh
===================================================================
--- branches/Cog/image/getGoodCogVM.sh	2016-05-05 19:29:09 UTC (rev 3698)
+++ branches/Cog/image/getGoodCogVM.sh	2016-05-05 22:28:56 UTC (rev 3699)
@@ -1,32 +1,32 @@
 #!/bin/sh
-# Sets the VM env var to the r3643 Cog VM for the current platform.
+# Sets the VM env var to the r3692 Cog VM for the current platform.
 # will download and install the VM in this directory if necessary.
-TAG=16.10.3643
-REV=3643
-LCBINDIR=4.0-3643
+TAG=16.18.3692
+REV=3692
+LCBINDIR=4.0-3692
 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 6495fcad0dfc1302a7abeb40860b228e \
-            Cog.app-$TAG.tgz c024c56458e4cb9c58002a25f93bd59a
+            Cog.app/Contents/MacOS/Squeak 738b30c9c50e489fe4068e4998e53d44 \
+            Cog.app-$TAG.tgz 17f05311cf1e2f8042c8781e14a3e985
         VM=Cog.app/Contents/MacOS/Squeak;;
 Linux)
     if expr $OSREL > 2.6.12; then
         get_vm_from_tar \
         coglinuxht/lib/squeak/$LCBINDIR/squeak  \
-        coglinuxht-$TAG.tgz b425f59475f1357fbe0c25b445f69717
+        coglinuxht-$TAG.tgz 3f2022dfb4d804a265c77aa770e34606
     else
         get_vm_from_tar \
         coglinux/lib/squeak/$LCBINDIR/squeak  \
-        coglinux-$TAG.tgz df1101e6ed629198f0806b75d9c12532
+        coglinux-$TAG.tgz 4ef3daa36509f8e6d0644ac954d9c70f
     fi;;
 CYGWIN*) get_vm_from_zip \
-            cogwin/SqueakConsole.exe 21c42946fec449edba92f5ca863e390a \
-            cogwin-$TAG.zip b38822661e97686813ac0512c825428b
+            cogwin/SqueakConsole.exe 41ca7c10b9f08d97739477439ebfaaf2 \
+            cogwin-$TAG.zip 7667b6c84c53376699aa80a183dc33f7
     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/getGoodSpurNsvm.sh
===================================================================
--- branches/Cog/image/getGoodSpurNsvm.sh	2016-05-05 19:29:09 UTC (rev 3698)
+++ branches/Cog/image/getGoodSpurNsvm.sh	2016-05-05 22:28:56 UTC (rev 3699)
@@ -1,26 +1,26 @@
 #!/bin/sh
-# Sets the VM env var to the r3643 Newspeak Spur VM for the current platform.
+# Sets the VM env var to the r3692 Newspeak Spur VM for the current platform.
 # will download and install the VM in this directory if necessary.
-TAG=16.10.3643
-REV=3643
-LSBINDIR=5.0-3643
+TAG=16.18.3692
+REV=3692
+LSBINDIR=5.0-3692
 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" a50b3f51714f1c012ce73a24a3c4fd1c \
-            "Newspeak Spur Virtual Machine.app-$TAG.tgz" a8c926d31ca71fac7d7f202529b7aab8
+            "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" 45319b241d7b0a2c00d2dd770a495abf \
+            "Newspeak Spur Virtual Machine.app-$TAG.tgz" 7504c3a462103df69fc64fa82351c6ee
         VM="Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";;
 Linux) get_vm_from_tar \
         nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm  \
-        nsvmspurlinuxht-$TAG.tgz 7a8810d1f87d044ad3a85866a6509e64
+        nsvmspurlinuxht-$TAG.tgz d47de73d6c8ef8a8338a6932ebf4c842
     VM=nsvmspurlinuxht/nsvm;;
 CYGWIN*) get_vm_from_zip \
-            nsvmspurwin/nsvmConsole.exe d9bb69463c8f9ec8b1436b294593f11e \
-            nsvmspurwin-$TAG.zip ec9e07efe9eea8ff6cc4805fbde6de2a
+            nsvmspurwin/nsvmConsole.exe bb82d0fc34ee0ea3a63f0f49ccb93e9b \
+            nsvmspurwin-$TAG.zip fb9665b61770bc54cf41b2e52c62b47f
     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	2016-05-05 19:29:09 UTC (rev 3698)
+++ branches/Cog/image/getGoodSpurVM.sh	2016-05-05 22:28:56 UTC (rev 3699)
@@ -1,26 +1,26 @@
 #!/bin/sh
-# Sets the VM env var to the r3643 Cog Spur VM for the current platform.
+# Sets the VM env var to the r3692 Cog Spur VM for the current platform.
 # will download and install the VM in this directory if necessary.
-TAG=16.10.3643
-REV=3643
-LSBINDIR=5.0-3643
+TAG=16.18.3692
+REV=3692
+LSBINDIR=5.0-3692
 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 244323eea6792e2e69bd523c9911b2f8 \
-            CogSpur.app-$TAG.tgz 7421e8188932dede31d5182238ee64c2
+            CogSpur.app/Contents/MacOS/Squeak 97460b152803235de4b0c11333f0cf74 \
+            CogSpur.app-$TAG.tgz 38c190e78fff34760292d6a9da3a61b8
         VM=CogSpur.app/Contents/MacOS/Squeak;;
 Linux) get_vm_from_tar \
-        cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 37bc3cec9db46498640b3d9eefeebdfd \
-        cogspurlinuxht-$TAG.tgz 02e977113ee4a059637650ab69439bff
+        cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 64cda56486bf7351de7a40f0389edfba \
+        cogspurlinuxht-$TAG.tgz 02948787583829d450d807afa910b178
     VM=cogspurlinuxht/squeak;;
 CYGWIN*) get_vm_from_zip \
-            cogspurwin/SqueakConsole.exe 2bcad50dcfe458e5737cd843546f47de \
-            cogspurwin-$TAG.zip 42112ad448e806790ad112635a596337
+            cogspurwin/SqueakConsole.exe 247e1e7a6acbb71f350f838ddc88b361 \
+            cogspurwin-$TAG.zip 6a58964e6f69a6a379a5dcd73796207b
     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/updatespurimage.sh
===================================================================
--- branches/Cog/image/updatespurimage.sh	2016-05-05 19:29:09 UTC (rev 3698)
+++ branches/Cog/image/updatespurimage.sh	2016-05-05 22:28:56 UTC (rev 3699)
@@ -1,11 +1,31 @@
 #!/bin/sh
 # Update the latest Spur image.
 . ./envvars.sh
+
+if false; then
+	# old way; get Squeak 5.0 and update
 . ./getsqueak50.sh
-if [ ! -f trunk50.image -o ! -f trunk50.changes ]; then
-	cp -p "$SQUEAK50".changes trunk50.changes
-	cp -p "$SQUEAK50".image trunk50.image
+	if [ ! -f trunk50.image -o ! -f trunk50.changes ]; then
+		cp -p "$SQUEAK50".changes trunk50.changes
+		cp -p "$SQUEAK50".image trunk50.image
+	fi
+else
+	# New way; download the latest trunk from squeak.org/downloads
+	geturl http://build.squeak.org/job/Trunk/default/lastSuccessfulBuild/artifact/targe...
+	unzip -ou TrunkImage.zip
+	mv SpurTrunkImage.changes trunk50.changes
+	mv SpurTrunkImage.image trunk50.image
+	if test ! -f SqueakV50.sources ; then
+		if test -f ../sources/SqueakV50.sources; then
+			ln ../sources/SqueakV50.sources .
+		else
+			if test ! -f SqueakV50.sources.zip; then
+				geturl http://ftp.squeak.org/5.0/SqueakV50.sources.zip
+			fi
+			unzip SqueakV50.sources.zip
+		fi
+	fi
 fi
. ./getGoodSpurVM.sh

    