[Vm-dev] [commit][3582] Mac OS X 32-bit builds.

commits at squeakvm.org commits at squeakvm.org
Thu Feb 11 02:35:02 UTC 2016 

Revision: 3582
Author:   eliot
Date:     2016-02-10 18:35:00 -0800 (Wed, 10 Feb 2016)
Log Message:
-----------
Mac OS X 32-bit builds.
Nuke the old build structure and replace with the new gnu make based one.
Simplify the iOS plugin makefiles to no longer set LIBOBJ.
Add blue icons for Squeak Sista VMs.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/common/Makefile.app
    branches/Cog/build.macos32x86/common/Makefile.plugin
    branches/Cog/build.macos32x86/common/Makefile.vm
    branches/Cog/build.macos32x86/glue.cog.spur/mvm
    branches/Cog/build.macos32x86/glue.stack.spur/mvm
    branches/Cog/build.macos32x86/pharo.cog.spur/Makefile
    branches/Cog/platforms/iOS/plugins/AioPlugin/Makefile
    branches/Cog/platforms/iOS/plugins/BitBltPlugin/Makefile
    branches/Cog/platforms/iOS/plugins/BochsIA32Plugin/Makefile
    branches/Cog/platforms/iOS/plugins/BochsX64Plugin/Makefile
    branches/Cog/platforms/iOS/plugins/IA32ABI/Makefile
    branches/Cog/platforms/iOS/plugins/SecurityPlugin/Makefile
    branches/Cog/platforms/iOS/plugins/SocketPlugin/Makefile
    branches/Cog/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile

Added Paths:
-----------
    branches/Cog/build.macos32x86/glue.cog.spur/Makefile
    branches/Cog/build.macos32x86/glue.stack.spur/Makefile
    branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile
    branches/Cog/build.macos32x86/newspeak.stack.spur/Makefile
    branches/Cog/build.macos32x86/squeak.cog.spur/Makefile
    branches/Cog/build.macos32x86/squeak.cog.spur/mvm
    branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int
    branches/Cog/build.macos32x86/squeak.cog.v3/Makefile
    branches/Cog/build.macos32x86/squeak.cog.v3/mvm
    branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext
    branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int
    branches/Cog/build.macos32x86/squeak.sista.spur/Makefile
    branches/Cog/build.macos32x86/squeak.sista.spur/mvm
    branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int
    branches/Cog/build.macos32x86/squeak.stack.spur/Makefile
    branches/Cog/build.macos32x86/squeak.stack.spur/mvm
    branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int
    branches/Cog/build.macos32x86/squeak.stack.v3/Makefile
    branches/Cog/build.macos32x86/squeak.stack.v3/mvm
    branches/Cog/build.macos32x86/squeak.stack.v3/plugins.ext
    branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int
    branches/Cog/platforms/iOS/vm/OSX/BlueSistaSqueak.icns

