CogVM source as per VMMaker.oscog-eem.282.

Change application name from Croquet to Squeak and change to green Cog Squeak icons. Add the SSLPlugin on mac and linux (won't link on old mingw; need to update). Cogit: Fix *HORRIBLE* yet ancient bug with the CogObjectRep. Both CogObjectRepresentationForSqueakV3>>couldBeObject: & CogObjectRepresentationForSqueakV3>>shouldAnnotateObjectReference: used signed comparisons for oops and so once the heap size pushes oops into the upper half of the address space constant oops in machine code were no longer being updated by the GC. StackInterpreter: rewrite the login for printing methods so that printing the frame of a bad receiver won't seg fault. Add primitivePathToUsing which mimics the PointerFinder and can hence be used to debug or verify it. Remove unnecessary forceInterruptCheck in NewObjectMemory>>become:with:twoWay:copyHash:. (heartbeat does this for us). Fix bug in assert in NewCoObjectMemory>>restoreHeaderOf:to:. Slang: Fix translation of to:by:do: loops so that the limit is not re-evaluated on each iteration if it may have side-effects. Include the correct AioPlugin (UnixAioPlugin) Include SqueakSSLPlugin in the configurations. Cogit: Stop reporting EncounteredUnknownBytecode with an error message. Fix slip in ceSICMiss: that didn't link new PIC if an MNU case. Add pixel peeker prims to BitBltPlugin. Minor signature changes to BitBltPlugin & HostWindowPlugin from SmartSyntaxPluginGenerator bug fix. git-svn-id: http://squeakvm.org/svn/squeak/branches/Cog@2713 fa1542d4-bde8-0310-ad64-8ed1123d492a
squeakvm · Apr 4, 2013 · 38b96e2 · 38b96e2
1 parent 170f694
commit 38b96e2
Show file tree

Hide file tree

Showing 43 changed files with 3,113 additions and 153 deletions.
diff --git a/cygwinbuild/GreenCogSqueak.ico b/cygwinbuild/GreenCogSqueak.ico
diff --git a/cygwinbuild/Makefile b/cygwinbuild/Makefile
@@ -12,7 +12,7 @@ CONFIGURATION=product
 THREADING=single
 
 # The name of the VM to build
-VM:=Croquet
+VM:=Squeak
 VM_NAME?=$(VM)
 
 # Is this a Croquet VM (defaults to OGL instead of D3D)?
@@ -190,7 +190,8 @@ OBJCOPY:=	objcopy
 # Note: RC compiles the .rc files into linkable .o files
 #
 RC:=	 windres
-RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32
+SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: \([0-9][0-9]*\).*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h)
+RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"'
 
 .SUFFIXES:
 .SUFFIXES:	.ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp
@@ -202,6 +203,9 @@ RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32
 #
 default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE)
 
