Mac OS X build changes.

Move the MIDI plugin to external, adding a Makefile. It does not work under Cocoa yetm and so is more convenient to work on externally. Move FloatArray & FloatMath plugins to internal; they're small, useful and stable. Fix dependency when plugins change from being internal to external and vice verse; they must be recompiled. Exclude sqMacV2Window.m SqViewBitmapConversion.m & SqViewClut.m; JMM says these shouldn't be included. rename the immutability build to squeak.cog.spur+immutability (for "naming consistency"). Add some ignore props. git-svn-id: http://squeakvm.org/svn/squeak/branches/Cog@3694 fa1542d4-bde8-0310-ad64-8ed1123d492a Former-commit-id: 4b1b584dd988265fe8cd3d1bb1f500b20431a012
OpenSmalltalk · May 4, 2016 · 7074989 · 7074989
1 parent 3e4f45f
commit 7074989
Show file tree

Hide file tree

Showing 36 changed files with 113 additions and 147 deletions.
diff --git a/build.macos32x86/common/Makefile.plugin b/build.macos32x86/common/Makefile.plugin
@@ -102,6 +102,9 @@ LIBOBJ:=$(addprefix $(OBJDIR)/,$(LIBOBJ))
 
 VPATH:= $(SRCDIRS)
 
+# If plugins change from internal to external they must be recompiled.
+$(BUILD)/$(LIBNAME)/$(LIBNAME).o: plugins.int plugins.ext
+
 #############################################################################
 # Rules for automated builds
 

