[Vm-dev] [commit][3428] Make the installer builders use SqueakV50.sources.

[commits at squeakvm.org]

Revision: 3428
Author:   eliot
Date:     2015-08-22 09:40:42 -0700 (Sat, 22 Aug 2015)
Log Message:
-----------
Make the installer builders use SqueakV50.sources.  Update the README info
generated by uploadvms to mention Squeak 5.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile
    branches/Cog/build.macos32x86/newspeak.cog.spur/makevm
    branches/Cog/build.win32x86/newspeak.cog.spur/installer/Makefile
    branches/Cog/scripts/uploadvms

Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile	2015-08-22 03:39:38 UTC (rev 3427)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile	2015-08-22 16:40:42 UTC (rev 3428)
@@ -5,7 +5,7 @@
 # edit and run ./links to get .app and sources, then run make
 
 SOURCES := yes
-SOURCEFILENAME1 := $(shell echo ~/Squeak/SqueakV41.sources)
+SOURCEFILENAME1 := ../../../sources/SqueakV50.sources
 DOCUMENTATION_DIR := doc
 
 include branding.gmk
@@ -21,7 +21,7 @@
 $(VM_LOCALIZED_NAME_ESC).app: ../Fast.app
 	rm -rf $(VM_LOCALIZED_NAME_ESC).app
 	cp -R ../Fast.app $(VM_LOCALIZED_NAME_ESC).app
-	-ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources
+	ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources
 
 # Cab contents:
 VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app

Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/makevm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/makevm	2015-08-22 03:39:38 UTC (rev 3427)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/makevm	2015-08-22 16:40:42 UTC (rev 3428)
@@ -93,4 +93,4 @@
 # Clean out any .svn directories (result of copying) in the VM
 find "$DEST" -name .svn -exec rm -rf {} \;
 #link source file into resources directory
-ln ../../sources/SqueakV41.sources "$DEST/Contents/Resources"
+ln ../../sources/SqueakV50.sources "$DEST/Contents/Resources"

Modified: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Makefile	2015-08-22 03:39:38 UTC (rev 3427)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Makefile	2015-08-22 16:40:42 UTC (rev 3428)
@@ -17,7 +17,7 @@
 VM_EXECUTABLE_MANIFEST := $(VM_EXECUTABLE).manifest
 VM_MANIFEST_8DOT3 := $(VM_BASE_NAME).man
 VM_ICON := $(VM_BASE_NAME).ico
-SOURCEFILENAME1 := SqueakV41.sources
+SOURCEFILENAME1 := SqueakV50.sources
 
 CAB_FILES := $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST)
 ifeq ($(strip $(SOURCES)),yes)

Modified: branches/Cog/scripts/uploadvms
===================================================================
--- branches/Cog/scripts/uploadvms	2015-08-22 03:39:38 UTC (rev 3427)
+++ branches/Cog/scripts/uploadvms	2015-08-22 16:40:42 UTC (rev 3428)
@@ -192,7 +192,7 @@
      non-blocking FFI calls.  The archives containing "Spur" or "spur" are
      VMs using the new Spur object representation and garbage collector and
      should be used with Spur-format Squeak/Pharo/Croquet or Newspeak images.
-     Newspeak has moved to Spur and no longer supports non-Spur versions.
+     Squeak V5 and Newspeak have moved to Spur.
 
      Linux
      There are two variants of the Linux VMs; those ending in "ht" have a