Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

[commit][3600] The MIDI plugin must declare pointer args as pointer args not ints.
by commits＠squeakvm.org 15 Feb '16

15 Feb '16

Revision: 3600 Author: eliot Date: 2016-02-14 15:00:54 -0800 (Sun, 14 Feb 2016) Log Message: ----------- The MIDI plugin must declare pointer args as pointer args not ints. Modified Paths: -------------- trunk/platforms/Cross/plugins/MIDIPlugin/MIDIPlugin.h Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/MIDIPlugin/MIDIPlugin.h =================================================================== --- trunk/platforms/Cross/plugins/MIDIPlugin/MIDIPlugin.h 2016-02-14 21:23:37 UTC (rev 3599) +++ trunk/platforms/Cross/plugins/MIDIPlugin/MIDIPlugin.h 2016-02-14 23:00:54 UTC (rev 3600) @@ -7,10 +7,10 @@ int sqMIDIGetClock(void); int sqMIDIGetPortCount(void); int sqMIDIGetPortDirectionality(int portNum); -int sqMIDIGetPortName(int portNum, int namePtr, int length); +int sqMIDIGetPortName(int portNum, char *namePtr, int length); int sqMIDIClosePort(int portNum); int sqMIDIOpenPort(int portNum, int readSemaIndex, int interfaceClockRate); int sqMIDIParameterSet(int whichParameter, int newValue); int sqMIDIParameterGet(int whichParameter); -int sqMIDIPortReadInto(int portNum, int count, int bufferPtr); -int sqMIDIPortWriteFromAt(int portNum, int count, int bufferPtr, int time); +int sqMIDIPortReadInto(int portNum, int count, char * bufferPtr); +int sqMIDIPortWriteFromAt(int portNum, int count, char * bufferPtr, int time); Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Feb 10 12:59:40 PST 2016 + Sun Feb 14 14:59:53 PST 2016

1 0

[commit][3599] Fix bug in unix configure script.
by commits＠squeakvm.org 14 Feb '16

14 Feb '16

Revision: 3599 Author: eliot Date: 2016-02-14 13:23:37 -0800 (Sun, 14 Feb 2016) Log Message: ----------- Fix bug in unix configure script. ./getversion must be ${blddir}/getversion. Modified Paths: -------------- branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/config/configure.ac Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Feb 14 11:18:17 PST 2016 + Sun Feb 14 13:22:13 PST 2016 Modified: branches/Cog/platforms/unix/config/configure =================================================================== --- branches/Cog/platforms/unix/config/configure 2016-02-14 19:20:23 UTC (rev 3598) +++ branches/Cog/platforms/unix/config/configure 2016-02-14 21:23:37 UTC (rev 3599) @@ -1689,7 +1689,7 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' imgdir=`eval echo ${libdir}/squeak` expanded_relative_imgdir=`eval echo lib/squeak/${VM_VERSION}` -plgdir='${imgdir}/`./getversion VERSION_TAG`' +plgdir='${imgdir}/`${blddir}/getversion VERSION_TAG`' Modified: branches/Cog/platforms/unix/config/configure.ac =================================================================== --- branches/Cog/platforms/unix/config/configure.ac 2016-02-14 19:20:23 UTC (rev 3598) +++ branches/Cog/platforms/unix/config/configure.ac 2016-02-14 21:23:37 UTC (rev 3599) @@ -138,7 +138,7 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' imgdir=`eval echo ${libdir}/squeak` expanded_relative_imgdir=`eval echo lib/squeak/${VM_VERSION}` -plgdir='${imgdir}/`./getversion VERSION_TAG`' +plgdir='${imgdir}/`${blddir}/getversion VERSION_TAG`' AC_SUBST(imgdir) AC_SUBST(expanded_relative_imgdir)

1 0

[commit][3598] More last minute build issues.
by commits＠squeakvm.org 14 Feb '16

14 Feb '16

Revision: 3598 Author: eliot Date: 2016-02-14 11:20:23 -0800 (Sun, 14 Feb 2016) Log Message: ----------- More last minute build issues. 64-bit MIDI support is unavailable on Mac OS X from QuickTime. VOlunteers welcome to reimplement this above a more up-to-date API (CoreMIDI?). Fix slip in Newspeak installer fix. Get the Mac OS convenience scripts to look for error: not the old BUILD FAILED. Modified Paths: -------------- branches/Cog/build.macos32x86/makeall branches/Cog/build.macos32x86/makeproduct branches/Cog/build.macos32x86/makesista branches/Cog/build.macos32x86/makespur branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile branches/Cog/build.macos64x64/makeall branches/Cog/build.macos64x64/makeproduct branches/Cog/build.macos64x64/makesista branches/Cog/build.macos64x64/makespur branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/makeall =================================================================== --- branches/Cog/build.macos32x86/makeall 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos32x86/makeall 2016-02-14 19:20:23 UTC (rev 3598) @@ -8,4 +8,4 @@ fi done echo no news is good news... -grep 'BUILD FAILED' newspeak.*/LOG* squeak.*/LOG* +grep -w error: newspeak.*/LOG* squeak.*/LOG* Modified: branches/Cog/build.macos32x86/makeproduct =================================================================== --- branches/Cog/build.macos32x86/makeproduct 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos32x86/makeproduct 2016-02-14 19:20:23 UTC (rev 3598) @@ -10,5 +10,5 @@ done echo no news is good news... for d in $PRODUCTDIRS; do - test -d $d && grep 'BUILD FAILED' $d/LOG* + test -d $d && grep -w error: $d/LOG* done Modified: branches/Cog/build.macos32x86/makesista =================================================================== --- branches/Cog/build.macos32x86/makesista 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos32x86/makesista 2016-02-14 19:20:23 UTC (rev 3598) @@ -10,5 +10,5 @@ done echo no news is good news... for d in $DIRS; do - test -d $d && grep 'BUILD FAILED' $d/LOG* + test -d $d && grep -w error: $d/LOG* done Modified: branches/Cog/build.macos32x86/makespur =================================================================== --- branches/Cog/build.macos32x86/makespur 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos32x86/makespur 2016-02-14 19:20:23 UTC (rev 3598) @@ -10,5 +10,5 @@ done echo no news is good news... for d in $DIRS; do - test -d $d && grep 'BUILD FAILED' $d/LOG* + test -d $d && grep -w error: $d/LOG* done Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile 2016-02-14 19:20:23 UTC (rev 3598) @@ -21,7 +21,7 @@ $(VM_LOCALIZED_NAME_ESC).app: ../CocoaFast.app rm -rf $(VM_LOCALIZED_NAME_ESC).app cp -R ../CocoaFast.app $(VM_LOCALIZED_NAME_ESC).app - test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources + test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources/$(SOURCEFILENAME1) || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources # Cab contents: VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app Modified: branches/Cog/build.macos64x64/makeall =================================================================== --- branches/Cog/build.macos64x64/makeall 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos64x64/makeall 2016-02-14 19:20:23 UTC (rev 3598) @@ -8,4 +8,4 @@ fi done echo no news is good news... -grep 'BUILD FAILED' newspeak.*/LOG* squeak.*/LOG* +grep -w error: newspeak.*/LOG* squeak.*/LOG* Modified: branches/Cog/build.macos64x64/makeproduct =================================================================== --- branches/Cog/build.macos64x64/makeproduct 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos64x64/makeproduct 2016-02-14 19:20:23 UTC (rev 3598) @@ -10,5 +10,5 @@ done echo no news is good news... for d in $PRODUCTDIRS; do - test -d $d && grep 'BUILD FAILED' $d/LOG* + test -d $d && grep -w error: $d/LOG* done Modified: branches/Cog/build.macos64x64/makesista =================================================================== --- branches/Cog/build.macos64x64/makesista 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos64x64/makesista 2016-02-14 19:20:23 UTC (rev 3598) @@ -10,5 +10,5 @@ done echo no news is good news... for d in $DIRS; do - test -d $d && grep 'BUILD FAILED' $d/LOG* + test -d $d && grep -w error: $d/LOG* done Modified: branches/Cog/build.macos64x64/makespur =================================================================== --- branches/Cog/build.macos64x64/makespur 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos64x64/makespur 2016-02-14 19:20:23 UTC (rev 3598) @@ -10,5 +10,5 @@ done echo no news is good news... for d in $DIRS; do - test -d $d && grep 'BUILD FAILED' $d/LOG* + test -d $d && grep -w error: $d/LOG* done Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile 2016-02-14 19:20:23 UTC (rev 3598) @@ -21,7 +21,7 @@ $(VM_LOCALIZED_NAME_ESC).app: ../CocoaFast.app rm -rf $(VM_LOCALIZED_NAME_ESC).app cp -R ../CocoaFast.app $(VM_LOCALIZED_NAME_ESC).app - test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources + test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources/$(SOURCEFILENAME1) || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources # Cab contents: VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-02-14 19:20:23 UTC (rev 3598) @@ -22,7 +22,6 @@ LocalePlugin \ MacMenubarPlugin \ Matrix2x3Plugin \ -MIDIPlugin \ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ @@ -35,4 +34,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# MIDIPlugin Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-02-14 19:20:23 UTC (rev 3598) @@ -22,7 +22,6 @@ LocalePlugin \ MacMenubarPlugin \ Matrix2x3Plugin \ -MIDIPlugin \ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ @@ -35,4 +34,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# MIDIPlugin Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-02-14 17:22:06 UTC (rev 3597) +++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-02-14 19:20:23 UTC (rev 3598) @@ -22,7 +22,6 @@ LocalePlugin \ MacMenubarPlugin \ Matrix2x3Plugin \ -MIDIPlugin \ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ @@ -35,4 +34,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# MIDIPlugin Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Feb 14 09:18:32 PST 2016 + Sun Feb 14 11:18:17 PST 2016

1 0

[commit][3597] Fix various build problems.
by commits＠squeakvm.org 14 Feb '16

14 Feb '16

