[Vm-dev] [commit][3598] More last minute build issues.

commits at squeakvm.org commits at squeakvm.org
Sun Feb 14 19:20:24 UTC 2016 

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

More information about the Vm-dev mailing list