Removed Paths:
-------------
    branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.plist
    branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.xcodeproj/
    branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/
    branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/
    branches/Cog/build.macos32x86/glue.cog.spur/makeclean
    branches/Cog/build.macos32x86/glue.cog.spur/makevm
    branches/Cog/build.macos32x86/glue.cog.spur/mkNamedPrims.sh
    branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.plist
    branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.xcodeproj/
    branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/
    branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/
    branches/Cog/build.macos32x86/glue.stack.spur/makeclean
    branches/Cog/build.macos32x86/glue.stack.spur/makevm
    branches/Cog/build.macos32x86/glue.stack.spur/mkNamedPrims.sh
    branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist
    branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/
    branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/
    branches/Cog/build.macos32x86/newspeak.cog.spur/UnixOSProcessPlugin/
    branches/Cog/build.macos32x86/newspeak.cog.spur/makeclean
    branches/Cog/build.macos32x86/newspeak.cog.spur/makevm
    branches/Cog/build.macos32x86/newspeak.cog.spur/mkNamedPrims.sh
    branches/Cog/build.macos32x86/newspeak.cog.spur/mvm
    branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist
    branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/
    branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/
    branches/Cog/build.macos32x86/newspeak.stack.spur/UnixOSProcessPlugin/
    branches/Cog/build.macos32x86/newspeak.stack.spur/makeclean
    branches/Cog/build.macos32x86/newspeak.stack.spur/makevm
    branches/Cog/build.macos32x86/newspeak.stack.spur/mkNamedPrims.sh
    branches/Cog/build.macos32x86/newspeak.stack.spur/mvm
    branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/
    branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/
    branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/
    branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.plist
    branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/
    branches/Cog/build.macos32x86/squeak.cog.spur/CroquetPlugin/
    branches/Cog/build.macos32x86/squeak.cog.spur/FloatArrayPlugin/
    branches/Cog/build.macos32x86/squeak.cog.spur/FloatMathPlugin/
    branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/
    branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/
    branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86/
    branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.plist
    branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/
    branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcworkspace/
    branches/Cog/build.macos32x86/squeak.cog.spur/SqueakFFIPrims/
    branches/Cog/build.macos32x86/squeak.cog.spur/SqueakMTFFIPrims/
    branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/
    branches/Cog/build.macos32x86/squeak.cog.spur/UnixOSProcessPlugin/
    branches/Cog/build.macos32x86/squeak.cog.spur/makeclean
    branches/Cog/build.macos32x86/squeak.cog.spur/makeiosclean
    branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm
    branches/Cog/build.macos32x86/squeak.cog.spur/makevm
    branches/Cog/build.macos32x86/squeak.cog.spur/miosvm
    branches/Cog/build.macos32x86/squeak.cog.spur/mkNamedPrims.sh
    branches/Cog/build.macos32x86/squeak.cog.spur/mvm
    branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int
    branches/Cog/build.macos32x86/squeak.cog.v3/BochsIA32Plugin/
    branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/
    branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.plist
    branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/
    branches/Cog/build.macos32x86/squeak.cog.v3/CroquetPlugin/
    branches/Cog/build.macos32x86/squeak.cog.v3/FloatArrayPlugin/
    branches/Cog/build.macos32x86/squeak.cog.v3/FloatMathPlugin/
    branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/
    branches/Cog/build.macos32x86/squeak.cog.v3/Mpeg3Plugin/
    branches/Cog/build.macos32x86/squeak.cog.v3/SqueakFFIPrims/
    branches/Cog/build.macos32x86/squeak.cog.v3/SqueakMTFFIPrims/
    branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/
    branches/Cog/build.macos32x86/squeak.cog.v3/UnixOSProcessPlugin/
    branches/Cog/build.macos32x86/squeak.cog.v3/makeclean
    branches/Cog/build.macos32x86/squeak.cog.v3/makevm
    branches/Cog/build.macos32x86/squeak.cog.v3/mkNamedPrims.sh
    branches/Cog/build.macos32x86/squeak.cog.v3/mvm
    branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext
    branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int
    branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/
    branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.plist
    branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/
    branches/Cog/build.macos32x86/squeak.sista.spur/CroquetPlugin/
    branches/Cog/build.macos32x86/squeak.sista.spur/FloatArrayPlugin/
    branches/Cog/build.macos32x86/squeak.sista.spur/FloatMathPlugin/
    branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/
    branches/Cog/build.macos32x86/squeak.sista.spur/Mpeg3Plugin/
    branches/Cog/build.macos32x86/squeak.sista.spur/SqueakFFIPrims/
    branches/Cog/build.macos32x86/squeak.sista.spur/SqueakSSL/
    branches/Cog/build.macos32x86/squeak.sista.spur/UnixOSProcessPlugin/
    branches/Cog/build.macos32x86/squeak.sista.spur/makeclean
    branches/Cog/build.macos32x86/squeak.sista.spur/makevm
    branches/Cog/build.macos32x86/squeak.sista.spur/mkNamedPrims.sh
    branches/Cog/build.macos32x86/squeak.sista.spur/mvm
    branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int
    branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.plist
    branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/
    branches/Cog/build.macos32x86/squeak.stack.spur/CroquetPlugin/
    branches/Cog/build.macos32x86/squeak.stack.spur/FloatArrayPlugin/
    branches/Cog/build.macos32x86/squeak.stack.spur/FloatMathPlugin/
    branches/Cog/build.macos32x86/squeak.stack.spur/Mpeg3Plugin/
    branches/Cog/build.macos32x86/squeak.stack.spur/SqueakFFIPrims/
    branches/Cog/build.macos32x86/squeak.stack.spur/SqueakSSL/
    branches/Cog/build.macos32x86/squeak.stack.spur/UnixOSProcessPlugin/
    branches/Cog/build.macos32x86/squeak.stack.spur/makeclean
    branches/Cog/build.macos32x86/squeak.stack.spur/makevm
    branches/Cog/build.macos32x86/squeak.stack.spur/mkNamedPrims.sh
    branches/Cog/build.macos32x86/squeak.stack.spur/mvm
    branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int
    branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.plist
    branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/
    branches/Cog/build.macos32x86/squeak.stack.v3/CroquetPlugin/
    branches/Cog/build.macos32x86/squeak.stack.v3/FloatArrayPlugin/
    branches/Cog/build.macos32x86/squeak.stack.v3/FloatMathPlugin/
    branches/Cog/build.macos32x86/squeak.stack.v3/Mpeg3Plugin/
    branches/Cog/build.macos32x86/squeak.stack.v3/SqueakFFIPrims/
    branches/Cog/build.macos32x86/squeak.stack.v3/SqueakSSL/
    branches/Cog/build.macos32x86/squeak.stack.v3/UnixOSProcessPlugin/
    branches/Cog/build.macos32x86/squeak.stack.v3/makeclean
    branches/Cog/build.macos32x86/squeak.stack.v3/makevm
    branches/Cog/build.macos32x86/squeak.stack.v3/mkNamedPrims.sh
    branches/Cog/build.macos32x86/squeak.stack.v3/mvm
    branches/Cog/build.macos32x86/squeak.stack.v3/plugins.ext
    branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int

Property Changed:
----------------
    branches/Cog/build.macos32x86/glue.cog.spur/
    branches/Cog/build.macos32x86/glue.stack.spur/
    branches/Cog/build.macos32x86/newspeak.cog.spur/
    branches/Cog/build.macos32x86/newspeak.stack.spur/
    branches/Cog/build.macos32x86/pharo.cog.spur/
    branches/Cog/build.macos32x86/squeak.cog.spur/
    branches/Cog/build.macos32x86/squeak.cog.v3/
    branches/Cog/build.macos32x86/squeak.sista.spur/
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Modified: branches/Cog/build.macos32x86/common/Makefile.app
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.app	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/common/Makefile.app	2016-02-11 02:35:00 UTC (rev 3582)
@@ -50,7 +50,7 @@
 VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS)))
 VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib
 