Revision: 3597 Author: eliot Date: 2016-02-14 09:22:06 -0800 (Sun, 14 Feb 2016) Log Message: ----------- Fix various build problems. The Newspeak installers need to install SqueakV50.sources and use CocoaFast.app. svn:ignore propertirs are missing in build.linux32ARM. Nice to build the Pharo VMs as part of makeproduct. Windows Makefiles need to put dll ancilliaries in the build dir and need to nuke the .lib files after linking both VM exes. Modified Paths: -------------- branches/Cog/build.macos32x86/makeproduct branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile branches/Cog/build.macos32x86/newspeak.cog.spur/installer/installer-Darwin.gmk branches/Cog/build.macos64x64/makeproduct branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile branches/Cog/build.macos64x64/newspeak.cog.spur/installer/installer-Darwin.gmk branches/Cog/build.macos64x64/newspeak.stack.spur/Makefile branches/Cog/build.macos64x64/squeak.cog.spur/Makefile branches/Cog/build.macos64x64/squeak.sista.spur/Makefile branches/Cog/build.macos64x64/squeak.stack.spur/Makefile branches/Cog/build.win32x86/bochsx64/conf.COG.dbg branches/Cog/build.win32x86/common/Makefile branches/Cog/build.win32x86/common/Makefile.plugin branches/Cog/build.win32x86/newspeak.cog.spur/installer/links Property Changed: ---------------- branches/Cog/build.linux32ARM/newspeak.cog.spur/build/ branches/Cog/build.linux32ARM/newspeak.cog.spur/build.assert/ branches/Cog/build.linux32ARM/newspeak.cog.spur/build.debug/ branches/Cog/build.linux32ARM/newspeak.stack.spur/build/ branches/Cog/build.linux32ARM/newspeak.stack.spur/build.assert/ branches/Cog/build.linux32ARM/newspeak.stack.spur/build.debug/ branches/Cog/build.linux32ARM/squeak.cog.spur/build/ branches/Cog/build.linux32ARM/squeak.cog.spur/build.assert/ branches/Cog/build.linux32ARM/squeak.cog.spur/build.debug/ branches/Cog/build.linux32ARM/squeak.stack.spur/build/ branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert/ branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug/ branches/Cog/build.linux32ARM/squeak.stack.v3/build/ branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/ branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/build.linux32ARM/newspeak.cog.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/newspeak.cog.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/newspeak.cog.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/newspeak.stack.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/newspeak.stack.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/newspeak.stack.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/squeak.cog.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/squeak.cog.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/squeak.cog.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/squeak.stack.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/squeak.stack.v3/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug ___________________________________________________________________ Added: svn:ignore + * Modified: branches/Cog/build.macos32x86/makeproduct =================================================================== --- branches/Cog/build.macos32x86/makeproduct 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos32x86/makeproduct 2016-02-14 17:22:06 UTC (rev 3597) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -PRODUCTDIRS="newspeak.cog.spur squeak.cog.spur squeak.cog.v3" +PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3" for d in $PRODUCTDIRS; do if test -d "$d"; then (cd ./$d;./mvm -A) Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/installer/Makefile 2016-02-14 17:22:06 UTC (rev 3597) @@ -18,10 +18,10 @@ BRANDING := VM_BASE_NAME PRODUCT_NAME VM_LOCALIZED_NAME MANUFACTURER IMAGE $(foreach var,$(BRANDING),$(eval $(call ESCAPE_VAR,$(var)))) -$(VM_LOCALIZED_NAME_ESC).app: ../Fast.app +$(VM_LOCALIZED_NAME_ESC).app: ../CocoaFast.app rm -rf $(VM_LOCALIZED_NAME_ESC).app - cp -R ../Fast.app $(VM_LOCALIZED_NAME_ESC).app - ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources + cp -R ../CocoaFast.app $(VM_LOCALIZED_NAME_ESC).app + test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources # Cab contents: VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/installer/installer-Darwin.gmk =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/installer-Darwin.gmk 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/installer/installer-Darwin.gmk 2016-02-14 17:22:06 UTC (rev 3597) @@ -11,7 +11,7 @@ ditto $(VM_BUNDLE) '/Volumes/$(PRODUCT_NAME)/$(VM_LOCALIZED_NAME).app' bless --folder '/Volumes/$(PRODUCT_NAME)' --openfolder '/Volumes/$(PRODUCT_NAME)' cp '$(INSTALLER_ICON).icns' '/Volumes/$(PRODUCT_NAME)/.VolumeIcon.icns' - /Developer/Tools/SetFile -a C '/Volumes/$(PRODUCT_NAME)' + /Applications/Xcode.app/Contents/Developer/Tools/SetFile -a C '/Volumes/$(PRODUCT_NAME)' osascript LayoutDiskImage.applescript while test -e '/Volumes/$(PRODUCT_NAME)' ; do echo Waiting for Finder to eject '/Volumes/$(PRODUCT_NAME)'; sleep 2; done hdiutil convert "$@.sparseimage" -format UDBZ -o $(VM_DMG) Modified: branches/Cog/build.macos64x64/makeproduct =================================================================== --- branches/Cog/build.macos64x64/makeproduct 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos64x64/makeproduct 2016-02-14 17:22:06 UTC (rev 3597) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -PRODUCTDIRS="newspeak.cog.spur squeak.cog.spur" +PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur" for d in $PRODUCTDIRS; do if test -d "$d"; then (cd ./$d;./mvm -A) Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/Makefile 2016-02-14 17:22:06 UTC (rev 3597) @@ -3,6 +3,6 @@ # Do make init to allow make -n to function. # -VMSRCDIR:= ../../nsspursrc/vm +VMSRCDIR:= ../../nsspur64src/vm include ../common/Makefile.app.newspeak Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/installer/Makefile 2016-02-14 17:22:06 UTC (rev 3597) @@ -5,7 +5,7 @@ # edit and run ./links to get .app and sources, then run make SOURCES := yes -SOURCEFILENAME1 := $(shell echo ~/Squeak/SqueakV41.sources) +SOURCEFILENAME1 := ../../../sources/SqueakV50.sources DOCUMENTATION_DIR := doc include branding.gmk @@ -18,10 +18,10 @@ BRANDING := VM_BASE_NAME PRODUCT_NAME VM_LOCALIZED_NAME MANUFACTURER IMAGE $(foreach var,$(BRANDING),$(eval $(call ESCAPE_VAR,$(var)))) -$(VM_LOCALIZED_NAME_ESC).app: ../Fast.app +$(VM_LOCALIZED_NAME_ESC).app: ../CocoaFast.app rm -rf $(VM_LOCALIZED_NAME_ESC).app - cp -R ../Fast.app $(VM_LOCALIZED_NAME_ESC).app - -ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources + cp -R ../CocoaFast.app $(VM_LOCALIZED_NAME_ESC).app + test -f $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources || ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources # Cab contents: VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/installer/installer-Darwin.gmk =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/installer/installer-Darwin.gmk 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/installer/installer-Darwin.gmk 2016-02-14 17:22:06 UTC (rev 3597) @@ -11,7 +11,7 @@ ditto $(VM_BUNDLE) '/Volumes/$(PRODUCT_NAME)/$(VM_LOCALIZED_NAME).app' bless --folder '/Volumes/$(PRODUCT_NAME)' --openfolder '/Volumes/$(PRODUCT_NAME)' cp '$(INSTALLER_ICON).icns' '/Volumes/$(PRODUCT_NAME)/.VolumeIcon.icns' - /Developer/Tools/SetFile -a C '/Volumes/$(PRODUCT_NAME)' + /Applications/Xcode.app/Contents/Developer/Tools/SetFile -a C '/Volumes/$(PRODUCT_NAME)' osascript LayoutDiskImage.applescript while test -e '/Volumes/$(PRODUCT_NAME)' ; do echo Waiting for Finder to eject '/Volumes/$(PRODUCT_NAME)'; sleep 2; done hdiutil convert "$@.sparseimage" -format UDBZ -o $(VM_DMG) Modified: branches/Cog/build.macos64x64/newspeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/newspeak.stack.spur/Makefile 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos64x64/newspeak.stack.spur/Makefile 2016-02-14 17:22:06 UTC (rev 3597) @@ -3,6 +3,6 @@ # Do make init to allow make -n to function. # -VMSRCDIR:= ../../nsspurstacksrc/vm +VMSRCDIR:= ../../nsspurstack64src/vm include ../common/Makefile.app.newspeak Modified: branches/Cog/build.macos64x64/squeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/Makefile 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos64x64/squeak.cog.spur/Makefile 2016-02-14 17:22:06 UTC (rev 3597) @@ -3,7 +3,7 @@ # Do make init to allow make -n to function. # -VMSRCDIR:= ../../spursrc/vm +VMSRCDIR:= ../../spur64src/vm SOURCEFILE:=SqueakV50.sources # Now include the Makefile proper, which is common to all Mac OS builds. Modified: branches/Cog/build.macos64x64/squeak.sista.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/Makefile 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos64x64/squeak.sista.spur/Makefile 2016-02-14 17:22:06 UTC (rev 3597) @@ -3,7 +3,7 @@ # Do make init to allow make -n to function. # -VMSRCDIR:= ../../spursistasrc/vm +VMSRCDIR:= ../../spursista64src/vm SOURCEFILE:=SqueakV50.sources APPPOST:=overwriteSqueakIcon Modified: branches/Cog/build.macos64x64/squeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/Makefile 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.macos64x64/squeak.stack.spur/Makefile 2016-02-14 17:22:06 UTC (rev 3597) @@ -3,7 +3,7 @@ # Do make init to allow make -n to function. # -VMSRCDIR:= ../../spurstacksrc/vm +VMSRCDIR:= ../../spurstack64src/vm SOURCEFILE:=SqueakV50.sources # Now include the Makefile proper, which is common to all Mac OS builds. Modified: branches/Cog/build.win32x86/bochsx64/conf.COG.dbg =================================================================== --- branches/Cog/build.win32x86/bochsx64/conf.COG.dbg 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.win32x86/bochsx64/conf.COG.dbg 2016-02-14 17:22:06 UTC (rev 3597) @@ -10,7 +10,7 @@ set echo CFLAGS="-m32 $CFLAGS" -CFLAGS="-Dlongjmp=_longjmp -Dsetjmp=_setjmp $CFLAGS" +CFLAGS="-Dsetjmp=_setjmp $CFLAGS" CFLAGS="-pipe -O0 $CFLAGS" CFLAGS="-g3 $CFLAGS" CPPFLAGS="" Modified: branches/Cog/build.win32x86/common/Makefile =================================================================== --- branches/Cog/build.win32x86/common/Makefile 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.win32x86/common/Makefile 2016-02-14 17:22:06 UTC (rev 3597) @@ -195,7 +195,7 @@ ############################################################################# # Common build rules # -default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) +default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) nukelibs svnver: echo $(RC) $(RCFLAGS) @@ -241,6 +241,9 @@ cleanmtdbg: rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtdbg +nukelibs: + rm $(LIBS) + print-settings: @echo ---------------- Makefile settings ------------------ @echo CONFIGURATION=$(CONFIGURATION) Modified: branches/Cog/build.win32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.win32x86/common/Makefile.plugin 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.win32x86/common/Makefile.plugin 2016-02-14 17:22:06 UTC (rev 3597) @@ -135,15 +135,15 @@ $(PLUGINDLL): $(VMDIR) $(OBJDIR) $(LIBOBJ) $(DLLTOOL) \ - --output-def $(LIBNAME).def \ - --output-exp $(LIBNAME).exp \ - --output-lib $(LIBNAME).lib \ + --output-def $(OBJDIR)/$(LIBNAME).def \ + --output-exp $(OBJDIR)/$(LIBNAME).exp \ + --output-lib $(OBJDIR)/$(LIBNAME).lib \ $(DLLTOOLEXTRAS) \ $(LIBOBJ) ifneq ($(LINK_WITH_GCC),) gcc -shared \ -mno-cygwin \ - -def $(LIBNAME).def \ + -def $(OBJDIR)/$(LIBNAME).def \ -o $(VMDIR)/$(LIBNAME).dll \ --entry _DllMain@12 \ $(GCCLINKEXTRAS) \ @@ -151,22 +151,22 @@ else ifneq ($(LINK_WITH_GPP),) g++ -shared \ -mno-cygwin \ - -def $(LIBNAME).def \ + -def $(OBJDIR)/$(LIBNAME).def \ -o $(VMDIR)/$(LIBNAME).dll \ --entry _DllMain@12 \ $(GPPLINKEXTRAS) \ $(LIBOBJ) $(EXTRALIBS) else $(DLLWRAP) -mwindows \ - -def $(LIBNAME).def \ + -def $(OBJDIR)/$(LIBNAME).def \ -o $(VMDIR)/$(LIBNAME).dll \ --entry _DllMain@12 \ $(DLLWRAPEXTRAS) \ - $(LIBNAME).exp \ + $(OBJDIR)/$(LIBNAME).exp \ $(LIBOBJ) $(EXTRALIBS) endif $(OPTSTRIP) --strip-all $(VMDIR)/$(LIBNAME).dll - -$(RM) $(LIBNAME).lib + -$(RM) $(OBJDIR)/$(LIBNAME).lib ############################################################################# # Rules for automated builds Modified: branches/Cog/build.win32x86/newspeak.cog.spur/installer/links =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/links 2016-02-14 00:43:52 UTC (rev 3596) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/links 2016-02-14 17:22:06 UTC (rev 3597) @@ -1,9 +1,9 @@ #!/bin/sh if [ "$1" = rm -o "$1" = mk ]; then - rm SqueakV41.sources + rm -f SqueakV50.sources fi if [ "$1" = mk ]; then - ln ../../../sources/SqueakV41.sources . + ln ../../../sources/SqueakV50.sources . fi if [ $ "$1" != rm $ -a $ "$1" != mk $ ]; then echo usage: $0 'mk|rm' Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Feb 13 16:41:12 PST 2016 + Sun Feb 14 09:18:32 PST 2016

1 0

[commit][3596] Correct the Newspeak Info. plist file so the VM launches on Mac OS X.
by commits＠squeakvm.org 14 Feb '16

14 Feb '16