diff --git a/build.macos32x86/common/Makefile.vm b/build.macos32x86/common/Makefile.vm
@@ -52,10 +52,13 @@ UNIXVMDIR:=$(PLATDIR)/unix/vm
 
 MAKERSRC:=$(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c)
 CROSSSRC:= $(wildcard $(CROSSDIR)/*.c)
-XEX:=%/sqSqueakMainApplication+screen.m
-OSXSRC:=$(wildcard $(OSXDIR)/*.c) $(filter-out $(XEX),$(wildcard $(OSXDIR)/*.m)) \
+#XEX:= ... %/sqMacV2Browser.m ...
+XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \
+	 %/SqViewBitmapConversion.m %/SqViewClut.m
+OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \
 		$(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \
 		$(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m)
+OSXSRC:=$(filter-out $(XEX),$(OSXSRC))
 UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixSpurMemory.c \
                      sqUnixThreads.c sqUnixVMProfile.c)
 VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(UNIXSRC)

diff --git a/build.macos32x86/makeproduct b/build.macos32x86/makeproduct
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap 'exit 2' HUP INT PIPE TERM
-PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur.immutability"
+PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur+immutability"
 for d in $PRODUCTDIRS; do
 	if test -d "$d"; then
 		(cd ./$d;./mvm -A)

diff --git a/build.macos32x86/makeproductclean b/build.macos32x86/makeproductclean
@@ -1,6 +1,6 @@
 #!/bin/bash
 trap 'exit 2' HUP INT PIPE TERM
-PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur.immutability"
+PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur+immutability"
 for d in $PRODUCTDIRS; do
 	if test -d "$d"; then
 		(cd ./$d;echo $d;make cleanall)

diff --git a/build.macos32x86/squeak+immutability.cog.spur/Makefile b/build.macos32x86/squeak+immutability.cog.spur/Makefile
diff --git a/build.macos32x86/squeak+immutability.cog.spur/plugins.ext b/build.macos32x86/squeak+immutability.cog.spur/plugins.ext
diff --git a/build.macos32x86/squeak+immutability.cog.spur/plugins.int b/build.macos32x86/squeak+immutability.cog.spur/plugins.int
diff --git a/...x86/squeak.cog.spur.immutability/Makefile → ...x86/squeak.cog.spur+immutability/Makefile b/...x86/squeak.cog.spur.immutability/Makefile → ...x86/squeak.cog.spur+immutability/Makefile
diff --git a/...cos32x86/squeak+immutability.cog.spur/mvm → ...cos32x86/squeak.cog.spur+immutability/mvm b/...cos32x86/squeak+immutability.cog.spur/mvm → ...cos32x86/squeak.cog.spur+immutability/mvm
diff --git a/.../squeak.cog.spur.immutability/plugins.ext → .../squeak.cog.spur+immutability/plugins.ext b/.../squeak.cog.spur.immutability/plugins.ext → .../squeak.cog.spur+immutability/plugins.ext
@@ -1,13 +1,12 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
 EXTERNAL_PLUGINS = \
 BochsIA32Plugin \
 BochsX64Plugin \
 GdbARMPlugin \
 CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
-UUIDPlugin \
 UnixOSProcessPlugin
diff --git a/.../squeak.cog.spur.immutability/plugins.int → .../squeak.cog.spur+immutability/plugins.int b/.../squeak.cog.spur.immutability/plugins.int → .../squeak.cog.spur+immutability/plugins.int
@@ -11,16 +11,16 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
 HostWindowPlugin \
 IA32ABI \
 JPEGReaderPlugin \
 JPEGReadWriter2Plugin \
 Klatt \
 LargeIntegers \
 LocalePlugin \
-MacMenubarPlugin \
 Matrix2x3Plugin \
-MIDIPlugin \
 MiscPrimitivePlugin \
 RePlugin \
 SecurityPlugin \
@@ -31,7 +31,9 @@ SoundGenerationPlugin \
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
+UUIDPlugin \
 VMProfileMacSupportPlugin \
 # B3DAcceleratorPlugin \
 # InternetConfigPlugin \
-# JoystickTabletPlugin
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
diff --git a/build.macos32x86/squeak.cog.spur.immutability/mvm b/build.macos32x86/squeak.cog.spur.immutability/mvm
diff --git a/build.macos32x86/squeak.cog.spur/plugins.ext b/build.macos32x86/squeak.cog.spur/plugins.ext
@@ -1,13 +1,12 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
 EXTERNAL_PLUGINS = \
 BochsIA32Plugin \
 BochsX64Plugin \
 GdbARMPlugin \
 CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
-UUIDPlugin \
 UnixOSProcessPlugin
diff --git a/build.macos32x86/squeak.cog.spur/plugins.int b/build.macos32x86/squeak.cog.spur/plugins.int
@@ -11,16 +11,16 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
 HostWindowPlugin \
 IA32ABI \
 JPEGReaderPlugin \
 JPEGReadWriter2Plugin \
 Klatt \
 LargeIntegers \
 LocalePlugin \
-MacMenubarPlugin \
 Matrix2x3Plugin \
-MIDIPlugin \
 MiscPrimitivePlugin \
 RePlugin \
 SecurityPlugin \
@@ -31,7 +31,9 @@ SoundGenerationPlugin \
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
+UUIDPlugin \
 VMProfileMacSupportPlugin \
 # B3DAcceleratorPlugin \
 # InternetConfigPlugin \
-# JoystickTabletPlugin
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
diff --git a/build.macos32x86/squeak.cog.v3/plugins.ext b/build.macos32x86/squeak.cog.v3/plugins.ext
@@ -1,8 +1,11 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
 EXTERNAL_PLUGINS = \
+BochsIA32Plugin \
+BochsX64Plugin \
+GdbARMPlugin \
 CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \

diff --git a/build.macos32x86/squeak.cog.v3/plugins.int b/build.macos32x86/squeak.cog.v3/plugins.int
@@ -11,6 +11,8 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
 HostWindowPlugin \
 IA32ABI \
 JPEGReaderPlugin \
@@ -31,4 +33,7 @@ StarSqueakPlugin \
 SurfacePlugin \
 UUIDPlugin \
 VMProfileMacSupportPlugin \
-# JoystickTabletPlugin
+# B3DAcceleratorPlugin \
+# InternetConfigPlugin \
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
diff --git a/build.macos32x86/squeak.sista.spur/Makefile b/build.macos32x86/squeak.sista.spur/Makefile
@@ -4,6 +4,7 @@
 #
 
 VMSRCDIR:= ../../spursistasrc/vm
+COGDEFS=-DIMMUTABILITY=1
 SOURCEFILE:=SqueakV50.sources
 
 APPPOST:=overwriteSqueakIcon

diff --git a/build.macos32x86/squeak.sista.spur/plugins.ext b/build.macos32x86/squeak.sista.spur/plugins.ext
@@ -1,13 +1,12 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Coca so keeping it external until it can be fixed.
 EXTERNAL_PLUGINS = \
 BochsIA32Plugin \
 BochsX64Plugin \
 GdbARMPlugin \
 CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
-UUIDPlugin \
 UnixOSProcessPlugin
diff --git a/build.macos32x86/squeak.sista.spur/plugins.int b/build.macos32x86/squeak.sista.spur/plugins.int
@@ -11,6 +11,8 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
 HostWindowPlugin \
 IA32ABI \
 JPEGReaderPlugin \
@@ -29,5 +31,9 @@ SoundGenerationPlugin \
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
+UUIDPlugin \
 VMProfileMacSupportPlugin \
-# JoystickTabletPlugin
+# B3DAcceleratorPlugin \
+# InternetConfigPlugin \
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
diff --git a/build.macos32x86/squeak.stack.spur/plugins.ext b/build.macos32x86/squeak.stack.spur/plugins.ext
@@ -1,10 +1,9 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
 EXTERNAL_PLUGINS = \
 CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
-UUIDPlugin \
 UnixOSProcessPlugin
diff --git a/build.macos32x86/squeak.stack.spur/plugins.int b/build.macos32x86/squeak.stack.spur/plugins.int
@@ -11,6 +11,8 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
 HostWindowPlugin \
 IA32ABI \
 JPEGReaderPlugin \
@@ -29,5 +31,9 @@ SoundGenerationPlugin \
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
+UUIDPlugin \
 VMProfileMacSupportPlugin \
-# JoystickTabletPlugin
+# B3DAcceleratorPlugin \
+# InternetConfigPlugin \
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
diff --git a/build.macos32x86/squeak.stack.v3/plugins.ext b/build.macos32x86/squeak.stack.v3/plugins.ext
@@ -1,8 +1,8 @@
 # Copied, perhaps edited, from ../src/examplePlugins.ext
+# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed.
 EXTERNAL_PLUGINS = \
 CroquetPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
+MIDIPlugin \
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \

diff --git a/build.macos32x86/squeak.stack.v3/plugins.int b/build.macos32x86/squeak.stack.v3/plugins.int
@@ -11,6 +11,8 @@ DropPlugin \
 DSAPrims \
 FFTPlugin \
 FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
 HostWindowPlugin \
 IA32ABI \
 JPEGReaderPlugin \
@@ -31,4 +33,7 @@ StarSqueakPlugin \
 SurfacePlugin \
 UUIDPlugin \
 VMProfileMacSupportPlugin \
-# JoystickTabletPlugin
+# B3DAcceleratorPlugin \
+# InternetConfigPlugin \
+# JoystickTabletPlugin \
+# MacMenubarPlugin # Does not work under Cocoa
diff --git a/build.macos64x64/common/Makefile.plugin b/build.macos64x64/common/Makefile.plugin
@@ -102,6 +102,9 @@ LIBOBJ:=$(addprefix $(OBJDIR)/,$(LIBOBJ))
 
 VPATH:= $(SRCDIRS)
 
+# If plugins change from internal to external they must be recompiled.
+$(BUILD)/$(LIBNAME)/$(LIBNAME).o: plugins.int plugins.ext
+
 #############################################################################
 # Rules for automated builds
 

diff --git a/build.macos64x64/common/Makefile.vm b/build.macos64x64/common/Makefile.vm
@@ -52,10 +52,13 @@ UNIXVMDIR:=$(PLATDIR)/unix/vm
 
 MAKERSRC:=$(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c)
 CROSSSRC:= $(wildcard $(CROSSDIR)/*.c)
-XEX:=%/sqSqueakMainApplication+screen.m
-OSXSRC:=$(wildcard $(OSXDIR)/*.c) $(filter-out $(XEX),$(wildcard $(OSXDIR)/*.m)) \
+#XEX:= ... %/sqMacV2Browser.m ...
+XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \
+	 %/SqViewBitmapConversion.m %/SqViewClut.m
+OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \
 		$(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \
 		$(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m)
+OSXSRC:=$(filter-out $(XEX),$(OSXSRC))
 UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixSpurMemory.c \
                      sqUnixThreads.c sqUnixVMProfile.c)
 VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(UNIXSRC)

diff --git a/build.macos64x64/pharo.cog.spur/plugins.int b/build.macos64x64/pharo.cog.spur/plugins.int
@@ -32,4 +32,4 @@ SurfacePlugin \
 UUIDPlugin \
 VMProfileMacSupportPlugin \
 # JoystickTabletPlugin \
-# SerialPlugin
+# SerialPlugin # Does not compile under 64-bits