[Vm-dev] [commit][3488]
JMM - fix xcodeproj and script so you can use makeiosvm for assert VM
commits at squeakvm.org
commits at squeakvm.org
Wed Nov 11 02:03:48 UTC 2015
Revision: 3488
Author: johnmci
Date: 2015-11-10 18:03:46 -0800 (Tue, 10 Nov 2015)
Log Message:
-----------
JMM - fix xcodeproj and script so you can use makeiosvm for assert VM
Modified Paths:
--------------
branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakCogSpur32x86.xcscheme
branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
branches/Cog/build.macos32x86/squeak.cog.spur/SqueakFFIPrims/SqueakFFI.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
branches/Cog/platforms/iOS/vm/iPhone/sqPlatformSpecific.h
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2015-11-10 19:15:04 UTC (rev 3487)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2015-11-11 02:03:46 UTC (rev 3488)
@@ -8,7 +8,7 @@
/* Begin PBXBuildFile section */
949199FD098186FB000FC37A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DF6C8201D7DF7E00A80119 /* Carbon.framework */; };
- 94C941F71BBB2384005D3CFF /* dct.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BC910814EC700B8FC7A /* dct.c */; settings = {ASSET_TAGS = (); }; };
+ 94C941F71BBB2384005D3CFF /* dct.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BC910814EC700B8FC7A /* dct.c */; };
A2181C0F10814EC700B8FC7A /* header.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BCA10814EC700B8FC7A /* header.c */; };
A2181C1010814EC700B8FC7A /* layer1.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BCC10814EC700B8FC7A /* layer1.c */; };
A2181C1110814EC700B8FC7A /* layer2.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181BCD10814EC700B8FC7A /* layer2.c */; };
@@ -338,6 +338,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ENABLE_TESTABILITY = YES;
+ GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_PREPROCESSOR_DEFINITIONS = TARGET_API_MAC_OSX;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
@@ -351,6 +352,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_PREPROCESSOR_DEFINITIONS = TARGET_API_MAC_OSX;
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
@@ -362,6 +364,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_PREPROCESSOR_DEFINITIONS = TARGET_API_MAC_OSX;
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
@@ -432,7 +435,7 @@
946BCE030959347500803517 /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Deployment;
};
949199E409818612000FC37A /* Build configuration list for PBXNativeTarget "Mpeg3Plugin" */ = {
isa = XCConfigurationList;
@@ -442,7 +445,7 @@
949199E709818612000FC37A /* Default */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Deployment;
};
/* End XCConfigurationList section */
};
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
===================================================================
(Binary files differ)
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-10 19:15:04 UTC (rev 3487)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-11 02:03:46 UTC (rev 3488)
@@ -41,13 +41,6 @@
9463C1D61AEE168F009C5CE5 /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 94E65A2E0DDD053900358328 /* pcre.c */; };
9463C1D71AEE1693009C5CE5 /* study.c in Sources */ = {isa = PBXBuildFile; fileRef = 94E65A340DDD053900358328 /* study.c */; };
948773FC10C64DD800E4AEC5 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 947E64DC10AA18FE00D3B69E /* MainMenu.xib */; };
- 948773FF10C64DD800E4AEC5 /* SqueakChanges.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414421F10BC89440088F8AC /* SqueakChanges.icns */; };
- 9487740010C64DD800E4AEC5 /* SqueakGeneric.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422010BC89440088F8AC /* SqueakGeneric.icns */; };
- 9487740110C64DD800E4AEC5 /* SqueakImage.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422110BC89440088F8AC /* SqueakImage.icns */; };
- 9487740210C64DD800E4AEC5 /* SqueakPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422210BC89440088F8AC /* SqueakPlugin.icns */; };
- 9487740310C64DD800E4AEC5 /* SqueakProject.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422310BC89440088F8AC /* SqueakProject.icns */; };
- 9487740410C64DD800E4AEC5 /* SqueakScript.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422410BC89440088F8AC /* SqueakScript.icns */; };
- 9487740510C64DD800E4AEC5 /* SqueakSources.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9414422510BC89440088F8AC /* SqueakSources.icns */; };
9487740610C64DD800E4AEC5 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 94D16CAF10BCF96B00A69A89 /* Credits.rtf */; };
9487740810C64DD800E4AEC5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
9487740910C64DD800E4AEC5 /* sqNamedPrims.c in Sources */ = {isa = PBXBuildFile; fileRef = 9424FF5E0DDCB1C7009912BF /* sqNamedPrims.c */; };
@@ -399,9 +392,9 @@
94B9533310E6BD7100DC476A /* MacMenuOS9ToOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacMenuOS9ToOSX.h; sourceTree = "<group>"; };
94B9533410E6BD7100DC476A /* MacMenuOS9ToOSX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MacMenuOS9ToOSX.m; sourceTree = "<group>"; };
94BB096B1BB47DDB0016BFDF /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
- 94BB09711BB47F9B0016BFDF /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = file; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
- 94BB09731BB47FB20016BFDF /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = file; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
- 94BB09751BB47FCD0016BFDF /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = file; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
+ 94BB09711BB47F9B0016BFDF /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+ 94BB09731BB47FB20016BFDF /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
+ 94BB09751BB47FCD0016BFDF /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
94BCABBF10AB72A600F87527 /* sqSqueakOSXFileDirectoryInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqSqueakOSXFileDirectoryInterface.h; path = vm/OSX/sqSqueakOSXFileDirectoryInterface.h; sourceTree = "<group>"; };
94BCABC010AB72A600F87527 /* sqSqueakOSXFileDirectoryInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = sqSqueakOSXFileDirectoryInterface.m; path = vm/OSX/sqSqueakOSXFileDirectoryInterface.m; sourceTree = "<group>"; };
94BCAD1B10AB942300F87527 /* sqSqueakOSXApplication+attributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "sqSqueakOSXApplication+attributes.h"; path = "vm/OSX/sqSqueakOSXApplication+attributes.h"; sourceTree = "<group>"; };
@@ -1576,13 +1569,6 @@
948773FC10C64DD800E4AEC5 /* MainMenu.xib in Resources */,
9422C3B51AFFFAC500448DC0 /* Localizable.strings in Resources */,
94FA4CE51BB4DE1400C1BE8F /* Images-2.xcassets in Resources */,
- 948773FF10C64DD800E4AEC5 /* SqueakChanges.icns in Resources */,
- 9487740010C64DD800E4AEC5 /* SqueakGeneric.icns in Resources */,
- 9487740110C64DD800E4AEC5 /* SqueakImage.icns in Resources */,
- 9487740210C64DD800E4AEC5 /* SqueakPlugin.icns in Resources */,
- 9487740310C64DD800E4AEC5 /* SqueakProject.icns in Resources */,
- 9487740410C64DD800E4AEC5 /* SqueakScript.icns in Resources */,
- 9487740510C64DD800E4AEC5 /* SqueakSources.icns in Resources */,
9487740610C64DD800E4AEC5 /* Credits.rtf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1840,6 +1826,10 @@
"DEBUGVM=0",
"USE_GLOBAL_STRUCT=0",
SQUEAK_BUILTIN_PLUGIN,
+ "DEBUG=1",
+ "NO_ISNAN=1",
+ USE_INLINE_MEMORY_ACCESSORS,
+ HAVE_NANOSLEEP,
);
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -1869,11 +1859,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ../../platforms/iOS/vm/SqueakPureObjc_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
+ "$(inherited)",
BUILD_FOR_OSX,
- USE_INLINE_MEMORY_ACCESSORS,
- HAVE_NANOSLEEP,
- SQUEAK_BUILTIN_PLUGIN,
- "DEBUGVM=0",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
INFOPLIST_FILE = SqueakCogSpur32x86.plist;
@@ -1907,6 +1894,9 @@
"DEBUGVM=1",
"USE_GLOBAL_STRUCT=0",
SQUEAK_BUILTIN_PLUGIN,
+ "NO_ISNAN=1",
+ USE_INLINE_MEMORY_ACCESSORS,
+ HAVE_NANOSLEEP,
);
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -1938,6 +1928,9 @@
"NDEBUG=1",
"USE_GLOBAL_STRUCT=0",
SQUEAK_BUILTIN_PLUGIN,
+ "NO_ISNAN=1",
+ USE_INLINE_MEMORY_ACCESSORS,
+ HAVE_NANOSLEEP,
);
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -1966,12 +1959,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ../../platforms/iOS/vm/SqueakPureObjc_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
+ "$(inherited)",
BUILD_FOR_OSX,
- USE_INLINE_MEMORY_ACCESSORS,
- HAVE_NANOSLEEP,
- SQUEAK_BUILTIN_PLUGIN,
- "DEBUGVM=1",
- "USE_GLOBAL_STRUCT=0",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
INFOPLIST_FILE = SqueakCogSpur32x86.plist;
@@ -2000,10 +1989,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ../../platforms/iOS/vm/SqueakPureObjc_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
+ "$(inherited)",
BUILD_FOR_OSX,
- HAVE_NANOSLEEP,
- SQUEAK_BUILTIN_PLUGIN,
- USE_INLINE_MEMORY_ACCESSORS,
);
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
INFOPLIST_FILE = SqueakCogSpur32x86.plist;
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakCogSpur32x86.xcscheme
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakCogSpur32x86.xcscheme 2015-11-10 19:15:04 UTC (rev 3487)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakCogSpur32x86.xcscheme 2015-11-11 02:03:46 UTC (rev 3488)
@@ -74,7 +74,7 @@
<ProfileAction
displayScaleIsEnabled = "NO"
displayScale = "1.00"
- buildConfiguration = "Debug"
+ buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
===================================================================
(Binary files differ)
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakFFIPrims/SqueakFFI.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
===================================================================
(Binary files differ)
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
===================================================================
(Binary files differ)
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm 2015-11-10 19:15:04 UTC (rev 3487)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm 2015-11-11 02:03:46 UTC (rev 3488)
@@ -94,9 +94,8 @@
echo
echo Mpeg3Plugin xcodebuild -project Mpeg3Plugin/Mpeg3Plugin.xcodeproj -configuration $NSD_BUILD_CONFIGURATION
xcodebuild -project Mpeg3Plugin/Mpeg3Plugin.xcodeproj -configuration $NSD_BUILD_CONFIGURATION
-cp -R Mpeg3Plugin/build/Release/Mpeg3Plugin.bundle mpeg3.app/Contents/Resources
+cp -R Mpeg3Plugin/build/$NSD_BUILD_CONFIGURATION/Mpeg3Plugin.bundle "$DEST/Contents/Resources"
-# Build the FFI plugin (New as of 27 March 2008)
echo
echo SqueakFFIPlugin xcodebuild -project $SFP/SqueakFFI.xcodeproj -configuration $NSD_BUILD_CONFIGURATION
xcodebuild -project $SFP/SqueakFFI.xcodeproj -configuration $NSD_BUILD_CONFIGURATION
@@ -154,3 +153,4 @@
# Clean out any .svn directories (result of copying) in the VM
find "$DEST" -name .svn -exec rm -rf {} \;
+
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj 2015-11-10 19:15:04 UTC (rev 3487)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj 2015-11-11 02:03:46 UTC (rev 3488)
@@ -180,6 +180,7 @@
949382771B001B9F00C802B2 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 949382761B001B9F00C802B2 /* Crashlytics.framework */; };
949382791B001C7A00C802B2 /* sqSqueakOSXInfoPlistInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 94BCAE6810ACA10100F87527 /* sqSqueakOSXInfoPlistInterface.m */; };
9493827A1B001C7E00C802B2 /* sqSqueakInfoPlistInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 9412CAE50E6C05EC00DB8625 /* sqSqueakInfoPlistInterface.m */; };
+ 94A6BD651BF2A9FE00389822 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 947E61C410AA03DC00D3B69E /* AppKit.framework */; };
94B9533510E6BD7100DC476A /* MacMenuOS9ToOSX.m in Sources */ = {isa = PBXBuildFile; fileRef = 94B9533410E6BD7100DC476A /* MacMenuOS9ToOSX.m */; };
94C315341AD4949B0096E59D /* AsynchFilePlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 94C315311AD4949B0096E59D /* AsynchFilePlugin.c */; };
94C317511AD495CD0096E59D /* JoystickTabletPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 94C317491AD495CD0096E59D /* JoystickTabletPlugin.c */; };
@@ -590,6 +591,7 @@
9487749F10C64DD800E4AEC5 /* AudioToolbox.framework in Frameworks */,
948774A010C64DD800E4AEC5 /* CoreAudio.framework in Frameworks */,
948774A110C64DD800E4AEC5 /* SystemConfiguration.framework in Frameworks */,
+ 94A6BD651BF2A9FE00389822 /* AppKit.framework in Frameworks */,
948774A210C64DD800E4AEC5 /* ApplicationServices.framework in Frameworks */,
948774A310C64DD800E4AEC5 /* QuartzCore.framework in Frameworks */,
);
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
===================================================================
(Binary files differ)
Modified: branches/Cog/platforms/iOS/vm/iPhone/sqPlatformSpecific.h
===================================================================
--- branches/Cog/platforms/iOS/vm/iPhone/sqPlatformSpecific.h 2015-11-10 19:15:04 UTC (rev 3487)
+++ branches/Cog/platforms/iOS/vm/iPhone/sqPlatformSpecific.h 2015-11-11 02:03:46 UTC (rev 3488)
@@ -165,6 +165,11 @@
# endif /* COGMTVM */
#endif /* STACKVM */
+/* warnPrintf is provided (and needed) on the win32 platform.
+ * But it may be mentioned elsewhere, so provide a suitable def.
+ */
+#define warnPrintf printf
+
// From Joshua Gargus, for XCode 3.1
#ifdef __GNUC__
# undef EXPORT
More information about the Vm-dev
mailing list