Revision: 3596 Author: eliot Date: 2016-02-13 16:43:52 -0800 (Sat, 13 Feb 2016) Log Message: ----------- Correct the Newspeak Info.plist file so the VM launches on Mac OS X. Provide mac-like mvm scripts for build.win32x86. Install a source file at the root level in the Mac newspeak builds. Don't hard set the VM in build.win32x86/common/Makefile Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.app.newspeak branches/Cog/build.macos64x64/common/Makefile.app.newspeak branches/Cog/build.macos64x64/common/Makefile.flags branches/Cog/build.win32x86/common/Makefile branches/Cog/build.win32x86/newspeak.cog.spur/mvm branches/Cog/build.win32x86/newspeak.stack.spur/mvm branches/Cog/build.win32x86/squeak.cog.spur/mvm branches/Cog/build.win32x86/squeak.cog.v3/mvm branches/Cog/build.win32x86/squeak.stack.spur/mvm branches/Cog/build.win32x86/squeak.stack.v3/mvm branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.app.newspeak =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app.newspeak 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/build.macos32x86/common/Makefile.app.newspeak 2016-02-14 00:43:52 UTC (rev 3596) @@ -8,6 +8,7 @@ VM:=NewspeakVirtualMachine SYSTEM:=Newspeak APPSOURCE:=SqueakV50.sources +SOURCEFILE:=SqueakV50.sources APPPOST:=renameExe renameIcon Modified: branches/Cog/build.macos64x64/common/Makefile.app.newspeak =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app.newspeak 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/build.macos64x64/common/Makefile.app.newspeak 2016-02-14 00:43:52 UTC (rev 3596) @@ -8,6 +8,7 @@ VM:=NewspeakVirtualMachine SYSTEM:=Newspeak APPSOURCE:=SqueakV50.sources +SOURCEFILE:=SqueakV50.sources APPPOST:=renameExe renameIcon Modified: branches/Cog/build.macos64x64/common/Makefile.flags =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-14 00:43:52 UTC (rev 3596) @@ -32,8 +32,8 @@ -Wno-trigraphs -Wdeprecated-declarations FRAMEWORKS:=-fobjc-link-runtime \ - -framework AGL -framework OpenGL -framework Cocoa \ - -framework Foundation -framework AudioToolbox \ - -framework CoreAudio -framework SystemConfiguration \ + -framework Foundation -framework OpenGL -framework Cocoa \ + -framework AudioToolbox -framework CoreAudio -framework QuickTime \ + -framework SystemConfiguration \ -framework ApplicationServices -framework Security \ -framework QuartzCore Modified: branches/Cog/build.win32x86/common/Makefile =================================================================== --- branches/Cog/build.win32x86/common/Makefile 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/build.win32x86/common/Makefile 2016-02-14 00:43:52 UTC (rev 3596) @@ -11,7 +11,7 @@ # CONFIGURATION configuration of VM to build from product, assert & debug # THREADING whether to build a multi-threaded FFI VM -VM=Squeak +VM?=Squeak VM_NAME?=$(VM) CONFIGURATION=product THREADING=single Modified: branches/Cog/build.win32x86/newspeak.cog.spur/mvm =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/mvm 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/build.win32x86/newspeak.cog.spur/mvm 2016-02-14 00:43:52 UTC (rev 3596) @@ -1,13 +1,27 @@ -#!/bin/sh -rm -rf build*/vm/nsvm*.exe -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF -ls -rlt build*/vm/nsvm*.exe -if test -f ../../sources/SqueakV41.sources; then - for d in build buildast builddbg; do - if [ -d $d/vm -a ! -f $d/vm/SqueakV41.sources ]; then - ln ../../sources/SqueakV41.sources $d/vm - fi +#!/bin/bash +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac done fi +if [ -n "$D" ]; then + rm -rf builddbg/vm/nsvm*.exe + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + rm -rf buildast/vm/nsvm*.exe + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + rm -rf build/vm/nsvm*.exe + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.win32x86/newspeak.stack.spur/mvm =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.spur/mvm 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/build.win32x86/newspeak.stack.spur/mvm 2016-02-14 00:43:52 UTC (rev 3596) @@ -1,13 +1,27 @@ -#!/bin/sh -rm -rf build*/vm/nsvm*.exe -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF -ls -rlt build*/vm/nsvm*.exe -if test -f ../../sources/SqueakV41.sources; then - for d in build buildast builddbg; do - if [ -d $d/vm -a ! -f $d/vm/SqueakV41.sources ]; then - ln ../../sources/SqueakV41.sources $d/vm - fi +#!/bin/bash +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac done fi +if [ -n "$D" ]; then + rm -rf builddbg/vm/nsvm*.exe + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + rm -rf buildast/vm/nsvm*.exe + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + rm -rf build/vm/nsvm*.exe + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.win32x86/squeak.cog.spur/mvm =================================================================== --- branches/Cog/build.win32x86/squeak.cog.spur/mvm 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/build.win32x86/squeak.cog.spur/mvm 2016-02-14 00:43:52 UTC (rev 3596) @@ -1,13 +1,27 @@ -#!/bin/sh -rm -rf build*/vm/Croquet*.exe build*/vm/Squeak*.exe -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF -ls -rlt build*/vm/Squeak*.exe -if test -f ../../sources/SqueakV41.sources; then - for d in build buildast builddbg; do - if [ -d $d/vm -a ! -f $d/vm/SqueakV41.sources ]; then - ln ../../sources/SqueakV41.sources $d/vm - fi +#!/bin/bash +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac done fi +if [ -n "$D" ]; then + rm -rf builddbg/vm/Squeak*.exe + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + rm -rf buildast/vm/Squeak*.exe + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + rm -rf build/vm/Squeak*.exe + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.win32x86/squeak.cog.v3/mvm =================================================================== --- branches/Cog/build.win32x86/squeak.cog.v3/mvm 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/build.win32x86/squeak.cog.v3/mvm 2016-02-14 00:43:52 UTC (rev 3596) @@ -1,16 +1,27 @@ -#!/bin/sh -rm -rf build*/vm/Croquet*.exe build*/vm/Squeak*.exe -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF -make THREADING=multi CONFIGURATION=debug 2>&1 | tee LOGTD -make THREADING=multi CONFIGURATION=assert 2>&1 | tee LOGTA -make THREADING=multi 2>&1 | tee LOGTF -ls -rlt build*/vm/Squeak*.exe -if test -f ../../sources/SqueakV41.sources; then - for d in build buildast builddbg; do - if [ -d $d/vm -a ! -f $d/vm/SqueakV41.sources ]; then - ln ../../sources/SqueakV41.sources $d/vm - fi +#!/bin/bash +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac done fi +if [ -n "$D" ]; then + rm -rf builddbg/vm/Squeak*.exe + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + rm -rf buildast/vm/Squeak*.exe + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + rm -rf build/vm/Squeak*.exe + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.win32x86/squeak.stack.spur/mvm =================================================================== --- branches/Cog/build.win32x86/squeak.stack.spur/mvm 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/build.win32x86/squeak.stack.spur/mvm 2016-02-14 00:43:52 UTC (rev 3596) @@ -1,13 +1,27 @@ -#!/bin/sh -rm -rf build*/vm/Croquet*.exe build*/vm/Squeak*.exe -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF -ls -rlt build*/vm/Squeak*.exe -if test -f ../../sources/SqueakV41.sources; then - for d in build buildast builddbg; do - if [ -d $d/vm -a ! -f $d/vm/SqueakV41.sources ]; then - ln ../../sources/SqueakV41.sources $d/vm - fi +#!/bin/bash +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac done fi +if [ -n "$D" ]; then + rm -rf builddbg/vm/Squeak*.exe + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + rm -rf buildast/vm/Squeak*.exe + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + rm -rf build/vm/Squeak*.exe + make 2>&1 | tee LOGF +fi Modified: branches/Cog/build.win32x86/squeak.stack.v3/mvm =================================================================== --- branches/Cog/build.win32x86/squeak.stack.v3/mvm 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/build.win32x86/squeak.stack.v3/mvm 2016-02-14 00:43:52 UTC (rev 3596) @@ -1,13 +1,27 @@ -#!/bin/sh -rm -rf build*/vm/Croquet*.exe build*/vm/Squeak*.exe -make debug 2>&1 | tee LOGD -make assert 2>&1 | tee LOGA -make 2>&1 | tee LOGF -ls -rlt build*/vm/Squeak*.exe -if test -f ../../sources/SqueakV41.sources; then - for d in build buildast builddbg; do - if [ -d $d/vm -a ! -f $d/vm/SqueakV41.sources ]; then - ln ../../sources/SqueakV41.sources $d/vm - fi +#!/bin/bash +A=;D=;F= +if [ $# = 0 ]; then + A=1;D=1;F=1 +else + while getopts 'Aadf?' opt "$@"; do + case $opt in + A) A=1;D=1;F=1;; + a) A=1;; + d) D=1;; + f) F=1;; + *) echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;; + esac done fi +if [ -n "$D" ]; then + rm -rf builddbg/vm/Squeak*.exe + make debug 2>&1 | tee LOGD +fi +if [ -n "$A" ]; then + rm -rf buildast/vm/Squeak*.exe + make assert 2>&1 | tee LOGA +fi +if [ -n "$F" ]; then + rm -rf build/vm/Squeak*.exe + make 2>&1 | tee LOGF +fi Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Feb 13 15:52:45 PST 2016 + Sat Feb 13 16:41:12 PST 2016 Modified: branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist 2016-02-13 23:57:51 UTC (rev 3595) +++ branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist 2016-02-14 00:43:52 UTC (rev 3596) @@ -120,6 +120,10 @@ <false/> <key>LSMinimumSystemVersion</key> <string>10.6.0</string> + <key>NSMainNibFile</key> + <string>MainMenu</string> + <key>NSPrincipalClass</key> + <string>SqueakOSXApplication</string> <key>SqueakBrowserMouseCmdButton1</key> <integer>3</integer> <key>SqueakBrowserMouseCmdButton2</key>

1 0

[commit][3595] CogVM plugin source as per VMMaker.oscog-eem.1678.
by commits＠squeakvm.org 14 Feb '16

14 Feb '16

