[Vm-dev] [commit][3588] Mac OS X gnu makefiles.

commits at squeakvm.org commits at squeakvm.org
Fri Feb 12 00:14:11 UTC 2016


Revision: 3588
Author:   eliot
Date:     2016-02-11 16:14:11 -0800 (Thu, 11 Feb 2016)
Log Message:
-----------
Mac OS X gnu makefiles.
Factor out the installation of green icons for squeak cog into its own makefile.
Add build.macos32x86/squeak+immutability.cog.spur to test IMMUATBILITY builds.
Ignore LOG* files.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/squeak.cog.spur/Makefile
    branches/Cog/build.macos64x64/squeak.cog.spur/Makefile

Added Paths:
-----------
    branches/Cog/build.macos32x86/common/Makefile.app.squeak.cog
    branches/Cog/build.macos32x86/squeak+immutability.cog.spur/
    branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile
    branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm
    branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int
    branches/Cog/build.macos64x64/common/Makefile.app.squeak.cog

Property Changed:
----------------
    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/build.macos32x86/squeak.stack.spur/
    branches/Cog/build.macos32x86/squeak.stack.v3/
    branches/Cog/build.macos64x64/newspeak.cog.spur/
    branches/Cog/build.macos64x64/newspeak.stack.spur/
    branches/Cog/build.macos64x64/pharo.cog.spur/
    branches/Cog/build.macos64x64/squeak.cog.spur/
    branches/Cog/build.macos64x64/squeak.sista.spur/
    branches/Cog/build.macos64x64/squeak.stack.spur/
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Added: branches/Cog/build.macos32x86/common/Makefile.app.squeak.cog
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.app.squeak.cog	                        (rev 0)
+++ branches/Cog/build.macos32x86/common/Makefile.app.squeak.cog	2016-02-12 00:14:11 UTC (rev 3588)
@@ -0,0 +1,17 @@
+##############################################################################
+# Generic Makefile for Mac OS X Squeak Cog Cocoa VM
+#
+
+# The caller should set VMSRCDIR to point to the relevant VM source
+# e.g. VMSRCDIR:= ../../spursrc/vm
+
+APPPOST:=overwriteSqueakIcon
+
+# Now include the Makefile proper, which is common to all Mac OS builds.
+#
+include ../common/Makefile.app
+
+# Replace the standard yellow VM icon with the green one used for Cog VMs
+
+overwriteSqueakIcon: $(APP)/Contents/Resources/Squeak.icns
+	cp -p $(OSXDIR)/GreenCogSqueak.icns $(APP)/Contents/Resources/Squeak.icns


Property changes on: branches/Cog/build.macos32x86/newspeak.cog.spur
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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



Property changes on: branches/Cog/build.macos32x86/newspeak.stack.spur
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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



Property changes on: branches/Cog/build.macos32x86/pharo.cog.spur
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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



Property changes on: branches/Cog/build.macos32x86/squeak+immutability.cog.spur
___________________________________________________________________
Added: svn:ignore
   + Cocoa*.app
LOG*
build*
deps
getversion*
sqNamedPrims.h


Added: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile	                        (rev 0)
+++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/Makefile	2016-02-12 00:14:11 UTC (rev 3588)
@@ -0,0 +1,11 @@
+##############################################################################
+# Makefile for Mac OS X Cog Spur Squeak Cocoa VM using clang and gnu make 3.81
+# Do make init to allow make -n to function.
+#
+
+VMSRCDIR:= ../../spursrc/vm
+COGDEFS=-DIMMUTABILITY=1
+
+# Now include the Makefile proper, which is common to all Mac OS builds.
+#
+include ../common/Makefile.app.squeak.cog

Added: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm
===================================================================
--- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm	                        (rev 0)
+++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/mvm	2016-02-12 00:14:11 UTC (rev 3588)
@@ -0,0 +1,4 @@
+#!/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/squeak+immutability.cog.spur/mvm
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.ext	                        (rev 0)
+++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.ext	2016-02-12 00:14:11 UTC (rev 3588)
@@ -0,0 +1,12 @@
+# Copied, perhaps edited, from ../src/examplePlugins.ext
+EXTERNAL_PLUGINS = \
+BochsIA32Plugin \
+BochsX64Plugin \
+GdbARMPlugin \
+CroquetPlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
+Mpeg3Plugin \
+SqueakFFIPrims \
+SqueakSSL \
+UnixOSProcessPlugin