-$(APP):	$(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS)
+$(APP):	$(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(APPPOST)
 
 $(VMEXE): vm $(OBJDIR)/$(VM)
 	mkdir -p $(APP)/Contents/MacOS

Modified: branches/Cog/build.macos32x86/common/Makefile.plugin
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.plugin	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/common/Makefile.plugin	2016-02-11 02:35:00 UTC (rev 3582)
@@ -2,6 +2,17 @@
 # Generic Makefile for plugins on Cocoa Mac OS X
 # Do make getversion to get makwe -n to work
 #
+# The following variables can be overridden in the platform Makefile, e.g.
+# platforms/iOS/plugins/AioPlugin/Makefile.  Look at
+# platforms/iOS/plugins/*/Makefile for examples.
+#
+# CFLAGS     adds additional compilation flags to source file compilation
+# EXCLUDESRC defines patterns of source files to not compile, e.g. %/dump.c
+# EXTRALIBS  defines additional libraries to link into an external plugin bundle
+# INCDIRS    defines additonal directories in which to search for includes
+# LIBSRC     overrides the set of files to compile (if EXCLUDESRC inconvenient)
+# LINK_WITH_CPP set to non-empty to link external plugin bundle with c++ runtime
+# SRCDIRS    supplies additional directories containing files to compile.
 
 # VM config flags.
 ifeq ("$(CONFIGURATION)","product")

Modified: branches/Cog/build.macos32x86/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.vm	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/common/Makefile.vm	2016-02-11 02:35:00 UTC (rev 3582)
@@ -148,7 +148,7 @@
 debug:
 	$(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=debug $(@,debug=) default
 
-cleanallvm:	cleanvm cleanvmast cleanvmdbg
+cleanallvm:	cleanvm cleanvmast cleanvmdbg cleangv
 
 cleanvm:
 	rm -rf sqNamedPrims.h build deps
@@ -159,6 +159,9 @@
 cleanvmdbg:
 	rm -rf sqNamedPrims.h builddbg
 
+cleangv:
+	rm -rf getversion getversion.*
+
 print-source:
 	@echo ---------------- Makefile.vm sources ------------------
 	@echo CROSSSRC=$(CROSSSRC)


Property changes on: branches/Cog/build.macos32x86/glue.cog.spur
___________________________________________________________________
Modified: svn:ignore
   - build
*.app
*.bundle
LOG*
*.sources
sqNamedPrims.h

   + Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h


Deleted: branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.plist
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.plist	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.plist	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,233 +0,0 @@
-<?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>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>image</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Image File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STim</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>sources</string>
-				<string>ns0</string>
-				<string>ns1</string>
-				<string>ns2</string>
-				<string>ns3</string>
-				<string>ns4</string>
-				<string>ns5</string>
-				<string>ns6</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Sources File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STso</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>changes</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Changes File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STch</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>bundle</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>SqueakPlugin.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Squeak Plugin</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>BNDL</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-	</array>
-	<key>UTExportedTypeDeclarations</key>
-	<array>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.data</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Newspeak Virtual Machine Image</string>
-			<key>UTTypeIconFile</key>
-			<string>NewspeakDocuments.icns</string>
-			<key>UTTypeIdentifier</key>
-			<string>org.newspeakplatform.image-data</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<array>
-					<string>image</string>
-				</array>
-			</dict>
-		</dict>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.text</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Newspeak Virtual Machine Changes</string>
-			<key>UTTypeIconFile</key>
-			<string>NewspeakDocuments.icns</string>
-			<key>UTTypeIdentifier</key>
-			<string>org.newspeakplatform.changes-data</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<array>
-					<string>changes</string>
-				</array>
-			</dict>
-		</dict>
-	</array>		
-	<key>CFBundleExecutable</key>
-	<string>Newspeak Virtual Machine</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Newspeak Cog Spur Virtual Machine 5.0.0 http://newspeaklanguage.org</string><!--version-->
-	<key>CFBundleShortVersionString</key>
-	<string>Newspeak Cog Spur Virtual Machine 5.0.0</string><!--version-->
-	<key>CFBundleVersion</key>
-	<string>5.0.0</string><!--version-->
-	<key>CFBundleIconFile</key>
-	<string>Newspeak Virtual Machine.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.bracha.Newspeak</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Newspeak Virtual Machine</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>NSVM</string>
-	<key>CGDisableCoalescedUpdates</key>
-	<true/>
-	<key>LSBackgroundOnly</key>
-	<false/>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.5.0</string>
-	<key>SqueakBrowserMouseCmdButton1</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseCmdButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseCmdButton3</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseControlButton1</key>
-	<integer>1</integer>
-	<key>SqueakBrowserMouseControlButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseControlButton3</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseNoneButton1</key>
-	<integer>1</integer>
-	<key>SqueakBrowserMouseNoneButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseNoneButton3</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseOptionButton1</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseOptionButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseOptionButton3</key>
-	<integer>2</integer>
-	<key>SqueakDebug</key>
-	<integer>0</integer>
-	<key>SqueakEncodingType</key>
-	<string>UTF-8</string>
-	<key>SqueakExplicitWindowOpenNeeded</key>
-	<false/>
-	<key>SqueakFloatingWindowGetsFocus</key>
-	<true/>
-	<key>SqueakHasQuitWithoutSaving</key>
-	<false/>
-	<key>SqueakImageName</key>
-	<string>Newspeak.image</string>
-	<key>SqueakMaxHeapSize</key>
-	<integer>1073741824</integer>
-	<key>SqueakMouseCmdButton1</key>
-	<integer>3</integer>
-	<key>SqueakMouseCmdButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseCmdButton3</key>
-	<integer>2</integer>
-	<key>SqueakMouseControlButton1</key>
-	<integer>1</integer>
-	<key>SqueakMouseControlButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseControlButton3</key>
-	<integer>2</integer>
-	<key>SqueakMouseNoneButton1</key>
-	<integer>1</integer>
-	<key>SqueakMouseNoneButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseNoneButton3</key>
-	<integer>2</integer>
-	<key>SqueakMouseOptionButton1</key>
-	<integer>2</integer>
-	<key>SqueakMouseOptionButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseOptionButton3</key>
-	<integer>2</integer>
-	<key>SqueakPluginsBuiltInOrLocalOnly</key>
-	<false/>
-	<key>SqueakUIFlushPrimaryDeferNMilliseconds</key>
-	<integer>20</integer>
-	<key>SqueakUIFlushSecondaryCheckForPossibleNeedEveryNMilliseconds</key>
-	<integer>20</integer>
-	<key>SqueakUIFlushSecondaryCleanupDelayMilliseconds</key>
-	<integer>25</integer>
-	<key>SqueakUIFlushUseHighPercisionClock</key>
-	<true/>
-	<key>SqueakUnTrustedDirectory</key>
-	<string>~/Library/Preferences/Newspeak/Internet/Untrusted/</string>
-	<key>SqueakWindowAttribute</key>
-	<data>
-	ggAAHw==
-	</data>
-	<key>SqueakWindowHasTitle</key>
-	<true/>
-	<key>SqueakWindowType</key>
-	<integer>6</integer>
-	<key>SqueakVMPathAnswersResources</key>
-	<true/>
-</dict>
-</plist>

Added: branches/Cog/build.macos32x86/glue.cog.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/Makefile	                        (rev 0)
+++ branches/Cog/build.macos32x86/glue.cog.spur/Makefile	2016-02-11 02:35:00 UTC (rev 3582)
@@ -0,0 +1,12 @@
+##############################################################################
+# Makefile for Mac OS X Cog Spur Newspeak Cocoa VM using clang and gnu make 3.81
+# Do make init to allow make -n to function.
+#
+
+VMSRCDIR:= ../../nsspursrc/vm
+VM:=Newspeak Virtual Machine
+SYSTEM:=Newspeak
+
+# Now include the Makefile proper, which is common to all Mac OS builds.
+#
+include ../common/Makefile.app

Deleted: branches/Cog/build.macos32x86/glue.cog.spur/makeclean
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/makeclean	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/glue.cog.spur/makeclean	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rm -r ./build ./*/build ./plugin-projects/*/build ./Fast.app ./Debug.app ./Assert.app ./Newspeak\ Virtual\ Machine.app

Deleted: branches/Cog/build.macos32x86/glue.cog.spur/makevm
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/makevm	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/glue.cog.spur/makevm	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,96 +0,0 @@
-#!/bin/bash
-# Build a "complete" Mac VM consisting of CoreVM + Plugins.
-# By default build the Deployment configuration into Newspeak Virtual Machine.app.
-IFS='	
-'
-BUILD_CONFIGURATION=Deployment
-NSD_BUILD_CONFIGURATION=Deployment
-XCD_BUILD_CONFIGURATION=Release
-DEST="Newspeak Virtual Machine.app"
-OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386"
-CONF=FAST
-KEEP=
-
-USAGE="usage: `basename $0` -[adskh?]"
-
-while getopts 'adskh?' opt $@; do
-	case $opt in
-	a)		BUILD_CONFIGURATION=Assert
-			NSD_BUILD_CONFIGURATION=Development
-			XCD_BUILD_CONFIGURATION=Debug
-			CONF=ASSERT
-			DEST="Assert.app";;
-	d)		BUILD_CONFIGURATION=Development
-			NSD_BUILD_CONFIGURATION=Development
-			XCD_BUILD_CONFIGURATION=Debug
-			CONF=DEBUG
-			DEST="Debug.app";;
-	s)		BUILD_CONFIGURATION=DeploymentSymbols
-			DEST="Fast.app";;
-	k)		KEEP=1;;
-	h|\?|*)	echo $USAGE
-			echo '	build the vm (defaults to a Deployment version)'
-			echo '  -a: compile Assert configuration in Assert.app for assert checks'
-			echo '  -d: compile Development configuration in Debug.app for debugging'
-			echo '  -s: compile DeploymentSymbols configuration in Fast.app for partial debugging'
-			echo '  -k: keep (do not delete) the existing Newspeak Virtual Machine.app prior to the build'
-			echo '	-h: display this help'
-			exit 0;;
-	esac
-done
-
-if [ -z "$DEVELOPER_SDK_DIR" ]; then
-	DEVELOPER_SDK_DIR=/Developer/SDKs
-fi
-test -d "$DEVELOPER_SDK_DIR" || echo '$DEVELOPER_SDK_DIR' "$DEVELOPER_SDK_DIR" does not exist \(needed by SqueakFFIPrims project\)
-export DEVELOPER_SDK_DIR
-if [ ! -d "$DEVELOPER_SDK_DIR/MacOSX10.5.sdk" ]; then
-	if [ -d "$DEVELOPER_SDK_DIR/MacOSX10.4u.sdk" ]; then
-		export SDKROOT="$DEVELOPER_SDK_DIR/MacOSX10.4u.sdk"
-	fi
-fi
-
-test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
-
-# Build CoreVM using xcode
-echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
-echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
-rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
-echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
-export TZ="`date +%Z`"
-xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
-if [ -d "$DEST" ]; then
-	mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST"
-else
-	mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app "$DEST"
-fi
-../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist"
-ex -u NONE "+g/????/s/????/$CONF/" +w +q "$DEST/Contents/Info.plist"
-
-# 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"
-
-if false; then
-# 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.
-echo BochsIA32Plugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
-xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
-rm -rf "$DEST/Contents/Resources/BochsIA32Plugin.bundle"
-cp -R BochsIA32Plugin/build/$XCD_BUILD_CONFIGURATION/BochsIA32Plugin.bundle "$DEST/Contents/Resources"
-fi
-
-# Build the UnixOSProcessPlugin
-echo UnixOSProcessPlugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj
-xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj
-rm -rf "$DEST/Contents/Resources/UnixOSProcessPlugin.bundle"
-cp -R UnixOSProcessPlugin/build/$XCD_BUILD_CONFIGURATION/UnixOSProcessPlugin.bundle "$DEST/Contents/Resources"
-
-# 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"

