[Vm-dev] [commit][2992] Differentiate the Cog and Spur Newspeak Mac installs.

[commits at squeakvm.org]

Revision: 2992
Author:   eliot
Date:     2014-06-11 16:24:07 -0700 (Wed, 11 Jun 2014)
Log Message:
-----------
Differentiate the Cog and Spur Newspeak Mac installs.  Make the makeallinstall
move the resulting dmg to products.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/makeallinstall
    branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk

Modified: branches/Cog/build.macos32x86/makeallinstall
===================================================================
--- branches/Cog/build.macos32x86/makeallinstall	2014-06-11 22:47:09 UTC (rev 2991)
+++ branches/Cog/build.macos32x86/makeallinstall	2014-06-11 23:24:07 UTC (rev 2992)
@@ -1,13 +1,20 @@
 #!/bin/bash
+IFS="
+	"
 trap 'exit 2' HUP INT PIPE TERM 0
-REV=`grep 'SvnRawRevisionString.*Rev:' "$1/Cross/vm/sqSCCSVersion.h" \
+REV=`grep 'SvnRawRevisionString.*Rev:' "\`dirname $0\`/../platforms/Cross/vm/sqSCCSVersion.h" \
 	| sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
 TAG=`date +%g.%U.`$REV
-for d in newspeak.*/installer squeak.*/installer; do
+set -- Newspeak\ Virtual\ Machine	Newspeak\ Spur\ Virtual\ Machine	\
+		Cog		Cog\ Spur
+for td in newspeak.cog.v3 newspeak.cog.spur squeak.cog.v3 squeak.cog.spur; do
+	d=$td/installer
+	PRODUCT=$1-$TAG.dmg
 	if test -d "$d"; then
-		(cd $d;make)
-		test -f $PRODUCT && mv $PRODUCT ../products
+		(cd $d;make -n)
+		test -f $d/$PRODUCT && mv $d/$PRODUCT ../products
 	else
 		echo no $d directory found
 	fi
+	shift
 done

Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk	2014-06-11 22:47:09 UTC (rev 2991)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk	2014-06-11 23:24:07 UTC (rev 2992)
@@ -14,7 +14,7 @@
 
 # Product name as compiled into the executable and installers
 ifndef PRODUCT_NAME
-PRODUCT_NAME := Newspeak Virtual Machine
+PRODUCT_NAME := Newspeak Spur Virtual Machine
 endif
 
 # Used for Desktop/menubar shortcuts