Revision: 3595 Author: eliot Date: 2016-02-13 15:57:51 -0800 (Sat, 13 Feb 2016) Log Message: ----------- CogVM plugin source as per VMMaker.oscog-eem.1678. Generate the plugin export tables aware of conditionally compiled prims. Add a simplified and shared build system for win32 and cygwin that follows the Mac OS X one. Add BochsX64Plugin to the win32 spur VM. Use the same scheme for the bochs support libraries as on Mac (build.win32x86/{bochsx86,bochsx64}). Fix the signatures of the MIDI plugin support files on unix and win32. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.flags branches/Cog/build.macos32x86/common/Makefile.plugin branches/Cog/build.macos32x86/common/Makefile.rules branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int branches/Cog/build.macos32x86/squeak+immutability.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/build.macos64x64/common/Makefile.flags branches/Cog/build.macos64x64/common/Makefile.plugin branches/Cog/build.macos64x64/common/Makefile.rules branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int branches/Cog/build.win32x86/newspeak.cog.spur/Makefile branches/Cog/build.win32x86/newspeak.stack.spur/Makefile branches/Cog/build.win32x86/squeak.cog.spur/Makefile branches/Cog/build.win32x86/squeak.cog.spur/plugins.ext branches/Cog/build.win32x86/squeak.cog.v3/Makefile branches/Cog/build.win32x86/squeak.cog.v3/plugins.ext branches/Cog/build.win32x86/squeak.stack.spur/Makefile branches/Cog/build.win32x86/squeak.stack.v3/Makefile branches/Cog/platforms/unix/plugins/MIDIPlugin/sqUnixMIDIALSA.inc branches/Cog/platforms/unix/plugins/MIDIPlugin/sqUnixMIDINone.inc branches/Cog/src/plugins/ImmX11Plugin/ImmX11Plugin.c branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c Added Paths: ----------- branches/Cog/build.win32x86/bochsx64/ branches/Cog/build.win32x86/bochsx64/conf.COG branches/Cog/build.win32x86/bochsx64/conf.COG.dbg branches/Cog/build.win32x86/bochsx64/exploration/ branches/Cog/build.win32x86/bochsx64/exploration/Makefile branches/Cog/build.win32x86/bochsx86/ branches/Cog/build.win32x86/bochsx86/conf.COG branches/Cog/build.win32x86/common/ branches/Cog/build.win32x86/common/Makefile branches/Cog/build.win32x86/common/Makefile.plugin branches/Cog/build.win32x86/common/Makefile.rules Removed Paths: ------------- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile.plugin branches/Cog/build.win32x86/newspeak.sista.spur/ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile.plugin branches/Cog/build.win32x86/squeak.cog.spur/Makefile.plugin branches/Cog/build.win32x86/squeak.cog.v3/Makefile.plugin branches/Cog/build.win32x86/squeak.stack.spur/Makefile.plugin branches/Cog/build.win32x86/squeak.stack.v3/Makefile.plugin Property Changed: ---------------- branches/Cog/build.win32x86/newspeak.cog.spur/ branches/Cog/build.win32x86/newspeak.stack.spur/ branches/Cog/build.win32x86/squeak.cog.spur/ branches/Cog/build.win32x86/squeak.cog.v3/ branches/Cog/build.win32x86/squeak.stack.spur/ branches/Cog/build.win32x86/squeak.stack.v3/ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.flags =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-13 23:57:51 UTC (rev 3595) @@ -32,8 +32,8 @@ -Wno-trigraphs -Wdeprecated-declarations FRAMEWORKS:=-fobjc-link-runtime \ - -framework OpenGL -framework Cocoa \ - -framework Foundation -framework AudioToolbox \ - -framework CoreAudio -framework SystemConfiguration \ + -framework Foundation -framework OpenGL -framework Cocoa \ + -framework AudioToolbox -framework CoreAudio -framework QuickTime \ + -framework SystemConfiguration \ -framework ApplicationServices -framework Security \ -framework QuartzCore Modified: branches/Cog/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-13 23:57:51 UTC (rev 3595) @@ -34,7 +34,6 @@ # 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? -COMMONDIR:=../common ############################################################################# # Standard directory locations: @@ -102,7 +101,7 @@ ############################################################################# # Rules for automated builds -include $(COMMONDIR)/Makefile.rules +include ../common/Makefile.rules all: $(PLUGINLIB) $(PLUGINBUNDLE) Modified: branches/Cog/build.macos32x86/common/Makefile.rules =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.rules 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/common/Makefile.rules 2016-02-13 23:57:51 UTC (rev 3595) @@ -1,5 +1,5 @@ ############################################################################# -# Compilations rules for Mac OS X +# Compilation rules for Mac OS X # # See http://make.mad-scientist.net/papers/advanced-auto-dependency-generation # for an explanation of the dependency management scheme. @@ -9,7 +9,7 @@ LD := clang LDCXX := clang++ # For linking c++ bundles -include $(COMMONDIR)/Makefile.flags +include ../common/Makefile.flags DEPFLAGS = -MT $@ -MMD -MP -MF deps/$(*F).Td ALLFLAGS = $(DEPFLAGS) $(WARNINGS) $(CFLAGS) Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-13 23:57:51 UTC (rev 3595) @@ -30,7 +30,6 @@ ############################################################################# # Build directories # -COMMONDIR:=../common ifeq ("$(CONFIGURATION)","assert") BUILD:=buildast @@ -124,7 +123,7 @@ ############################################################################# # Common build rules # -include $(COMMONDIR)/Makefile.rules +include ../common/Makefile.rules svnver: @-echo $(SVNREV) @@ -207,7 +206,7 @@ # .PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle -plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo $(COMMONDIR)/Makefile.plugin) +plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin) # Internal plugin. Build as lib then link in lib # Check for Makefile in iOS plugins directory otherwise use default Makefile @@ -250,6 +249,6 @@ # Extra specific dependencies # sqNamedPrims.h: plugins.int - $(COMMONDIR)/mkNamedPrims.sh plugins.int > sqNamedPrims.h + ../common/mkNamedPrims.sh plugins.int > sqNamedPrims.h $(OBJDIR)/sqNamedPrims.o: sqNamedPrims.c sqNamedPrims.h Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -22,6 +22,7 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin \ -# SerialPlugin +# JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/squeak+immutability.cog.spur/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -22,6 +22,7 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin \ -# SerialPlugin +# JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -18,10 +18,13 @@ Klatt \ LargeIntegers \ LocalePlugin \ +MacMenubarPlugin \ Matrix2x3Plugin \ +MIDIPlugin \ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -30,5 +33,6 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin \ -# SerialPlugin +# B3DAcceleratorPlugin \ +# InternetConfigPlugin \ +# JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -22,6 +22,7 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin \ -# SerialPlugin +# JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -22,6 +22,7 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin \ -# SerialPlugin +# JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -22,6 +22,7 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin \ -# SerialPlugin +# JoystickTabletPlugin Modified: branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -22,6 +22,7 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin \ -# SerialPlugin +# JoystickTabletPlugin Modified: branches/Cog/build.macos64x64/common/Makefile.flags =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-13 23:57:51 UTC (rev 3595) @@ -32,7 +32,7 @@ -Wno-trigraphs -Wdeprecated-declarations FRAMEWORKS:=-fobjc-link-runtime \ - -framework OpenGL -framework Cocoa \ + -framework AGL -framework OpenGL -framework Cocoa \ -framework Foundation -framework AudioToolbox \ -framework CoreAudio -framework SystemConfiguration \ -framework ApplicationServices -framework Security \ Modified: branches/Cog/build.macos64x64/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-13 23:57:51 UTC (rev 3595) @@ -34,7 +34,6 @@ # 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? -COMMONDIR:=../common ############################################################################# # Standard directory locations: @@ -102,7 +101,7 @@ ############################################################################# # Rules for automated builds -include $(COMMONDIR)/Makefile.rules +include ../common/Makefile.rules all: $(PLUGINLIB) $(PLUGINBUNDLE) Modified: branches/Cog/build.macos64x64/common/Makefile.rules =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.rules 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos64x64/common/Makefile.rules 2016-02-13 23:57:51 UTC (rev 3595) @@ -1,5 +1,5 @@ ############################################################################# -# Compilations rules for Mac OS X +# Compilation rules for Mac OS X # # See http://make.mad-scientist.net/papers/advanced-auto-dependency-generation # for an explanation of the dependency management scheme. @@ -9,7 +9,7 @@ LD := clang LDCXX := clang++ # For linking c++ bundles -include $(COMMONDIR)/Makefile.flags +include ../common/Makefile.flags DEPFLAGS = -MT $@ -MMD -MP -MF deps/$(*F).Td ALLFLAGS = $(DEPFLAGS) $(WARNINGS) $(CFLAGS) Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-13 23:57:51 UTC (rev 3595) @@ -30,7 +30,6 @@ ############################################################################# # Build directories # -COMMONDIR:=../common ifeq ("$(CONFIGURATION)","assert") BUILD:=buildast @@ -124,7 +123,7 @@ ############################################################################# # Common build rules # -include $(COMMONDIR)/Makefile.rules +include ../common/Makefile.rules svnver: @-echo $(SVNREV) @@ -207,7 +206,7 @@ # .PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle -plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo $(COMMONDIR)/Makefile.plugin) +plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin) # Internal plugin. Build as lib then link in lib # Check for Makefile in iOS plugins directory otherwise use default Makefile @@ -250,6 +249,6 @@ # Extra specific dependencies # sqNamedPrims.h: plugins.int - $(COMMONDIR)/mkNamedPrims.sh plugins.int > sqNamedPrims.h + ../common/mkNamedPrims.sh plugins.int > sqNamedPrims.h $(OBJDIR)/sqNamedPrims.o: sqNamedPrims.c sqNamedPrims.h Modified: branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -22,6 +22,7 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -30,5 +31,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin \ -# SerialPlugin +# JoystickTabletPlugin Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -3,6 +3,7 @@ ADPCMCodecPlugin \ AioPlugin \ AsynchFilePlugin \ +B3DAcceleratorPlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -13,15 +14,19 @@ FilePlugin \ HostWindowPlugin \ IA32ABI \ +InternetConfigPlugin \ JPEGReaderPlugin \ JPEGReadWriter2Plugin \ Klatt \ LargeIntegers \ LocalePlugin \ +MacMenubarPlugin \ Matrix2x3Plugin \ +MIDIPlugin \ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -30,5 +35,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin \ -# SerialPlugin +# JoystickTabletPlugin Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -26,6 +26,7 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -34,5 +35,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin \ -# SerialPlugin +# JoystickTabletPlugin Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-02-13 23:57:51 UTC (rev 3595) @@ -1,8 +1,9 @@ -# Copied, perhaps edited, from ../../src/examplePlugins.int +# Copied, perhaps edited, from ../src/examplePlugins.int INTERNAL_PLUGINS = \ +ADPCMCodecPlugin \ AioPlugin \ -ADPCMCodecPlugin \ AsynchFilePlugin \ +B3DAcceleratorPlugin \ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ @@ -11,7 +12,9 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +HostWindowPlugin \ IA32ABI \ +InternetConfigPlugin \ JPEGReaderPlugin \ JPEGReadWriter2Plugin \ Klatt \ @@ -19,9 +22,11 @@ LocalePlugin \ MacMenubarPlugin \ Matrix2x3Plugin \ +MIDIPlugin \ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ +SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -30,9 +35,4 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# B3DAcceleratorPlugin \ -# ClipboardExtendedPlugin \ -# InternetConfigPlugin \ -# JoystickTabletPlugin \ -# MIDIPlugin \ -# SerialPlugin +# JoystickTabletPlugin Property changes on: branches/Cog/build.win32x86/bochsx64 ___________________________________________________________________ Added: svn:ignore + * Added: branches/Cog/build.win32x86/bochsx64/conf.COG =================================================================== --- branches/Cog/build.win32x86/bochsx64/conf.COG (rev 0) +++ branches/Cog/build.win32x86/bochsx64/conf.COG 2016-02-13 23:57:51 UTC (rev 3595) @@ -0,0 +1,55 @@ +#!/bin/sh + +# Bochs x64 simulator for the BochsX64Alien plugin. +# This sets up the x64 compile for Cog on win32 under cygwin. Disable as much +# inessential stuff as possible leaving only the cpu/fpu & memory interface + +# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using +# $ ./conf.COG +# $ ../../processors/IA32/bochs/makeem + +set echo +# CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-labels=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -fprefetch-loop-arrays $CFLAGS" +CFLAGS="-m32 $CFLAGS" +CFLAGS="-Dsetjmp=_setjmp $CFLAGS" +CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions $CFLAGS" +CFLAGS="-g $CFLAGS" +CPPFLAGS="" +CXXFLAGS="$CFLAGS" + +export CFLAGS +export CPATH +export CPPFLAGS +export CXXFLAGS +export LDFLAGS + +../../processors/IA32/bochs/configure \ + -target=i686-pc-mingw32 \ + --enable-Cog \ + --enable-cpu-level=6 \ + --enable-sse=2 \ + --enable-assert-checks \ + --with-nogui \ + --enable-x86-64 \ + --enable-global-pages \ + --disable-mtrr \ + --disable-sb16 \ + --disable-ne2000 \ + --disable-pci \ + --disable-acpi \ + --disable-apic \ + --disable-clgd54xx \ + --disable-usb \ + --disable-plugins \ + ${CONFIGURE_ARGS} + +# apic == Advanced programmable Interrupt Controller +# acpi == Advanced Configuration and Power Interface +# pci == Peripheral Component Interconnect local bus +# clgd54xx == Cirrus Logic GD54xx video card + +# avoid conflict with squeak unix build's config.h +echo cp config.h bochsconfig.h +cp config.h bochsconfig.h + +echo "and don't forget to run ../../processors/IA32/bochs/makeem" Property changes on: branches/Cog/build.win32x86/bochsx64/conf.COG ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.win32x86/bochsx64/conf.COG.dbg =================================================================== --- branches/Cog/build.win32x86/bochsx64/conf.COG.dbg (rev 0) +++ branches/Cog/build.win32x86/bochsx64/conf.COG.dbg 2016-02-13 23:57:51 UTC (rev 3595) @@ -0,0 +1,53 @@ +#!/bin/sh + +# Bochs x64 simulator for the BochsX64Alien plugin. +# this sets up the x64 compile for Cog on Mac OS X. Disable as much inessential +# stuff as possible leaving only the cpu/fpu & memory interface + +# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using +# $ ./conf.COG.dbg +# $ ../../processors/IA32/bochs/makeem + +set echo +CFLAGS="-m32 $CFLAGS" +CFLAGS="-Dlongjmp=_longjmp -Dsetjmp=_setjmp $CFLAGS" +CFLAGS="-pipe -O0 $CFLAGS" +CFLAGS="-g3 $CFLAGS" +CPPFLAGS="" +CXXFLAGS="$CFLAGS" + +export CFLAGS +export CPATH +export CPPFLAGS +export CXXFLAGS +export LDFLAGS + +../../processors/IA32/bochs/configure \ + --enable-Cog \ + --enable-cpu-level=6 \ + --enable-sse=2 \ + --enable-assert-checks \ + --with-nogui \ + --enable-x86-64 \ + --enable-global-pages \ + --disable-mtrr \ + --disable-sb16 \ + --disable-ne2000 \ + --disable-pci \ + --disable-acpi \ + --disable-apic \ + --disable-clgd54xx \ + --disable-usb \ + --disable-plugins \ + ${CONFIGURE_ARGS} + +# apic == Advanced programmable Interrupt Controller +# acpi == Advanced Configuration and Power Interface +# pci == Peripheral Component Interconnect local bus +# clgd54xx == Cirrus Logic GD54xx video card + +# avoid conflict with squeak unix build's config.h +echo cp config.h bochsconfig.h +cp config.h bochsconfig.h + +echo "and don't forget to run ../../processors/IA32/bochs/makeem" Property changes on: branches/Cog/build.win32x86/bochsx64/conf.COG.dbg ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.win32x86/bochsx64/exploration/Makefile =================================================================== --- branches/Cog/build.win32x86/bochsx64/exploration/Makefile (rev 0) +++ branches/Cog/build.win32x86/bochsx64/exploration/Makefile 2016-02-13 23:57:51 UTC (rev 3595) @@ -0,0 +1,32 @@ +BOCHS=../../../processors/IA32/bochs +BOCHSEX64=$(BOCHS)/explorationx64 +LIBDEPS=../../cpu/libcpu.a +CFLAGS=-m32 -I.. -I$(BOCHS) -I$(BOCHS)/cpu -I$(BOCHS)/instrument/stubs -L../cpu -lcpu +FULLLIBS=-L../fpu -lfpu -L../disasm -ldisasm + +.PHONY: $(LIBDEPS) + +all: BochsX64Alien-regs.st BochsX64Alien-cr.st BochsX64Alien-xmm.st + +BochsX64Alien-regs.st: printcpu + ./printcpu >BochsX64Alien-regs.st + +BochsX64Alien-cr.st: printcpucr + ./printcpucr >BochsX64Alien-cr.st + +BochsX64Alien-xmm.st: printcpuxmm + ./printcpuxmm >BochsX64Alien-xmm.st + +clean: + rm -f BochsX64Alien-regs.st BochsX64Alien-cr.st BochsX64Alien-xmm.st + rm -f printcpu printcpucr printcpuxmm + rm -f printcpu.exe printcpucr.exe printcpuxmm.exe + +printcpu: $(BOCHSEX64)/printcpu.c $(LIBDEPS) + g++ -o $@ $< $(CFLAGS) + +printcpucr: $(BOCHSEX64)/printcpucr.c $(LIBDEPS) + g++ -o $@ $< $(CFLAGS) + +printcpuxmm: $(BOCHSEX64)/printcpuxmm.c $(LIBDEPS) + g++ -o $@ $< $(CFLAGS) Property changes on: branches/Cog/build.win32x86/bochsx86 ___________________________________________________________________ Added: svn:ignore + * Added: branches/Cog/build.win32x86/bochsx86/conf.COG =================================================================== --- branches/Cog/build.win32x86/bochsx86/conf.COG (rev 0) +++ branches/Cog/build.win32x86/bochsx86/conf.COG 2016-02-13 23:57:51 UTC (rev 3595) @@ -0,0 +1,57 @@ +#!/bin/sh + +# Bochs x86 simulator for the BochsIA32Alien plugin. +# This sets up the x86 compile for Cog on win32 under cygwin. Disable as much +# inessential stuff as possible leaving only the cpu/fpu & memory interface + +# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using +# $ ./conf.COG +# $ ../../processors/IA32/bochs/makeem + +set echo +# CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-labels=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -fprefetch-loop-arrays $CFLAGS" +CFLAGS="-m32 $CFLAGS" +CFLAGS="-Dsetjmp=_setjmp $CFLAGS" +CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions $CFLAGS" +CFLAGS="-g $CFLAGS" +CPPFLAGS="" +CXXFLAGS="$CFLAGS" + +export CFLAGS +export CPATH +export CPPFLAGS +export CXXFLAGS +export LDFLAGS + +../../processors/IA32/bochs/configure \ + -target=i686-pc-mingw32 \ + --enable-Cog \ + --enable-cpu-level=6 \ + --enable-sse=2 \ + --enable-assert-checks \ + --with-nogui \ + --disable-x86-64 \ + --disable-pae \ + --disable-large-pages \ + --disable-global-pages \ + --disable-mtrr \ + --disable-sb16 \ + --disable-ne2000 \ + --disable-pci \ + --disable-acpi \ + --disable-apic \ + --disable-clgd54xx \ + --disable-usb \ + --disable-plugins \ + ${CONFIGURE_ARGS} + +# apic == Advanced programmable Interrupt Controller +# acpi == Advanced Configuration and Power Interface +# pci == Peripheral Component Interconnect local bus +# clgd54xx == Cirrus Logic GD54xx video card + +# avoid conflict with squeak unix build's config.h +echo cp config.h bochsconfig.h +cp config.h bochsconfig.h + +echo "and don't forget to run ../../processors/IA32/bochs/makeem" Property changes on: branches/Cog/build.win32x86/bochsx86/conf.COG ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.win32x86/common/Makefile =================================================================== --- branches/Cog/build.win32x86/common/Makefile (rev 0) +++ branches/Cog/build.win32x86/common/Makefile 2016-02-13 23:57:51 UTC (rev 3595) @@ -0,0 +1,365 @@ +############################################################################# +# COmmon Makefile for Win32 VM using gcc-3.4.x, cygwin and gnu make +# Do make init to allow make -n to function. +############################################################################# + +############################################################################# +# Parameters: +# VM the name of the exe to build, defaults to Squeak (=> Squeak.exe) +# VM_NAME the name the VM will print when reporting, defaults to $(VM) +# VMSRCDIR the directory containing the interpreter, optional cogit and interp.h +# CONFIGURATION configuration of VM to build from product, assert & debug +# THREADING whether to build a multi-threaded FFI VM + +VM=Squeak +VM_NAME?=$(VM) +CONFIGURATION=product +THREADING=single + +# Is this a Croquet VM (defaults to OGL instead of D3D)? +CROQUET:=-DCROQUET + +############################################################################# +# Default locations +# + +ifeq ($(THREADING),multi) + ifeq ($(CONFIGURATION),product) + BUILD:=buildmt + else ifeq ($(CONFIGURATION),assert) + BUILD:=buildmtast + else + BUILD:=buildmtdbg + endif +else + ifeq ($(CONFIGURATION),product) + BUILD:=build + else ifeq ($(CONFIGURATION),assert) + BUILD:=buildast + else + BUILD:=builddbg + endif +endif +$(shell mkdir -p deps >/dev/null) # deps is the dependencies directory +PLUGINSRCDIR:= ../../src +OBJDIR:= $(BUILD)/vm + +# N.B. PLATDIR *must* be a relative path, see -f../../$(shell ./eitheror ... below +PLATDIR:=../../platforms +CROSSDIR:=$(PLATDIR)/Cross/vm +WIN32DIR:=$(PLATDIR)/win32/vm +WIN32MISCDIR:=$(PLATDIR)/win32/misc +WIN32UTILDIR:=$(PLATDIR)/win32/util + +CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) $(wildcard $(CROSSDIR)/*.cpp) +WIN32SRC:= $(wildcard $(WIN32DIR)/*.c) $(wildcard $(WIN32DIR)/*.cpp) +ifeq ("$(THREADING)","multi") +MAKERSRC:= $(wildcard $(VMSRCDIR)/gcc3x-*interpmt.c $(VMSRCDIR)/cogit.c) +else +MAKERSRC:= $(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c) +endif +VMSRC:= $(notdir $(MAKERSRC) $(WIN32SRC) $(CROSSSRC)) + +VPATH:= $(VMSRCDIR) $(WIN32DIR) $(CROSSDIR) + +############################################################################# +# The internal (.lib) and external (.dll) plugins +# +include plugins.ext +include plugins.int + +LIBS:= $(addprefix $(OBJDIR)/, $(addsuffix .lib, $(INTERNAL_PLUGINS))) +DLLS:= $(addprefix $(OBJDIR)/, $(addsuffix .dll, $(EXTERNAL_PLUGINS))) + +############################################################################# +# Generic VM source file definitions +# +VMOBJ:= $(VMSRC:.c=.o) +VMOBJ:= $(addprefix $(OBJDIR)/,$(VMOBJ)) + +############################################################################# +# SqueakVM definitions +# +ifeq ("$(CONFIGURATION)","product") +VMEXE:= $(OBJDIR)/$(VM)Unstripped.exe +CONSOLEVMEXE:= $(OBJDIR)/$(VM)ConsoleUnstripped.exe +STRIPEXE:= $(OBJDIR)/$(VM).exe +STRIPCONSOLEEXE:= $(OBJDIR)/$(VM)Console.exe +else +VMEXE:= $(OBJDIR)/$(VM).exe +CONSOLEVMEXE:= $(OBJDIR)/$(VM)Console.exe +STRIPEXE:= +STRIPCONSOLEEXE:= +endif +VMDEF:= $(VM).def +VMEXP:= $(OBJDIR)/$(VM).exp +VMMAP:= $(OBJDIR)/$(VM).map +CONSOLEVMMAP:= $(OBJDIR)/$(VM)Console.map +VMLIB:= $(VM).lib +VMRES:= $(VM).res +VMDEFIN:=$(VM).def.in +BTOBJ:= $(OBJDIR)/btext.o +ETOBJ:= $(OBJDIR)/etext.o + + +.PRECIOUS: eitheror.exe mkNamedPrims.exe + +############################################################################# +# DirectX definitions +# +DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include + +############################################################################# +# C compiler settings (gcc-3.4.4 cygwin 19.24) +# +CC:=gcc + +# VM config flags. +ifeq ("$(CONFIGURATION)","product") +OFLAGS:= -D_MT -O2 -march=pentium4 -momit-leaf-frame-pointer -funroll-loops +NDEBUG:=-DNDEBUG -D'VM_LABEL(foo)=0' # Define NDEBUG for production to exclude asserts +DEBUGVM=0 +else ifeq ("$(CONFIGURATION)","assert") +OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer +DEBUGVM=0 +NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' +else +OFLAGS:= -D_MT -march=pentium4 +DEBUGVM=1 +NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' +endif + +ifeq ("$(THREADING)","multi") +COGDEFS:=-DCOGMTVM=1 -DDEBUGVM=$(DEBUGVM) +else +COGDEFS:=-DCOGMTVM=0 -DDEBUGVM=$(DEBUGVM) +endif + +# Set minimum version to WindowsXP (see /cygwin/usr/include//w32api/w32api.h) +WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501 + +INCLUDEPATH:= -isystem/usr/include/mingw -I/usr/include/w32api +# define _MT to eliminate the inline versions of printf et al in mingw/stdio.h +NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf +CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ + -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) +DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ + $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) +XDEFS:= -DSQUEAK_BUILTIN_PLUGIN +INCLUDES:= -I. -I$(VMSRCDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) + +############################################################################# +# Linker settings +# +# Note: I had to use 'gcc' instead of 'ld' to prevent unresolved symbols +# The switch '-mwindows' gives us a GUI app instead of a console app. +# Newer cygwins want --export-all-symbols in place of --export-dynamic. +# +LD:= gcc +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ + -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ + -ldsound -lsecur32 + +############################################################################# +# Tools to use +# +AR:= ar rc +CP:= cp +RM:= rm +DLLTOOL:= dlltool +DLLWRAP:= dllwrap +STRIP:= strip +OBJCOPY:= objcopy + +############################################################################# +# RC settings +# +# Note: RC compiles the .rc files into linkable .o files +# +RC:= windres +SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) +RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"' + +.SUFFIXES: +.SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp + + + +############################################################################# +# Common build rules +# +default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) + +svnver: + echo $(RC) $(RCFLAGS) + +productmt:; + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product THREADING=multi $(@,product=) default + +product:; + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product THREADING=single $(@,product=) default + +assertmt: + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=assert THREADING=multi $(@,assert=) default + +assert: + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=assert THREADING=single $(@,assert=) default + +debugmt: + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=debug THREADING=multi $(@,debug=) default + +debug: + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=debug THREADING=single $(@,debug=) default + +# Do make init to allow make -n to function. +init: $(OBJDIR) eitheror.exe mkNamedPrims.exe + +cleanall: clean cleanmt cleanast cleanmtast cleandbg cleanmtdbg + +clean: + rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe build + +cleanmt: + rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmt + +cleanast: + rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildast + +cleanmtast: + rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtast + +cleandbg: + rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe builddbg + +cleanmtdbg: + rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtdbg + +print-settings: + @echo ---------------- Makefile settings ------------------ + @echo CONFIGURATION=$(CONFIGURATION) + @echo THREADING=$(THREADING) + @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 DLLS=$(DLLS) + @echo ----------------------------------------------------- + +print-objects: + @echo ---------------- Makefile objects ------------------ + @echo VMOBJ=$(VMOBJ) + @echo ----------------------------------------------------- + +eitheror.exe: $(WIN32UTILDIR)/eitheror.c + $(CC) -o $@ -O1 -mconsole -mno-cygwin $< + +mingw32ver.exe: $(WIN32UTILDIR)/mingw32ver.c + $(CC) -o $@ -O1 -mconsole -mno-cygwin $< + +mkNamedPrims.exe: $(WIN32UTILDIR)/mkNamedPrims.c + $(CC) -o $@ -mconsole -mno-cygwin $< + +$(BTOBJ): $(WIN32MISCDIR)/btext.c + $(CC) -c -o $@ -fomit-frame-pointer -O2 $< + +$(ETOBJ): $(WIN32MISCDIR)/etext.c + $(CC) -c -o $@ -fomit-frame-pointer -O2 $< + +vm: $(VMEXE) + +$(VMEXE): $(OBJDIR) $(VMOBJ) $(LIBS) $(VMEXP) resource.o $(BTOBJ) $(ETOBJ) + $(CC) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(WIN32DIR)/version.c + $(LD) $(LDFLAGS) -o $(VMEXE) \ + $(BTOBJ) $(VMOBJ) $(VMEXP) $(OBJDIR)/resource.o $(LIBS) $(STDLIBS) $(ETOBJ) + nm --numeric-sort --defined-only -f bsd $(VMEXE) >$(VMMAP) + +$(CONSOLEVMEXE): $(VMOBJ) $(LIBS) $(VMEXP) resource.o $(BTOBJ) $(ETOBJ) + $(CC) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(WIN32DIR)/version.c + $(LD) $(CONSOLELDFLAGS) -o $(CONSOLEVMEXE) \ + $(BTOBJ) $(VMOBJ) $(VMEXP) $(OBJDIR)/resource.o $(LIBS) $(STDLIBS) $(ETOBJ) + nm --numeric-sort --defined-only -f bsd $(CONSOLEVMEXE) >$(CONSOLEVMMAP) + +ifneq ($STRIPEXE,) +$(STRIPEXE): $(VMEXE) + $(STRIP) --strip-unneeded -o $(STRIPEXE) $(VMEXE) + $(OBJCOPY) --add-gnu-debuglink=$(VMEXE) $(STRIPEXE) + +$(STRIPCONSOLEEXE): $(CONSOLEVMEXE) + $(STRIP) --strip-unneeded -o $(STRIPCONSOLEEXE) $(CONSOLEVMEXE) + $(OBJCOPY) --add-gnu-debuglink=$(CONSOLEVMEXE) $(STRIPCONSOLEEXE) +endif + +$(OBJDIR): + @-mkdir $(BUILD) + mkdir $(OBJDIR) +ifneq ($(INTERNAL_PLUGINS),) + mkdir $(addprefix $(BUILD)/, $(INTERNAL_PLUGINS)) +endif +ifneq ($(EXTERNAL_PLUGINS),) + mkdir $(addprefix $(BUILD)/, $(EXTERNAL_PLUGINS)) +endif + +############################################################################# +# The exports for named primitives from Squeak (required by VM) +# +$(VMDEF) $(VMEXP) $(VMLIB): $(VMOBJ) + $(DLLTOOL) --input-def $(VMDEFIN) --output-def $(OBJDIR)/$(VMDEF) --output-exp $(VMEXP) --output-lib $(OBJDIR)/$(VMLIB) $(VMOBJ) + +############################################################################# +# Building plugins +# + +.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.dll + +# Check for Makefile in win32 plugins directory otherwise use default Makefile +plugin-makefile = $(shell ./eitheror.exe \ + $(PLATDIR)/win32/plugins/$(*F)/Makefile.plugin \ + ../common/Makefile.plugin) + +# Internal plugin. Build as lib then link in lib +$(OBJDIR)/%.lib: eitheror.exe $(call plugin-makefile,$(*F)) + @-mkdir $(BUILD)/$(*F) + $(MAKE) $(MFLAGS) CONFIGURATION=$(CONFIGURATION) BUILD=$(BUILD) \ + -f $(call plugin-makefile,$(*F)) \ + PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ + LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \ + $(OBJDIR)/$(*F).lib + +# External plugin. Build as dll and copy to vm dir ($(OBJDIR)). +$(OBJDIR)/%.dll: eitheror.exe $(call plugin-makefile,$(*F)) + @-mkdir $(BUILD)/$(*F) + $(MAKE) $(MFLAGS) CONFIGURATION=$(CONFIGURATION) BUILD=$(BUILD) \ + -f $(call plugin-makefile,$(*F)) \ + PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \ + COGDEFS="$(COGDEFS)" LIBNAME=$(*F) $(OBJDIR)/$(*F).dll + +############################################################################# +# Basic rules +# +include ../common/Makefile.rules + +$(VMRES): $(VM).rc + $(RC) $(RCFLAGS) -i $(VM).rc -o $(OBJDIR)/$@ + $(CP) $(VM).exe.manifest $(OBJDIR) + $(CP) $(VM).exe.manifest $(OBJDIR)/$(VM)Console.exe.manifest + +resource.o: $(VMRES) + $(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@ + +############################################################################# +# Extra specific dependencies +# +sqNamedPrims.h: plugins.int mkNamedPrims.exe + ./mkNamedPrims.exe $(INTERNAL_PLUGINS) > sqNamedPrims.h + +$(OBJDIR)/sqNamedPrims.o: sqNamedPrims.c sqNamedPrims.h Added: branches/Cog/build.win32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.win32x86/common/Makefile.plugin (rev 0) +++ branches/Cog/build.win32x86/common/Makefile.plugin 2016-02-13 23:57:51 UTC (rev 3595) @@ -0,0 +1,174 @@ +############################################################################# +# Generic Makefile for plugins +############################################################################# +AR:= ar rc +CP:= cp +RM:= rm + +# 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 src/vm source directory? +# PLATDIR: Where is the root of the platforms tree? +# BUILDDIR: Which irectory should objects be compiled into? + +############################################################################# +# Standard directory locations: +# CROSSDIR: The location of the cross platform sources +# WIN32DIR: The location of the win32 sources +# MAKERDIR: The location of the VMMaker generated sources +# BUILDDIR: The location where the plugin is built +# +CROSSDIR:= $(PLATDIR)/Cross/plugins/$(LIBNAME) +WIN32DIR:= $(PLATDIR)/win32/plugins/$(LIBNAME) +MAKERDIR:= $(PLUGINSRCDIR)/plugins/$(LIBNAME) +BUILDDIR:= $(BUILD)/$(LIBNAME) + +# Support directory locations +CROSSVMDIR:=$(PLATDIR)/Cross/vm +WIN32VMDIR:=$(PLATDIR)/win32/vm + +DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include + +INCLUDES:= -I. -I$(DXDIR) \ + -I$(VMSRCDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \ + -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR) + +############################################################################# +# If no source files were given, use standard set +# + +CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) $(wildcard $(CROSSDIR)/*.cpp) +WIN32SRC:= $(wildcard $(WIN32DIR)/*.c) $(wildcard $(WIN32DIR)/*.cpp) +MAKERSRC:= $(wildcard $(MAKERDIR)/*.c) +LIBSRC:= $(notdir $(MAKERSRC) $(WIN32SRC) $(CROSSSRC)) + +############################################################################# +# C compiler settings (gcc-3.4.4 cygwin 19.24) +# +NDEBUG:=-DNDEBUG +# Set minimum version to WindowsXP (see /cygwin/usr/include//w32api/w32api.h) +WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501 +INCLUDEPATH:= -isystem/usr/include/mingw -I/usr/include/w32api +CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mdll -mno-cygwin -mwin32 \ + -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) +DEFS:= $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + $(NDEBUG) -DLSB_FIRST -DVM_NAME=\"$(VM)\" -DX86 $(XDEFS) +# define _MT to eliminate the inline versions of printf et al in mingw/stdio.h +ifeq ("$(CONFIGURATION)","product") +OFLAGS:= -D_MT -O1 -march=pentium4 -momit-leaf-frame-pointer -funroll-loops \ + -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf +NDEBUG:=-DNDEBUG +DEBUGVM=0 +else ifeq ("$(CONFIGURATION)","assert") +OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer \ + -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf +DEBUGVM=0 +NDEBUG:= +else +OFLAGS:= -D_MT -march=pentium4 \ + -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf +DEBUGVM=1 +NDEBUG:= +endif + + +############################################################################# +# DLL 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 + +.SUFFIXES: .c .cpp .o .s .rc .res .dep + +############################################################################# +# Plugin settings +# +OBJDIR:= $(BUILD)/$(LIBNAME) +VMDIR:= $(BUILD)/vm +PLUGINLIB:= $(VMDIR)/$(LIBNAME).lib +PLUGINDLL:= $(VMDIR)/$(LIBNAME).dll +LIBOBJ ?= $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(LIBSRC))) +LIBOBJ:= $(addprefix $(OBJDIR)/,$(LIBOBJ)) + + +VPATH:= $(MAKERDIR) $(WIN32DIR) $(CROSSDIR) $(OBJDIR) + +all: $(PLUGINLIB) $(PLUGINDLL) + +print-settings: + @echo ---------------- Makefile settings ------------------ + @echo VPATH=$(VPATH) + @echo INCLUDES=$(INCLUDES) + @echo CFLAGS=$(CFLAGS) + @echo ALLFLAGS=$(ALLFLAGS) + @echo PLUGINSRCDIR=$(PLUGINSRCDIR) + @echo VMSRCDIR=$(VMSRCDIR) + @echo CROSSDIR=$(CROSSDIR) + @echo WIN32DIR=$(WIN32DIR) + @echo MAKERDIR=$(MAKERDIR) + @echo CROSSSRC=$(CROSSSRC) + @echo WIN32SRC=$(WIN32SRC) + @echo MAKERSRC=$(MAKERSRC) + @echo LIBSRC=$(LIBSRC) + @echo LIBOBJ=$(LIBOBJ) + @echo OBJDIR=$(OBJDIR) + @echo VMDIR=$(VMDIR) + @echo PLUGINLIB=$(PLUGINLIB) + @echo PLUGINDLL=$(PLUGINDLL) + @echo ----------------------------------------------------- + +$(OBJDIR): + mkdir $(OBJDIR) + +$(VMDIR): + mkdir $(VMDIR) + +$(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ) + -$(RM) $(PLUGINLIB) + $(AR) $(PLUGINLIB) $(LIBOBJ) + +$(PLUGINDLL): $(VMDIR) $(OBJDIR) $(LIBOBJ) + $(DLLTOOL) \ + --output-def $(LIBNAME).def \ + --output-exp $(LIBNAME).exp \ + --output-lib $(LIBNAME).lib \ + $(DLLTOOLEXTRAS) \ + $(LIBOBJ) +ifneq ($(LINK_WITH_GCC),) + gcc -shared \ + -mno-cygwin \ + -def $(LIBNAME).def \ + -o $(VMDIR)/$(LIBNAME).dll \ + --entry _DllMain@12 \ + $(GCCLINKEXTRAS) \ + $(LIBOBJ) $(EXTRALIBS) +else ifneq ($(LINK_WITH_GPP),) + g++ -shared \ + -mno-cygwin \ + -def $(LIBNAME).def \ + -o $(VMDIR)/$(LIBNAME).dll \ + --entry _DllMain@12 \ + $(GPPLINKEXTRAS) \ + $(LIBOBJ) $(EXTRALIBS) +else + $(DLLWRAP) -mwindows \ + -def $(LIBNAME).def \ + -o $(VMDIR)/$(LIBNAME).dll \ + --entry _DllMain@12 \ + $(DLLWRAPEXTRAS) \ + $(LIBNAME).exp \ + $(LIBOBJ) $(EXTRALIBS) +endif + $(OPTSTRIP) --strip-all $(VMDIR)/$(LIBNAME).dll + -$(RM) $(LIBNAME).lib + +############################################################################# +# Rules for automated builds +# +include ../common/Makefile.rules Added: branches/Cog/build.win32x86/common/Makefile.rules =================================================================== --- branches/Cog/build.win32x86/common/Makefile.rules (rev 0) +++ branches/Cog/build.win32x86/common/Makefile.rules 2016-02-13 23:57:51 UTC (rev 3595) @@ -0,0 +1,46 @@ +############################################################################# +# Compilation rules for Mac OS X +# +# See http://make.mad-scientist.net/papers/advanced-auto-dependency-generation +# for an explanation of the dependency management scheme. + +# gcc 3.4.x +# Note: I had to use 'gcc' instead of 'ld' to prevent unresolved symbols +# The switch '-mwindows' gives us a GUI app instead of a console app. +# Newer cygwins want --export-all-symbols in place of --export-dynamic. +# +CC := gcc +CXX:= g++ +LD := gcc +LDCXX := clang++ # For linking c++ bundles + +DEPFLAGS = -MT $@ -MMD -MP -MF deps/$(*F).Td +ALLFLAGS = $(DEPFLAGS) $(CFLAGS) $(INCLUDES) $(DEFS) +POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' > deps/$(*F).d; rm deps/$(*F).Td; touch -r $< deps/$(*F).d + +$(OBJDIR)/%.o: %.c deps/%.d + $(CC) -x c $(ALLFLAGS) $(INCLUDES) -c $< -o $@ + $(POSTCOMPILE) + +$(OBJDIR)/%.o: %.m deps/%.d + $(CC) -x objective-c $(ALLFLAGS) $(INCLUDES) -c $< -o $@ + $(POSTCOMPILE) + +$(OBJDIR)/%.o: %.cpp deps/%.d + $(CXX) $(ALLFLAGS) $(INCLUDES) -c $< -o $@ + $(POSTCOMPILE) + +%res: %.rc + $(RC) $(RCFLAGS) -i $< -o $@ + + +deps/%.d: ; + +.PRECIOUS: deps/%.d + +-include $(patsubst %,deps/%.d,$(notdir $(basename $(VMSRC)))) + +#.cpp.o: +# $(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $< +# +#CXX:=g++ Property changes on: branches/Cog/build.win32x86/newspeak.cog.spur ___________________________________________________________________ Modified: svn:ignore - build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h LOG* + build buildast builddbg deps eitheror.exe mkNamedPrims.exe sqNamedPrims.h LOG* Modified: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2016-02-13 23:45:59 UTC (rev 3594) +++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2016-02-13 23:57:51 UTC (rev 3595) @@ -3,329 +3,10 @@ # Do make init to allow make -n to function. ############################################################################# -############################################################################# -# Base definitions: -# default configuration from product, assert & debug -# -CONFIGURATION=product - # The name of the VM to build VM:=nsvm -VM_NAME?=Newspeak Virtual Machine +VM_NAME:=Newspeak Virtual Machine -############################################################################# -# Default locations -# -ifndef BASEDIR -BASEDIR:=. -endif +VMSRCDIR:= ../../nsspursrc/vm -ifeq ("$(CONFIGURATION)","product") -BUILD:=build -else ifeq ("$(CONFIGURATION)","assert") -BUILD:=buildast -else -BUILD:=builddbg -endif -PLUGINSRCDIR:= ../../nsspursrc -VMSRCDIR:= ../../nsspursrc -BLDDIR:= $(BASEDIR)/$(BUILD) -OBJDIR:= $(BLDDIR)/vm - -# N.B. PLATDIR *must* be a relative path, see -f../../$(shell ./eitheror ... below -PLATDIR:=../../platforms -CROSSDIR:=$(PLATDIR)/Cross/vm -WIN32DIR:=$(PLATDIR)/win32/vm -MAKERDIR:=$(VMSRCDIR)/vm -WIN32MISCDIR:=$(PLATDIR)/win32/misc -WIN32UTILDIR:=$(PLATDIR)/win32/util - -CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) $(wildcard $(CROSSDIR)/*.cpp) -WIN32SRC:= $(wildcard $(WIN32DIR)/*.c) $(wildcard $(WIN32DIR)/*.cpp) -MAKERSRC:= $(MAKERDIR)/gcc3x-cointerp.c $(MAKERDIR)/cogit.c -VMSRC:= $(notdir $(MAKERSRC) $(WIN32SRC) $(CROSSSRC)) - -VPATH:= $(MAKERDIR) $(WIN32DIR) $(CROSSDIR) - -############################################################################# -# The internal (.lib) and external (.dll) plugins -# -include plugins.ext -include plugins.int - -LIBS:= $(addprefix $(OBJDIR)/, $(addsuffix .lib, $(INTERNAL_PLUGINS))) -DLLS:= $(addprefix $(OBJDIR)/, $(addsuffix .dll, $(EXTERNAL_PLUGINS))) - -############################################################################# -# Generic VM source file definitions -# -VMDIR:= $(VMSRCDIR)/vm -VMOBJ:= $(VMSRC:.c=.o) -VMOBJ:= $(addprefix $(OBJDIR)/,$(VMOBJ)) - -#LIBSRC:= $(wildcard *.c) -#LIBOBJ:= $(LIBSRC:.c=.o) - -############################################################################# -# SqueakVM definitions -# -ifeq ("$(CONFIGURATION)","product") -VMEXE:= $(OBJDIR)/$(VM)Unstripped.exe -CONSOLEVMEXE:= $(OBJDIR)/$(VM)ConsoleUnstripped.exe -STRIPEXE:= $(OBJDIR)/$(VM).exe -STRIPCONSOLEEXE:= $(OBJDIR)/$(VM)Console.exe -else -VMEXE:= $(OBJDIR)/$(VM).exe -CONSOLEVMEXE:= $(OBJDIR)/$(VM)Console.exe -STRIPEXE:= -STRIPCONSOLEEXE:= -endif -VMDEF:= $(VM).def -VMEXP:= $(OBJDIR)/$(VM).exp -VMMAP:= $(OBJDIR)/$(VM).map -CONSOLEVMMAP:= $(OBJDIR)/$(VM)Console.map -VMLIB:= $(VM).lib -VMRES:= $(VM).res -VMDEFIN:=$(BASEDIR)/$(VM).def.in -BTOBJ:= $(OBJDIR)/btext.o -ETOBJ:= $(OBJDIR)/etext.o - - -.PRECIOUS: eitheror.exe mkNamedPrims.exe - -############################################################################# -# DirectX definitions -# -DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include - -############################################################################# -# C compiler settings (gcc-3.4.4 cygwin 19.24) -# -CC:=gcc - -# VM config flags. -ifeq ("$(CONFIGURATION)","product") -OFLAGS:= -D_MT -O2 -march=pentium4 -momit-leaf-frame-pointer -funroll-loops -NDEBUG:=-DNDEBUG -D'VM_LABEL(foo)=0' # Define NDEBUG for production to exclude asserts -DEBUGVM=0 -else ifeq ("$(CONFIGURATION)","assert") -OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer -NDEBUG:=-D'VM_LABEL(foo)=0' -DEBUGVM=0 -else -OFLAGS:= -D_MT -march=pentium4 -NDEBUG:=-DNODBGPRINT=1 -D'VM_LABEL(foo)=0' -D'bzero(p,s)=__builtin_bzero((p),(s))' -DEBUGVM=1 -endif - -# Set minimum version to WindowsXP (see /cygwin/usr/include//w32api/w32api.h) -WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501 -WINDEFS:=$(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT - -INCLUDEPATH:= -isystem/usr/include/mingw -I/usr/include/w32api -# define _MT to eliminate the inline versions of printf et al in mingw/stdio.h -NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf -CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ - -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) -TZ:=$(shell date +%Z) -DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ - $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) -XDEFS:= -DSQUEAK_BUILTIN_PLUGIN -INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) - -############################################################################# -# Linker settings -# -# Note: I had to use 'gcc' instead of 'ld' to prevent unresolved symbols -# The switch '-mwindows' gives us a GUI app instead of a console app. -# Newer cygwins want --export-all-symbols in place of --export-dynamic. -# -LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) -STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ - -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ - -ldsound -lsecur32 - -############################################################################# -# Tools to use -# -AR:= ar rc -CP:= cp -RM:= rm -DLLTOOL:= dlltool -DLLWRAP:= dllwrap -STRIP:= strip -OBJCOPY:= objcopy - -############################################################################# -# RC settings -# -# Note: RC compiles the .rc files into linkable .o files -# -RC:= windres -SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) -RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"5.0.$(SVNREV)\\0\"' - -.SUFFIXES: -.SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp - - - -############################################################################# -# Common build rules -# -default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) - -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 - -# Do make init to allow make -n to function. -init: $(OBJDIR) eitheror.exe mkNamedPrims.exe - -cleanall: clean cleanast cleandbg - -clean: - rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe build - -cleanast: - rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildast - -cleandbg: - rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe builddbg - -print-settings: @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3594] Get the Bochs plugins to compile under the new common/ Makefile.plugin regime
by commits＠squeakvm.org 14 Feb '16