+svnver:
+	echo $(RC) $(RCFLAGS)
+
 productmt:;
 	$(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product THREADING=multi $(@,product=) default
 

diff --git a/cygwinbuild/Squeak.rc b/cygwinbuild/Squeak.rc
@@ -1,11 +1,11 @@
 #ifdef _WIN32
-1                       ICON    DISCARDABLE     "squeak.ico"
+1                       ICON    DISCARDABLE     "GreenCogSqueak.ico"
 2                       ICON    DISCARDABLE     "squeak2.ico"
 3                       ICON    DISCARDABLE     "squeak3.ico"
 
 1 VERSIONINFO
- FILEVERSION 3,11,3,0
- PRODUCTVERSION 3,11,0,0
+ FILEVERSION FILEVERSIONVALUES
+ PRODUCTVERSION 4,0,0,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0xaL
  FILEOS 0x10001L
@@ -17,16 +17,16 @@ BEGIN
         BLOCK "040904E4"    // Lang=US English, CharSet=Windows Multilin
         BEGIN
             VALUE "CompanyName", "Squeak.org\0"
-            VALUE "FileDescription", "Squeak Virtual Machine\0"
-            VALUE "FileVersion", "3.11.3\0"
-            VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2009\0"
-            VALUE "ProductName", "Squeak\0"
-            VALUE "ProductVersion", "3.11\0"
+            VALUE "FileDescription", "Squeak Cog Virtual Machine\0"
+            VALUE "FileVersion", FILEVERSIONSTRING
+            VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2013\0"
+            VALUE "ProductName", "Squeak Cog\0"
+            VALUE "ProductVersion", "4.0\0"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
         VALUE "Translation", 0x409, 1252
     END
 END
-#endif
+#endif
diff --git a/cygwinbuild/mvm b/cygwinbuild/mvm
@@ -2,4 +2,4 @@
 rm -rf build*/vm/Croquet*.exe
 make debug;make assert;make
 make THREADING=multi CONFIGURATION=debug;make THREADING=multi CONFIGURATION=assert;make THREADING=multi
-ls -rlt build*/vm/Croquet*.exe
+ls -rlt build*/vm/Squeak*.exe
diff --git a/cygwinbuild/plugins.ext b/cygwinbuild/plugins.ext
@@ -1,4 +1,6 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
+# N.B. SqueakSSL is not ready for prime time.  Compiles but does not link fully.
+# See platforms/win32/plugins/SqueakSSL/Makefile
 EXTERNAL_PLUGINS = \
 BochsIA32Plugin \
 SqueakFFIPrims \

diff --git a/image/Workspace.text b/image/Workspace.text
@@ -1 +1 @@
-This image is intended to build new CoInterpreter or StackInterpreter Cog VMs, and a Newspeak VM, and to run the Cog VM simulator (see the VM Simulation Workspace).The following doit offers a menu of configurations that create a single; source tree (../src) for all platforms.  Since they use a relative path they will work out of the box.  Generate the entire VM using them.  Choose Squeak Cog VM by default, and when prompted choose CoInterpreter.	VMMaker generateConfigurationTo rebuild this image- start with a Squeak 4.3 or newer image (this is a Squeak 4.3 trunk image that you can update).1. If Alien is not already in the image, load it, e.g.  Alien-eem.18 from http://www.squeaksource.com/Alien.2. If FFI is not already in the image, load FFI-Pools, e.g. FFI-Pools-eem.3, from http://source.squeak.org/FFI (For FFIConstants)[2a. Load FFI if you want to use cog:selector: to compile a method in this image]3. Load SharedPool-Speech, e.g. SharedPool-Speech-dtl.2, from http://www.squeaksource.com/Speech (For KlattResonatorIndices)4. Load Balloon-Engine-Pools (e.g. Balloon-Engine-Pools-JB.2) from http://source.squeak.org/VMMaker5. From    http://source.squeak.org/VMMakerload "VMMaker.oscog" and "Cog" monticello packages.  First load the most up-to-dateVMMaker.oscog, e.g. VMMaker.oscog-eem.157, and then the most up-to-date  Cog, e.g. Cog-eem.46.N.B. do *not* load VMMaker or VMMaker-oscog.N.B. VMMaker.oscog packages may be listed with VMMaker packages depending on Monticello version.
+This image is intended to build new CoInterpreter or StackInterpreter Cog VMs, and a Newspeak VM, and to run the Cog VM simulator (see the VM Simulation Workspace).The following doit offers a menu of configurations that create a single; source tree (../src) for all platforms.  Since they use a relative path they will work out of the box.  Generate the entire VM using them.  Choose Squeak Cog VM by default, and when prompted choose CoInterpreter.	VMMaker generateConfigurationTo rebuild this image- start with a Squeak 4.4 or newer image (the Squeak 4.3 All-in-one is fine too, but please update the image).1. If Alien is not already in the image, load it, e.g.  Alien-eem.18 from http://www.squeaksource.com/Alien.2. If FFI is not already in the image, load FFI-Pools, e.g. FFI-Pools-eem.3, from http://source.squeak.org/FFI (For FFIConstants)[2a. Load FFI if you want to use cog:selector: to compile a method in this image]3. Load SharedPool-Speech, e.g. SharedPool-Speech-dtl.2, from http://www.squeaksource.com/Speech (For KlattResonatorIndices)4. Load Balloon-Engine-Pools (e.g. Balloon-Engine-Pools-JB.2) from http://source.squeak.org/VMMaker5. From    http://source.squeak.org/VMMakerload "VMMaker.oscog" and "Cog" monticello packages.  First load the most up-to-dateVMMaker.oscog, e.g. VMMaker.oscog-eem.278, and then the most up-to-date  Cog, e.g. Cog-lw.60.N.B. do *not* load VMMaker or VMMaker-oscog.N.B. VMMaker.oscog packages may be listed with VMMaker packages depending on Monticello version.6. Load any additional plugins not in VMMaker.  Currently these are:	- SqueakSSLPlugin from e.g. SqueakSSL-Plugin-ar.3 at http://www.squeaksource.com/SqueakSSL	- Win32OSProcessPlugin  & UnixOSProcessPlugin from e.g. VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 at http://www.squeaksource.com/OSProcessPlugin	- FT2Plugin from e.g. Freetype-Plugin-IgorStasenko.57  at http://www.squeaksource.com/FreetypePlugin	- AioPlugin from e.g. VMConstruction-Plugins-AioPlugin-dtl.14 at t http://www.squeaksource.com/AioPluginRead the class comments of StackInterpreterSimulator and CogVMSimulator for running the simulator.

diff --git a/macbuild/CoreMTVM.xcodeproj/project.pbxproj b/macbuild/CoreMTVM.xcodeproj/project.pbxproj
@@ -255,7 +255,7 @@
 		A2FB6B730CCD723F00A29088 /* LocalePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = A2FB6B720CCD723F00A29088 /* LocalePlugin.h */; };
 		DA6061C40AA515470009E25D /* sqMacMain.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF402EB4E0A0100013C /* sqMacMain.c */; };
 		DA6061CA0AA5155E0009E25D /* sqNamedPrims.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AFDD02EB4E0A0100013C /* sqNamedPrims.c */; };
