Revision: 2713 Author: eliot Date: 2013-04-04 11:39:10 -0700 (Thu, 04 Apr 2013) Log Message: ----------- 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.
Modified Paths: -------------- branches/Cog/cygwinbuild/Makefile branches/Cog/cygwinbuild/Squeak.rc branches/Cog/cygwinbuild/mvm branches/Cog/cygwinbuild/plugins.ext branches/Cog/image/Workspace.text branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/macbuild/CoreVM.plist branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj branches/Cog/macbuild/makeclean branches/Cog/macbuild/makevm branches/Cog/macbuild/plugins.ext branches/Cog/nscogbuild/cygwinbuild/Makefile branches/Cog/nscogbuild/cygwinbuild/nsvm.rc branches/Cog/nscogbuild/cygwinbuild/plugins.ext branches/Cog/nscogbuild/macbuild/makevm branches/Cog/nscogbuild/unixbuild/astbld/plugins.ext branches/Cog/nscogbuild/unixbuild/bld/plugins.ext branches/Cog/nscogbuild/unixbuild/dbgbld/plugins.ext branches/Cog/nscogsrc/examplePlugins.ext branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/scripts/mkvmarchives branches/Cog/scripts/uploadvms branches/Cog/src/examplePlugins.ext branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stackbuild/macbuild/CoreVM.plist branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/stackbuild/macbuild/makeclean branches/Cog/stackbuild/macbuild/makevm branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h branches/Cog/unixbuild/abld/plugins.ext branches/Cog/unixbuild/bld/plugins.ext branches/Cog/unixbuild/dbld/plugins.ext branches/Cog/unixbuild/mtbld/plugins.ext
Added Paths: ----------- branches/Cog/cygwinbuild/GreenCogSqueak.ico branches/Cog/macbuild/SqueakSSL/ branches/Cog/macbuild/SqueakSSL/Info.plist branches/Cog/macbuild/SqueakSSL/SqueakSSL.xcodeproj/ branches/Cog/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/macbuild/SqueakSSL/SqueakSSL_Prefix.pch branches/Cog/macbuild/resources/ProjectBuilder/GreenCogSqueak.icns branches/Cog/nscogbuild/macbuild/SqueakSSL/ branches/Cog/nscogbuild/macbuild/SqueakSSL/Info.plist branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/ branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.mode1v3 branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.pbxuser branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL_Prefix.pch branches/Cog/nscogbuild/macbuild/plugins.ext branches/Cog/platforms/Mac OS/plugins/SqueakSSL/ branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c branches/Cog/platforms/unix/plugins/SqueakSSL/ branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c branches/Cog/platforms/win32/misc/GreenCogSqueak.ico branches/Cog/src/plugins/SqueakSSL/ branches/Cog/src/plugins/SqueakSSL/SqueakSSL.c branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/GreenCogSqueak.icns
Added: branches/Cog/cygwinbuild/GreenCogSqueak.ico =================================================================== (Binary files differ)
Property changes on: branches/Cog/cygwinbuild/GreenCogSqueak.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream
Modified: branches/Cog/cygwinbuild/Makefile =================================================================== --- branches/Cog/cygwinbuild/Makefile 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/cygwinbuild/Makefile 2013-04-04 18:39:10 UTC (rev 2713) @@ -12,7 +12,7 @@ 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 @@ # 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 @@ # default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE)
+svnver: + echo $(RC) $(RCFLAGS) + productmt:; $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product THREADING=multi $(@,product=) default
Modified: branches/Cog/cygwinbuild/Squeak.rc =================================================================== --- branches/Cog/cygwinbuild/Squeak.rc 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/cygwinbuild/Squeak.rc 2013-04-04 18:39:10 UTC (rev 2713) @@ -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,11 +17,11 @@ 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" @@ -29,4 +29,4 @@ VALUE "Translation", 0x409, 1252 END END -#endif \ No newline at end of file +#endif
Modified: branches/Cog/cygwinbuild/mvm =================================================================== --- branches/Cog/cygwinbuild/mvm 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/cygwinbuild/mvm 2013-04-04 18:39:10 UTC (rev 2713) @@ -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
Modified: branches/Cog/cygwinbuild/plugins.ext =================================================================== --- branches/Cog/cygwinbuild/plugins.ext 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/cygwinbuild/plugins.ext 2013-04-04 18:39:10 UTC (rev 2713) @@ -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 \
Modified: branches/Cog/image/Workspace.text =================================================================== --- branches/Cog/image/Workspace.text 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/image/Workspace.text 2013-04-04 18:39:10 UTC (rev 2713) @@ -4,7 +4,8 @@
To rebuild this image -- start with a Squeak 4.3 or newer image (this is a Squeak 4.3 trunk image that you can update). + +- 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] @@ -12,6 +13,13 @@ 4. Load Balloon-Engine-Pools (e.g. Balloon-Engine-Pools-JB.2) from http://source.squeak.org/VMMaker 5. From http://source.squeak.org/VMMaker -load "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. +load "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. \ No newline at end of file +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/AioPlugin + +Read the class comments of StackInterpreterSimulator and CogVMSimulator for running the simulator. Modified: branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj 2013-04-04 18:39:10 UTC (rev 2713) @@ -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 */,
Modified: branches/Cog/macbuild/CoreVM.plist =================================================================== --- branches/Cog/macbuild/CoreVM.plist 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/CoreVM.plist 2013-04-04 18:39:10 UTC (rev 2713) @@ -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>
Modified: branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj 2013-04-04 18:39:10 UTC (rev 2713) @@ -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 */,
Added: branches/Cog/macbuild/SqueakSSL/Info.plist =================================================================== --- branches/Cog/macbuild/SqueakSSL/Info.plist (rev 0) +++ branches/Cog/macbuild/SqueakSSL/Info.plist 2013-04-04 18:39:10 UTC (rev 2713) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>SquealSSL</string> + <key>CFBundleIconFile</key> + <string></string> + <key>CFBundleIdentifier</key> + <string>org.squeak.Cog.SqueakSSL</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>BNDL</string> + <key>CFBundleSignature</key> + <string>FAST</string> + <key>CFBundleVersion</key> + <string>1.0</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CSResourcesFileMapped</key> + <true/> +</dict> +</plist>
Added: branches/Cog/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj (rev 0) +++ branches/Cog/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2013-04-04 18:39:10 UTC (rev 2713) @@ -0,0 +1,270 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 42; + objects = { + +/* Begin PBXBuildFile section */ + 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; + 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; + 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 32BAE0B30371A71500C91783 /* SqueakSSL_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SqueakSSL_Prefix.pch; sourceTree = "<group>"; }; + 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SqueakSSL.c; path = ../../src/plugins/SqueakSSL/SqueakSSL.c; sourceTree = SOURCE_ROOT; }; + 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; + 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; + 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; + 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; + 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; + 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../src/vm/interp.h; sourceTree = SOURCE_ROOT; }; + DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; + DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; + DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; + DA3A20F90AA63D000050B983 /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "../../platforms/Mac OS/vm/sqConfig.h"; sourceTree = SOURCE_ROOT; }; + DA3A20FA0AA63D000050B983 /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "../../platforms/Mac OS/vm/sqPlatformSpecific.h"; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8D01CCCD0486CAD60068D4B7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, + 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 089C166AFE841209C02AAC07 /* SqueakSSL */ = { + isa = PBXGroup; + children = ( + 08FB77ADFE841716C02AAC07 /* Source */, + 089C167CFE841241C02AAC07 /* Resources */, + 19C28FB4FE9D528D11CA2CBB /* Products */, + ); + name = SqueakSSL; + sourceTree = "<group>"; + }; + 089C167CFE841241C02AAC07 /* Resources */ = { + isa = PBXGroup; + children = ( + 732D9F4017012B6E00E25893 /* Frameworks */, + 8D01CCD10486CAD60068D4B7 /* Info.plist */, + ); + name = Resources; + sourceTree = "<group>"; + }; + 08FB77ADFE841716C02AAC07 /* Source */ = { + isa = PBXGroup; + children = ( + 73027B6717012E3F0086D8E4 /* SqueakSSL */, + 73D8A63C170125E500C66275 /* SqueakSSL */, + 73D8A636170125C500C66275 /* SqueakSSL */, + DA3A20F80AA63D000050B983 /* config.h */, + DA3A20F90AA63D000050B983 /* sqConfig.h */, + DA3A20FA0AA63D000050B983 /* sqPlatformSpecific.h */, + DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */, + DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */, + DA3A20F50AA63CBF0050B983 /* interp.h */, + 73811791170128D400CB30CE /* sq.h */, + 32BAE0B30371A71500C91783 /* SqueakSSL_Prefix.pch */, + ); + name = Source; + sourceTree = "<group>"; + }; + 19C28FB4FE9D528D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */, + ); + name = Products; + sourceTree = "<group>"; + }; + 73027B6717012E3F0086D8E4 /* SqueakSSL */ = { + isa = PBXGroup; + children = ( + 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */, + ); + name = SqueakSSL; + sourceTree = "<group>"; + }; + 732D9F4017012B6E00E25893 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 732D9F4117012B6E00E25893 /* Security.framework */, + 732D9F4217012B6E00E25893 /* CoreFoundation.framework */, + ); + name = Frameworks; + sourceTree = "<group>"; + }; + 73D8A636170125C500C66275 /* SqueakSSL */ = { + isa = PBXGroup; + children = ( + 73D8A62E1701259800C66275 /* SqueakSSL.h */, + ); + name = SqueakSSL; + sourceTree = "<group>"; + }; + 73D8A63C170125E500C66275 /* SqueakSSL */ = { + isa = PBXGroup; + children = ( + 73D8A6411701272700C66275 /* sqMacSSL.c */, + ); + name = SqueakSSL; + sourceTree = "<group>"; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 8D01CCC60486CAD60068D4B7 /* SqueakSSL */ = { + isa = PBXNativeTarget; + buildConfigurationList = 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "SqueakSSL" */; + buildPhases = ( + 8D01CCC90486CAD60068D4B7 /* Resources */, + 8D01CCCB0486CAD60068D4B7 /* Sources */, + 8D01CCCD0486CAD60068D4B7 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SqueakSSL; + productInstallPath = "$(HOME)/Library/Bundles"; + productName = SqueakSSL; + productReference = 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */; + productType = "com.apple.product-type.bundle"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 089C1669FE841209C02AAC07 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "SqueakSSL" */; + compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 089C166AFE841209C02AAC07 /* SqueakSSL */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8D01CCC60486CAD60068D4B7 /* SqueakSSL */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8D01CCC90486CAD60068D4B7 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8D01CCCB0486CAD60068D4B7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */, + 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 4FADC23408B4156C00ABE55E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + PRODUCT_NAME = SqueakSSL; + WRAPPER_EXTENSION = bundle; + ZERO_LINK = YES; + }; + name = Debug; + }; + 4FADC23508B4156C00ABE55E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = i386; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + PRODUCT_NAME = SqueakSSL; + WRAPPER_EXTENSION = bundle; + }; + name = Release; + }; + 4FADC23808B4156C00ABE55E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; + PREBINDING = NO; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; + }; + name = Debug; + }; + 4FADC23908B4156C00ABE55E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; + PREBINDING = NO; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "SqueakSSL" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4FADC23408B4156C00ABE55E /* Debug */, + 4FADC23508B4156C00ABE55E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "SqueakSSL" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4FADC23808B4156C00ABE55E /* Debug */, + 4FADC23908B4156C00ABE55E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 089C1669FE841209C02AAC07 /* Project object */; +}
Added: branches/Cog/macbuild/SqueakSSL/SqueakSSL_Prefix.pch =================================================================== --- branches/Cog/macbuild/SqueakSSL/SqueakSSL_Prefix.pch (rev 0) +++ branches/Cog/macbuild/SqueakSSL/SqueakSSL_Prefix.pch 2013-04-04 18:39:10 UTC (rev 2713) @@ -0,0 +1,5 @@ +// +// Prefix header for all source files of the 'Template' target in the 'Template' project. +// + +#include <Carbon/Carbon.h>
Modified: branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj 2013-04-04 18:39:10 UTC (rev 2713) @@ -149,7 +149,6 @@ COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Template_Prefix.pch; @@ -164,12 +163,8 @@ 4FADC23508B4156C00ABE55E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); + ARCHS = i386; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Template_Prefix.pch; INFOPLIST_FILE = Info.plist; @@ -186,7 +181,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Debug; }; @@ -197,7 +192,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Release; };
Modified: branches/Cog/macbuild/makeclean =================================================================== --- branches/Cog/macbuild/makeclean 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/makeclean 2013-04-04 18:39:10 UTC (rev 2713) @@ -1,3 +1,3 @@ #!/bin/bash
-rm -r ./build ./*/build ./plugin-projects/*/build ./Fast.app ./Debug.app ./Assert.app ./Croquet.app +rm -r ./build ./*/build ./plugin-projects/*/build ./Fast.app ./Debug.app ./Assert.app ./Croquet.app ./Squeak.app
Modified: branches/Cog/macbuild/makevm =================================================================== --- branches/Cog/macbuild/makevm 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/makevm 2013-04-04 18:39:10 UTC (rev 2713) @@ -1,13 +1,14 @@ #!/bin/bash # Build a "complete" Mac VM consisting of CoreVM/CoreMTVM + Plugins. -# By default build the Deployment configuration into Croquet.app. +# By default build the Deployment configuration into $APP (Squeak.app) IFS=' ' BUILD_CONFIGURATION=Deployment NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release +APP=Squeak.app VMAPP=".app" -DEST="Croquet" +DEST="Squeak" VMXCP=CoreVM SFP=SqueakFFIPrims KEEP= @@ -36,7 +37,7 @@ echo ' -d: compile Development configuration in Debug.app for debugging' echo ' -m: compile the multi-threaded version of the target, e.g. FastMT.app instead of Fast.app' echo ' -s: compile DeploymentSymbols configuration in Fast.app for partial debugging' - echo ' -k: keep (do not delete) the existing Croquet.app prior to the build' + echo " -k: keep (do not delete) the existing $APP prior to the build" echo ' -h: display this help' exit 0;; esac @@ -61,9 +62,9 @@ echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then - mv build/$BUILD_CONFIGURATION/Croquet.app/* "$DEST" + mv build/$BUILD_CONFIGURATION/$APP/* "$DEST" else - mv build/$BUILD_CONFIGURATION/Croquet.app "$DEST" + mv build/$BUILD_CONFIGURATION/$APP "$DEST" fi ../scripts/versionInfoPlist ../platforms CoreVM.plist "$DEST/Contents/Info.plist"
@@ -101,6 +102,13 @@ rm -rf "$DEST/Contents/Resources/SqueakFFIPrims.bundle" cp -R $SFP/build/$NSD_BUILD_CONFIGURATION/SqueakFFIPrims.bundle "$DEST/Contents/Resources"
+# Build the SSL plugin (New as of 25 March 2013) +echo +echo SqueakSSL xcodebuild -project SqueakSSL/SqueakSSL.xcodeproj -configuration $XCD_BUILD_CONFIGURATION +xcodebuild -project SqueakSSL/SqueakSSL.xcodeproj -configuration $XCD_BUILD_CONFIGURATION +rm -rf "$DEST/Contents/Resources/SqueakSSL.bundle" +cp -R SqueakSSL/build/$XCD_BUILD_CONFIGURATION/SqueakSSL.bundle "$DEST/Contents/Resources" + # Build the BochsIA32Plugin # N.B. To build the plugin you also have to build the Bochs libraries in # ../processors/IA32/bochs. cd ../processors/IA32/bochs. Run conf.COG & makeem.
Modified: branches/Cog/macbuild/plugins.ext =================================================================== --- branches/Cog/macbuild/plugins.ext 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/plugins.ext 2013-04-04 18:39:10 UTC (rev 2713) @@ -3,6 +3,7 @@ BochsIA32Plugin \ CroquetPlugin \ SqueakFFIPrims \ +SqueakSSL \ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \
Added: branches/Cog/macbuild/resources/ProjectBuilder/GreenCogSqueak.icns =================================================================== (Binary files differ)
Property changes on: branches/Cog/macbuild/resources/ProjectBuilder/GreenCogSqueak.icns ___________________________________________________________________ Added: svn:mime-type + application/octet-stream
Modified: branches/Cog/nscogbuild/cygwinbuild/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/Makefile 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/nscogbuild/cygwinbuild/Makefile 2013-04-04 18:39:10 UTC (rev 2713) @@ -165,7 +165,8 @@ # 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
Modified: branches/Cog/nscogbuild/cygwinbuild/nsvm.rc =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/nsvm.rc 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/nscogbuild/cygwinbuild/nsvm.rc 2013-04-04 18:39:10 UTC (rev 2713) @@ -11,4 +11,30 @@ #endif
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "nsvm.exe.manifest" + +1 VERSIONINFO + FILEVERSION FILEVERSIONVALUES + PRODUCTVERSION 4,0,0,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0xaL + FILEOS 0x10001L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin + BEGIN + VALUE "CompanyName", "newspeaklanguage.org\0" + VALUE "FileDescription", "Newsqueak Cog Virtual Machine\0" + VALUE "FileVersion", FILEVERSIONSTRING + VALUE "ProductName", "Newsqueak Cog\0" + VALUE "ProductVersion", "4.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END #endif
Modified: branches/Cog/nscogbuild/cygwinbuild/plugins.ext =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/plugins.ext 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/nscogbuild/cygwinbuild/plugins.ext 2013-04-04 18:39:10 UTC (rev 2713) @@ -1,2 +1,4 @@ # Copied, perhaps edited, from ../../nscogsrc/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 =
Added: branches/Cog/nscogbuild/macbuild/SqueakSSL/Info.plist =================================================================== --- branches/Cog/nscogbuild/macbuild/SqueakSSL/Info.plist (rev 0) +++ branches/Cog/nscogbuild/macbuild/SqueakSSL/Info.plist 2013-04-04 18:39:10 UTC (rev 2713) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>SquealSSL</string> + <key>CFBundleIconFile</key> + <string></string> + <key>CFBundleIdentifier</key> + <string>org.squeak.Cog.SqueakSSL</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>BNDL</string> + <key>CFBundleSignature</key> + <string>FAST</string> + <key>CFBundleVersion</key> + <string>1.0</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CSResourcesFileMapped</key> + <true/> +</dict> +</plist>
Added: branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.mode1v3 =================================================================== --- branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.mode1v3 (rev 0) +++ branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.mode1v3 2013-04-04 18:39:10 UTC (rev 2713) @@ -0,0 +1,1367 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>ActivePerspectiveName</key> + <string>Project</string> + <key>AllowedModules</key> + <array> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXSmartGroupTreeModule</string> + <key>Name</key> + <string>Groups and Files Outline View</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Name</key> + <string>Editor</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCTaskListModule</string> + <key>Name</key> + <string>Task List</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCDetailModule</string> + <key>Name</key> + <string>File and Smart Group Detail Viewer</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>1</string> + <key>Module</key> + <string>PBXBuildResultsModule</string> + <key>Name</key> + <string>Detailed Build Results Viewer</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string>
@@ Diff output truncated at 50000 characters. @@
vm-dev@lists.squeakfoundation.org