14 Feb '16

Revision: 3594 Author: eliot Date: 2016-02-13 15:45:59 -0800 (Sat, 13 Feb 2016) Log Message: ----------- Get the Bochs plugins to compile under the new common/Makefile.plugin regime Modified Paths: -------------- trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin Added Paths: ----------- trunk/platforms/win32/plugins/BochsX64Plugin/ trunk/platforms/win32/plugins/BochsX64Plugin/Makefile.plugin Removed Paths: ------------- trunk/platforms/win32/plugins/BochsX64Plugin/Makefile Modified: trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin =================================================================== --- trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin 2016-02-13 23:09:50 UTC (rev 3593) +++ trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin 2016-02-13 23:45:59 UTC (rev 3594) @@ -1,24 +1,17 @@ -DLLTOOLEXTRA := $(PLATDIR)/../processors/IA32/winbochs/cpu/libcpu.a \ - $(PLATDIR)/../processors/IA32/winbochs/fpu/libfpu.a \ - $(PLATDIR)/../processors/IA32/winbochs/disasm/libdisasm.a +DLLTOOLEXTRA := ../bochsx86/cpu/libcpu.a \ + ../bochsx86/fpu/libfpu.a \ + ../bochsx86/disasm/libdisasm.a DLLWRAPEXTRA := $(DLLTOOLEXTRA) LINK_WITH_GPP := yes -EXTRALIBS:= -L$(PLATDIR)/../processors/IA32/winbochs/cpu \ - -L$(PLATDIR)/../processors/IA32/winbochs/fpu \ - -L$(PLATDIR)/../processors/IA32/winbochs/disasm \ +EXTRALIBS:= -L../bochsx86/cpu -L../bochsx86/fpu -L../bochsx86/disasm \ -lcpu -lfpu -ldisasm include ../common/Makefile.plugin -CXXINCLUDES:= -I$(PLATDIR)/../processors/IA32/winbochs \ - -I$(PLATDIR)/../processors/IA32/bochs \ - -I$(PLATDIR)/../processors/IA32/bochs/instrument/stubs +INCLUDES+=-I../bochsx86 \ + -I../../processors/IA32/bochs \ + -I../../processors/IA32/bochs/instrument/stubs -CXXFLAGS:= -m32 -mno-cygwin -DWIN32 -msse2 -ggdb2 -mwindows -mthreads -mwin32 \ +CFLAGS:= -m32 -mno-cygwin -DWIN32 -msse2 -ggdb2 -mwindows -mthreads -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $< - -CXX:=g++ Deleted: trunk/platforms/win32/plugins/BochsX64Plugin/Makefile =================================================================== --- trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile 2016-02-12 19:32:34 UTC (rev 3589) +++ trunk/platforms/win32/plugins/BochsX64Plugin/Makefile 2016-02-13 23:45:59 UTC (rev 3594) @@ -1,24 +0,0 @@ -DLLTOOLEXTRA := $(PLATDIR)/../processors/IA32/winbochs/cpu/libcpu.a \ - $(PLATDIR)/../processors/IA32/winbochs/fpu/libfpu.a \ - $(PLATDIR)/../processors/IA32/winbochs/disasm/libdisasm.a -DLLWRAPEXTRA := $(DLLTOOLEXTRA) - -LINK_WITH_GPP := yes -EXTRALIBS:= -L$(PLATDIR)/../processors/IA32/winbochs/cpu \ - -L$(PLATDIR)/../processors/IA32/winbochs/fpu \ - -L$(PLATDIR)/../processors/IA32/winbochs/disasm \ - -lcpu -lfpu -ldisasm - -include ../../Makefile.plugin - -CXXINCLUDES:= -I$(PLATDIR)/../processors/IA32/winbochs \ - -I$(PLATDIR)/../processors/IA32/bochs \ - -I$(PLATDIR)/../processors/IA32/bochs/instrument/stubs - -CXXFLAGS:= -m32 -mno-cygwin -DWIN32 -msse2 -ggdb2 -mwindows -mthreads -mwin32 \ - -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $< - -CXX:=g++ Copied: trunk/platforms/win32/plugins/BochsX64Plugin/Makefile.plugin (from rev 3593, trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin) =================================================================== --- trunk/platforms/win32/plugins/BochsX64Plugin/Makefile.plugin (rev 0) +++ trunk/platforms/win32/plugins/BochsX64Plugin/Makefile.plugin 2016-02-13 23:45:59 UTC (rev 3594) @@ -0,0 +1,17 @@ +DLLTOOLEXTRA := ../bochsx64/cpu/libcpu.a \ + ../bochsx64/fpu/libfpu.a \ + ../bochsx64/disasm/libdisasm.a +DLLWRAPEXTRA := $(DLLTOOLEXTRA) + +LINK_WITH_GPP := yes +EXTRALIBS:= -L../bochsx64/cpu -L../bochsx64/fpu -L../bochsx64/disasm \ + -lcpu -lfpu -ldisasm + +include ../common/Makefile.plugin + +INCLUDES+=-I../bochsx64 \ + -I../../processors/IA32/bochs \ + -I../../processors/IA32/bochs/instrument/stubs + +CFLAGS:= -m32 -mno-cygwin -DWIN32 -msse2 -ggdb2 -mwindows -mthreads -mwin32 \ + -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args