Deleted: branches/Cog/build.macos32x86/glue.cog.spur/mkNamedPrims.sh
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/mkNamedPrims.sh	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/glue.cog.spur/mkNamedPrims.sh	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Generate a sqNamedPrims.h file from plugins.int.  The plugins.int used should
-# be the one and only argument.
-if [ $# != 1 -o ! -f "$1" ]; then
-	echo usage $0 plugins.int ">sqNamedPrims.h" 1>&2
-	exit 1
-fi
-echo "/* Automatically generated on "`date`" */"
-echo "extern sqExport vm_exports[];";
-echo "extern sqExport os_exports[];";
-for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | tr -d '\\\\\\012'`
-do
-	echo "extern sqExport "$p"_exports[];"
-done
-echo
-echo "sqExport *pluginExports[] = {"
-echo "	vm_exports,"
-echo "	os_exports,"
-for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | tr -d '\\\\\\012'`
-do
-	echo "	"$p"_exports,"
-done
-echo "	NULL"
-echo "};"

Modified: branches/Cog/build.macos32x86/glue.cog.spur/mvm
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/mvm	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/glue.cog.spur/mvm	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,27 +1,4 @@
-#!/bin/sh
-D=
-A=
-F=
-H=
-while [ -n "$1" ]; do
-	case $1 in
-	-A|-AS)	D=LOGD;A=LOGA;F=LOGF;;
-	-d)	D=LOGD;;
-	-a)	A=LOGA;;
-	-f)	F=LOGF;;
-	-?|-h)	H=h
-	esac
-	shift
-done
-if [ -n "$H" -o -z "$D$A$F" ]; then
-	echo usage: $0 -A \| -AS \| -d -a -f
-	exit 1
-fi
-trap 'exit 2' HUP INT PIPE TERM
-test -n "$D" && (makevm -d 2>&1 | tee $D;grep "BUILD .*ED" $D)
-test -n "$A" && (makevm -a 2>&1 | tee $A;grep "BUILD .*ED" $A)
-test -n "$F" && (makevm -s 2>&1 | tee $F;grep "BUILD .*ED" $F)
-
-test -n "$D" && (echo $D;grep "BUILD .*ED" $D)
-test -n "$A" && (echo $A;grep "BUILD .*ED" $A)
-test -n "$F" && (echo $F;grep "BUILD .*ED" $F)
+#!/bin/bash
+make debug 2>&1 | tee LOGD
+make assert 2>&1 | tee LOGA
+make 2>&1 | tee LOGF


Property changes on: branches/Cog/build.macos32x86/glue.stack.spur
___________________________________________________________________
Modified: svn:ignore
   - build
*.app
*.bundle
LOG*
*.sources
sqNamedPrims.h

   + Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h