-		DAFA08940AA64625008DF459 /* Croquet.icns in Resources */ = {isa = PBXBuildFile; fileRef = DAFA08930AA64625008DF459 /* Croquet.icns */; };
+		DAFA08940AA64625008DF459 /* GreenCogSqueak.icns in Resources */ = {isa = PBXBuildFile; fileRef = DAFA08930AA64625008DF459 /* GreenCogSqueak.icns */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -301,7 +301,7 @@
 		94196AAE09974200005962BF /* sqMacUIEventsUniversal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIEventsUniversal.c; sourceTree = "<group>"; };
 		94196AAF09974200005962BF /* sqMacUIMenuBarUniversal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIMenuBarUniversal.c; sourceTree = "<group>"; };
 		94196AB009974200005962BF /* sqMacWindowUniversal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacWindowUniversal.c; sourceTree = "<group>"; };
-		941A3C0C09AA144000C9D25A /* Croquet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Croquet.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		941A3C0C09AA144000C9D25A /* Squeak.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Squeak.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9426FF0F09F489D200ECEDDC /* chartables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = chartables.c; sourceTree = "<group>"; };
 		9426FF1009F489D200ECEDDC /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
 		9426FF1109F489D200ECEDDC /* get.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = get.c; sourceTree = "<group>"; };
@@ -396,7 +396,7 @@
 		A2FB6B580CCD71B000A29088 /* sqMacLocaleCarbon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMacLocaleCarbon.h; path = LocalePlugin/sqMacLocaleCarbon.h; sourceTree = "<group>"; };
 		A2FB6B720CCD723F00A29088 /* LocalePlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LocalePlugin.h; path = LocalePlugin/LocalePlugin.h; sourceTree = "<group>"; };
 		DAD40DAF0AA60CE90082521A /* CoreVM.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = CoreVM.plist; sourceTree = "<group>"; };
-		DAFA08930AA64625008DF459 /* Croquet.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Croquet.icns; path = resources/ProjectBuilder/Croquet.icns; sourceTree = "<group>"; };
+		DAFA08930AA64625008DF459 /* GreenCogSqueak.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = GreenCogSqueak.icns; path = resources/ProjectBuilder/GreenCogSqueak.icns; sourceTree = "<group>"; };
 		F5F8AE0F02EB4E090100013C /* sqMacOpenGL.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacOpenGL.h; sourceTree = "<group>"; };
 		F5F8AE3D02EB4E090100013C /* sqMacInternetConfiguration.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacInternetConfiguration.c; sourceTree = "<group>"; };
 		F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacJoystickAndTablet.c; sourceTree = "<group>"; };
@@ -563,7 +563,7 @@
 			isa = PBXGroup;
 			children = (
 				664A73DB0300584000A80109 /* Squeak VM.r */,
-				DAFA08930AA64625008DF459 /* Croquet.icns */,
+				DAFA08930AA64625008DF459 /* GreenCogSqueak.icns */,
 				664A73DC0300584000A80109 /* Squeak.icns */,
 				664A73DD0300584000A80109 /* SqueakChanges.icns */,
 				664A73DE0300584000A80109 /* SqueakImage.icns */,
@@ -579,7 +579,7 @@
 		08773F3000C6A1C4C0A80109 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				941A3C0C09AA144000C9D25A /* Croquet.app */,
+				941A3C0C09AA144000C9D25A /* Squeak.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1714,9 +1714,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		941A3B2B09AA144000C9D25A /* Croquet */ = {
+		941A3B2B09AA144000C9D25A /* Squeak */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Croquet" */;
+			buildConfigurationList = 941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Squeak" */;
 			buildPhases = (
 				941A3B2C09AA144000C9D25A /* Headers */,
 				941A3B7109AA144000C9D25A /* Resources */,
@@ -1731,10 +1731,10 @@
 ";
 			dependencies = (
 			);
-			name = Croquet;
+			name = Squeak;
 			productInstallPath = "$(USER_APPS_DIR)";
 			productName = "Squeak VM OPT";
-			productReference = 941A3C0C09AA144000C9D25A /* Croquet.app */;
+			productReference = 941A3C0C09AA144000C9D25A /* Squeak.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -1757,7 +1757,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				941A3B2B09AA144000C9D25A /* Croquet */,
+				941A3B2B09AA144000C9D25A /* Squeak */,
 			);
 		};
 /* End PBXProject section */
@@ -1775,7 +1775,7 @@
 				941A3B7709AA144000C9D25A /* SqueakGeneric.icns in Resources */,
 				941A3B7809AA144000C9D25A /* SqueakProject.icns in Resources */,
 				941A3B7909AA144000C9D25A /* SqueakSources.icns in Resources */,
-				DAFA08940AA64625008DF459 /* Croquet.icns in Resources */,
+				DAFA08940AA64625008DF459 /* GreenCogSqueak.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2000,7 +2000,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = Croquet;
+				PRODUCT_NAME = Squeak;
 				SECTORDER_FLAGS = "";
 				UNSTRIPPED_PRODUCT = YES;
 				WARNING_CFLAGS = "";
@@ -2078,7 +2078,7 @@
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
 				PER_ARCH_CFLAGS_i386 = "";
-				PRODUCT_NAME = Croquet;
+				PRODUCT_NAME = Squeak;
 				WARNING_CFLAGS = "";
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
@@ -2106,7 +2106,7 @@
 					HAVE_SYS_TIME_H,
 				);
 				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "$(GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1)";
-				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1 = "BUILD_VERSION=\"\\\"Croquet Cog OS/X 4.0.0\\\"\"";
+				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1 = "BUILD_VERSION=\"\\\"Squeak Cog OS/X 4.0.0\\\"\"";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_UNROLL_LOOPS = YES;
 				GCC_VERSION_i386 = 4.2;
@@ -2117,7 +2117,7 @@
 					$SRCROOT,
 				);
 				ICC_DATA_NO_ALIAS = NO;
-				ICC_DEFINES = "ILP32=1 _NONSTD_SOURCE $(GCC_PREPROCESSOR_DEFINITIONS) BUILD_VERSION=\"\\\"Croquet Cog OS/X 4.0.0\\\"\"";
+				ICC_DEFINES = "ILP32=1 _NONSTD_SOURCE $(GCC_PREPROCESSOR_DEFINITIONS) BUILD_VERSION=\"\\\"Squeak Cog OS/X 4.0.0\\\"\"";
 				ICC_FP_MODEL = src;
 				ICC_LANG_ANSI_OPT = NO;
 				ICC_OPTLEVEL = speedHLO;
@@ -2131,7 +2131,7 @@
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
 				PER_ARCH_CFLAGS_i386 = "-O3  -falign-functions=16 -fno-gcse -mtune=prescott -march=pentium-m  -mfpmath=sse -finline-functions -Wall -DUSE_INLINE_MEMORY_ACCESSORS";
-				PRODUCT_NAME = Croquet;
+				PRODUCT_NAME = Squeak;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "";
 				WRAPPER_EXTENSION = app;
@@ -2175,7 +2175,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = Croquet;
+				PRODUCT_NAME = Squeak;
 				SECTORDER_FLAGS = "";
 				UNSTRIPPED_PRODUCT = YES;
 				WARNING_CFLAGS = "";
@@ -2260,7 +2260,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Croquet" */ = {
+		941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Squeak" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				941A3C0809AA144000C9D25A /* Development */,

diff --git a/macbuild/CoreVM.plist b/macbuild/CoreVM.plist
@@ -14,9 +14,9 @@
 				<string>image</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>Croquet.icns</string>
+			<string>SqueakImage.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>Croquet Image File</string>
+			<string>Squeak Image File</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>STim</string>
@@ -30,9 +30,9 @@
 				<string>sources</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>Croquet.icns</string>
+			<string>SqueakSources.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>Croquet Sources File</string>
+			<string>Squeak Sources File</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>STso</string>
@@ -46,9 +46,9 @@
 				<string>changes</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>Croquet.icns</string>
+			<string>SqueakChanges.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>Croquet Changes File</string>
+			<string>Squeak Changes File</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>STch</string>
@@ -366,21 +366,21 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>Croquet</string>
+	<string>Squeak</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Croquet Cog 4.0.0 http://www.mirandabanda.org</string><!--version-->
+	<string>Squeak Cog 4.0.0 http://www.mirandabanda.org</string><!--version-->
 	<key>CFBundleShortVersionString</key>
-	<string>Croquet Cog 4.0.0</string><!--version-->
+	<string>Squeak Cog 4.0.0</string><!--version-->
 	<key>CFBundleVersion</key>
 	<string>4.0.0</string><!--version-->
 	<key>CFBundleIconFile</key>
-	<string>Croquet.icns</string>
+	<string>GreenCogSqueak.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.squeak.Cog</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Croquet</string>
+	<string>Squeak</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
@@ -484,7 +484,7 @@
 	<key>SqueakUIFlushUseHighPercisionClock</key>
 	<true/>
 	<key>SqueakUnTrustedDirectory</key>
-	<string>~/Library/Preferences/Croquet/Internet/Untrusted/</string>
+	<string>~/Library/Preferences/Squeak/Internet/Untrusted/</string>
 	<key>SqueakWindowAttribute</key>
 	<data>ggAAHw==</data>
 	<key>SqueakWindowHasTitle</key>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		This image is intended to build new CoInterpreter or StackInterpreter Cog VMs, and a Newspeak VM, and to run the Cog VM simulator (see the VM Simulation Workspace).The following doit offers a menu of configurations that create a single; source tree (../src) for all platforms. Since they use a relative path they will work out of the box. Generate the entire VM using them. Choose Squeak Cog VM by default, and when prompted choose CoInterpreter. VMMaker generateConfigurationTo rebuild this image- start with a Squeak 4.3 or newer image (this is a Squeak 4.3 trunk image that you can update).1. If Alien is not already in the image, load it, e.g. Alien-eem.18 from http://www.squeaksource.com/Alien.2. If FFI is not already in the image, load FFI-Pools, e.g. FFI-Pools-eem.3, from http://source.squeak.org/FFI (For FFIConstants)[2a. Load FFI if you want to use cog:selector: to compile a method in this image]3. Load SharedPool-Speech, e.g. SharedPool-Speech-dtl.2, from http://www.squeaksource.com/Speech (For KlattResonatorIndices)4. Load Balloon-Engine-Pools (e.g. Balloon-Engine-Pools-JB.2) from http://source.squeak.org/VMMaker5. From http://source.squeak.org/VMMakerload "VMMaker.oscog" and "Cog" monticello packages. First load the most up-to-dateVMMaker.oscog, e.g. VMMaker.oscog-eem.157, and then the most up-to-date Cog, e.g. Cog-eem.46.N.B. do not load VMMaker or VMMaker-oscog.N.B. VMMaker.oscog packages may be listed with VMMaker packages depending on Monticello version.
		This image is intended to build new CoInterpreter or StackInterpreter Cog VMs, and a Newspeak VM, and to run the Cog VM simulator (see the VM Simulation Workspace).The following doit offers a menu of configurations that create a single; source tree (../src) for all platforms. Since they use a relative path they will work out of the box. Generate the entire VM using them. Choose Squeak Cog VM by default, and when prompted choose CoInterpreter. VMMaker generateConfigurationTo rebuild this image- start with a Squeak 4.4 or newer image (the Squeak 4.3 All-in-one is fine too, but please update the image).1. If Alien is not already in the image, load it, e.g. Alien-eem.18 from http://www.squeaksource.com/Alien.2. If FFI is not already in the image, load FFI-Pools, e.g. FFI-Pools-eem.3, from http://source.squeak.org/FFI (For FFIConstants)[2a. Load FFI if you want to use cog:selector: to compile a method in this image]3. Load SharedPool-Speech, e.g. SharedPool-Speech-dtl.2, from http://www.squeaksource.com/Speech (For KlattResonatorIndices)4. Load Balloon-Engine-Pools (e.g. Balloon-Engine-Pools-JB.2) from http://source.squeak.org/VMMaker5. From http://source.squeak.org/VMMakerload "VMMaker.oscog" and "Cog" monticello packages. First load the most up-to-dateVMMaker.oscog, e.g. VMMaker.oscog-eem.278, and then the most up-to-date Cog, e.g. Cog-lw.60.N.B. do not load VMMaker or VMMaker-oscog.N.B. VMMaker.oscog packages may be listed with VMMaker packages depending on Monticello version.6. Load any additional plugins not in VMMaker. Currently these are: - SqueakSSLPlugin from e.g. SqueakSSL-Plugin-ar.3 at http://www.squeaksource.com/SqueakSSL - Win32OSProcessPlugin & UnixOSProcessPlugin from e.g. VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 at http://www.squeaksource.com/OSProcessPlugin - FT2Plugin from e.g. Freetype-Plugin-IgorStasenko.57 at http://www.squeaksource.com/FreetypePlugin - AioPlugin from e.g. VMConstruction-Plugins-AioPlugin-dtl.14 at t http://www.squeaksource.com/AioPluginRead the class comments of StackInterpreterSimulator and CogVMSimulator for running the simulator.
Expand Down