Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

[commit][3586] And remember the svn:ignore properties
by commits＠squeakvm.org 11 Feb '16

11 Feb '16

Revision: 3586 Author: eliot Date: 2016-02-11 12:59:14 -0800 (Thu, 11 Feb 2016) Log Message: ----------- And remember the svn:ignore properties Property Changed: ---------------- branches/Cog/build.macos64x64/newspeak.cog.spur/ branches/Cog/build.macos64x64/newspeak.stack.spur/ branches/Cog/build.macos64x64/squeak.cog.spur/ branches/Cog/build.macos64x64/squeak.sista.spur/ branches/Cog/build.macos64x64/squeak.stack.spur/ Property changes on: branches/Cog/build.macos64x64/newspeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - build *.app *.bundle LOG* *.sources sqNamedPrims.h + Cocoa*.app build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/newspeak.stack.spur ___________________________________________________________________ Modified: svn:ignore - build *.app *.bundle LOG* *.sources sqNamedPrims.h + Cocoa*.app build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - build *.app *.bundle LOG* *.sources sqNamedPrims.h + Cocoa*.app build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.sista.spur ___________________________________________________________________ Modified: svn:ignore - build *.app *.bundle LOG* *.sources sqNamedPrims.h + Cocoa*.app build* deps getversion* sqNamedPrims.h Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur ___________________________________________________________________ Deleted: svn:ignore - build *.app *.bundle LOG* *.sources sqNamedPrims.h

1 0

[commit][3585] Move the macos64x64 builds to the new gnu makefiles
by commits＠squeakvm.org 11 Feb '16

11 Feb '16

