[Vm-dev] [commit][3015] Rewrite
platforms/unix/vm/sqUnixSpurMemory.c to stand alone.
commits at squeakvm.org
commits at squeakvm.org
Tue Jun 24 17:31:08 UTC 2014
Revision: 3015
Author: eliot
Date: 2014-06-24 10:30:28 -0700 (Tue, 24 Jun 2014)
Log Message:
-----------
Rewrite platforms/unix/vm/sqUnixSpurMemory.c to stand alone. Use it in place
of sqMacMemory.c with Spur on Mac OS. Now Spur can grow the heap to 2.9Gb on
both linux (CentOS 5.3) and Mac OS X (10.6.8).
Move the nuking of version.o from the xcodeproj (where it was inoperative) to
the makevm scripts.
Modified Paths:
--------------
branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/newspeak.cog.spur/makevm
branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/newspeak.cog.v3/makevm
branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/newspeak.stack.spur/makevm
branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/newspeak.stack.v3/makevm
branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.cog.spur/makevm
branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.cog.v3/makevm
branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.sista.spur/makevm
branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.sista.v3/makevm
branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.stack.spur/makevm
branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.stack.v3/makevm
branches/Cog/platforms/Mac OS/vm/sqMacMemory.h
branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h
branches/Cog/platforms/unix/vm/sqUnixMemory.c
branches/Cog/platforms/unix/vm/sqUnixSpurMemory.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -112,7 +112,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; };
941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; };
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; };
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; };
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; };
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; };
941A3B6309AA144000C9D25A /* sqMacUnixInterfaceSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 94D42B2B07B2C8DC001CCA37 /* sqMacUnixInterfaceSound.h */; };
@@ -124,7 +123,7 @@
941A3B7009AA144000C9D25A /* sqMacFileLogic.h in Headers */ = {isa = PBXBuildFile; fileRef = 948AE67B09942EF2006256FE /* sqMacFileLogic.h */; };
941A3B7509AA144000C9D25A /* SqueakPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 664A73DF0300584000A80109 /* SqueakPlugin.icns */; };
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; };
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; };
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; };
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; };
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; };
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; };
@@ -405,8 +404,7 @@
F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; };
F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; };
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; };
- F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMemory.c; sourceTree = "<group>"; };
- F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMemory.h; sourceTree = "<group>"; };
+ F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixSpurMemory.c; path = ../../platforms/unix/vm/sqUnixSpurMemory.c; sourceTree = SOURCE_ROOT; };
F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacTime.c; sourceTree = "<group>"; };
F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacTime.h; sourceTree = "<group>"; };
F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIAppleEvents.c; sourceTree = "<group>"; };
@@ -881,8 +879,7 @@
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */,
946DD91C099015C5006BBA1E /* sqMacImageIO.c */,
946DD91D099015C5006BBA1E /* sqMacImageIO.h */,
- F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */,
- F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */,
+ F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */,
F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */,
F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */,
F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */,
@@ -1156,7 +1153,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */,
941A3B5A09AA144000C9D25A /* sq.h in Headers */,
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */,
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */,
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */,
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */,
941A3B6309AA144000C9D25A /* sqMacUnixInterfaceSound.h in Headers */,
@@ -1276,7 +1272,7 @@
733AC8E70FEAAE29007C6206 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- comments = "Script deletes version.o to ensure vmBuildString is up-to-date.";
+ comments = "Script creates sqNamedPrims.h.";
files = (
);
inputPaths = (
@@ -1285,7 +1281,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
+ shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -1295,7 +1291,7 @@
buildActionMask = 2147483647;
files = (
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */,
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */,
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */,
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */,
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */,
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */,
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/makevm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/makevm 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/makevm 2014-06-24 17:30:28 UTC (rev 3015)
@@ -7,6 +7,7 @@
NSD_BUILD_CONFIGURATION=Deployment
XCD_BUILD_CONFIGURATION=Release
DEST="Newspeak Virtual Machine.app"
+OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386"
CONF=FAST
KEEP=
@@ -52,7 +53,9 @@
test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
# Build CoreVM using xcode
-echo
+echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
+echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
+rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
if [ -d "$DEST" ]; then
Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -1276,7 +1276,7 @@
733AC8E70FEAAE29007C6206 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- comments = "Script deletes version.o to ensure vmBuildString is up-to-date.";
+ comments = "Script creates sqNamedPrims.h.";
files = (
);
inputPaths = (
@@ -1285,7 +1285,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
+ shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/makevm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.v3/makevm 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/newspeak.cog.v3/makevm 2014-06-24 17:30:28 UTC (rev 3015)
@@ -7,6 +7,7 @@
NSD_BUILD_CONFIGURATION=Deployment
XCD_BUILD_CONFIGURATION=Release
DEST="Newspeak Virtual Machine.app"
+OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386"
CONF=FAST
KEEP=
@@ -52,7 +53,9 @@
test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
# Build CoreVM using xcode
-echo
+echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
+echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
+rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
if [ -d "$DEST" ]; then
Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -107,7 +107,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; };
941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; };
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; };
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; };
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; };
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; };
941A3B6309AA144000C9D25A /* sqMacUnixInterfaceSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 94D42B2B07B2C8DC001CCA37 /* sqMacUnixInterfaceSound.h */; };
@@ -119,7 +118,7 @@
941A3B7009AA144000C9D25A /* sqMacFileLogic.h in Headers */ = {isa = PBXBuildFile; fileRef = 948AE67B09942EF2006256FE /* sqMacFileLogic.h */; };
941A3B7509AA144000C9D25A /* SqueakPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 664A73DF0300584000A80109 /* SqueakPlugin.icns */; };
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; };
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; };
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; };
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; };
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; };
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; };
@@ -395,8 +394,7 @@
F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; };
F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; };
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; };
- F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMemory.c; sourceTree = "<group>"; };
- F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMemory.h; sourceTree = "<group>"; };
+ F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixSpurMemory.c; path = ../../platforms/unix/vm/sqUnixSpurMemory.c; sourceTree = SOURCE_ROOT; };
F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacTime.c; sourceTree = "<group>"; };
F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacTime.h; sourceTree = "<group>"; };
F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIAppleEvents.c; sourceTree = "<group>"; };
@@ -867,8 +865,7 @@
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */,
946DD91C099015C5006BBA1E /* sqMacImageIO.c */,
946DD91D099015C5006BBA1E /* sqMacImageIO.h */,
- F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */,
- F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */,
+ F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */,
F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */,
F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */,
F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */,
@@ -1141,7 +1138,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */,
941A3B5A09AA144000C9D25A /* sq.h in Headers */,
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */,
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */,
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */,
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */,
941A3B6309AA144000C9D25A /* sqMacUnixInterfaceSound.h in Headers */,
@@ -1257,7 +1253,7 @@
733AC8E70FEAAE29007C6206 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- comments = "Script deletes version.o to ensure vmBuildString is up-to-date.";
+ comments = "Script creates sqNamedPrims.h.";
files = (
);
inputPaths = (
@@ -1266,7 +1262,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
+ shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -1276,7 +1272,7 @@
buildActionMask = 2147483647;
files = (
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */,
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */,
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */,
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */,
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */,
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */,
Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/makevm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/makevm 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/makevm 2014-06-24 17:30:28 UTC (rev 3015)
@@ -7,6 +7,7 @@
NSD_BUILD_CONFIGURATION=Deployment
XCD_BUILD_CONFIGURATION=Release
DEST="Newspeak Virtual Machine.app"
+OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386"
CONF=FAST
KEEP=
@@ -52,7 +53,9 @@
test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
# Build CoreVM using xcode
-echo
+echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
+echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
+rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
if [ -d "$DEST" ]; then
Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -1257,7 +1257,7 @@
733AC8E70FEAAE29007C6206 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- comments = "Script deletes version.o to ensure vmBuildString is up-to-date.";
+ comments = "Script creates sqNamedPrims.h.";
files = (
);
inputPaths = (
@@ -1266,7 +1266,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
+ shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/makevm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.v3/makevm 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/newspeak.stack.v3/makevm 2014-06-24 17:30:28 UTC (rev 3015)
@@ -7,6 +7,7 @@
NSD_BUILD_CONFIGURATION=Deployment
XCD_BUILD_CONFIGURATION=Release
DEST="Newspeak Virtual Machine.app"
+OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386"
CONF=FAST
KEEP=
@@ -52,7 +53,9 @@
test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
# Build CoreVM using xcode
-echo
+echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
+echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
+rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION
if [ -d "$DEST" ]; then
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -72,7 +72,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; };
941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; };
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; };
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; };
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; };
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; };
941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 940AFA4206DFD0280062E19F /* MacMenubarPlugin.h */; };
@@ -102,7 +101,7 @@
941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */; };
941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE4302EB4E090100013C /* sqMacMIDI.c */; };
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; };
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; };
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; };
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; };
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; };
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; };
@@ -409,8 +408,7 @@
F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; };
F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; };
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; };
- F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMemory.c; sourceTree = "<group>"; };
- F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMemory.h; sourceTree = "<group>"; };
+ F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixSpurMemory.c; path = ../../platforms/unix/vm/sqUnixSpurMemory.c; sourceTree = SOURCE_ROOT; };
F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacTime.c; sourceTree = "<group>"; };
F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacTime.h; sourceTree = "<group>"; };
F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIAppleEvents.c; sourceTree = "<group>"; };
@@ -957,8 +955,7 @@
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */,
946DD91C099015C5006BBA1E /* sqMacImageIO.c */,
946DD91D099015C5006BBA1E /* sqMacImageIO.h */,
- F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */,
- F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */,
+ F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */,
9454DFE603E1C93E00DA393B /* sqMacNSPlugin.c */,
9481DDB309B38AE3005C4088 /* sqMacNSPluginUILogic.c */,
F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */,
@@ -1316,7 +1313,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */,
941A3B5A09AA144000C9D25A /* sq.h in Headers */,
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */,
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */,
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */,
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */,
941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */,
@@ -1434,7 +1430,7 @@
733AC8E70FEAAE29007C6206 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- comments = "Script deletes version.o to ensure vmBuildString is up-to-date.";
+ comments = "Script creates sqNamedPrims.h.";
files = (
);
inputPaths = (
@@ -1443,7 +1439,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
+ shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -1456,7 +1452,7 @@
941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */,
941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */,
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */,
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */,
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */,
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */,
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */,
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */,
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -73,7 +73,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; };
941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; };
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; };
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; };
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; };
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; };
941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 940AFA4206DFD0280062E19F /* MacMenubarPlugin.h */; };
@@ -103,7 +102,7 @@
941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */; };
941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE4302EB4E090100013C /* sqMacMIDI.c */; };
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; };
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; };
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; };
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; };
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; };
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; };
@@ -409,8 +408,7 @@
F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; };
F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; };
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; };
- F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMemory.c; sourceTree = "<group>"; };
- F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMemory.h; sourceTree = "<group>"; };
+ F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixSpurMemory.c; path = ../../platforms/unix/vm/sqUnixSpurMemory.c; sourceTree = SOURCE_ROOT; };
F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacTime.c; sourceTree = "<group>"; };
F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacTime.h; sourceTree = "<group>"; };
F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIAppleEvents.c; sourceTree = "<group>"; };
@@ -957,8 +955,7 @@
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */,
946DD91C099015C5006BBA1E /* sqMacImageIO.c */,
946DD91D099015C5006BBA1E /* sqMacImageIO.h */,
- F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */,
- F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */,
+ F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */,
9454DFE603E1C93E00DA393B /* sqMacNSPlugin.c */,
9481DDB309B38AE3005C4088 /* sqMacNSPluginUILogic.c */,
F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */,
@@ -1316,7 +1313,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */,
941A3B5A09AA144000C9D25A /* sq.h in Headers */,
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */,
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */,
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */,
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */,
941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */,
@@ -1434,7 +1430,7 @@
733AC8E70FEAAE29007C6206 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- comments = "Script deletes version.o to ensure vmBuildString is up-to-date.";
+ comments = "Script creates sqNamedPrims.h.";
files = (
);
inputPaths = (
@@ -1443,7 +1439,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
+ shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -1456,7 +1452,7 @@
941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */,
941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */,
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */,
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */,
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */,
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */,
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */,
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */,
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/makevm
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/makevm 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/makevm 2014-06-24 17:30:28 UTC (rev 3015)
@@ -7,6 +7,7 @@
NSD_BUILD_CONFIGURATION=Deployment
XCD_BUILD_CONFIGURATION=Release
APP=Squeak.app
+OBJDIR=Squeak.build/Objects-normal/i386
VMAPP=".app"
DEST="Squeak"
VMXCP=CoreVM
@@ -58,7 +59,9 @@
test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
# Build CoreVM/CoreMTVM using xcode
-echo
+echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
+echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
+rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION
xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION
if [ -d "$DEST" ]; then
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -1434,7 +1434,7 @@
733AC8E70FEAAE29007C6206 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- comments = "Script deletes version.o to ensure vmBuildString is up-to-date.";
+ comments = "Script creates sqNamedPrims.h.";
files = (
);
inputPaths = (
@@ -1443,7 +1443,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
+ shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -1436,7 +1436,7 @@
733AC8E70FEAAE29007C6206 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- comments = "Script deletes version.o to ensure vmBuildString is up-to-date.";
+ comments = "Script creates sqNamedPrims.h.";
files = (
);
inputPaths = (
@@ -1445,7 +1445,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
+ shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/makevm
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/makevm 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/makevm 2014-06-24 17:30:28 UTC (rev 3015)
@@ -7,6 +7,7 @@
NSD_BUILD_CONFIGURATION=Deployment
XCD_BUILD_CONFIGURATION=Release
APP=Squeak.app
+OBJDIR=Squeak.build/Objects-normal/i386
VMAPP=".app"
DEST="Squeak"
VMXCP=CoreVM
@@ -58,7 +59,9 @@
test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
# Build CoreVM/CoreMTVM using xcode
-echo
+echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
+echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
+rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION
xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION
if [ -d "$DEST" ]; then
@@ -123,11 +126,5 @@
rm -rf "$DEST/Contents/Resources/UnixOSProcessPlugin.bundle"
cp -R UnixOSProcessPlugin/build/$XCD_BUILD_CONFIGURATION/UnixOSProcessPlugin.bundle "$DEST/Contents/Resources"
-# Build the UnixOSProcessPlugin
-echo UnixOSProcessPlugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj
-xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj
-rm -rf "$DEST/Contents/Resources/UnixOSProcessPlugin.bundle"
-cp -R UnixOSProcessPlugin/build/$XCD_BUILD_CONFIGURATION/UnixOSProcessPlugin.bundle "$DEST/Contents/Resources"
-
# Clean out any .svn directories (result of copying) in the VM
find "$DEST" -name .svn -exec rm -rf {} \;
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -73,7 +73,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; };
941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; };
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; };
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; };
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; };
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; };
941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 940AFA4206DFD0280062E19F /* MacMenubarPlugin.h */; };
@@ -103,7 +102,7 @@
941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */; };
941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE4302EB4E090100013C /* sqMacMIDI.c */; };
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; };
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; };
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; };
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; };
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; };
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; };
@@ -409,8 +408,7 @@
F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; };
F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; };
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; };
- F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMemory.c; sourceTree = "<group>"; };
- F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMemory.h; sourceTree = "<group>"; };
+ F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixSpurMemory.c; path = ../../platforms/unix/vm/sqUnixSpurMemory.c; sourceTree = SOURCE_ROOT; };
F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacTime.c; sourceTree = "<group>"; };
F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacTime.h; sourceTree = "<group>"; };
F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIAppleEvents.c; sourceTree = "<group>"; };
@@ -957,8 +955,7 @@
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */,
946DD91C099015C5006BBA1E /* sqMacImageIO.c */,
946DD91D099015C5006BBA1E /* sqMacImageIO.h */,
- F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */,
- F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */,
+ F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */,
9454DFE603E1C93E00DA393B /* sqMacNSPlugin.c */,
9481DDB309B38AE3005C4088 /* sqMacNSPluginUILogic.c */,
F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */,
@@ -1316,7 +1313,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */,
941A3B5A09AA144000C9D25A /* sq.h in Headers */,
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */,
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */,
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */,
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */,
941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */,
@@ -1434,7 +1430,7 @@
733AC8E70FEAAE29007C6206 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- comments = "Script deletes version.o to ensure vmBuildString is up-to-date.";
+ comments = "Script creates sqNamedPrims.h.";
files = (
);
inputPaths = (
@@ -1443,7 +1439,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
+ shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -1456,7 +1452,7 @@
941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */,
941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */,
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */,
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */,
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */,
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */,
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */,
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */,
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/makevm
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2014-06-24 17:30:28 UTC (rev 3015)
@@ -7,6 +7,7 @@
NSD_BUILD_CONFIGURATION=Deployment
XCD_BUILD_CONFIGURATION=Release
APP=Squeak.app
+OBJDIR=Squeak.build/Objects-normal/i386
VMAPP=".app"
DEST="Squeak"
VMXCP=CoreVM
@@ -58,7 +59,9 @@
test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
# Build CoreVM/CoreMTVM using xcode
-echo
+echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
+echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
+rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION
xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION
if [ -d "$DEST" ]; then
Modified: branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -1434,7 +1434,7 @@
733AC8E70FEAAE29007C6206 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- comments = "Script deletes version.o to ensure vmBuildString is up-to-date.";
+ comments = "Script creates sqNamedPrims.h.";
files = (
);
inputPaths = (
@@ -1443,7 +1443,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
+ shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: branches/Cog/build.macos32x86/squeak.sista.v3/makevm
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.v3/makevm 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.sista.v3/makevm 2014-06-24 17:30:28 UTC (rev 3015)
@@ -7,6 +7,7 @@
NSD_BUILD_CONFIGURATION=Deployment
XCD_BUILD_CONFIGURATION=Release
APP=Squeak.app
+OBJDIR=Squeak.build/Objects-normal/i386
VMAPP=".app"
DEST="Squeak"
VMXCP=CoreVM
@@ -58,7 +59,9 @@
test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??*
# Build CoreVM/CoreMTVM using xcode
-echo
+echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails
+echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\"
+rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o"
echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION
xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION
if [ -d "$DEST" ]; then
Modified: branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014)
+++ branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015)
@@ -68,7 +68,6 @@
941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; };
941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; };
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; };
- 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; };
941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; };
941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; };
941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 940AFA4206DFD0280062E19F /* MacMenubarPlugin.h */; };
@@ -98,7 +97,7 @@
941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */; };
941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE4302EB4E090100013C /* sqMacMIDI.c */; };
941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; };
- 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; };
+ 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; };
941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; };
941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; };
941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; };
@@ -399,8 +398,7 @@
F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; };
F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; };
F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; };
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list