Added: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int	                        (rev 0)
+++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int	2016-02-12 00:14:11 UTC (rev 3588)
@@ -0,0 +1,34 @@
+# Copied, perhaps edited, from ../src/examplePlugins.int
+INTERNAL_PLUGINS = \
+ADPCMCodecPlugin \
+AioPlugin \
+AsynchFilePlugin \
+B2DPlugin \
+BitBltPlugin \
+BMPReadWriterPlugin \
+ZipPlugin \
+DropPlugin \
+DSAPrims \
+FFTPlugin \
+FilePlugin \
+HostWindowPlugin \
+IA32ABI \
+JPEGReaderPlugin \
+JPEGReadWriter2Plugin \
+Klatt \
+LargeIntegers \
+LocalePlugin \
+Matrix2x3Plugin \
+MiscPrimitivePlugin \
+RePlugin \
+SecurityPlugin \
+SerialPlugin \
+SocketPlugin \
+SoundCodecPrims \
+SoundGenerationPlugin \
+SoundPlugin \
+StarSqueakPlugin \
+SurfacePlugin \
+UUIDPlugin \
+VMProfileMacSupportPlugin \
+# JoystickTabletPlugin


Property changes on: branches/Cog/build.macos32x86/squeak.cog.spur
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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


Modified: branches/Cog/build.macos32x86/squeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/Makefile	2016-02-11 23:57:38 UTC (rev 3587)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/Makefile	2016-02-12 00:14:11 UTC (rev 3588)
@@ -5,13 +5,6 @@
 
 VMSRCDIR:= ../../spursrc/vm
 
-APPPOST:=overwriteSqueakIcon
-
 # Now include the Makefile proper, which is common to all Mac OS builds.
 #
-include ../common/Makefile.app
-
-# Replace the standard yellow VM icon with the green one used for Cog VMs
-
-overwriteSqueakIcon: $(APP)/Contents/Resources/Squeak.icns
-	cp -p $(OSXDIR)/GreenCogSqueak.icns $(APP)/Contents/Resources/Squeak.icns
+include ../common/Makefile.app.squeak.cog


Property changes on: branches/Cog/build.macos32x86/squeak.cog.v3
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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



Property changes on: branches/Cog/build.macos32x86/squeak.sista.spur
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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



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

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



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

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


Added: branches/Cog/build.macos64x64/common/Makefile.app.squeak.cog
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.app.squeak.cog	                        (rev 0)
+++ branches/Cog/build.macos64x64/common/Makefile.app.squeak.cog	2016-02-12 00:14:11 UTC (rev 3588)
@@ -0,0 +1,17 @@
+##############################################################################
+# Generic Makefile for Mac OS X Squeak Cog Cocoa VM
+#
+
+# The caller should set VMSRCDIR to point to the relevant VM source
+# e.g. VMSRCDIR:= ../../spursrc/vm
+
+APPPOST:=overwriteSqueakIcon
+
+# Now include the Makefile proper, which is common to all Mac OS builds.
+#
+include ../common/Makefile.app
+
+# Replace the standard yellow VM icon with the green one used for Cog VMs
+
+overwriteSqueakIcon: $(APP)/Contents/Resources/Squeak.icns
+	cp -p $(OSXDIR)/GreenCogSqueak.icns $(APP)/Contents/Resources/Squeak.icns


Property changes on: branches/Cog/build.macos64x64/newspeak.cog.spur
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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



Property changes on: branches/Cog/build.macos64x64/newspeak.stack.spur
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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



Property changes on: branches/Cog/build.macos64x64/pharo.cog.spur
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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



Property changes on: branches/Cog/build.macos64x64/squeak.cog.spur
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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


Modified: branches/Cog/build.macos64x64/squeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur/Makefile	2016-02-11 23:57:38 UTC (rev 3587)
+++ branches/Cog/build.macos64x64/squeak.cog.spur/Makefile	2016-02-12 00:14:11 UTC (rev 3588)
@@ -5,13 +5,6 @@
 
 VMSRCDIR:= ../../spursrc/vm
 
-APPPOST:=overwriteSqueakIcon
-
 # Now include the Makefile proper, which is common to all Mac OS builds.
 #
-include ../common/Makefile.app
-
-# Replace the standard yellow VM icon with the green one used for Cog VMs
-
-overwriteSqueakIcon: $(APP)/Contents/Resources/Squeak.icns
-	cp -p $(OSXDIR)/GreenCogSqueak.icns $(APP)/Contents/Resources/Squeak.icns
+include ../common/Makefile.app.squeak.cog


Property changes on: branches/Cog/build.macos64x64/squeak.sista.spur
___________________________________________________________________
Modified: svn:ignore
   - Cocoa*.app
build*
deps
getversion*
sqNamedPrims.h

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



Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur
___________________________________________________________________
Added: svn:ignore
   + Cocoa*.app
LOG*
build*
deps
getversion*
sqNamedPrims.h



Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Thu Feb 11 15:55:53 PST 2016
   + Thu Feb 11 16:11:36 PST 2016



More information about the Vm-dev mailing list