[Vm-dev] [commit][3596] Correct the Newspeak Info.
plist file so the VM launches on Mac OS X.
commits at squeakvm.org
commits at squeakvm.org
Sun Feb 14 00:43:54 UTC 2016
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>
More information about the Vm-dev
mailing list