1 0

[commit][3593] Add new plugin makefiles for the revised win32 makefiles that follow the Mac pattern .
by commits＠squeakvm.org 14 Feb '16

14 Feb '16

Revision: 3593 Author: eliot Date: 2016-02-13 15:09:50 -0800 (Sat, 13 Feb 2016) Log Message: ----------- Add new plugin makefiles for the revised win32 makefiles that follow the Mac pattern. Modified Paths: -------------- trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c Added Paths: ----------- trunk/platforms/win32/plugins/BitBltPlugin/Makefile.plugin trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin trunk/platforms/win32/plugins/FT2Plugin/Makefile.plugin trunk/platforms/win32/plugins/FloatMathPlugin/Makefile.plugin trunk/platforms/win32/plugins/IA32ABI/Makefile.plugin trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.plugin trunk/platforms/win32/plugins/SqueakFFIPrims/Makefile.plugin trunk/platforms/win32/plugins/SqueakSSL/Makefile.plugin trunk/platforms/win32/plugins/Win32OSProcessPlugin/Makefile.plugin Added: trunk/platforms/win32/plugins/BitBltPlugin/Makefile.plugin =================================================================== --- trunk/platforms/win32/plugins/BitBltPlugin/Makefile.plugin (rev 0) +++ trunk/platforms/win32/plugins/BitBltPlugin/Makefile.plugin 2016-02-13 23:09:50 UTC (rev 3593) @@ -0,0 +1,10 @@ +# Override to avoid files in platforms/Cross/plugins/BitBltPlugin. +# Fails if one redefines VPATH and then includes ../common/Makefile.plugin. Grrr... + +WIN32DIR:= $(PLATDIR)/win32/plugins/$(LIBNAME) +MAKERDIR:= $(PLUGINSRCDIR)/plugins/$(LIBNAME) +OBJDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) + +%: + $(MAKE) -f ../common/Makefile.plugin VPATH="$(MAKERDIR) $(WIN32DIR) $(OBJDIR)" \ + CROSSSRC="" $@ Added: trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin =================================================================== --- trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin (rev 0) +++ trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile.plugin 2016-02-13 23:09:50 UTC (rev 3593) @@ -0,0 +1,24 @@ +DLLTOOLEXTRA := $(PLATDIR)/../processors/IA32/winbochs/cpu/libcpu.a \ + $(PLATDIR)/../processors/IA32/winbochs/fpu/libfpu.a \ + $(PLATDIR)/../processors/IA32/winbochs/disasm/libdisasm.a +DLLWRAPEXTRA := $(DLLTOOLEXTRA) + +LINK_WITH_GPP := yes +EXTRALIBS:= -L$(PLATDIR)/../processors/IA32/winbochs/cpu \ + -L$(PLATDIR)/../processors/IA32/winbochs/fpu \ + -L$(PLATDIR)/../processors/IA32/winbochs/disasm \ + -lcpu -lfpu -ldisasm + +include ../common/Makefile.plugin + +CXXINCLUDES:= -I$(PLATDIR)/../processors/IA32/winbochs \ + -I$(PLATDIR)/../processors/IA32/bochs \ + -I$(PLATDIR)/../processors/IA32/bochs/instrument/stubs + +CXXFLAGS:= -m32 -mno-cygwin -DWIN32 -msse2 -ggdb2 -mwindows -mthreads -mwin32 \ + -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $< + +CXX:=g++ Added: trunk/platforms/win32/plugins/FT2Plugin/Makefile.plugin =================================================================== --- trunk/platforms/win32/plugins/FT2Plugin/Makefile.plugin (rev 0) +++ trunk/platforms/win32/plugins/FT2Plugin/Makefile.plugin 2016-02-13 23:09:50 UTC (rev 3593) @@ -0,0 +1,10 @@ +include ../common/Makefile.plugin + +# This seems broken, but in the generated FT2Plugin.c there is an +# include<tttables.h> which should be include<freetype/tttables.h> +# so we simply add it to the include path. Eeek. +INCLUDES+= -I$(WIN32DIR)/freetype + +# Add the freetype libs to the build +EXTRALIBS=$(WIN32DIR)/freetype.a + Added: trunk/platforms/win32/plugins/FloatMathPlugin/Makefile.plugin =================================================================== --- trunk/platforms/win32/plugins/FloatMathPlugin/Makefile.plugin (rev 0) +++ trunk/platforms/win32/plugins/FloatMathPlugin/Makefile.plugin 2016-02-13 23:09:50 UTC (rev 3593) @@ -0,0 +1,11 @@ +include ../common/Makefile.plugin + +# Special OFLAGS for some files +k_tan.o: k_tan.c + $(MAKE) -f ../common/Makefile.plugin OFLAGS="-O0" $*.o + +acos.o: acos.c + $(MAKE) -f ../common/Makefile.plugin OFLAGS="-O0" $*.o + +tanh.o: tanh.c + $(MAKE) -f ../common/Makefile.plugin OFLAGS="-O0" $*.o Added: trunk/platforms/win32/plugins/IA32ABI/Makefile.plugin =================================================================== --- trunk/platforms/win32/plugins/IA32ABI/Makefile.plugin (rev 0) +++ trunk/platforms/win32/plugins/IA32ABI/Makefile.plugin 2016-02-13 23:09:50 UTC (rev 3593) @@ -0,0 +1,3 @@ +LIBOBJ:= ia32abicc.o IA32ABI.o + +include ../common/Makefile.plugin Modified: trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c =================================================================== --- trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c 2016-02-13 18:10:32 UTC (rev 3592) +++ trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c 2016-02-13 23:09:50 UTC (rev 3593) @@ -723,7 +723,7 @@ /* Copy the name of the given MIDI port into the string at the given address. Copy at most length characters, and return the number of characters copied. Fail if there is no port of the given number.*/ -int sqMIDIGetPortName(int portNum, int namePtr, int length) { +int sqMIDIGetPortName(int portNum, char * namePtr, int length) { TCHAR *portName; int count, i; MIDIOUTCAPS outCaps; @@ -744,7 +744,7 @@ count = lstrlen(portName); if (count > length) count = length; for(i=0;i<count;i++) - ((char*)namePtr)[i] = (char) portName[i]; + namePtr[i] = (char) portName[i]; return count; } @@ -933,7 +933,7 @@ available. Fail if the buffer is shorter than five bytes, since there must be enough room for the timestamp plus at least one data byte. */ -int sqMIDIPortReadInto(int portNum, int count, int bufferPtr) { +int sqMIDIPortReadInto(int portNum, int count, char * bufferPtr) { int bytesRead, stamped; DWORD index, i, data, len, stamp; unsigned char *dstPtr; @@ -1011,7 +1011,7 @@ zero, then send the data immediately. Implementations that do not support a timestamped output queue, such as this one, always send the data immediately; see sqMIDIHasBuffer. */ -int sqMIDIPortWriteFromAt(int portNum, int count, int bufferPtr, int time) { +int sqMIDIPortWriteFromAt(int portNum, int count, char * bufferPtr, int time) { unsigned char *srcPtr = (char*) bufferPtr; unsigned char cmd; sqMidiPort *port; Added: trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.plugin =================================================================== --- trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.plugin (rev 0) +++ trunk/platforms/win32/plugins/Mpeg3Plugin/Makefile.plugin 2016-02-13 23:09:50 UTC (rev 3593) @@ -0,0 +1,30 @@ +include ../common/Makefile.plugin + +# additional CFLAGS +CFLAGS += -DNOPTHREADS + +# additional directories and files +MP3DIR= $(CROSSDIR)/libmpeg +MP3SRC= $(notdir $(wildcard $(MP3DIR)/*.c)) +MP3SRC:= $(filter-out dump.c dump2.c mpeg3toc.c mpeg3cat.c testaudio.c udump.c test.c, $(MP3SRC)) +MP3OBJ:= $(MP3SRC:.c=.o) + +AUDDIR= $(MP3DIR)/audio +AUDSRC= $(notdir $(wildcard $(AUDDIR)/*.c)) +AUDOBJ:= $(AUDSRC:.c=.o) + +VIDDIR= $(MP3DIR)/video +VIDSRC= $(notdir $(wildcard $(VIDDIR)/*.c)) +VIDSRC:= $(filter-out worksheet.c, $(VIDSRC)) +VIDOBJ:= $(VIDSRC:.c=.o) + +# add the libmpeg files +LIBSRC += $(MP3SRC) $(AUDSRC) $(VIDSRC) +LIBOBJ += $(addprefix $(OBJDIR)/,$(MP3OBJ) $(AUDOBJ) $(VIDOBJ)) + +# add the directories +VPATH += $(MP3DIR) $(VIDDIR) $(AUDDIR) +INCLUDES += -I$(MP3DIR) -I$(VIDDIR) -I$(AUDDIR) + +$(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ) + $(AR) $(PLUGINLIB) $(LIBOBJ) Added: trunk/platforms/win32/plugins/SqueakFFIPrims/Makefile.plugin =================================================================== --- trunk/platforms/win32/plugins/SqueakFFIPrims/Makefile.plugin (rev 0) +++ trunk/platforms/win32/plugins/SqueakFFIPrims/Makefile.plugin 2016-02-13 23:09:50 UTC (rev 3593) @@ -0,0 +1,16 @@ +# On Cog we use the ThreadedFFIPlugin and need no platform-dependent code +ifdef COGDEFS +CROSSDIR:= $(PLATDIR)/Cross/plugins/$(LIBNAME) +MAKERDIR:= $(PLUGINSRCDIR)/plugins/$(LIBNAME) +OBJDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) +WIN32DIR:= $(PLATDIR)/win32/plugins/$(LIBNAME) + +%: + $(MAKE) -f ../common/Makefile.plugin VPATH="$(CROSSDIR) $(MAKERDIR) $(WIN32DIR) $(OBJDIR)" \ + CROSSSRC="sqFFIPlugin.c sqFFITestFuncs.c sqManualSurface.c" \ + MAKERSRC="SqueakFFIPrims.c" \ + WIN32SRC="" \ + $@ +else +include ../common/Makefile.plugin +endif Added: trunk/platforms/win32/plugins/SqueakSSL/Makefile.plugin =================================================================== --- trunk/platforms/win32/plugins/SqueakSSL/Makefile.plugin (rev 0) +++ trunk/platforms/win32/plugins/SqueakSSL/Makefile.plugin 2016-02-13 23:09:50 UTC (rev 3593) @@ -0,0 +1,28 @@ +# Makefile for SqueakSSL plugin. This should work given the right versions of +# things. Alas my current MINGW installation, 3.17, doesn't have an up-to-date +# /usr/lib/w32api/libcrypt32.a; it defines 14 funcs needed by sqWin32SSL.c but +# another 11 are undefined. +# If you want to experiment, download a suitable version of openssl, +# e.g. http://www.openssl.org/source/openssl-1.0.1e.tar.gz +# and unpack it. The below assumes it is unpacked in /usr/local. +# Then in the openssl directory do +# ./Configure mingw +# make +# make test +# Then in cygwinbuild do +# make build/vm/SqueakSSL.dll +# If you get something that works please let me know. +# Eliot Miranda, eliot.miranda(a)gmail.com, 2013/4/4 + +OPENSSL:=/usr/local/openssl-1.0.1e +EXTRALIBS:= -L$(OPENSSL) \ + -lssl -lcrypto \ + -L/usr/lib/w32api \ + -lcrypt32 -lsecur32 + +# You may need the following to make an internal plugin +DLLTOOLEXTRA := $(OPENSSL)/libssl.a \ + $(OPENSSL)/libcrypto.a +DLLWRAPEXTRA := $(DLLTOOLEXTRA) + +include ../common/Makefile.plugin Added: trunk/platforms/win32/plugins/Win32OSProcessPlugin/Makefile.plugin =================================================================== --- trunk/platforms/win32/plugins/Win32OSProcessPlugin/Makefile.plugin (rev 0) +++ trunk/platforms/win32/plugins/Win32OSProcessPlugin/Makefile.plugin 2016-02-13 23:09:50 UTC (rev 3593) @@ -0,0 +1,3 @@ +include ../common/Makefile.plugin +INCLUDES += -I$(PLATDIR)/Cross/plugins/FilePlugin \ + -I$(PLATDIR)/Cross/plugins/SocketPlugin