Revision: 3585 Author: eliot Date: 2016-02-11 12:54:30 -0800 (Thu, 11 Feb 2016) Log Message: ----------- Move the macos64x64 builds to the new gnu makefiles Fix the signature of closeWindow in the iOS HostWindowPlugin Modified Paths: -------------- branches/Cog/build.macos64x64/common/Makefile.flags branches/Cog/build.macos64x64/newspeak.cog.spur/mvm branches/Cog/build.macos64x64/newspeak.cog.spur/plugins.int branches/Cog/build.macos64x64/newspeak.stack.spur/mvm branches/Cog/build.macos64x64/newspeak.stack.spur/plugins.int branches/Cog/build.macos64x64/pharo.cog.spur/Makefile branches/Cog/build.macos64x64/squeak.cog.spur/mvm branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.sista.spur/mvm branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int branches/Cog/build.macos64x64/squeak.stack.spur/mvm branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int branches/Cog/platforms/iOS/plugins/HostWindowPlugin/sqMacHostWindow.m Added Paths: ----------- branches/Cog/build.macos64x64/common/ branches/Cog/build.macos64x64/common/Makefile.app branches/Cog/build.macos64x64/common/Makefile.app.newspeak branches/Cog/build.macos64x64/common/Makefile.plugin branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile branches/Cog/build.macos64x64/newspeak.stack.spur/Makefile branches/Cog/build.macos64x64/pharo.cog.spur/ branches/Cog/build.macos64x64/pharo.cog.spur/mvm branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.cog.spur/Makefile branches/Cog/build.macos64x64/squeak.sista.spur/Makefile branches/Cog/build.macos64x64/squeak.stack.spur/Makefile Removed Paths: ------------- branches/Cog/build.macos64x64/common/Makefile.app branches/Cog/build.macos64x64/common/Makefile.plugin branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.macos64x64/newspeak.cog.spur/CoreVM.plist branches/Cog/build.macos64x64/newspeak.cog.spur/CoreVM.xcodeproj/ branches/Cog/build.macos64x64/newspeak.cog.spur/SqueakSSL/ branches/Cog/build.macos64x64/newspeak.cog.spur/UnixOSProcessPlugin/ branches/Cog/build.macos64x64/newspeak.cog.spur/makeclean branches/Cog/build.macos64x64/newspeak.cog.spur/makevm branches/Cog/build.macos64x64/newspeak.cog.spur/mkNamedPrims.sh branches/Cog/build.macos64x64/newspeak.stack.spur/CoreVM.plist branches/Cog/build.macos64x64/newspeak.stack.spur/CoreVM.xcodeproj/ branches/Cog/build.macos64x64/newspeak.stack.spur/SqueakSSL/ branches/Cog/build.macos64x64/newspeak.stack.spur/UnixOSProcessPlugin/ branches/Cog/build.macos64x64/newspeak.stack.spur/makeclean branches/Cog/build.macos64x64/newspeak.stack.spur/makevm branches/Cog/build.macos64x64/newspeak.stack.spur/mkNamedPrims.sh branches/Cog/build.macos64x64/pharo.cog.spur/mvm branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.cog.spur/BochsIA32Plugin/ branches/Cog/build.macos64x64/squeak.cog.spur/BochsX64Plugin/ branches/Cog/build.macos64x64/squeak.cog.spur/CroquetPlugin/ branches/Cog/build.macos64x64/squeak.cog.spur/FloatArrayPlugin/ branches/Cog/build.macos64x64/squeak.cog.spur/FloatMathPlugin/ branches/Cog/build.macos64x64/squeak.cog.spur/GdbARMPlugin/ branches/Cog/build.macos64x64/squeak.cog.spur/Mpeg3Plugin/ branches/Cog/build.macos64x64/squeak.cog.spur/SqueakCogSpur32x86/ branches/Cog/build.macos64x64/squeak.cog.spur/SqueakCogSpur32x86.plist branches/Cog/build.macos64x64/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/ branches/Cog/build.macos64x64/squeak.cog.spur/SqueakFFIPrims/ branches/Cog/build.macos64x64/squeak.cog.spur/SqueakMTFFIPrims/ branches/Cog/build.macos64x64/squeak.cog.spur/SqueakSSL/ branches/Cog/build.macos64x64/squeak.cog.spur/UnixOSProcessPlugin/ branches/Cog/build.macos64x64/squeak.cog.spur/makeclean branches/Cog/build.macos64x64/squeak.cog.spur/makeiosclean branches/Cog/build.macos64x64/squeak.cog.spur/makeiosvm branches/Cog/build.macos64x64/squeak.cog.spur/miosvm branches/Cog/build.macos64x64/squeak.cog.spur/mkNamedPrims.sh branches/Cog/build.macos64x64/squeak.sista.spur/CoreVM.plist branches/Cog/build.macos64x64/squeak.sista.spur/CoreVM.xcodeproj/ branches/Cog/build.macos64x64/squeak.sista.spur/CroquetPlugin/ branches/Cog/build.macos64x64/squeak.sista.spur/FloatArrayPlugin/ branches/Cog/build.macos64x64/squeak.sista.spur/FloatMathPlugin/ branches/Cog/build.macos64x64/squeak.sista.spur/Mpeg3Plugin/ branches/Cog/build.macos64x64/squeak.sista.spur/SqueakFFIPrims/ branches/Cog/build.macos64x64/squeak.sista.spur/SqueakSSL/ branches/Cog/build.macos64x64/squeak.sista.spur/UnixOSProcessPlugin/ branches/Cog/build.macos64x64/squeak.sista.spur/makeclean branches/Cog/build.macos64x64/squeak.sista.spur/makevm branches/Cog/build.macos64x64/squeak.sista.spur/mkNamedPrims.sh branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.plist branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/ branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/ branches/Cog/build.macos64x64/squeak.stack.spur/CroquetPlugin/ branches/Cog/build.macos64x64/squeak.stack.spur/English.lproj/ branches/Cog/build.macos64x64/squeak.stack.spur/FloatArrayPlugin/ branches/Cog/build.macos64x64/squeak.stack.spur/FloatMathPlugin/ branches/Cog/build.macos64x64/squeak.stack.spur/Mpeg3Plugin/ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakCogSpur32x86.plist branches/Cog/build.macos64x64/squeak.stack.spur/SqueakFFIPrims/ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64x64/ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc_Prefix.pch branches/Cog/build.macos64x64/squeak.stack.spur/SqueakSSL/ branches/Cog/build.macos64x64/squeak.stack.spur/UnixOSProcessPlugin/ branches/Cog/build.macos64x64/squeak.stack.spur/makeclean branches/Cog/build.macos64x64/squeak.stack.spur/makevm branches/Cog/build.macos64x64/squeak.stack.spur/mkNamedPrims.sh branches/Cog/build.macos64x64/xcode/ Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Deleted: branches/Cog/build.macos64x64/common/Makefile.app =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 00:23:41 UTC (rev 3581) +++ branches/Cog/build.macos64x64/common/Makefile.app 2016-02-11 20:54:30 UTC (rev 3585) @@ -1,89 +0,0 @@ -############################################################################# -# Generic Makefile for VM app bundle -# Do make getversion to get makwe -n to work -# -# This is designed to be invoked by Makefile in a specific build directory via -# include ../common/Makefile.app -# -# Parameters: -# VMSRCDIR defines the locaton of the VM source to build. Required. -# -# COGDEFS supply any command-line defines to use, and may be null. -# -# The name of the VM to build. Optional. Defaults to Squeak -# -# PLUGINSRCDIR defines the locaton of the plugin source, the subsets of which -# selected by plugins.int and plugins.ext will be built. Optional. Defaults to -# ../../src -# -# CONFIGURATION defines what version of the VM to build, product, assert or -# debug. Optional. Defaults to product. The default is overridden in mvm script - - -ifeq ("$(CONFIGURATION)","product") - APP:=CocoaFast.app -else ifeq ("$(CONFIGURATION)","assert") - APP:=CocoaAssert.app -else - APP:=CocoaDebug.app -endif - -default: $(APP) - -include ../common/Makefile.vm - -cleanall: cleanapp cleanastapp cleandbgapp cleanallvm - -cleanapp: - rm -rf CocoaFast.app - -cleanastapp: - rm -rf CocoaAssert.app - -cleandbgapp: - rm -rf CocoaDebug.app - -VMEXE:=$(APP)/Contents/MacOS/$(VM) -VMPLIST:=$(APP)/Contents/Info.plist -VMBUNDLES:=$(addprefix $(APP)/Contents/Resources/, $(addsuffix .bundle, $(EXTERNAL_PLUGINS))) -OSXICONS:=$(OSXDIR)/$(VM).icns $(wildcard $(OSXDIR)/$(SYSTEM)*.icns) -VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) -VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib - -$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) - -$(VMEXE): vm $(OBJDIR)/$(VM) - mkdir -p $(APP)/Contents/MacOS - cp $(OBJDIR)/$(VM) $(APP)/Contents/MacOS - -$(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle - mkdir -p $(APP)/Contents/Resources - cp -pR $< $(APP)/Contents/Resources - -$(VMPLIST): $(OSXDIR)/$(SYSTEM)-Info.plist getversion - mkdir -p $(APP)/Contents - sed "s/\$$(VERSION)/`getversion VERSION_TAG`/" $< | \ - sed "s/\$$(VERSION_NUMBER)/`getversion VERSION_NUMBER`/" | \ - sed "s/\$$(VERSION_TAG)/`getversion VERSION_TAG`/" | \ - sed "s/\$$(VM_NICKNAME)/`getversion VM_NICKNAME`/" > $@ - -$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib - mkdir -p $(dir $@) - $(XCUB)/ibtool --errors --warnings --notices --module $(VM) \ - --minimum-deployment-target $(TARGET_VERSION_MIN) \ - --auto-activate-custom-fonts --output-format human-readable-text \ - --compile $(VMMENUNIB) \ - $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib - -$(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns - mkdir -p $(APP)/Contents/Resources - cp -p $< $(APP)/Contents/Resources - -print-app-settings: - @echo ---------------- Makefile.app settings ------------------ - @echo APP=$(APP) - @echo VMEXE=$(VMEXE) - @echo VMBUNDLES=$(VMBUNDLES) - @echo VMPLIST=$(VMPLIST) - @echo VMICONS=$(VMICONS) - @echo ----------------------------------------------------- Copied: branches/Cog/build.macos64x64/common/Makefile.app (from rev 3584, branches/Cog/build.macos32x86/common/Makefile.app) =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app (rev 0) +++ branches/Cog/build.macos64x64/common/Makefile.app 2016-02-11 20:54:30 UTC (rev 3585) @@ -0,0 +1,90 @@ +############################################################################# +# Generic Makefile for VM app bundle +# Do make getversion to get makwe -n to work +# +# This is designed to be invoked by Makefile in a specific build directory via +# include ../common/Makefile.app +# +# Parameters: +# VMSRCDIR defines the locaton of the VM source to build. Required. +# +# COGDEFS supply any command-line defines to use, and may be null. +# +# The name of the VM to build. Optional. Defaults to Squeak +# +# PLUGINSRCDIR defines the locaton of the plugin source, the subsets of which +# selected by plugins.int and plugins.ext will be built. Optional. Defaults to +# ../../src +# +# CONFIGURATION defines what version of the VM to build, product, assert or +# debug. Optional. Defaults to product. The default is overridden in mvm script + + +ifeq ("$(CONFIGURATION)","debug") + APP:=CocoaDebug.app +else ifeq ("$(CONFIGURATION)","assert") + APP:=CocoaAssert.app +else # default CONFIGURATION=product => CocoaFast.app + APP:=CocoaFast.app +endif + +default: $(APP) + +include ../common/Makefile.vm + +cleanall: cleanapp cleanastapp cleandbgapp cleanallvm + +cleanapp: + rm -rf CocoaFast.app + +cleanastapp: + rm -rf CocoaAssert.app + +cleandbgapp: + rm -rf CocoaDebug.app + +VMEXE:=$(APP)/Contents/MacOS/$(VM) +VMPLIST:=$(APP)/Contents/Info.plist +VMBUNDLES:=$(addprefix $(APP)/Contents/Resources/, $(addsuffix .bundle, $(EXTERNAL_PLUGINS))) +OSXICONS:=$(OSXDIR)/$(VM).icns $(wildcard $(OSXDIR)/$(SYSTEM)*.icns) +VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) +VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib + +$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(APPPOST) + +$(VMEXE): vm $(OBJDIR)/$(VM) + mkdir -p $(APP)/Contents/MacOS + cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS + +$(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle + mkdir -p $(APP)/Contents/Resources + cp -pR $< $(APP)/Contents/Resources + +$(VMPLIST): $(OSXDIR)/$(SYSTEM)-Info.plist getversion + mkdir -p $(APP)/Contents + sed "s/\$$(VERSION)/`getversion VERSION_TAG`/" $< | \ + sed "s/\$$(VERSION_NUMBER)/`getversion VERSION_NUMBER`/" | \ + sed "s/\$$(VERSION_TAG)/`getversion VERSION_TAG`/" | \ + sed "s/\$$(VIRTUAL_MACHINE_NICKNAME)/`getversion VIRTUAL_MACHINE_NICKNAME`/" | \ + sed "s/\$$(VM_NICKNAME)/`getversion VM_NICKNAME`/" > $@ + +$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib + mkdir -p $(dir $@) + $(XCUB)/ibtool --errors --warnings --notices --module $(VM) \ + --minimum-deployment-target $(TARGET_VERSION_MIN) \ + --auto-activate-custom-fonts --output-format human-readable-text \ + --compile $(VMMENUNIB) \ + $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib + +$(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns + mkdir -p $(APP)/Contents/Resources + cp -p $< $(APP)/Contents/Resources + +print-app-settings: + @echo ---------------- Makefile.app settings ------------------ + @echo APP=$(APP) + @echo VMEXE=$(VMEXE) + @echo VMBUNDLES=$(VMBUNDLES) + @echo VMPLIST=$(VMPLIST) + @echo VMICONS=$(VMICONS) + @echo ----------------------------------------------------- Copied: branches/Cog/build.macos64x64/common/Makefile.app.newspeak (from rev 3584, branches/Cog/build.macos32x86/common/Makefile.app.newspeak) =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app.newspeak (rev 0) +++ branches/Cog/build.macos64x64/common/Makefile.app.newspeak 2016-02-11 20:54:30 UTC (rev 3585) @@ -0,0 +1,27 @@ +############################################################################## +# Generic Makefile for Mac OS X Newspeak or Glue Cocoa VM +# + +# The caller should set VMSRCDIR to point to the relevant VM source +# e.g. VMSRCDIR:= ../../nsspursrc/vm + +VM:=NewspeakVirtualMachine +SYSTEM:=Newspeak + +APPPOST:=renameExe renameIcon + +# Now include the Makefile proper, which is common to all Mac OS builds. +# +include ../common/Makefile.app + +# Rename NewspeakVirtualMachine to the problematic Newspeak Virtual Machine + +renameExe: $(APP)/Contents/MacOS/NewspeakVirtualMachine + mv $(APP)/Contents/MacOS/NewspeakVirtualMachine \ + "$(APP)/Contents/MacOS/Newspeak Virtual Machine" + +# Likewise, rename NewspeakVirtualMachine.icns + +renameIcon: $(APP)/Contents/Resources/NewspeakVirtualMachine.icns + mv $(APP)/Contents/Resources/NewspeakVirtualMachine.icns \ + "$(APP)/Contents/Resources/Newspeak Virtual Machine.icns" Modified: branches/Cog/build.macos64x64/common/Makefile.flags =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-11 00:23:41 UTC (rev 3581) +++ branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-11 20:54:30 UTC (rev 3585) @@ -6,7 +6,7 @@ XCODE:=/Applications/Xcode.app/Contents/Developer XCUB:=$(XCODE)/usr/bin SDK:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -TARGET_ARCH:=i386 +TARGET_ARCH:=x86_64 TARGET_VERSION_MIN:=10.6 CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX \ Deleted: branches/Cog/build.macos64x64/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-11 00:23:41 UTC (rev 3581) +++ branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-11 20:54:30 UTC (rev 3585) @@ -1,159 +0,0 @@ -############################################################################# -# Generic Makefile for plugins on Cocoa Mac OS X -# Do make getversion to get makwe -n to work -# - -# VM config flags. -ifeq ("$(CONFIGURATION)","product") -OFLAGS:= -g -Os -DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 -BUILD:=build -else ifeq ("$(CONFIGURATION)","assert") -OFLAGS:= -g -O1 -fno-omit-frame-pointer -DEBUGVM=-DDEBUGVM=0 -BUILD:=buildast -else -OFLAGS:= -g -O0 -fno-omit-frame-pointer -DEBUGVM=-DDEBUGVM=1 -BUILD:=builddbg -endif - -CFLAGS:= $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS) -# The following are the four key locations (set via invocation): -# PLUGINSRCDIR: Where is the root of the src/plugins source tree? -# VMSRCDIR: Where is the root of the src vm source tree? -# PLATDIR: Where is the root of the platforms tree? -# BASEDIR: Where is the root of the build tree? -COMMONDIR:=$(BASEDIR)/../common - -############################################################################# -# Standard directory locations: -# CROSSDIR: The location of the cross platform sources -# OSXPLGDIR: The location of the iOS sources -# MAKERDIR: The location of the VMMaker generated sources -# BUILDDIR: The location where the plugin is built -# -#PLUGINSRCDIR:= ../../src/plugins -CROSSDIR:= $(PLATDIR)/Cross/plugins/$(LIBNAME) -OSXDIR:= $(PLATDIR)/iOS/vm/OSX -OSXPLGDIR:= $(PLATDIR)/iOS/plugins/$(LIBNAME) -UNIXDIR:= $(PLATDIR)/unix/vm -MAKERDIR:= $(PLUGINSRCDIR)/$(LIBNAME) -BUILDDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) - -# Support directory locations -CROSSVMDIR:=$(PLATDIR)/Cross/vm -OSXVMDIR:=$(PLATDIR)/iOS/vm/OSX -MAKERVMDIR:=$(VMSRCDIR) - -# INCDIRS are where include files are searched for. A superset of SRCDIRS. -INCDIRS:= $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR) $(INCDIRS) -INCLUDES:= $(addprefix -I,. $(INCDIRS)) $(INCLUDES) - -############################################################################# -# If no source files were given, use standard set -# - -SRCDIRS:=$(SRCDIRS) $(MAKERDIR) $(CROSSDIR) $(OSXPLGDIR) -LIBSRC?= $(foreach d,$(SRCDIRS),$(wildcard $(d)/*.c) $(wildcard $(d)/*.cpp) $(wildcard $(d)/*.m)) -ifneq ($(EXCLUDESRC),) -LIBSRC:=$(filter-out $(EXCLUDESRC),$(LIBSRC)) -endif - - -############################################################################# -# bundle settings -# -# Note: By default DLLTOOL/DLLWRAP do the work for everything related to plugins -# but if LINK_WITH_GCC we use gcc and if LINK_WITH_GPP we use g++. -# -DLLTOOL:= dlltool -DLLWRAP:= dllwrap -mno-cygwin -#OPTSTRIP:= strip # for production -OPTSTRIP:= echo not doing strip - -############################################################################# -# Plugin settings -# -OBJDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) -VMDIR:= $(BASEDIR)/$(BUILD)/vm -PLUGINLIB:= $(VMDIR)/$(LIBNAME).lib -PLUGINBUNDLE:= $(VMDIR)/$(LIBNAME).bundle -PLUGINEXE:= $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME) -# https://developer.apple.com/library/ios/documentation/General/Reference/Inf… -PLUGINPLIST:= $(PLUGINBUNDLE)/Contents/Info.plist -PLUGINICONS:= $(PLUGINBUNDLE)/Contents/Resources/SqueakPlugin.icns -LIBOBJ?=$(notdir $(LIBSRC)) -LIBOBJ:=$(patsubst %.c,%.o,$(patsubst %.m,%.o,$(patsubst %.cpp,%.o,$(LIBOBJ)))) -LIBOBJ:=$(addprefix $(OBJDIR)/,$(LIBOBJ)) - -VPATH:= $(SRCDIRS) - -############################################################################# -# Rules for automated builds - -include $(COMMONDIR)/Makefile.rules - -all: $(PLUGINLIB) $(PLUGINBUNDLE) - -print-settings: - @echo ---------------- Makefile.plugin settings ------------------ - @echo PWD=$(shell pwd) - @echo VPATH=$(VPATH) - @echo INCLUDES=$(INCLUDES) - @echo CFLAGS=$(CFLAGS) - @echo PLUGINSRCDIR=$(PLUGINSRCDIR) - @echo VMSRCDIR=$(VMSRCDIR) - @echo CROSSDIR=$(CROSSDIR) - @echo OSXPLGDIR=$(OSXPLGDIR) - @echo OSXDIR=$(OSXDIR) - @echo MAKERDIR=$(MAKERDIR) - @echo CROSSSRC=$(CROSSSRC) - @echo OSXSRC=$(OSXSRC) - @echo MAKERSRC=$(MAKERSRC) - @echo SRCDIRS=$(SRCDIRS) - @echo LIBSRC=$(LIBSRC) - @echo LIBOBJ=$(LIBOBJ) - @echo OBJDIR=$(OBJDIR) - @echo VMDIR=$(VMDIR) - @echo PLUGINLIB=$(PLUGINLIB) - @echo PLUGINEXE=$(PLUGINEXE) - @echo PLUGINBUNDLE=$(PLUGINBUNDLE) - @echo ----------------------------------------------------- - -$(OBJDIR): - mkdir -p $(OBJDIR) - -$(VMDIR): - mkdir -p $(VMDIR) - -$(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ) - -rm $(PLUGINLIB) - ar -rc $(PLUGINLIB) $(LIBOBJ) - -# Either link with normal compiler/linker or with cpp compiler/linker. If -# LINK_WITH_CPP is set, use e.g. clang++ -$(PLUGINBUNDLE): $(PLUGINEXE) $(PLUGINICONS) $(PLUGINPLIST) - -$(PLUGINEXE): $(VMDIR) $(OBJDIR) $(LIBOBJ) - mkdir -p $(PLUGINBUNDLE)/Contents/MacOS -ifneq ($(LINK_WITH_CPP),) - $(LDCXX) \ - $(BFLAGS) \ - $(LIBOBJ) $(EXTRALIBS) \ - -o $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME) -else - $(LD) \ - $(BFLAGS) \ - $(LIBOBJ) $(EXTRALIBS) \ - -o $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME) -endif - -$(PLUGINICONS): $(OSXDIR)/SqueakPlugin.icns - mkdir -p $(PLUGINBUNDLE)/Contents/Resources - cp -p $< $@ - -$(PLUGINPLIST): $(PLATDIR)/iOS/plugins/Info.plist getversion - mkdir -p $(PLUGINBUNDLE)/Contents - sed "s/\$$(VERSION)/`getversion VERSION_TAG`/" $< | \ - sed "s/\$(LIBNAME)/$(LIBNAME)/" > $(PLUGINPLIST) Copied: branches/Cog/build.macos64x64/common/Makefile.plugin (from rev 3584, branches/Cog/build.macos32x86/common/Makefile.plugin) =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.plugin (rev 0) +++ branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-11 20:54:30 UTC (rev 3585) @@ -0,0 +1,172 @@ +############################################################################# +# 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") +OFLAGS:= -g -Os +DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 +BUILD:=build +else ifeq ("$(CONFIGURATION)","assert") +OFLAGS:= -g -O1 -fno-omit-frame-pointer +DEBUGVM=-DDEBUGVM=0 +BUILD:=buildast +else +OFLAGS:= -g -O0 -fno-omit-frame-pointer +DEBUGVM=-DDEBUGVM=1 +BUILD:=builddbg +endif + +CFLAGS:= $(CFLAGS) $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS) +# The following are the four key locations (set via invocation): +# PLUGINSRCDIR: Where is the root of the src/plugins source tree? +# VMSRCDIR: Where is the root of the src vm source tree? +# PLATDIR: Where is the root of the platforms tree? +# BASEDIR: Where is the root of the build tree? +COMMONDIR:=$(BASEDIR)/../common + +############################################################################# +# Standard directory locations: +# CROSSDIR: The location of the cross platform sources +# OSXPLGDIR: The location of the iOS sources +# MAKERDIR: The location of the VMMaker generated sources +# BUILDDIR: The location where the plugin is built +# +#PLUGINSRCDIR:= ../../src/plugins +CROSSDIR:= $(PLATDIR)/Cross/plugins/$(LIBNAME) +OSXDIR:= $(PLATDIR)/iOS/vm/OSX +OSXPLGDIR:= $(PLATDIR)/iOS/plugins/$(LIBNAME) +UNIXDIR:= $(PLATDIR)/unix/vm +MAKERDIR:= $(PLUGINSRCDIR)/$(LIBNAME) +BUILDDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) + +# Support directory locations +CROSSVMDIR:=$(PLATDIR)/Cross/vm +OSXVMDIR:=$(PLATDIR)/iOS/vm/OSX +MAKERVMDIR:=$(VMSRCDIR) + +# INCDIRS are where include files are searched for. A superset of SRCDIRS. +INCDIRS:= $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR) $(INCDIRS) +INCLUDES:= $(addprefix -I,. $(INCDIRS)) + +############################################################################# +# If no source files were given, use standard set +# + +SRCDIRS:=$(SRCDIRS) $(MAKERDIR) $(CROSSDIR) $(OSXPLGDIR) +LIBSRC?= $(foreach d,$(SRCDIRS),$(wildcard $(d)/*.c) $(wildcard $(d)/*.cpp) $(wildcard $(d)/*.m)) +ifneq ($(EXCLUDESRC),) +LIBSRC:=$(filter-out $(EXCLUDESRC),$(LIBSRC)) +endif + + +############################################################################# +# bundle settings +# +# Note: By default DLLTOOL/DLLWRAP do the work for everything related to plugins +# but if LINK_WITH_GCC we use gcc and if LINK_WITH_GPP we use g++. +# +DLLTOOL:= dlltool +DLLWRAP:= dllwrap -mno-cygwin +#OPTSTRIP:= strip # for production +OPTSTRIP:= echo not doing strip + +############################################################################# +# Plugin settings +# +OBJDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) +VMDIR:= $(BASEDIR)/$(BUILD)/vm +PLUGINLIB:= $(VMDIR)/$(LIBNAME).lib +PLUGINBUNDLE:= $(VMDIR)/$(LIBNAME).bundle +PLUGINEXE:= $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME) +# https://developer.apple.com/library/ios/documentation/General/Reference/Inf… +PLUGINPLIST:= $(PLUGINBUNDLE)/Contents/Info.plist +PLUGINICONS:= $(PLUGINBUNDLE)/Contents/Resources/SqueakPlugin.icns +LIBOBJ?=$(notdir $(LIBSRC)) +LIBOBJ:=$(patsubst %.c,%.o,$(patsubst %.m,%.o,$(patsubst %.cpp,%.o,$(LIBOBJ)))) +LIBOBJ:=$(addprefix $(OBJDIR)/,$(LIBOBJ)) + +VPATH:= $(SRCDIRS) + +############################################################################# +# Rules for automated builds + +include $(COMMONDIR)/Makefile.rules + +all: $(PLUGINLIB) $(PLUGINBUNDLE) + +print-settings: + @echo ---------------- Makefile.plugin settings ------------------ + @echo PWD=$(shell pwd) + @echo MAKEFILE=$(MAKEFILE) + @echo VPATH=$(VPATH) + @echo INCLUDES=$(INCLUDES) + @echo CFLAGS=$(CFLAGS) + @echo PLUGINSRCDIR=$(PLUGINSRCDIR) + @echo VMSRCDIR=$(VMSRCDIR) + @echo CROSSDIR=$(CROSSDIR) + @echo OSXPLGDIR=$(OSXPLGDIR) + @echo OSXDIR=$(OSXDIR) + @echo MAKERDIR=$(MAKERDIR) + @echo CROSSSRC=$(CROSSSRC) + @echo OSXSRC=$(OSXSRC) + @echo MAKERSRC=$(MAKERSRC) + @echo SRCDIRS=$(SRCDIRS) + @echo INCDIRS=$(INCDIRS) + @echo LIBSRC=$(LIBSRC) + @echo LIBOBJ=$(LIBOBJ) + @echo OBJDIR=$(OBJDIR) + @echo VMDIR=$(VMDIR) + @echo PLUGINLIB=$(PLUGINLIB) + @echo PLUGINEXE=$(PLUGINEXE) + @echo PLUGINBUNDLE=$(PLUGINBUNDLE) + @echo ----------------------------------------------------- + +$(OBJDIR): + mkdir -p $(OBJDIR) + +$(VMDIR): + mkdir -p $(VMDIR) + +$(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ) + -rm $(PLUGINLIB) + ar -rc $(PLUGINLIB) $(LIBOBJ) + +# Either link with normal compiler/linker or with cpp compiler/linker. If +# LINK_WITH_CPP is set, use e.g. clang++ +$(PLUGINBUNDLE): $(PLUGINEXE) $(PLUGINICONS) $(PLUGINPLIST) + +$(PLUGINEXE): $(VMDIR) $(OBJDIR) $(LIBOBJ) + mkdir -p $(PLUGINBUNDLE)/Contents/MacOS +ifneq ($(LINK_WITH_CPP),) + $(LDCXX) \ + $(BFLAGS) \ + $(LIBOBJ) $(EXTRALIBS) \ + -o $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME) +else + $(LD) \ + $(BFLAGS) \ + $(LIBOBJ) $(EXTRALIBS) \ + -o $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME) +endif + +$(PLUGINICONS): $(OSXDIR)/SqueakPlugin.icns + mkdir -p $(PLUGINBUNDLE)/Contents/Resources + cp -p $< $@ + +$(PLUGINPLIST): $(PLATDIR)/iOS/plugins/Info.plist getversion + mkdir -p $(PLUGINBUNDLE)/Contents + sed "s/\$$(VERSION)/`getversion VERSION_TAG`/" $< | \ + sed "s/\$(LIBNAME)/$(LIBNAME)/" > $(PLUGINPLIST) Deleted: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-11 00:23:41 UTC (rev 3581) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-11 20:54:30 UTC (rev 3585) @@ -1,242 +0,0 @@ -############################################################################# -# Generic Makefile for Mac OS VM -# Do make getversion to get makwe -n to work -# -# This is designed to be invoked by Makefile in a specific build directory via -# include ../common/Makefile.app -# -# Parameters: -# VMSRCDIR defines the locaton of the VM source to build. Required. -# -# COGDEFS supply any command-line defines to use, and may be null. -# -# The name of the VM to build, e.g. Squeak or "Newspeak Virtual Machine" -# and its short name, e.g. Squeak or Newspeak, used to choose app icon files. - -VM?=Squeak -SYSTEM?=$(VM) - -# PLUGINSRCDIR defines the locaton of the plugin source, the subsets of which -# selected by plugins.int and plugins.ext will be built. - -PLUGINSRCDIR?=../../src/plugins - -# CONFIGURATION defines what version of the VM to build, product, assert or -# debug. The default is overridden in the mvm script - -CONFIGURATION?=product - - -############################################################################# -# Build directories -# -ifndef BASEDIR -BASEDIR:=. -endif -COMMONDIR:=$(BASEDIR)/../common - -ifeq ("$(CONFIGURATION)","product") - BUILD:=build -else ifeq ("$(CONFIGURATION)","assert") - BUILD:=buildast -else - BUILD:=builddbg -endif -$(shell mkdir -p deps >/dev/null) # deps is the dependencies directory -BLDDIR:= $(BASEDIR)/$(BUILD) -OBJDIR:= $(BLDDIR)/vm - -# N.B. PLATDIR *must* be a relative path, see -f../../$(shell test -f ...) below -PLATDIR:=../../platforms -CROSSDIR:=$(PLATDIR)/Cross/vm -OSXDIR:=$(PLATDIR)/iOS/vm/OSX -OSXCOMMONDIR:=$(PLATDIR)/iOS/vm/Common -OSXCLASSESDIR:=$(PLATDIR)/iOS/vm/Common/Classes -OSXPLUGINSDIR:=$(PLATDIR)/iOS/plugins -UNIXVMDIR:=$(PLATDIR)/unix/vm - -MAKERSRC:=$(addprefix $(VMSRCDIR)/,gcc3x-cointerp.c cogit.c) -CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) -XEX:=%/sqSqueakMainApplication+screen.m -OSXSRC:=$(wildcard $(OSXDIR)/*.c) $(filter-out $(XEX),$(wildcard $(OSXDIR)/*.m)) \ - $(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \ - $(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m) -UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixMemory.c \ - sqUnixSpurMemory.c sqUnixThreads.c sqUnixVMProfile.c) -VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(UNIXSRC) -VMOBJ:= $(notdir $(VMSRC)) -VMOBJ:= $(VMOBJ:.c=.o) -VMOBJ:= $(VMOBJ:.m=.o) -VMOBJ:= $(VMOBJ:.cpp=.o) -VMOBJ:= $(addprefix $(OBJDIR)/,$(VMOBJ)) - -# N.B. Most important that OSXCOMMONDIR precede OSXDIR so that the above -# exclusion of OSXDIR/sqSqueakMainApplication+screen.m works, since there -# exists a OSXCOMMONDIR/sqSqueakMainApplication+screen.m. -SRCDIRS:=$(VMSRCDIR) $(OSXCOMMONDIR) $(OSXCLASSESDIR) $(OSXDIR) $(UNIXVMDIR) $(CROSSDIR) -VPATH:=$(SRCDIRS) -# Additonal includes are required, eg for SoundPlugin/sqSqueakSoundCoreAudio.h -PluginIncludes := FilePlugin HostWindowPlugin SoundPlugin -OSPluginIncludes := FilePlugin HostWindowPlugin SoundPlugin -SRCDIRS:=$(SRCDIRS) \ - $(addprefix $(PLATDIR)/Cross/plugins/,$(PluginIncludes)) \ - $(addprefix $(OSXPLUGINSDIR)/,$(OSPluginIncludes)) - -# The internal (.lib) and external (.bundle) plugins -# -include plugins.int -include plugins.ext - -LIBS:= $(addprefix $(OBJDIR)/, $(addsuffix .lib, $(INTERNAL_PLUGINS))) -BUNDLES:= $(addprefix $(OBJDIR)/, $(addsuffix .bundle, $(EXTERNAL_PLUGINS))) - - -# VM config flags. -ifeq ("$(CONFIGURATION)","product") -OFLAGS:= -g -Os -DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 # Define NDEBUG for production to exclude asserts -INTERPFLAGS:=-D'VM_LABEL(foo)=0' -else ifeq ("$(CONFIGURATION)","assert") -OFLAGS:= -g -O1 -fno-omit-frame-pointer -DEBUGVM=-DDEBUGVM=0 -INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' -else -OFLAGS:= -g -O0 -fno-omit-frame-pointer -DEBUGVM=-DDEBUGVM=1 -INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' -endif - -TZ:=$(shell date +%Z) -DEFS:= $(COGDEFS) -DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \ - -DUSE_INLINE_MEMORY_ACCESSORS -D'TZ="$(TZ)"' \ - $(INTERPFLAGS) -XDEFS:= -DSQUEAK_BUILTIN_PLUGIN -CFLAGS:= $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(DEFS) $(XDEFS) -INCLUDES:= $(addprefix -I,. $(SRCDIRS)) - -############################################################################# -# Linker settings -# -LD:= gcc - -############################################################################# -# -SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) - - -############################################################################# -# Common build rules -# -include $(COMMONDIR)/Makefile.rules - -svnver: - @-echo $(SVNREV) - -getversion: $(OSXCOMMONDIR)/version.c $(CROSSDIR)/sqSCCSVersion.h -getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqSCCSVersion.h - $(CC) -x c -DVERSION_PROGRAM=1 $(ALLFLAGS) $(INCLUDES) $< -o $@ - $(POSTCOMPILE) - --include deps/version.d - -product:; - $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product $(@,product=) default - -assert: - $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=assert $(@,assert=) default - -debug: - $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=debug $(@,debug=) default - -cleanallvm: cleanvm cleanvmast cleanvmdbg - -cleanvm: - rm -rf sqNamedPrims.h build deps - -cleanvmast: - rm -rf sqNamedPrims.h buildast - -cleanvmdbg: - rm -rf sqNamedPrims.h builddbg - -print-source: - @echo ---------------- Makefile.vm sources ------------------ - @echo CROSSSRC=$(CROSSSRC) - @echo OSXSRC=$(OSXSRC) - @echo MAKERSRC=$(MAKERSRC) - @echo UNIXSRC=$(UNIXSRC) - @echo VMSRC=$(VMSRC) - -print-settings: - @echo ---------------- Makefile.vm settings ------------------ - @echo CONFIGURATION=$(CONFIGURATION) - @echo VPATH=$(VPATH) - @echo INCLUDES=$(INCLUDES) - @echo CFLAGS=$(CFLAGS) - @echo INTERNAL_PLUGINS=$(INTERNAL_PLUGINS) - @echo EXTERNAL_PLUGINS=$(EXTERNAL_PLUGINS) - @echo OBJDIR=$(OBJDIR) - @echo LIBS=$(LIBS) - @echo BUNDLES=$(BUNDLES) - @echo ----------------------------------------------------- - -print-objects: - @echo ---------------- Makefile.vm objects ------------------ - @echo VMOBJ=$(VMOBJ) - @echo ----------------------------------------------------- - -vm: $(OBJDIR)/$(VM) - -$(OBJDIR)/$(VM): $(OBJDIR) $(VMOBJ) $(LIBS) - $(CC) -arch $(TARGET_ARCH) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(OSXCOMMONDIR)/version.c - $(CC) -arch $(TARGET_ARCH) -isysroot $(SDK) $(LDFLAGS) $(FRAMEWORKS) \ - -o $(OBJDIR)/$(VM) $(VMOBJ) $(LIBS) - -$(OBJDIR): - @-mkdir -p $(BLDDIR) - mkdir -p $(OBJDIR) -ifneq ($(INTERNAL_PLUGINS),) - mkdir -p $(addprefix $(BLDDIR)/, $(INTERNAL_PLUGINS)) -endif -ifneq ($(EXTERNAL_PLUGINS),) - mkdir -p $(addprefix $(BLDDIR)/, $(EXTERNAL_PLUGINS)) -endif - -############################################################################# -# Building plugins -# -.PHONY: FORCE - -# Internal plugin. Build as lib then link in lib -# Check for Makefile in iOS plugins directory otherwise use default Makefile -# N.B. PLATDIR *must* be a relative path for this to work -$(OBJDIR)/%.lib: getversion FORCE - @-mkdir -p $(BLDDIR)/$(*F) - $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ - -f $(shell test -f $(OSXPLUGINSDIR)/$(*F)/Makefile && echo $(OSXPLUGINSDIR)/$(*F)/Makefile || echo $(COMMONDIR)/Makefile.plugin) \ - CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ - PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \ - PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ - LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \ - $(OBJDIR)/$(*F).lib - -# External plugin. Build as bundle and copy to vm dir ($(OBJDIR)). -# Check for Makefile in iOS plugins directory otherwise use default Makefile -$(OBJDIR)/%.bundle: getversion FORCE - @-mkdir -p $(BLDDIR)/$(*F) - $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ - -f $(shell test -f $(OSXPLUGINSDIR)/$(*F)/Makefile && echo $(OSXPLUGINSDIR)/$(*F)/Makefile || echo $(COMMONDIR)/Makefile.plugin) \ - CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ - PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \ - PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ - COGDEFS="$(COGDEFS)" LIBNAME=$(*F) $(OBJDIR)/$(*F).bundle - -FORCE: - -############################################################################# -# Extra specific dependencies -# -sqNamedPrims.h: plugins.int - $(COMMONDIR)/mkNamedPrims.sh plugins.int > sqNamedPrims.h - -$(OBJDIR)/sqNamedPrims.o: sqNamedPrims.c sqNamedPrims.h Copied: branches/Cog/build.macos64x64/common/Makefile.vm (from rev 3584, branches/Cog/build.macos32x86/common/Makefile.vm) =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm (rev 0) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-11 20:54:30 UTC (rev 3585) @@ -0,0 +1,259 @@ +############################################################################# +# Generic Makefile for Mac OS VM +# Do make getversion to get makwe -n to work +# +# This is designed to be invoked by Makefile in a specific build directory via +# include ../common/Makefile.app +# +# Parameters: +# VMSRCDIR defines the locaton of the VM source to build. Required. +# +# COGDEFS supply any command-line defines to use, and may be null. +# +# The name of the VM to build, e.g. Squeak or "Newspeak Virtual Machine" +# and its short name, e.g. Squeak or Newspeak, used to choose app icon files. + +VM?=Squeak +SYSTEM?=$(VM) + +# PLUGINSRCDIR defines the locaton of the plugin source, the subsets of which +# selected by plugins.int and plugins.ext will be built. + +PLUGINSRCDIR?=../../src/plugins + +# CONFIGURATION defines what version of the VM to build, product, assert or +# debug. The default is overridden in the mvm script + +CONFIGURATION?=product + + +############################################################################# +# Build directories +# +ifndef BASEDIR +BASEDIR:=. +endif +COMMONDIR:=$(BASEDIR)/../common + +ifeq ("$(CONFIGURATION)","assert") + BUILD:=buildast +else ifeq ("$(CONFIGURATION)","debug") + BUILD:=builddbg +else # default CONFIGURATION=product + BUILD:=build +endif +$(shell mkdir -p deps >/dev/null) # deps is the dependencies directory +BLDDIR:= $(BASEDIR)/$(BUILD) +OBJDIR:= $(BLDDIR)/vm + +# N.B. PLATDIR *must* be a relative path, see -f../../$(shell test -f ...) below +PLATDIR:=../../platforms +CROSSDIR:=$(PLATDIR)/Cross/vm +OSXDIR:=$(PLATDIR)/iOS/vm/OSX +OSXCOMMONDIR:=$(PLATDIR)/iOS/vm/Common +OSXCLASSESDIR:=$(PLATDIR)/iOS/vm/Common/Classes +OSXPLUGINSDIR:=$(PLATDIR)/iOS/plugins +UNIXVMDIR:=$(PLATDIR)/unix/vm + +MAKERSRC:=$(addprefix $(VMSRCDIR)/,gcc3x-cointerp.c cogit.c) +CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) +XEX:=%/sqSqueakMainApplication+screen.m +OSXSRC:=$(wildcard $(OSXDIR)/*.c) $(filter-out $(XEX),$(wildcard $(OSXDIR)/*.m)) \ + $(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \ + $(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m) +UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixMemory.c \ + sqUnixSpurMemory.c sqUnixThreads.c sqUnixVMProfile.c) +VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(UNIXSRC) +VMOBJ:= $(notdir $(VMSRC)) +VMOBJ:= $(VMOBJ:.c=.o) +VMOBJ:= $(VMOBJ:.m=.o) +VMOBJ:= $(VMOBJ:.cpp=.o) +VMOBJ:= $(addprefix $(OBJDIR)/,$(VMOBJ)) + +# N.B. Most important that OSXCOMMONDIR precede OSXDIR so that the above +# exclusion of OSXDIR/sqSqueakMainApplication+screen.m works, since there +# exists a OSXCOMMONDIR/sqSqueakMainApplication+screen.m. +SRCDIRS:=$(VMSRCDIR) $(OSXCOMMONDIR) $(OSXCLASSESDIR) $(OSXDIR) $(UNIXVMDIR) $(CROSSDIR) +VPATH:=$(SRCDIRS) +# Additonal includes are required, eg for SoundPlugin/sqSqueakSoundCoreAudio.h +PluginIncludes := FilePlugin HostWindowPlugin SoundPlugin +OSPluginIncludes := FilePlugin HostWindowPlugin SoundPlugin +SRCDIRS:=$(SRCDIRS) \ + $(addprefix $(PLATDIR)/Cross/plugins/,$(PluginIncludes)) \ + $(addprefix $(OSXPLUGINSDIR)/,$(OSPluginIncludes)) + +# The internal (.lib) and external (.bundle) plugins +# +include plugins.int +include plugins.ext + +LIBS:= $(addprefix $(OBJDIR)/, $(addsuffix .lib, $(INTERNAL_PLUGINS))) +BUNDLES:= $(addprefix $(OBJDIR)/, $(addsuffix .bundle, $(EXTERNAL_PLUGINS))) + + +# VM config flags. +ifeq ("$(CONFIGURATION)","debug") +OFLAGS:= -g -O0 -fno-omit-frame-pointer +DEBUGVM=-DDEBUGVM=1 +INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' +else ifeq ("$(CONFIGURATION)","assert") +OFLAGS:= -g -O1 -fno-omit-frame-pointer +DEBUGVM=-DDEBUGVM=0 +INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' +else # default CONFIGURATION=product +OFLAGS:= -g -Os +DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 # Define NDEBUG for production to exclude asserts +INTERPFLAGS:=-D'VM_LABEL(foo)=0' +endif + +TZ:=$(shell date +%Z) +DEFS:= $(COGDEFS) -DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \ + -DUSE_INLINE_MEMORY_ACCESSORS -D'TZ="$(TZ)"' \ + $(INTERPFLAGS) +XDEFS:= -DSQUEAK_BUILTIN_PLUGIN +CFLAGS:= $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(DEFS) $(XDEFS) +INCLUDES:= $(addprefix -I,. $(SRCDIRS)) + +############################################################################# +# Linker settings +# +LD:= gcc + +############################################################################# +# +SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) + + +############################################################################# +# Common build rules +# +include $(COMMONDIR)/Makefile.rules + +svnver: + @-echo $(SVNREV) + +getversion: $(OSXCOMMONDIR)/version.c $(CROSSDIR)/sqSCCSVersion.h +getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqSCCSVersion.h + $(CC) -x c -DVERSION_PROGRAM=1 $(ALLFLAGS) $(INCLUDES) $< -o $@ + $(POSTCOMPILE) + +-include deps/version.d + +product:; + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product $(@,product=) default + +assert: + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=assert $(@,assert=) default + +debug: + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=debug $(@,debug=) default + +cleanallvm: cleanvm cleanvmast cleanvmdbg cleangv + +cleanvm: + rm -rf sqNamedPrims.h build deps + +cleanvmast: + rm -rf sqNamedPrims.h buildast + +cleanvmdbg: + rm -rf sqNamedPrims.h builddbg + +cleangv: + rm -rf getversion getversion.* + +print-source: + @echo ---------------- Makefile.vm sources ------------------ + @echo CROSSSRC=$(CROSSSRC) + @echo OSXSRC=$(OSXSRC) + @echo MAKERSRC=$(MAKERSRC) + @echo UNIXSRC=$(UNIXSRC) + @echo VMSRC=$(VMSRC) + +print-settings: + @echo ---------------- Makefile.vm settings ------------------ + @echo CONFIGURATION=$(CONFIGURATION) + @echo VPATH=$(VPATH) + @echo INCLUDES=$(INCLUDES) + @echo CFLAGS=$(CFLAGS) + @echo INTERNAL_PLUGINS=$(INTERNAL_PLUGINS) + @echo EXTERNAL_PLUGINS=$(EXTERNAL_PLUGINS) + @echo OBJDIR=$(OBJDIR) + @echo LIBS=$(LIBS) + @echo BUNDLES=$(BUNDLES) + @echo MAKEFILE=$(MAKEFILE) + @echo ----------------------------------------------------- + +print-objects: + @echo ---------------- Makefile.vm objects ------------------ + @echo VMOBJ=$(VMOBJ) + @echo ----------------------------------------------------- + +vm: $(OBJDIR)/$(VM) + +$(OBJDIR)/$(VM): $(OBJDIR) $(VMOBJ) $(LIBS) + $(CC) -arch $(TARGET_ARCH) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(OSXCOMMONDIR)/version.c + $(CC) -arch $(TARGET_ARCH) -isysroot $(SDK) $(LDFLAGS) $(FRAMEWORKS) \ + -o $(OBJDIR)/$(VM) $(VMOBJ) $(LIBS) + +$(OBJDIR): + @-mkdir -p $(BLDDIR) + mkdir -p $(OBJDIR) +ifneq ($(INTERNAL_PLUGINS),) + mkdir -p $(addprefix $(BLDDIR)/, $(INTERNAL_PLUGINS)) +endif +ifneq ($(EXTERNAL_PLUGINS),) + mkdir -p $(addprefix $(BLDDIR)/, $(EXTERNAL_PLUGINS)) +endif + +############################################################################# +# Building plugins +# +.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle %.lib %.bundle + +plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo $(COMMONDIR)/Makefile.plugin) + +# Internal plugin. Build as lib then link in lib +# Check for Makefile in iOS plugins directory otherwise use default Makefile +# N.B. PLATDIR *must* be a relative path for this to work +$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F)) + @-mkdir -p $(BLDDIR)/$(*F) + test $@ -ot $(call plugin-makefile,$(*F)) && rm $(OBJDIR)/$(*F).lib || true + $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ + -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ + CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ + PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \ + PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ + LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \ + $(PLUGINHACK) \ + $(OBJDIR)/$(*F).lib + +# It would be nice to have this abbreviation but it creates havoc eem 2/2016 +#%.lib: $(OBJDIR)/%.lib +# make $(MAKEFLAGS) $< + +# External plugin. Build as bundle and copy to vm dir ($(OBJDIR)). +# Check for Makefile in iOS plugins directory otherwise use default Makefile +$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F)) + @-mkdir -p $(BLDDIR)/$(*F) + test $@ -ot $(call plugin-makefile,$(*F)) && rm $(OBJDIR)/$(*F).lib || true + $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ + -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ + CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ + PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \ + PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ + LIBNAME=$(*F) COGDEFS="$(COGDEFS)" \ + $(PLUGINHACK) \ + $(OBJDIR)/$(*F).bundle + +# It would be nice to have this abbreviation but it creates havoc eem 2/2016 +#%.bundle: $(OBJDIR)/%.bundle +# make $(MAKEFLAGS) $< + +############################################################################# +# Extra specific dependencies +# +sqNamedPrims.h: plugins.int + $(COMMONDIR)/mkNamedPrims.sh plugins.int > sqNamedPrims.h + +$(OBJDIR)/sqNamedPrims.o: sqNamedPrims.c sqNamedPrims.h Deleted: branches/Cog/build.macos64x64/newspeak.cog.spur/CoreVM.plist =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/CoreVM.plist 2016-02-11 20:07:36 UTC (rev 3584) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/CoreVM.plist 2016-02-11 20:54:30 UTC (rev 3585) @@ -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> - <key>CFBundleShortVersionString</key> - <string>Newspeak Cog Spur Virtual Machine 5.0.0</string> - <key>CFBundleVersion</key> - <string>5.0.0</string> - <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.macos64x64/newspeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile (rev 0) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile 2016-02-11 20:54:30 UTC (rev 3585) @@ -0,0 +1,8 @@ +############################################################################## +# 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 + +include ../common/Makefile.app.newspeak Deleted: branches/Cog/build.macos64x64/newspeak.cog.spur/makeclean =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/makeclean 2016-02-11 20:07:36 UTC (rev 3584) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/makeclean 2016-02-11 20:54:30 UTC (rev 3585) @@ -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.macos64x64/newspeak.cog.spur/makevm =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/makevm 2016-02-11 20:07:36 UTC (rev 3584) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/makevm 2016-02-11 20:54:30 UTC (rev 3585) @@ -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 @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3584] Mac OS X gnu makefiles:
by commits＠squeakvm.org 11 Feb '16