Deleted: branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.plist
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.plist	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.plist	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,221 +0,0 @@
-<?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>BuildMachineOSBuild</key>
-	<string>10J4138</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>image</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Image File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STim</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>sources</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Sources File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STso</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>changes</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Changes File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STch</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>bundle</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>SqueakPlugin.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Squeak Plugin</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>BNDL</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-	</array>
-	<key>CFBundleExecutable</key>
-	<string>Newspeak Virtual Machine</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Newspeak Stack Spur Virtual Machine 5.0.0 http://newspeaklanguage.org</string><!--version-->
-	<key>CFBundleShortVersionString</key>
-	<string>Newspeak Stack Spur Virtual Machine 5.0.0</string><!--version-->
-	<key>CFBundleVersion</key>
-	<string>5.0.0</string><!--version-->
-	<key>CFBundleIconFile</key>
-	<string>Newspeak Virtual Machine.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.bracha.Newspeak</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Newspeak Virtual Machine</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CGDisableCoalescedUpdates</key>
-	<true/>
-	<key>DTCompiler</key>
-	<string></string>
-	<key>DTPlatformBuild</key>
-	<string>10M2518</string>
-	<key>DTPlatformVersion</key>
-	<string>PG</string>
-	<key>DTSDKBuild</key>
-	<string>9L31a</string>
-	<key>DTSDKName</key>
-	<string>macosx10.5</string>
-	<key>DTXcode</key>
-	<string>0400</string>
-	<key>DTXcodeBuild</key>
-	<string>10M2518</string>
-	<key>LSBackgroundOnly</key>
-	<false/>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.5.0</string>
-	<key>NSServices</key>
-	<array>
-		<dict>
-			<key>NSMenuItem</key>
-			<dict>
-				<key>default</key>
-				<string>Squeak DoIt</string>
-			</dict>
-			<key>NSMessage</key>
-			<string>doitandreturn</string>
-			<key>NSPortName</key>
-			<string>Squeak</string>
-			<key>NSReturnTypes</key>
-			<array>
-				<string>NSStringPboardType</string>
-			</array>
-			<key>NSSendTypes</key>
-			<array>
-				<string>NSStringPboardType</string>
-			</array>
-		</dict>
-	</array>
-	<key>SqueakBrowserMouseCmdButton1</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseCmdButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseCmdButton3</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseControlButton1</key>
-	<integer>1</integer>
-	<key>SqueakBrowserMouseControlButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseControlButton3</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseNoneButton1</key>
-	<integer>1</integer>
-	<key>SqueakBrowserMouseNoneButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseNoneButton3</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseOptionButton1</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseOptionButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseOptionButton3</key>
-	<integer>2</integer>
-	<key>SqueakDebug</key>
-	<integer>0</integer>
-	<key>SqueakEncodingType</key>
-	<string>UTF-8</string>
-	<key>SqueakExplicitWindowOpenNeeded</key>
-	<false/>
-	<key>SqueakFloatingWindowGetsFocus</key>
-	<true/>
-	<key>SqueakHasQuitWithoutSaving</key>
-	<false/>
-	<key>SqueakImageName</key>
-	<string>Newspeak.image</string>
-	<key>SqueakMaxHeapSize</key>
-	<integer>1073741824</integer>
-	<key>SqueakMouseCmdButton1</key>
-	<integer>3</integer>
-	<key>SqueakMouseCmdButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseCmdButton3</key>
-	<integer>2</integer>
-	<key>SqueakMouseControlButton1</key>
-	<integer>1</integer>
-	<key>SqueakMouseControlButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseControlButton3</key>
-	<integer>2</integer>
-	<key>SqueakMouseNoneButton1</key>
-	<integer>1</integer>
-	<key>SqueakMouseNoneButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseNoneButton3</key>
-	<integer>2</integer>
-	<key>SqueakMouseOptionButton1</key>
-	<integer>2</integer>
-	<key>SqueakMouseOptionButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseOptionButton3</key>
-	<integer>2</integer>
-	<key>SqueakPluginsBuiltInOrLocalOnly</key>
-	<false/>
-	<key>SqueakUIFlushPrimaryDeferNMilliseconds</key>
-	<integer>20</integer>
-	<key>SqueakUIFlushSecondaryCheckForPossibleNeedEveryNMilliseconds</key>
-	<integer>20</integer>
-	<key>SqueakUIFlushSecondaryCleanupDelayMilliseconds</key>
-	<integer>25</integer>
-	<key>SqueakUIFlushUseHighPercisionClock</key>
-	<true/>
-	<key>SqueakUnTrustedDirectory</key>
-	<string>~/Library/Preferences/Newspeak/Internet/Untrusted/</string>
-	<key>SqueakWindowAttribute</key>
-	<data>
-	ggAAHw==
-	</data>
-	<key>SqueakWindowHasTitle</key>
-	<true/>
-	<key>SqueakWindowType</key>
-	<integer>6</integer>
-</dict>
-</plist>

Added: branches/Cog/build.macos32x86/glue.stack.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/Makefile	                        (rev 0)
+++ branches/Cog/build.macos32x86/glue.stack.spur/Makefile	2016-02-11 02:35:00 UTC (rev 3582)
@@ -0,0 +1,12 @@
+##############################################################################
+# Makefile for Mac OS X Stack Spur Newspeak Cocoa VM using clang and gnu make 3.81
+# Do make init to allow make -n to function.
+#
+
+VMSRCDIR:= ../../nsspurstacksrc/vm
+VM:=Newspeak Virtual Machine
+SYSTEM:=Newspeak
+
+# Now include the Makefile proper, which is common to all Mac OS builds.
+#
+include ../common/Makefile.app

Deleted: branches/Cog/build.macos32x86/glue.stack.spur/makeclean
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/makeclean	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/glue.stack.spur/makeclean	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rm -r ./build ./*/build ./plugin-projects/*/build ./Fast.app ./Debug.app ./Assert.app ./Newspeak\ Virtual\ Machine.app