1 0

VM Maker: VMMaker.oscog-eem.1679.mcz
by commits＠source.squeak.org 13 Feb '16

13 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1679.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1679 Author: eem Time: 13 February 2016, 1:08:25.162285 pm UUID: dac7e09c-8ee4-4fee-bd93-9cdcb7acb992 Ancestors: VMMaker.oscog-eem.1678 And revert the sort order regression in the last commit to not disturb the generated source unnecessarily. =============== Diff against VMMaker.oscog-eem.1678 =============== Item was changed: ----- Method: CCodeGenerator>>emitExportsNamed:pluginName:on: (in category 'C code generator') ----- emitExportsNamed: exportsNamePrefix pluginName: pluginName on: aStream "Store all the exported primitives in the form used by the internal named prim system." | nilVMClass excludeDepth | (nilVMClass := vmClass isNil) ifTrue: "We need a vmClass temporarily to compute accessor depths." [vmClass := StackInterpreter]. "Don't include the depth in the vm's named primitives if the vm is non-Spur." excludeDepth := exportsNamePrefix = 'vm' and: [pluginName isEmpty and: [vmClass objectMemoryClass hasSpurMemoryManagerAPI not]]. aStream cr; cr; nextPutAll: 'void* '; nextPutAll: exportsNamePrefix; nextPutAll: '_exports[][3] = {'; cr. + ((methods select: [:m| m export]) asSortedCollection: [:a :b| a selector caseSensitiveLessOrEqual: b selector]) do: - ((methods select: [:m| m export]) asSortedCollection: [:a :b| a selector < b selector]) do: [:method| | compileTimeOptionPragmas primName | (compileTimeOptionPragmas := method compileTimeOptionPragmas) notEmpty ifTrue: [method outputConditionalDefineFor: compileTimeOptionPragmas on: aStream]. primName := self cFunctionNameFor: method selector. aStream tab; nextPutAll: '{"'; nextPutAll: pluginName; nextPutAll: '", "'; nextPutAll: primName. excludeDepth ifFalse: [(self accessorDepthForSelector: primName asSymbol) ifNotNil: [:depth| "store the accessor depth in a hidden byte immediately after the primName" self assert: depth < 128. aStream nextPutAll: '\000\'; nextPutAll: ((depth bitAnd: 255) printStringBase: 8 nDigits: 3)]]. aStream nextPutAll: '", (void*)'; nextPutAll: primName; nextPutAll: '},'; cr. method terminateConditionalDefineFor: compileTimeOptionPragmas on: aStream]. aStream tab; nextPutAll: '{NULL, NULL, NULL}'; cr; nextPutAll: '};'; cr. nilVMClass ifTrue: [vmClass := nil]!

1 0

VM Maker: VMMaker.oscog-eem.1678.mcz
by commits＠source.squeak.org 13 Feb '16

13 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1678.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1678 Author: eem Time: 13 February 2016, 1:01:06.083634 pm UUID: 34356cdc-f0b4-47bc-a22d-60f6030890f9 Ancestors: VMMaker.oscog-eem.1677 The plugin export table also needs to use conditional inclusion of conditionally compiled functions. Use cFunctionNameFor: in computing the function names for the export table. =============== Diff against VMMaker.oscog-eem.1677 =============== Item was changed: ----- Method: CCodeGenerator>>emitExportsNamed:pluginName:on: (in category 'C code generator') ----- emitExportsNamed: exportsNamePrefix pluginName: pluginName on: aStream "Store all the exported primitives in the form used by the internal named prim system." | nilVMClass excludeDepth | + (nilVMClass := vmClass isNil) ifTrue: "We need a vmClass temporarily to compute accessor depths." - (nilVMClass := vmClass isNil) ifTrue: [vmClass := StackInterpreter]. "Don't include the depth in the vm's named primitives if the vm is non-Spur." excludeDepth := exportsNamePrefix = 'vm' and: [pluginName isEmpty and: [vmClass objectMemoryClass hasSpurMemoryManagerAPI not]]. + aStream cr; cr; nextPutAll: 'void* '; nextPutAll: exportsNamePrefix; nextPutAll: '_exports[][3] = {'; cr. + ((methods select: [:m| m export]) asSortedCollection: [:a :b| a selector < b selector]) do: + [:method| | compileTimeOptionPragmas primName | + (compileTimeOptionPragmas := method compileTimeOptionPragmas) notEmpty ifTrue: + [method outputConditionalDefineFor: compileTimeOptionPragmas on: aStream]. + primName := self cFunctionNameFor: method selector. + aStream tab; nextPutAll: '{"'; nextPutAll: pluginName; nextPutAll: '", "'; nextPutAll: primName. - aStream cr; cr; nextPutAll: 'void* '; nextPutAll: exportsNamePrefix; nextPutAll: '_exports[][3] = {'. - (self sortStrings: self exportedPrimitiveNames) do: - [:primName| - aStream cr; tab; - nextPutAll: '{"'; - nextPutAll: pluginName; - nextPutAll: '", "'; - nextPutAll: primName. excludeDepth ifFalse: [(self accessorDepthForSelector: primName asSymbol) ifNotNil: [:depth| "store the accessor depth in a hidden byte immediately after the primName" self assert: depth < 128. aStream nextPutAll: '\000\'; nextPutAll: ((depth bitAnd: 255) printStringBase: 8 nDigits: 3)]]. + aStream nextPutAll: '", (void*)'; nextPutAll: primName; nextPutAll: '},'; cr. + method terminateConditionalDefineFor: compileTimeOptionPragmas on: aStream]. + aStream tab; nextPutAll: '{NULL, NULL, NULL}'; cr; nextPutAll: '};'; cr. - aStream - nextPutAll: '", (void*)'; - nextPutAll: primName; - nextPutAll: '},']. - aStream cr; tab; nextPutAll: '{NULL, NULL, NULL}'; cr; nextPutAll: '};'; cr. nilVMClass ifTrue: [vmClass := nil]! Item was changed: ----- Method: CCodeGenerator>>exportedPrimitiveNames (in category 'public') ----- exportedPrimitiveNames "Return an array of all exported primitives" + ^methods select:[:m| m export] thenCollect:[:m| self cFunctionNameFor: m selector]. - ^methods select:[:m| m export] thenCollect:[:m| m selector copyWithout: $:]. !

1 0

← Newer
1
...
8
9
10
11
12
13
14
15
Older →

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