11 Feb '16

Revision: 3584 Author: eliot Date: 2016-02-11 12:07:36 -0800 (Thu, 11 Feb 2016) Log Message: ----------- Mac OS X gnu makefiles: Make the Newspeak VMs build (must include sound & host window plugins). Factor out the name mangling necessary to put spaces in the Newspeak exe & icns into common/Makefile.app.newspeak. Factor out chosing the relevant plugin Makefile into a function. Add a dummy ioDrainEventQueue to the iOS source. Freshen the spur VM source which was accidentally unofficial. 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/Makefile branches/Cog/build.macos32x86/glue.cog.spur/plugins.int branches/Cog/build.macos32x86/glue.stack.spur/Makefile branches/Cog/build.macos32x86/glue.stack.spur/plugins.int branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile branches/Cog/build.macos32x86/newspeak.cog.spur/plugins.int branches/Cog/build.macos32x86/newspeak.stack.spur/Makefile branches/Cog/build.macos32x86/newspeak.stack.spur/plugins.int branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c Added Paths: ----------- branches/Cog/build.macos32x86/common/Makefile.app.newspeak branches/Cog/build.macos32x86/newspeak.cog.spur/mvm branches/Cog/build.macos32x86/newspeak.stack.spur/mvm branches/Cog/platforms/iOS/plugins/AsynchFilePlugin/ branches/Cog/platforms/iOS/plugins/AsynchFilePlugin/Makefile branches/Cog/platforms/iOS/plugins/FileCopyPlugin/ branches/Cog/platforms/iOS/plugins/FileCopyPlugin/Makefile branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist branches/Cog/platforms/iOS/vm/OSX/NewspeakVirtualMachine.icns Removed Paths: ------------- branches/Cog/platforms/iOS/vm/OSX/Newspeak Virtual Machine.icns Property Changed: ---------------- 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 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 20:07:36 UTC (rev 3584) @@ -54,7 +54,7 @@ $(VMEXE): vm $(OBJDIR)/$(VM) mkdir -p $(APP)/Contents/MacOS - cp $(OBJDIR)/$(VM) $(APP)/Contents/MacOS + cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS $(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle mkdir -p $(APP)/Contents/Resources @@ -65,6 +65,7 @@ sed "s/\$$(VERSION)/`getversion VERSION_TAG`/" $< | \ sed "s/\$$(VERSION_NUMBER)/`getversion VERSION_NUMBER`/" | \ sed "s/\$$(VERSION_TAG)/`getversion VERSION_TAG`/" | \ + sed "s/\$$(VIRTUAL_MACHINE_NICKNAME)/`getversion VIRTUAL_MACHINE_NICKNAME`/" | \ sed "s/\$$(VM_NICKNAME)/`getversion VM_NICKNAME`/" > $@ $(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib Added: branches/Cog/build.macos32x86/common/Makefile.app.newspeak =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app.newspeak (rev 0) +++ branches/Cog/build.macos32x86/common/Makefile.app.newspeak 2016-02-11 20:07:36 UTC (rev 3584) @@ -0,0 +1,27 @@ +############################################################################## +# Generic Makefile for Mac OS X Newspeak or Glue Cocoa VM +# + +# The caller should set VMSRCDIR to point to the relevant VM source +# e.g. VMSRCDIR:= ../../nsspursrc/vm + +VM:=NewspeakVirtualMachine +SYSTEM:=Newspeak + +APPPOST:=renameExe renameIcon + +# Now include the Makefile proper, which is common to all Mac OS builds. +# +include ../common/Makefile.app + +# Rename NewspeakVirtualMachine to the problematic Newspeak Virtual Machine + +renameExe: $(APP)/Contents/MacOS/NewspeakVirtualMachine + mv $(APP)/Contents/MacOS/NewspeakVirtualMachine \ + "$(APP)/Contents/MacOS/Newspeak Virtual Machine" + +# Likewise, rename NewspeakVirtualMachine.icns + +renameIcon: $(APP)/Contents/Resources/NewspeakVirtualMachine.icns + mv $(APP)/Contents/Resources/NewspeakVirtualMachine.icns \ + "$(APP)/Contents/Resources/Newspeak Virtual Machine.icns" Modified: branches/Cog/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-11 20:07:36 UTC (rev 3584) @@ -110,6 +110,7 @@ print-settings: @echo ---------------- Makefile.plugin settings ------------------ @echo PWD=$(shell pwd) + @echo MAKEFILE=$(MAKEFILE) @echo VPATH=$(VPATH) @echo INCLUDES=$(INCLUDES) @echo CFLAGS=$(CFLAGS) Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-11 20:07:36 UTC (rev 3584) @@ -92,18 +92,18 @@ # VM config flags. -ifeq ("$(CONFIGURATION)","product") -OFLAGS:= -g -Os -DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 # Define NDEBUG for production to exclude asserts -INTERPFLAGS:=-D'VM_LABEL(foo)=0' +ifeq ("$(CONFIGURATION)","debug") +OFLAGS:= -g -O0 -fno-omit-frame-pointer +DEBUGVM=-DDEBUGVM=1 +INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' else ifeq ("$(CONFIGURATION)","assert") OFLAGS:= -g -O1 -fno-omit-frame-pointer DEBUGVM=-DDEBUGVM=0 INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' -else -OFLAGS:= -g -O0 -fno-omit-frame-pointer -DEBUGVM=-DDEBUGVM=1 -INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' +else # default CONFIGURATION=product +OFLAGS:= -g -Os +DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 # Define NDEBUG for production to exclude asserts +INTERPFLAGS:=-D'VM_LABEL(foo)=0' endif TZ:=$(shell date +%Z) @@ -181,6 +181,7 @@ @echo OBJDIR=$(OBJDIR) @echo LIBS=$(LIBS) @echo BUNDLES=$(BUNDLES) + @echo MAKEFILE=$(MAKEFILE) @echo ----------------------------------------------------- print-objects: @@ -208,33 +209,46 @@ ############################################################################# # Building plugins # -.PHONY: FORCE +.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle %.lib %.bundle +plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo $(COMMONDIR)/Makefile.plugin) + # Internal plugin. Build as lib then link in lib # Check for Makefile in iOS plugins directory otherwise use default Makefile # N.B. PLATDIR *must* be a relative path for this to work -$(OBJDIR)/%.lib: getversion FORCE +$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F)) @-mkdir -p $(BLDDIR)/$(*F) + test $@ -ot $(call plugin-makefile,$(*F)) && rm $(OBJDIR)/$(*F).lib || true $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ - -f $(shell test -f $(OSXPLUGINSDIR)/$(*F)/Makefile && echo $(OSXPLUGINSDIR)/$(*F)/Makefile || echo $(COMMONDIR)/Makefile.plugin) \ + -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \ PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \ + $(PLUGINHACK) \ $(OBJDIR)/$(*F).lib +# It would be nice to have this abbreviation but it creates havoc eem 2/2016 +#%.lib: $(OBJDIR)/%.lib +# make $(MAKEFLAGS) $< + # External plugin. Build as bundle and copy to vm dir ($(OBJDIR)). # Check for Makefile in iOS plugins directory otherwise use default Makefile -$(OBJDIR)/%.bundle: getversion FORCE +$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F)) @-mkdir -p $(BLDDIR)/$(*F) + test $@ -ot $(call plugin-makefile,$(*F)) && rm $(OBJDIR)/$(*F).lib || true $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ - -f $(shell test -f $(OSXPLUGINSDIR)/$(*F)/Makefile && echo $(OSXPLUGINSDIR)/$(*F)/Makefile || echo $(COMMONDIR)/Makefile.plugin) \ + -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \ PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ - COGDEFS="$(COGDEFS)" LIBNAME=$(*F) $(OBJDIR)/$(*F).bundle + LIBNAME=$(*F) COGDEFS="$(COGDEFS)" \ + $(PLUGINHACK) \ + $(OBJDIR)/$(*F).bundle -FORCE: +# It would be nice to have this abbreviation but it creates havoc eem 2/2016 +#%.bundle: $(OBJDIR)/%.bundle +# make $(MAKEFLAGS) $< ############################################################################# # Extra specific dependencies Modified: branches/Cog/build.macos32x86/glue.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/glue.cog.spur/Makefile 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/glue.cog.spur/Makefile 2016-02-11 20:07:36 UTC (rev 3584) @@ -1,12 +1,9 @@ ############################################################################## -# Makefile for Mac OS X Cog Spur Newspeak Cocoa VM using clang and gnu make 3.81 +# Makefile for Mac OS X Cog Spur Glue 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 +COGDEFS:=-DEnforceAccessControl=0 -# Now include the Makefile proper, which is common to all Mac OS builds. -# -include ../common/Makefile.app +include ../common/Makefile.app.newspeak Modified: branches/Cog/build.macos32x86/glue.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/glue.cog.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/glue.cog.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584) @@ -10,6 +10,7 @@ FilePlugin \ FloatArrayPlugin \ FloatMathPlugin \ +HostWindowPlugin \ ZipPlugin \ JPEGReadWriter2Plugin \ JPEGReaderPlugin \ @@ -20,6 +21,7 @@ RePlugin \ SecurityPlugin \ SocketPlugin \ +SoundPlugin \ SurfacePlugin \ UUIDPlugin \ UnixOSProcessPlugin \ Modified: branches/Cog/build.macos32x86/glue.stack.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/glue.stack.spur/Makefile 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/glue.stack.spur/Makefile 2016-02-11 20:07:36 UTC (rev 3584) @@ -1,12 +1,9 @@ ############################################################################## -# Makefile for Mac OS X Stack Spur Newspeak Cocoa VM using clang and gnu make 3.81 +# Makefile for Mac OS X Stack Spur Glue 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 +COGDEFS:=-DEnforceAccessControl=0 -# Now include the Makefile proper, which is common to all Mac OS builds. -# -include ../common/Makefile.app +include ../common/Makefile.app.newspeak Modified: branches/Cog/build.macos32x86/glue.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/glue.stack.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/glue.stack.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584) @@ -10,6 +10,7 @@ FilePlugin \ FloatArrayPlugin \ FloatMathPlugin \ +HostWindowPlugin \ ZipPlugin \ JPEGReadWriter2Plugin \ JPEGReaderPlugin \ @@ -20,6 +21,7 @@ RePlugin \ SecurityPlugin \ SocketPlugin \ +SoundPlugin \ SurfacePlugin \ UUIDPlugin \ UnixOSProcessPlugin \ Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile 2016-02-11 20:07:36 UTC (rev 3584) @@ -4,9 +4,5 @@ # 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 +include ../common/Makefile.app.newspeak Added: branches/Cog/build.macos32x86/newspeak.cog.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/mvm (rev 0) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/mvm 2016-02-11 20:07:36 UTC (rev 3584) @@ -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/newspeak.cog.spur/mvm ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584) @@ -10,6 +10,7 @@ FilePlugin \ FloatArrayPlugin \ FloatMathPlugin \ +HostWindowPlugin \ ZipPlugin \ JPEGReadWriter2Plugin \ JPEGReaderPlugin \ @@ -20,6 +21,7 @@ RePlugin \ SecurityPlugin \ SocketPlugin \ +SoundPlugin \ SurfacePlugin \ UUIDPlugin \ UnixOSProcessPlugin \ Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/Makefile 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/Makefile 2016-02-11 20:07:36 UTC (rev 3584) @@ -1,12 +1,8 @@ ############################################################################## -# Makefile for Mac OS X Cog Spur Newspeak Cocoa VM using clang and gnu make 3.81 +# 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 +include ../common/Makefile.app.newspeak Added: branches/Cog/build.macos32x86/newspeak.stack.spur/mvm =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/mvm (rev 0) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/mvm 2016-02-11 20:07:36 UTC (rev 3584) @@ -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/newspeak.stack.spur/mvm ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584) @@ -10,6 +10,7 @@ FilePlugin \ FloatArrayPlugin \ FloatMathPlugin \ +HostWindowPlugin \ ZipPlugin \ JPEGReadWriter2Plugin \ JPEGReaderPlugin \ @@ -20,6 +21,7 @@ RePlugin \ SecurityPlugin \ SocketPlugin \ +SoundPlugin \ SurfacePlugin \ UUIDPlugin \ UnixOSProcessPlugin \ Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584) @@ -2,6 +2,7 @@ INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AioPlugin \ +AsynchFilePlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# AsynchFilePlugin \ # JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584) @@ -2,6 +2,7 @@ INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AioPlugin \ +AsynchFilePlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# AsynchFilePlugin \ # JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-02-11 20:07:36 UTC (rev 3584) @@ -2,6 +2,7 @@ INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AioPlugin \ +AsynchFilePlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# AsynchFilePlugin \ # JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584) @@ -2,6 +2,7 @@ INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AioPlugin \ +AsynchFilePlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# AsynchFilePlugin \ # JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584) @@ -2,6 +2,7 @@ INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AioPlugin \ +AsynchFilePlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# AsynchFilePlugin \ # JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-02-11 20:07:36 UTC (rev 3584) @@ -2,6 +2,7 @@ INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AioPlugin \ +AsynchFilePlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# AsynchFilePlugin \ # JoystickTabletPlugin Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2016-02-11 20:07:36 UTC (rev 3584) @@ -144,6 +144,8 @@ if (printit("VM_NICKNAME")) printf("%s\n", NICKNAME " " OBJMEM " VM"); + if (printit("VIRTUAL_MACHINE_NICKNAME")) + printf("%s\n", NICKNAME " " OBJMEM " Virtual Machine"); if (printit("VM_MONIKER")) printf("%s\n", NICKNAME OBJMEM "VM"); if (printit("VM_VERSION")) Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Feb 10 21:05:09 PST 2016 + Thu Feb 11 12:03:34 PST 2016 Added: branches/Cog/platforms/iOS/plugins/AsynchFilePlugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/AsynchFilePlugin/Makefile (rev 0) +++ branches/Cog/platforms/iOS/plugins/AsynchFilePlugin/Makefile 2016-02-11 20:07:36 UTC (rev 3584) @@ -0,0 +1,5 @@ +SRCDIRS:=../../platforms/unix/plugins/AsynchFilePlugin +INCDIRS:=../../platforms/Cross/plugins/AsynchFilePlugin \ + ../../platforms/unix/vm + +include ../common/Makefile.plugin Added: branches/Cog/platforms/iOS/plugins/FileCopyPlugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/FileCopyPlugin/Makefile (rev 0) +++ branches/Cog/platforms/iOS/plugins/FileCopyPlugin/Makefile 2016-02-11 20:07:36 UTC (rev 3584) @@ -0,0 +1,6 @@ +SRCDIRS:=../../platforms/unix/plugins/FileCopyPlugin \ + ../../platforms/unix/vm + +LIBSRC:=FileCopyPlugin.c sqUnixFileCopyPlugin.c sqUnixCharConv.c + +include ../common/Makefile.plugin Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m 2016-02-11 20:07:36 UTC (rev 3584) @@ -101,3 +101,11 @@ } */ return 0; } + +#if NewspeakVM +/* For now this is only here to make the linker happy; + the function really does something interesting only on Windows. + */ +void +ioDrainEventQueue() {} +#endif /* NewspeakVM */ Deleted: branches/Cog/platforms/iOS/vm/OSX/Newspeak Virtual Machine.icns =================================================================== (Binary files differ) Added: branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist (rev 0) +++ branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist 2016-02-11 20:07:36 UTC (rev 3584) @@ -0,0 +1,249 @@ +<?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>10K549</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> + <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>CFBundleExecutable</key> + <string>Newspeak Virtual Machine</string> + <key>CFBundleGetInfoString</key> + <string>Newspeak $(VIRTUAL_MACHINE_NICKNAME) $(VERSION_NUMBER) http://newspeaklanguage.org</string> + <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>CFBundleShortVersionString</key> + <string>Newspeak $(VIRTUAL_MACHINE_NICKNAME) $(VERSION_NUMBER)</string> + <key>CFBundleSignature</key> + <string>NSVM</string> + <key>CFBundleVersion</key> + <string>$(VERSION_NUMBER)</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.6.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>SqueakVMPathAnswersResources</key> + <true/> + <key>SqueakWindowAttribute</key> + <data> + ggAAHw== + </data> + <key>SqueakWindowHasTitle</key> + <true/> + <key>SqueakWindowType</key> + <integer>6</integer> + <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> +</dict> +</plist> Copied: branches/Cog/platforms/iOS/vm/OSX/NewspeakVirtualMachine.icns (from rev 3581, branches/Cog/platforms/iOS/vm/OSX/Newspeak Virtual Machine.icns) =================================================================== (Binary files differ) Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/spursrc/vm/cogit.h 2016-02-11 20:07:36 UTC (rev 3584) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1670 uuid: 6ba2dd3d-ab44-468e-9184-1c85580f980b + CCodeGenerator VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36 */ Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/spursrc/vm/cointerp.c 2016-02-11 20:07:36 UTC (rev 3584) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36 from - CoInterpreter * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae + CoInterpreter VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36 */ -static char __buildInfo[] = "CoInterpreter * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -128,7 +128,7 @@ #define ActiveProcessIndex 1 #define AlternateHeaderHasPrimFlag 0x20000 #define AlternateHeaderNumLiteralsMask 0x7FFF -#define AltLongStoreBytecode 234 +#define AltLongStoreBytecode 129 #define BecameActiveClassFlag 8 #define BecameCompiledMethodFlag 2 #define BecamePointerObjectFlag 1 @@ -2362,7 +2362,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives * VMMaker.oscog-eem.1669]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1674]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -12957,7 +12957,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - signed char accessorDepth; + sqInt accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -46957,7 +46957,7 @@ static sqInt imageSegmentVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - int wholeWord; + sqInt wholeWord; /* first data word, 'does' */ @@ -55905,7 +55905,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -61234,7 +61234,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -61477,7 +61477,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -61821,7 +61821,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -63612,7 +63612,7 @@ sqInt slotBytes4; sqInt stopAddr; sqInt swapFloatWords; - int temp; + sqInt temp; sqInt temp1; sqInt wordAddr; @@ -71752,7 +71752,7 @@ sqInt displayObj; sqInt primFailCodeValue; sqInt ptr; - int reversed; + sqInt reversed; sqInt w; sqInt wordEndIndex; sqInt wordStartIndex; Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/spursrc/vm/cointerp.h 2016-02-11 20:07:36 UTC (rev 3584) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2016-02-11 05:07:43 UTC (rev 3583) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2016-02-11 20:07:36 UTC (rev 3584) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36 from - CoInterpreter * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae + CoInterpreter VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36 */ -static char __buildInfo[] = "CoInterpreter * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -131,7 +131,7 @@ #define ActiveProcessIndex 1 #define AlternateHeaderHasPrimFlag 0x20000 #define AlternateHeaderNumLiteralsMask 0x7FFF -#define AltLongStoreBytecode 234 +#define AltLongStoreBytecode 129 #define BecameActiveClassFlag 8 #define BecameCompiledMethodFlag 2 #define BecamePointerObjectFlag 1 @@ -2365,7 +2365,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives * VMMaker.oscog-eem.1669]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1674]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -12966,7 +12966,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - signed char accessorDepth; + sqInt accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -46966,7 +46966,7 @@ static sqInt imageSegmentVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - int wholeWord; + sqInt wholeWord; /* first data word, 'does' */ @@ -55914,7 +55914,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -61243,7 +61243,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -61486,7 +61486,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -61830,7 +61830,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -63621,7 +63621,7 @@ sqInt slotBytes4; sqInt stopAddr; sqInt swapFloatWords; - int temp; + sqInt temp; sqInt temp1; sqInt wordAddr; @@ -71761,7 +71761,7 @@ sqInt displayObj; sqInt primFailCodeValue; sqInt ptr; - int reversed; + sqInt reversed; sqInt w; sqInt wordEndIndex; sqInt wordStartIndex;

1 0

VM Maker: VMMaker.oscog-tfel.1677.mcz
by commits＠source.squeak.org 11 Feb '16

11 Feb '16

Tim Felgentreff uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tfel.1677.mcz ==================== Summary ==================== Name: VMMaker.oscog-tfel.1677 Author: tfel Time: 11 February 2016, 9:48:04.961 am UUID: e845ffd7-66b9-594f-b02c-350f015e9cbf Ancestors: VMMaker.oscog-EstebanLorenzano.1676 Fix BitBltSimulation (for RSqueak on Spur) =============== Diff against VMMaker.oscog-EstebanLorenzano.1676 =============== Item was changed: ----- Method: BitBlt>>simulatePrimitive:args: (in category '*VMMaker-Interpreter') ----- simulatePrimitive: aString args: args "simulate primitives in RSqueak" aString = 'primitiveCopyBits' + ifTrue: [ + args size = 1 + ifTrue: [^ self copyBitsSimulated: (args at: 1)] + ifFalse: [^ self copyBitsSimulated]]. - ifTrue: [^ self copyBitsSimulated]. aString = 'primitiveWarpBits' ifTrue: [^ self warpBitsSimulated: (args at: 1) sourceMap: (args at: 2)]. ^ InterpreterProxy new primitiveFailFor: 255 ! Item was changed: ----- Method: BitBltSimulation>>loadColorMap (in category 'interpreter interface') ----- loadColorMap "ColorMap, if not nil, must be longWords, and 2^N long, where N = sourceDepth for 1, 2, 4, 8 bits, or N = 9, 12, or 15 (3, 4, 5 bits per color) for 16 or 32 bits." | cmSize oldStyle oop cmOop | <inline: true> cmFlags := cmMask := cmBitsPerColor := 0. cmShiftTable := nil. cmMaskTable := nil. cmLookupTable := nil. cmOop := interpreterProxy fetchPointer: BBColorMapIndex ofObject: bitBltOop. cmOop = interpreterProxy nilObject ifTrue:[^true]. cmFlags := ColorMapPresent. "even if identity or somesuch - may be cleared later" oldStyle := false. (interpreterProxy isWords: cmOop) ifTrue:[ "This is an old-style color map (indexed only, with implicit RGBA conversion)" cmSize := interpreterProxy slotSizeOf: cmOop. cmLookupTable := interpreterProxy firstIndexableField: cmOop. oldStyle := true. ] ifFalse: [ "A new-style color map (fully qualified)" ((interpreterProxy isPointers: cmOop) and:[(interpreterProxy slotSizeOf: cmOop) >= 3]) ifFalse:[^false]. cmShiftTable := self loadColorMapShiftOrMaskFrom: (interpreterProxy fetchPointer: 0 ofObject: cmOop). cmMaskTable := self loadColorMapShiftOrMaskFrom: (interpreterProxy fetchPointer: 1 ofObject: cmOop). oop := interpreterProxy fetchPointer: 2 ofObject: cmOop. oop = interpreterProxy nilObject ifTrue:[cmSize := 0] ifFalse:[(interpreterProxy isWords: oop) ifFalse:[^false]. cmSize := (interpreterProxy slotSizeOf: oop). cmLookupTable := interpreterProxy firstIndexableField: oop]. cmFlags := cmFlags bitOr: ColorMapNewStyle. self cCode: '' inSmalltalk: + []. - [self assert: cmShiftTable unitSize = 4. - self assert: cmMaskTable unitSize = 4. - self assert: cmLookupTable unitSize = 4]. ]. (cmSize bitAnd: cmSize - 1) = 0 ifFalse:[^false]. cmMask := cmSize - 1. cmBitsPerColor := 0. cmSize = 512 ifTrue: [cmBitsPerColor := 3]. cmSize = 4096 ifTrue: [cmBitsPerColor := 4]. cmSize = 32768 ifTrue: [cmBitsPerColor := 5]. cmSize = 0 ifTrue:[cmLookupTable := nil. cmMask := 0] ifFalse:[cmFlags := cmFlags bitOr: ColorMapIndexedPart]. oldStyle "needs implicit conversion" ifTrue:[ self setupColorMasks]. "Check if colorMap is just identity mapping for RGBA parts" (self isIdentityMap: cmShiftTable with: cmMaskTable) ifTrue:[ cmMaskTable := nil. cmShiftTable := nil ] ifFalse:[ cmFlags := cmFlags bitOr: ColorMapFixedPart]. ^true! Item was added: + ----- Method: BitBltSimulator>>halftoneAt: (in category 'memory access') ----- + halftoneAt: idx + + ^ (halftoneBase + (idx \\ halftoneHeight * 4)) long32At: 0! Item was added: + ----- Method: InterpreterProxy>>isNonImmediate: (in category 'testing') ----- + isNonImmediate: anObject + + ^ (self isImmediate: anObject) not! Item was changed: ----- Method: InterpreterProxy>>majorVersion (in category 'other') ----- majorVersion + ^ 1! - self notYetImplemented! Item was changed: ----- Method: InterpreterProxy>>minorVersion (in category 'other') ----- minorVersion + ^ 8! - self notYetImplemented! Item was changed: Object subclass: #TMethod instanceVariableNames: 'args comment complete declarations definingClass export extraVariableNumber globalStructureBuildMethodHasFoo inline labels locals parseTree primitive properties returnType selector sharedCase sharedLabel static writtenToGlobalVarsCache functionAttributes' classVariableNames: 'CaseStatements' poolDictionaries: '' category: 'VMMaker-Translation to C'! + + !TMethod commentStamp: 'dtl 9/15/2008 09:06' prior: 0! + A TMethod is a translation method, representing a MethodNode that is to be translated to C source. It has a parseTree of translation nodes that mirrors the parse tree of the corresponding Smalltalk method.! Item was changed: Object subclass: #TParseNode instanceVariableNames: 'comment' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Translation to C'! + + !TParseNode commentStamp: 'dtl 9/15/2008 09:05' prior: 0! + A TParseNode is node in the parse tree of a TMethod. Subclasses correspond to different types of nodes in a method parse tree. The tree of translation parse nodes mirrors the parse tree of a Smalltalk method, and is used for translating a Smalltalk method to C source.! Item was changed: ----- Method: VMClass>>oopForPointer: (in category 'memory access') ----- oopForPointer: pointerOrSurrogate "This gets implemented by Macros in C, where its types will also be checked. oop is the width of a machine word, and pointer is a raw address." <doNotGenerate> + ^pointerOrSurrogate! - ^pointerOrSurrogate asInteger!

1 0

[commit][3583] Mac OS X gnu makefiles:
by commits＠squeakvm.org 11 Feb '16

11 Feb '16

Revision: 3583 Author: eliot Date: 2016-02-10 21:07:43 -0800 (Wed, 10 Feb 2016) Log Message: ----------- Mac OS X gnu makefiles: Make the GdbARMPlugin make. Make the Makefiles default to CONFIGURATION=product, not debug. Allow CFLAGS to be extended. Correct the external plugin set. 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/pharo.cog.spur/plugins.ext branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext branches/Cog/build.macos32x86/squeak.sista.spur/Makefile branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext Added Paths: ----------- branches/Cog/platforms/iOS/plugins/GdbARMPlugin/ branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile branches/Cog/platforms/iOS/plugins/GdbARMPlugin/environ.c Property Changed: ---------------- 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 02:35:00 UTC (rev 3582) +++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 05:07:43 UTC (rev 3583) @@ -20,12 +20,12 @@ # debug. Optional. Defaults to product. The default is overridden in mvm script -ifeq ("$(CONFIGURATION)","product") - APP:=CocoaFast.app +ifeq ("$(CONFIGURATION)","debug") + APP:=CocoaDebug.app else ifeq ("$(CONFIGURATION)","assert") APP:=CocoaAssert.app -else - APP:=CocoaDebug.app +else # default CONFIGURATION=product => CocoaFast.app + APP:=CocoaFast.app endif default: $(APP) Modified: branches/Cog/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-11 02:35:00 UTC (rev 3582) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-11 05:07:43 UTC (rev 3583) @@ -29,7 +29,7 @@ BUILD:=builddbg endif -CFLAGS:= $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS) +CFLAGS:= $(CFLAGS) $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS) # The following are the four key locations (set via invocation): # PLUGINSRCDIR: Where is the root of the src/plugins source tree? # VMSRCDIR: Where is the root of the src vm source tree? @@ -59,7 +59,7 @@ # INCDIRS are where include files are searched for. A superset of SRCDIRS. INCDIRS:= $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR) $(INCDIRS) -INCLUDES:= $(addprefix -I,. $(INCDIRS)) $(INCLUDES) +INCLUDES:= $(addprefix -I,. $(INCDIRS)) ############################################################################# # If no source files were given, use standard set @@ -123,6 +123,7 @@ @echo OSXSRC=$(OSXSRC) @echo MAKERSRC=$(MAKERSRC) @echo SRCDIRS=$(SRCDIRS) + @echo INCDIRS=$(INCDIRS) @echo LIBSRC=$(LIBSRC) @echo LIBOBJ=$(LIBOBJ) @echo OBJDIR=$(OBJDIR) Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-11 02:35:00 UTC (rev 3582) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-11 05:07:43 UTC (rev 3583) @@ -35,12 +35,12 @@ endif COMMONDIR:=$(BASEDIR)/../common -ifeq ("$(CONFIGURATION)","product") - BUILD:=build -else ifeq ("$(CONFIGURATION)","assert") +ifeq ("$(CONFIGURATION)","assert") BUILD:=buildast -else +else ifeq ("$(CONFIGURATION)","debug") BUILD:=builddbg +else # default CONFIGURATION=product + BUILD:=build endif $(shell mkdir -p deps >/dev/null) # deps is the dependencies directory BLDDIR:= $(BASEDIR)/$(BUILD) Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext 2016-02-11 02:35:00 UTC (rev 3582) +++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext 2016-02-11 05:07:43 UTC (rev 3583) @@ -1,6 +1,5 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext EXTERNAL_PLUGINS = \ -BochsIA32Plugin \ CroquetPlugin \ FloatArrayPlugin \ FloatMathPlugin \ Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext 2016-02-11 02:35:00 UTC (rev 3582) +++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext 2016-02-11 05:07:43 UTC (rev 3583) @@ -1,6 +1,8 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext EXTERNAL_PLUGINS = \ BochsIA32Plugin \ +BochsX64Plugin \ +GdbARMPlugin \ CroquetPlugin \ FloatArrayPlugin \ FloatMathPlugin \ Modified: branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext 2016-02-11 02:35:00 UTC (rev 3582) +++ branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext 2016-02-11 05:07:43 UTC (rev 3583) @@ -1,6 +1,5 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext EXTERNAL_PLUGINS = \ -BochsIA32Plugin \ CroquetPlugin \ FloatArrayPlugin \ FloatMathPlugin \ Modified: branches/Cog/build.macos32x86/squeak.sista.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/Makefile 2016-02-11 02:35:00 UTC (rev 3582) +++ branches/Cog/build.macos32x86/squeak.sista.spur/Makefile 2016-02-11 05:07:43 UTC (rev 3583) @@ -3,7 +3,7 @@ # Do make init to allow make -n to function. # -VMSRCDIR:= ../../spursrc/vm +VMSRCDIR:= ../../spursistasrc/vm APPPOST:=overwriteSqueakIcon Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext 2016-02-11 02:35:00 UTC (rev 3582) +++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext 2016-02-11 05:07:43 UTC (rev 3583) @@ -1,6 +1,8 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext EXTERNAL_PLUGINS = \ BochsIA32Plugin \ +BochsX64Plugin \ +GdbARMPlugin \ CroquetPlugin \ FloatArrayPlugin \ FloatMathPlugin \ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Feb 10 18:33:55 PST 2016 + Wed Feb 10 21:05:09 PST 2016 Added: branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile (rev 0) +++ branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile 2016-02-11 05:07:43 UTC (rev 3583) @@ -0,0 +1,16 @@ +INCDIRS:=../../processors/ARM/gdb-7.10/include \ + ../../processors/ARM/gdb-7.10/sim/arm \ + ../../processors/ARM/gdb-7.10/bfd \ + ../gdbarm32/bfd +INCFIRST:=../../processors/ARM/gdb-7.10/include \ + ../../processors/ARM/gdb-7.10/sim/arm \ + ../../processors/ARM/gdb-7.10/bfd \ + ../gdbarm32/bfd +EXTRALIBS:=-L../gdbarm32/bfd -L../gdbarm32/libiberty -L../gdbarm32/opcodes \ + -L../gdbarm32/sim/arm -L../gdbarm32/zlib \ + -lbfd -liberty -lopcodes -lopcodes -lsim -lz + +include ../common/Makefile.plugin + +INCDIRS:= $(INCFIRST) $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR) +INCLUDES:= $(addprefix -I,. $(INCDIRS)) Copied: branches/Cog/platforms/iOS/plugins/GdbARMPlugin/environ.c (from rev 3581, branches/Cog/platforms/Mac OS/plugins/GdbARMPlugin/environ.c) =================================================================== --- branches/Cog/platforms/iOS/plugins/GdbARMPlugin/environ.c (rev 0) +++ branches/Cog/platforms/iOS/plugins/GdbARMPlugin/environ.c 2016-02-11 05:07:43 UTC (rev 3583) @@ -0,0 +1,5 @@ +/* + * Provide a fake environ so that xmalloc.o from libiberty.a links. + */ + +char **environ = 0;

1 0

[commit][3582] Mac OS X 32-bit builds.
by commits＠squeakvm.org 11 Feb '16

11 Feb '16

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> - <key>CFBundleShortVersionString</key> - <string>Newspeak Cog Spur Virtual Machine 5.0.0</string> - <key>CFBundleVersion</key> - <string>5.0.0</string> - <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> - <key>CFBundleShortVersionString</key> - <string>Newspeak Stack Spur Virtual Machine 5.0.0</string> - <key>CFBundleVersion</key> - <string>5.0.0</string> - <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> - <key>CFBundleShortVersionString</key> - <string>Newspeak Cog Spur Virtual Machine 5.0.0</string> - <key>CFBundleVersion</key> - <string>5.0.0</string> - <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> - <key>CFBundleShortVersionString</key> - <string>Newspeak Stack Spur Virtual Machine 5.0.0</string> - <key>CFBundleVersion</key> - <string>5.0.0</string> - <key>CFBundleIconFile</key> - <string>Newspeak Virtual Machine.icns</string> - <key>CFBundleIdentifier</key> - <string>org.bracha.Newspeak</string> @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3581] Mac OS X gnu makefiles:
by commits＠squeakvm.org 11 Feb '16

11 Feb '16

Revision: 3581 Author: eliot Date: 2016-02-10 16:23:41 -0800 (Wed, 10 Feb 2016) Log Message: ----------- Mac OS X gnu makefiles: Complete the app bundle build by compiling in the MainMenu.nib. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.app branches/Cog/build.macos32x86/common/Makefile.flags Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.app =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-10 21:00:41 UTC (rev 3580) +++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 00:23:41 UTC (rev 3581) @@ -48,8 +48,9 @@ VMBUNDLES:=$(addprefix $(APP)/Contents/Resources/, $(addsuffix .bundle, $(EXTERNAL_PLUGINS))) OSXICONS:=$(OSXDIR)/$(VM).icns $(wildcard $(OSXDIR)/$(SYSTEM)*.icns) VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) +VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib -$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMICONS) +$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(VMEXE): vm $(OBJDIR)/$(VM) mkdir -p $(APP)/Contents/MacOS @@ -66,6 +67,14 @@ sed "s/\$$(VERSION_TAG)/`getversion VERSION_TAG`/" | \ sed "s/\$$(VM_NICKNAME)/`getversion VM_NICKNAME`/" > $@ +$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib + mkdir -p $(dir $@) + $(XCUB)/ibtool --errors --warnings --notices --module $(VM) \ + --minimum-deployment-target $(TARGET_VERSION_MIN) \ + --auto-activate-custom-fonts --output-format human-readable-text \ + --compile $(VMMENUNIB) \ + $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib + $(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns mkdir -p $(APP)/Contents/Resources cp -p $< $(APP)/Contents/Resources Modified: branches/Cog/build.macos32x86/common/Makefile.flags =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-10 21:00:41 UTC (rev 3580) +++ branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-11 00:23:41 UTC (rev 3581) @@ -1,14 +1,18 @@ ############################################################################# -# Compilations flags for Mac OS X +# Compilations flags & paths for Mac OS X # # These are derived from Xcode v 6.2 for Apple LLVM version 6.0 (clang-600.0.57) -SDK:=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk +XCODE:=/Applications/Xcode.app/Contents/Developer +XCUB:=$(XCODE)/usr/bin +SDK:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk TARGET_ARCH:=i386 +TARGET_VERSION_MIN:=10.6 CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX \ -arch $(TARGET_ARCH) \ - -mmacosx-version-min=10.6 -msse4.2 -fvisibility=hidden -fwrapv \ + -mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \ + -fvisibility=hidden -fwrapv \ -fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \ -fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \ -isysroot $(SDK) \ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Feb 10 12:49:01 PST 2016 + Wed Feb 10 16:22:12 PST 2016

1 0

[commit][3580] Fix several illegal returns in libmpeg support code for the Mpeg3Plugin
by commits＠squeakvm.org 10 Feb '16

10 Feb '16

Revision: 3580 Author: eliot Date: 2016-02-10 13:00:41 -0800 (Wed, 10 Feb 2016) Log Message: ----------- Fix several illegal returns in libmpeg support code for the Mpeg3Plugin Modified Paths: -------------- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c =================================================================== --- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c 2016-02-10 20:52:25 UTC (rev 3579) +++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c 2016-02-10 21:00:41 UTC (rev 3580) @@ -884,7 +884,7 @@ if(gr_info->block_type == 2) { if(!gr_info->mixed_block_flag) - return; + return 0; sblim = 1; } else Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c =================================================================== --- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c 2016-02-10 20:52:25 UTC (rev 3579) +++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c 2016-02-10 21:00:41 UTC (rev 3580) @@ -154,7 +154,7 @@ /* decode one intra coded MPEG-1 block */ -int mpeg3video_getintrablock(mpeg3_slice_t *slice, +void mpeg3video_getintrablock(mpeg3_slice_t *slice, mpeg3video_t *video, int comp, int dc_dct_pred[]) @@ -179,7 +179,7 @@ bp[0] <<= 4; #endif - if(slice->fault) return 1; + if(slice->fault) return; /* decode AC coefficients */ for(i = 1; ; i++) @@ -265,7 +265,7 @@ /* not a sparse matrix ! */ slice->sparse[comp] = 0; } - return 0; + return; } @@ -369,7 +369,7 @@ /* decode one intra coded MPEG-2 block */ -int mpeg3video_getmpg2intrablock(mpeg3_slice_t *slice, +void mpeg3video_getmpg2intrablock(mpeg3_slice_t *slice, mpeg3video_t *video, int comp, int dc_dct_pred[]) @@ -444,7 +444,7 @@ { /* fprintf(stderr,"mpeg3video_getmpg2intrablock: invalid Huffman code\n"); */ slice->fault = 1; - return 1; + return; } mpeg3slice_flushbits(slice_buffer, tab->len); @@ -492,13 +492,13 @@ /* not a sparse matrix ! */ slice->sparse[comp] = 0; } - return 1; + return; } /* decode one non-intra coded MPEG-2 block */ -int mpeg3video_getmpg2interblock(mpeg3_slice_t *slice, +void mpeg3video_getmpg2interblock(mpeg3_slice_t *slice, mpeg3video_t *video, int comp) { @@ -563,7 +563,7 @@ { /* fprintf(stderr, "mpeg3video_getmpg2interblock: invalid signed_level (escape)\n"); */ slice->fault = 1; - return 1; + return; } if((sign = (val >= 2048)) != 0) val = 4096 - val; } @@ -591,7 +591,7 @@ { slice->sparse[comp] = 0; } - return 0; + return; } Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c =================================================================== --- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c 2016-02-10 20:52:25 UTC (rev 3579) +++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c 2016-02-10 21:00:41 UTC (rev 3580) @@ -70,7 +70,7 @@ -int mpeg3video_idctrow(short *blk) +void mpeg3video_idctrow(short *blk) { int x0, x1, x2, x3, x4, x5, x6, x7, x8; @@ -133,7 +133,7 @@ */ -int mpeg3video_idctcol(short *blk) +void mpeg3video_idctcol(short *blk) { int x0, x1, x2, x3, x4, x5, x6, x7, x8; Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Feb 10 09:35:01 PST 2016 + Wed Feb 10 12:59:40 PST 2016

1 0

[commit][3579] Mac OS X gnu makefiles:
by commits＠squeakvm.org 10 Feb '16

10 Feb '16

Revision: 3579 Author: eliot Date: 2016-02-10 12:52:25 -0800 (Wed, 10 Feb 2016) Log Message: ----------- Mac OS X gnu makefiles: Fix Mpeg3Plugin by allowing Makefile to supply EXCLUDESRC to filter out files not to be built. Fix remaining external plugin link issues. 32-bit pharo.cog.spur now builds. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.plugin branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile Added Paths: ----------- branches/Cog/platforms/iOS/plugins/SqueakFFIPrims/Makefile branches/Cog/platforms/iOS/plugins/SqueakSSL/Makefile branches/Cog/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-10 19:05:51 UTC (rev 3578) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-10 20:52:25 UTC (rev 3579) @@ -56,6 +56,9 @@ SRCDIRS:=$(SRCDIRS) $(MAKERDIR) $(CROSSDIR) $(OSXPLGDIR) LIBSRC?= $(foreach d,$(SRCDIRS),$(wildcard $(d)/*.c) $(wildcard $(d)/*.cpp) $(wildcard $(d)/*.m)) +ifneq ($(EXCLUDESRC),) +LIBSRC:=$(filter-out $(EXCLUDESRC),$(LIBSRC)) +endif ############################################################################# Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Feb 10 11:03:22 PST 2016 + Wed Feb 10 12:49:01 PST 2016 Modified: branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile 2016-02-10 19:05:51 UTC (rev 3578) +++ branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile 2016-02-10 20:52:25 UTC (rev 3579) @@ -3,5 +3,6 @@ ../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video SRCDIRS:=$(INCDIRS) +EXCLUDESRC:=%/dump.c %/dump2.c %/mpeg3toc.c %/mpeg3cat.c %/testaudio.c %/udump.c %/worksheet.c %/test.c include ../common/Makefile.plugin Copied: branches/Cog/platforms/iOS/plugins/SqueakFFIPrims/Makefile (from rev 3578, branches/Cog/platforms/iOS/plugins/SocketPlugin/Makefile) =================================================================== --- branches/Cog/platforms/iOS/plugins/SqueakFFIPrims/Makefile (rev 0) +++ branches/Cog/platforms/iOS/plugins/SqueakFFIPrims/Makefile 2016-02-10 20:52:25 UTC (rev 3579) @@ -0,0 +1,3 @@ +LIBSRC:=SqueakFFIPrims.c sqFFIPlugin.c sqFFITestFuncs.c sqManualSurface.c + +include ../common/Makefile.plugin Copied: branches/Cog/platforms/iOS/plugins/SqueakSSL/Makefile (from rev 3576, branches/Cog/platforms/iOS/plugins/BochsIA32Plugin/Makefile) =================================================================== --- branches/Cog/platforms/iOS/plugins/SqueakSSL/Makefile (rev 0) +++ branches/Cog/platforms/iOS/plugins/SqueakSSL/Makefile 2016-02-10 20:52:25 UTC (rev 3579) @@ -0,0 +1,3 @@ +EXTRALIBS:= -framework CoreFoundation -framework Security -lssl -lcrypto + +include ../common/Makefile.plugin Copied: branches/Cog/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile (from rev 3576, branches/Cog/platforms/iOS/plugins/AioPlugin/Makefile) =================================================================== --- branches/Cog/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile (rev 0) +++ branches/Cog/platforms/iOS/plugins/UnixOSProcessPlugin/Makefile 2016-02-10 20:52:25 UTC (rev 3579) @@ -0,0 +1,7 @@ +INCLUDES:=-I../../platforms/Cross/plugins/FilePlugin \ + -I../../platforms/Cross/plugins/SocketPlugin \ + -I../../platforms/unix/vm + +EXTRALIBS:=-undefined dynamic_lookup + +include ../common/Makefile.plugin

1 0

[commit][3578] Mac OS X gnu makefiles:
by commits＠squeakvm.org 10 Feb '16

10 Feb '16

Revision: 3578 Author: eliot Date: 2016-02-10 11:05:51 -0800 (Wed, 10 Feb 2016) Log Message: ----------- Mac OS X gnu makefiles: Make clear the distinction between SRCDIRS (dirs searched for source files to compile) and INCDIRS (dirs searched for include files) in plugins. Make sure getversion is built before invoking Makefile.plugin. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.plugin branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/platforms/iOS/plugins/SocketPlugin/Makefile branches/Cog/platforms/iOS/plugins/SoundPlugin/Makefile Added Paths: ----------- branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-10 18:09:25 UTC (rev 3577) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-10 19:05:51 UTC (rev 3578) @@ -46,17 +46,16 @@ OSXVMDIR:=$(PLATDIR)/iOS/vm/OSX MAKERVMDIR:=$(VMSRCDIR) -SRCDIRS:= $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR) $(SRCDIRS) -INCLUDES:= $(addprefix -I,. $(SRCDIRS)) $(INCLUDES) +# INCDIRS are where include files are searched for. A superset of SRCDIRS. +INCDIRS:= $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR) $(INCDIRS) +INCLUDES:= $(addprefix -I,. $(INCDIRS)) $(INCLUDES) ############################################################################# # If no source files were given, use standard set # -CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) $(wildcard $(CROSSDIR)/*.cpp) -OSXSRC:= $(wildcard $(OSXPLGDIR)/*.c) $(wildcard $(OSXPLGDIR)/*.m) $(wildcard $(OSXPLGDIR)/*.cpp) -MAKERSRC:= $(wildcard $(MAKERDIR)/*.c) -LIBSRC?= $(notdir $(MAKERSRC) $(OSXSRC) $(CROSSSRC)) +SRCDIRS:=$(SRCDIRS) $(MAKERDIR) $(CROSSDIR) $(OSXPLGDIR) +LIBSRC?= $(foreach d,$(SRCDIRS),$(wildcard $(d)/*.c) $(wildcard $(d)/*.cpp) $(wildcard $(d)/*.m)) ############################################################################# @@ -81,7 +80,8 @@ # https://developer.apple.com/library/ios/documentation/General/Reference/Inf… PLUGINPLIST:= $(PLUGINBUNDLE)/Contents/Info.plist PLUGINICONS:= $(PLUGINBUNDLE)/Contents/Resources/SqueakPlugin.icns -LIBOBJ?=$(patsubst %.c,%.o,$(patsubst %.m,%.o,$(patsubst %.cpp,%.o,$(LIBSRC)))) +LIBOBJ?=$(notdir $(LIBSRC)) +LIBOBJ:=$(patsubst %.c,%.o,$(patsubst %.m,%.o,$(patsubst %.cpp,%.o,$(LIBOBJ)))) LIBOBJ:=$(addprefix $(OBJDIR)/,$(LIBOBJ)) VPATH:= $(SRCDIRS) @@ -108,6 +108,7 @@ @echo CROSSSRC=$(CROSSSRC) @echo OSXSRC=$(OSXSRC) @echo MAKERSRC=$(MAKERSRC) + @echo SRCDIRS=$(SRCDIRS) @echo LIBSRC=$(LIBSRC) @echo LIBOBJ=$(LIBOBJ) @echo OBJDIR=$(OBJDIR) Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-10 18:09:25 UTC (rev 3577) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-10 19:05:51 UTC (rev 3578) @@ -210,7 +210,7 @@ # Internal plugin. Build as lib then link in lib # Check for Makefile in iOS plugins directory otherwise use default Makefile # N.B. PLATDIR *must* be a relative path for this to work -$(OBJDIR)/%.lib: FORCE +$(OBJDIR)/%.lib: getversion FORCE @-mkdir -p $(BLDDIR)/$(*F) $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(shell test -f $(OSXPLUGINSDIR)/$(*F)/Makefile && echo $(OSXPLUGINSDIR)/$(*F)/Makefile || echo $(COMMONDIR)/Makefile.plugin) \ @@ -222,7 +222,7 @@ # External plugin. Build as bundle and copy to vm dir ($(OBJDIR)). # Check for Makefile in iOS plugins directory otherwise use default Makefile -$(OBJDIR)/%.bundle: FORCE +$(OBJDIR)/%.bundle: getversion FORCE @-mkdir -p $(BLDDIR)/$(*F) $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(shell test -f $(OSXPLUGINSDIR)/$(*F)/Makefile && echo $(OSXPLUGINSDIR)/$(*F)/Makefile || echo $(COMMONDIR)/Makefile.plugin) \ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Feb 10 10:07:57 PST 2016 + Wed Feb 10 11:03:22 PST 2016 Copied: branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile (from rev 3576, branches/Cog/platforms/iOS/plugins/AioPlugin/Makefile) =================================================================== --- branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile (rev 0) +++ branches/Cog/platforms/iOS/plugins/Mpeg3Plugin/Makefile 2016-02-10 19:05:51 UTC (rev 3578) @@ -0,0 +1,7 @@ +INCDIRS:=../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg \ + ../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg/audio \ + ../../platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video + +SRCDIRS:=$(INCDIRS) + +include ../common/Makefile.plugin Modified: branches/Cog/platforms/iOS/plugins/SocketPlugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/SocketPlugin/Makefile 2016-02-10 18:09:25 UTC (rev 3577) +++ branches/Cog/platforms/iOS/plugins/SocketPlugin/Makefile 2016-02-10 19:05:51 UTC (rev 3578) @@ -1,6 +1,6 @@ SRCDIRS:=../../platforms/unix/plugins/SocketPlugin -INCLUDES:=-I../../platforms/Cross/plugins/SocketPlugin \ - -I../../platforms/unix/vm +INCDIRS:=../../platforms/Cross/plugins/SocketPlugin \ + ../../platforms/unix/vm LIBSRC:= SocketPlugin.c sqUnixSocket.c LIBOBJ:=SocketPlugin.o sqUnixSocket.o Modified: branches/Cog/platforms/iOS/plugins/SoundPlugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/SoundPlugin/Makefile 2016-02-10 18:09:25 UTC (rev 3577) +++ branches/Cog/platforms/iOS/plugins/SoundPlugin/Makefile 2016-02-10 19:05:51 UTC (rev 3578) @@ -1,3 +1,3 @@ -INCLUDES:=-I../../platforms/iOS/vm/Common/Classes +INCDIRS:=../../platforms/iOS/vm/Common/Classes include ../common/Makefile.plugin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2016