Deleted: branches/Cog/build.macos32x86/glue.stack.spur/makevm
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/makevm	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/glue.stack.spur/makevm	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,96 +0,0 @@
-#!/bin/bash
-# Build a "complete" Mac VM consisting of CoreVM + Plugins.
-# By default build the Deployment configuration into Newspeak Virtual Machine.app.
-IFS='	
-'
-BUILD_CONFIGURATION=Deployment
-NSD_BUILD_CONFIGURATION=Deployment
-XCD_BUILD_CONFIGURATION=Release
-DEST="Newspeak Virtual Machine.app"
-OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386"
-CONF=FAST
-KEEP=
-
-USAGE="usage: `basename $0` -[adskh?]"
-
-while getopts 'adskh?' opt $@; do
-	case $opt in
-	a)		BUILD_CONFIGURATION=Assert
-			NSD_BUILD_CONFIGURATION=Development
-			XCD_BUILD_CONFIGURATION=Debug
-			CONF=ASSERT
-			DEST="Assert.app";;
-	d)		BUILD_CONFIGURATION=Development
-			NSD_BUILD_CONFIGURATION=Development
-			XCD_BUILD_CONFIGURATION=Debug
-			CONF=DEBUG
-			DEST="Debug.app";;
-	s)		BUILD_CONFIGURATION=DeploymentSymbols
-			DEST="Fast.app";;
-	k)		KEEP=1;;
-	h|\?|*)	echo $USAGE
-			echo '	build the vm (defaults to a Deployment version)'
-			echo '  -a: compile Assert configuration in Assert.app for assert checks'
-			echo '  -d: compile Development configuration in Debug.app for debugging'
-			echo '  -s: compile DeploymentSymbols configuration in Fast.app for partial debugging'
-			echo '  -k: keep (do not delete) the existing Newspeak Virtual Machine.app prior to the build'
-			echo '	-h: display this help'
-			exit 0;;
-	esac
-done
-
-if [ -z "$DEVELOPER_SDK_DIR" ]; then
-	DEVELOPER_SDK_DIR=/Developer/SDKs
-fi
-test -d "$DEVELOPER_SDK_DIR" || echo '$DEVELOPER_SDK_DIR' "$DEVELOPER_SDK_DIR" does not exist \(needed by SqueakFFIPrims project\)
-export DEVELOPER_SDK_DIR
-if [ ! -d "$DEVELOPER_SDK_DIR/MacOSX10.5.sdk" ]; then
-	if [ -d "$DEVELOPER_SDK_DIR/MacOSX10.4u.sdk" ]; then
-		export SDKROOT="$DEVELOPER_SDK_DIR/MacOSX10.4u.sdk"
-	fi
-fi
-
-test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
-
-# Build CoreVM using xcode
-echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
-echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
-rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
-echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
-export TZ="`date +%Z`"
-xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
-if [ -d "$DEST" ]; then
-	mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST"
-else
-	mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app "$DEST"
-fi
-../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist"
-ex -u NONE "+g/????/s/????/$CONF/" +w +q "$DEST/Contents/Info.plist"
-
-# 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"
-
-if false; then
-# 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.
-echo BochsIA32Plugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
-xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
-rm -rf "$DEST/Contents/Resources/BochsIA32Plugin.bundle"
-cp -R BochsIA32Plugin/build/$XCD_BUILD_CONFIGURATION/BochsIA32Plugin.bundle "$DEST/Contents/Resources"
-fi
-
-# Build the UnixOSProcessPlugin
-echo UnixOSProcessPlugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj
-xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj
-rm -rf "$DEST/Contents/Resources/UnixOSProcessPlugin.bundle"
-cp -R UnixOSProcessPlugin/build/$XCD_BUILD_CONFIGURATION/UnixOSProcessPlugin.bundle "$DEST/Contents/Resources"
-
-# 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"

Deleted: branches/Cog/build.macos32x86/glue.stack.spur/mkNamedPrims.sh
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/mkNamedPrims.sh	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/glue.stack.spur/mkNamedPrims.sh	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Generate a sqNamedPrims.h file from plugins.int.  The plugins.int used should
-# be the one and only argument.
-if [ $# != 1 -o ! -f "$1" ]; then
-	echo usage $0 plugins.int ">sqNamedPrims.h" 1>&2
-	exit 1
-fi
-echo "/* Automatically generated on "`date`" */"
-echo "extern sqExport vm_exports[];";
-echo "extern sqExport os_exports[];";
-for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | tr -d '\\\\\\012'`
-do
-	echo "extern sqExport "$p"_exports[];"
-done
-echo
-echo "sqExport *pluginExports[] = {"
-echo "	vm_exports,"
-echo "	os_exports,"
-for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | tr -d '\\\\\\012'`
-do
-	echo "	"$p"_exports,"
-done
-echo "	NULL"
-echo "};"

Modified: branches/Cog/build.macos32x86/glue.stack.spur/mvm
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/mvm	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/glue.stack.spur/mvm	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,27 +1,4 @@
-#!/bin/sh
-D=
-A=
-F=
-H=
-while [ -n "$1" ]; do
-	case $1 in
-	-A|-AS)	D=LOGD;A=LOGA;F=LOGF;;
-	-d)	D=LOGD;;
-	-a)	A=LOGA;;
-	-f)	F=LOGF;;
-	-?|-h)	H=h
-	esac
-	shift
-done
-if [ -n "$H" -o -z "$D$A$F" ]; then
-	echo usage: $0 -A \| -AS \| -d -a -f
-	exit 1
-fi
-trap 'exit 2' HUP INT PIPE TERM
-test -n "$D" && (makevm -d 2>&1 | tee $D;grep "BUILD .*ED" $D)
-test -n "$A" && (makevm -a 2>&1 | tee $A;grep "BUILD .*ED" $A)
-test -n "$F" && (makevm -s 2>&1 | tee $F;grep "BUILD .*ED" $F)
-
-test -n "$D" && (echo $D;grep "BUILD .*ED" $D)
-test -n "$A" && (echo $A;grep "BUILD .*ED" $A)
-test -n "$F" && (echo $F;grep "BUILD .*ED" $F)
+#!/bin/bash
+make debug 2>&1 | tee LOGD
+make assert 2>&1 | tee LOGA
+make 2>&1 | tee LOGF


Property changes on: branches/Cog/build.macos32x86/newspeak.cog.spur
___________________________________________________________________
Modified: svn:ignore
   - build
*.app
*.bundle
LOG*
*.sources
sqNamedPrims.h

   + Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h


Deleted: branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,233 +0,0 @@
-<?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>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>image</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Image File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STim</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>sources</string>
-				<string>ns0</string>
-				<string>ns1</string>
-				<string>ns2</string>
-				<string>ns3</string>
-				<string>ns4</string>
-				<string>ns5</string>
-				<string>ns6</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Sources File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STso</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>changes</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Changes File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STch</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>bundle</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>SqueakPlugin.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Squeak Plugin</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>BNDL</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-	</array>
-	<key>UTExportedTypeDeclarations</key>
-	<array>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.data</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Newspeak Virtual Machine Image</string>
-			<key>UTTypeIconFile</key>
-			<string>NewspeakDocuments.icns</string>
-			<key>UTTypeIdentifier</key>
-			<string>org.newspeakplatform.image-data</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<array>
-					<string>image</string>
-				</array>
-			</dict>
-		</dict>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.text</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Newspeak Virtual Machine Changes</string>
-			<key>UTTypeIconFile</key>
-			<string>NewspeakDocuments.icns</string>
-			<key>UTTypeIdentifier</key>
-			<string>org.newspeakplatform.changes-data</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<array>
-					<string>changes</string>
-				</array>
-			</dict>
-		</dict>
-	</array>		
-	<key>CFBundleExecutable</key>
-	<string>Newspeak Virtual Machine</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Newspeak Cog Spur Virtual Machine 5.0.0 http://newspeaklanguage.org</string><!--version-->
-	<key>CFBundleShortVersionString</key>
-	<string>Newspeak Cog Spur Virtual Machine 5.0.0</string><!--version-->
-	<key>CFBundleVersion</key>
-	<string>5.0.0</string><!--version-->
-	<key>CFBundleIconFile</key>
-	<string>Newspeak Virtual Machine.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.bracha.Newspeak</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Newspeak Virtual Machine</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>NSVM</string>
-	<key>CGDisableCoalescedUpdates</key>
-	<true/>
-	<key>LSBackgroundOnly</key>
-	<false/>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.5.0</string>
-	<key>SqueakBrowserMouseCmdButton1</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseCmdButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseCmdButton3</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseControlButton1</key>
-	<integer>1</integer>
-	<key>SqueakBrowserMouseControlButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseControlButton3</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseNoneButton1</key>
-	<integer>1</integer>
-	<key>SqueakBrowserMouseNoneButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseNoneButton3</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseOptionButton1</key>
-	<integer>2</integer>
-	<key>SqueakBrowserMouseOptionButton2</key>
-	<integer>3</integer>
-	<key>SqueakBrowserMouseOptionButton3</key>
-	<integer>2</integer>
-	<key>SqueakDebug</key>
-	<integer>0</integer>
-	<key>SqueakEncodingType</key>
-	<string>UTF-8</string>
-	<key>SqueakExplicitWindowOpenNeeded</key>
-	<false/>
-	<key>SqueakFloatingWindowGetsFocus</key>
-	<true/>
-	<key>SqueakHasQuitWithoutSaving</key>
-	<false/>
-	<key>SqueakImageName</key>
-	<string>Newspeak.image</string>
-	<key>SqueakMaxHeapSize</key>
-	<integer>1073741824</integer>
-	<key>SqueakMouseCmdButton1</key>
-	<integer>3</integer>
-	<key>SqueakMouseCmdButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseCmdButton3</key>
-	<integer>2</integer>
-	<key>SqueakMouseControlButton1</key>
-	<integer>1</integer>
-	<key>SqueakMouseControlButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseControlButton3</key>
-	<integer>2</integer>
-	<key>SqueakMouseNoneButton1</key>
-	<integer>1</integer>
-	<key>SqueakMouseNoneButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseNoneButton3</key>
-	<integer>2</integer>
-	<key>SqueakMouseOptionButton1</key>
-	<integer>2</integer>
-	<key>SqueakMouseOptionButton2</key>
-	<integer>3</integer>
-	<key>SqueakMouseOptionButton3</key>
-	<integer>2</integer>
-	<key>SqueakPluginsBuiltInOrLocalOnly</key>
-	<false/>
-	<key>SqueakUIFlushPrimaryDeferNMilliseconds</key>
-	<integer>20</integer>
-	<key>SqueakUIFlushSecondaryCheckForPossibleNeedEveryNMilliseconds</key>
-	<integer>20</integer>
-	<key>SqueakUIFlushSecondaryCleanupDelayMilliseconds</key>
-	<integer>25</integer>
-	<key>SqueakUIFlushUseHighPercisionClock</key>
-	<true/>
-	<key>SqueakUnTrustedDirectory</key>
-	<string>~/Library/Preferences/Newspeak/Internet/Untrusted/</string>
-	<key>SqueakWindowAttribute</key>
-	<data>
-	ggAAHw==
-	</data>
-	<key>SqueakWindowHasTitle</key>
-	<true/>
-	<key>SqueakWindowType</key>
-	<integer>6</integer>
-	<key>SqueakVMPathAnswersResources</key>
-	<true/>
-</dict>
-</plist>

Added: branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile	                        (rev 0)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile	2016-02-11 02:35:00 UTC (rev 3582)
@@ -0,0 +1,12 @@
+##############################################################################
+# Makefile for Mac OS X Cog Spur Newspeak Cocoa VM using clang and gnu make 3.81
+# Do make init to allow make -n to function.
+#
+
+VMSRCDIR:= ../../nsspursrc/vm
+VM:=Newspeak Virtual Machine
+SYSTEM:=Newspeak
+
+# Now include the Makefile proper, which is common to all Mac OS builds.
+#
+include ../common/Makefile.app

Deleted: branches/Cog/build.macos32x86/newspeak.cog.spur/makeclean
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/makeclean	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/makeclean	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rm -r ./build ./*/build ./plugin-projects/*/build ./Fast.app ./Debug.app ./Assert.app ./Newspeak\ Virtual\ Machine.app

Deleted: branches/Cog/build.macos32x86/newspeak.cog.spur/makevm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/makevm	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/makevm	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,96 +0,0 @@
-#!/bin/bash
-# Build a "complete" Mac VM consisting of CoreVM + Plugins.
-# By default build the Deployment configuration into Newspeak Virtual Machine.app.
-IFS='	
-'
-BUILD_CONFIGURATION=Deployment
-NSD_BUILD_CONFIGURATION=Deployment
-XCD_BUILD_CONFIGURATION=Release
-DEST="Newspeak Virtual Machine.app"
-OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386"
-CONF=FAST
-KEEP=
-
-USAGE="usage: `basename $0` -[adskh?]"
-
-while getopts 'adskh?' opt $@; do
-	case $opt in
-	a)		BUILD_CONFIGURATION=Assert
-			NSD_BUILD_CONFIGURATION=Development
-			XCD_BUILD_CONFIGURATION=Debug
-			CONF=ASSERT
-			DEST="Assert.app";;
-	d)		BUILD_CONFIGURATION=Development
-			NSD_BUILD_CONFIGURATION=Development
-			XCD_BUILD_CONFIGURATION=Debug
-			CONF=DEBUG
-			DEST="Debug.app";;
-	s)		BUILD_CONFIGURATION=DeploymentSymbols
-			DEST="Fast.app";;
-	k)		KEEP=1;;
-	h|\?|*)	echo $USAGE
-			echo '	build the vm (defaults to a Deployment version)'
-			echo '  -a: compile Assert configuration in Assert.app for assert checks'
-			echo '  -d: compile Development configuration in Debug.app for debugging'
-			echo '  -s: compile DeploymentSymbols configuration in Fast.app for partial debugging'
-			echo '  -k: keep (do not delete) the existing Newspeak Virtual Machine.app prior to the build'
-			echo '	-h: display this help'
-			exit 0;;
-	esac
-done
-
-if [ -z "$DEVELOPER_SDK_DIR" ]; then
-	DEVELOPER_SDK_DIR=/Developer/SDKs
-fi
-test -d "$DEVELOPER_SDK_DIR" || echo '$DEVELOPER_SDK_DIR' "$DEVELOPER_SDK_DIR" does not exist \(needed by SqueakFFIPrims project\)
-export DEVELOPER_SDK_DIR
-if [ ! -d "$DEVELOPER_SDK_DIR/MacOSX10.5.sdk" ]; then
-	if [ -d "$DEVELOPER_SDK_DIR/MacOSX10.4u.sdk" ]; then
-		export SDKROOT="$DEVELOPER_SDK_DIR/MacOSX10.4u.sdk"
-	fi
-fi
-
-test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
-
-# Build CoreVM using xcode
-echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
-echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
-rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
-echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
-export TZ="`date +%Z`"
-xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
-if [ -d "$DEST" ]; then
-	mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST"
-else
-	mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app "$DEST"
-fi
-../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist"
-ex -u NONE "+g/????/s/????/$CONF/" +w +q "$DEST/Contents/Info.plist"
-
-# 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"
-
-if false; then
-# 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.
-echo BochsIA32Plugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
-xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
-rm -rf "$DEST/Contents/Resources/BochsIA32Plugin.bundle"
-cp -R BochsIA32Plugin/build/$XCD_BUILD_CONFIGURATION/BochsIA32Plugin.bundle "$DEST/Contents/Resources"
-fi
-
-# Build the UnixOSProcessPlugin
-echo UnixOSProcessPlugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj
-xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj
-rm -rf "$DEST/Contents/Resources/UnixOSProcessPlugin.bundle"
-cp -R UnixOSProcessPlugin/build/$XCD_BUILD_CONFIGURATION/UnixOSProcessPlugin.bundle "$DEST/Contents/Resources"
-
-# 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/SqueakV50.sources "$DEST/Contents/Resources"

Deleted: branches/Cog/build.macos32x86/newspeak.cog.spur/mkNamedPrims.sh
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/mkNamedPrims.sh	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/mkNamedPrims.sh	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Generate a sqNamedPrims.h file from plugins.int.  The plugins.int used should
-# be the one and only argument.
-if [ $# != 1 -o ! -f "$1" ]; then
-	echo usage $0 plugins.int ">sqNamedPrims.h" 1>&2
-	exit 1
-fi
-echo "/* Automatically generated on "`date`" */"
-echo "extern sqExport vm_exports[];";
-echo "extern sqExport os_exports[];";
-for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | tr -d '\\\\\\012'`
-do
-	echo "extern sqExport "$p"_exports[];"
-done
-echo
-echo "sqExport *pluginExports[] = {"
-echo "	vm_exports,"
-echo "	os_exports,"
-for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | tr -d '\\\\\\012'`
-do
-	echo "	"$p"_exports,"
-done
-echo "	NULL"
-echo "};"

Deleted: branches/Cog/build.macos32x86/newspeak.cog.spur/mvm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/mvm	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/mvm	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,27 +0,0 @@
-#!/bin/sh
-D=
-A=
-F=
-H=
-while [ -n "$1" ]; do
-	case $1 in
-	-A|-AS)	D=LOGD;A=LOGA;F=LOGF;;
-	-d)	D=LOGD;;
-	-a)	A=LOGA;;
-	-f)	F=LOGF;;
-	-?|-h)	H=h
-	esac
-	shift
-done
-if [ -n "$H" -o -z "$D$A$F" ]; then
-	echo usage: $0 -A \| -AS \| -d -a -f
-	exit 1
-fi
-trap 'exit 2' HUP INT PIPE TERM
-test -n "$D" && (makevm -d 2>&1 | tee $D;grep "BUILD .*ED" $D)
-test -n "$A" && (makevm -a 2>&1 | tee $A;grep "BUILD .*ED" $A)
-test -n "$F" && (makevm -s 2>&1 | tee $F;grep "BUILD .*ED" $F)
-
-test -n "$D" && (echo $D;grep "BUILD .*ED" $D)
-test -n "$A" && (echo $A;grep "BUILD .*ED" $A)
-test -n "$F" && (echo $F;grep "BUILD .*ED" $F)


Property changes on: branches/Cog/build.macos32x86/newspeak.stack.spur
___________________________________________________________________
Modified: svn:ignore
   - build
*.app
*.bundle
LOG*
*.sources
sqNamedPrims.h

   + Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h


Deleted: branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist	2016-02-11 00:23:41 UTC (rev 3581)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist	2016-02-11 02:35:00 UTC (rev 3582)
@@ -1,221 +0,0 @@
-<?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>BuildMachineOSBuild</key>
-	<string>10J4138</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>image</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Image File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STim</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>sources</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Sources File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STso</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>changes</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Newspeak Virtual Machine.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Newspeak Changes File</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>STch</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>bundle</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>SqueakPlugin.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>Squeak Plugin</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>BNDL</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-	</array>
-	<key>CFBundleExecutable</key>
-	<string>Newspeak Virtual Machine</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Newspeak Stack Spur Virtual Machine 5.0.0 http://newspeaklanguage.org</string><!--version-->
-	<key>CFBundleShortVersionString</key>
-	<string>Newspeak Stack Spur Virtual Machine 5.0.0</string><!--version-->
-	<key>CFBundleVersion</key>
-	<string>5.0.0</string><!--version-->
-	<key>CFBundleIconFile</key>
-	<string>Newspeak Virtual Machine.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.bracha.Newspeak</string>

@@ Diff output truncated at 50000 characters. @@

More information about the Vm-dev mailing list