[Vm-dev] [commit][3327] Port os-x cocoa logic to cog
commits at squeakvm.org
commits at squeakvm.org
Sun May 10 23:14:20 UTC 2015
Revision: 3327
Author: johnmci
Date: 2015-05-10 16:14:19 -0700 (Sun, 10 May 2015)
Log Message:
-----------
Port os-x cocoa logic to cog
Modified Paths:
--------------
branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.plist
branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int
branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.h
branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m
branches/Cog/platforms/iOS/plugins/MacMenubarPlugin/MacMenuOS9ToOSX.m
branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h
branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m
branches/Cog/platforms/iOS/plugins/SqueakObjectiveC/PDColoredProgressView.m
branches/Cog/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.h
branches/Cog/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.m
branches/Cog/platforms/iOS/vm/Common/Classes/Queue.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.h
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.h
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.h
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+imageReadWrite.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+sound.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+vmAndImagePath.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.h
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.h
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m
branches/Cog/platforms/iOS/vm/Common/main.m
branches/Cog/platforms/iOS/vm/OSX/BitMapConversionLogicFromX11.h
branches/Cog/platforms/iOS/vm/OSX/Credits.rtf
branches/Cog/platforms/iOS/vm/OSX/SqViewBitmapConversion.m
branches/Cog/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.h
branches/Cog/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m
branches/Cog/platforms/iOS/vm/OSX/SqueakOSXApplication.m
branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+clipboard.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+cursor.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.h
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXClipboardAPI.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXFileDirectoryInterface.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXInfoPlistInterface.h
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXInfoPlistInterface.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.h
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakNoOGLIPhoneAppDelegate.h
branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakNoOGLIPhoneAppDelegate.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIController.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIView.h
branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIView.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication+clipboard.h
branches/Cog/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication+clipboard.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication+events.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication+imageReadWrite.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneClipboardAPI.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneFileDirectoryInterface.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneInfoPlistInterface.m
branches/Cog/platforms/iOS/vm/iPhone/Classes/sqiPhoneScreenAndWindow.m
branches/Cog/platforms/iOS/vm/iPhone/config.h
branches/Cog/platforms/iOS/vm/iPhone/macintoshextra.c
branches/Cog/platforms/iOS/vm/iPhone/plugins/ClipboardExtended/sqMacExtendedClipboard.h
branches/Cog/platforms/iOS/vm/iPhone/plugins/ClipboardExtended/sqMacExtendedClipboard.m
branches/Cog/platforms/iOS/vm/iPhone/sqPlatformSpecific.h
Added Paths:
-----------
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Crashlytics
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Headers
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Modules
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Resources
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Crashlytics
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Headers/
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Headers/Crashlytics.h
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Modules/
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Modules/module.modulemap
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Resources/
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Resources/Info.plist
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/Current
branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/run
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/Contents.json
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak-1-1.png
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak-1.png
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak-2.png
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak.png
branches/Cog/platforms/iOS/vm/Common/English.lproj/
branches/Cog/platforms/iOS/vm/Common/English.lproj/Localizable.strings
Removed Paths:
-------------
branches/Cog/platforms/Mac OS/Resources/Squeak VM.r
branches/Cog/platforms/Mac OS/Resources/Squeak.icns
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.plist
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.plist 2015-05-10 17:44:53 UTC (rev 3326)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.plist 2015-05-10 23:14:19 UTC (rev 3327)
@@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>LSMinimumSystemVersion</key>
- <string>10.5.0</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDocumentTypes</key>
@@ -368,49 +366,27 @@
<key>CFBundleExecutable</key>
<string>Squeak</string>
<key>CFBundleGetInfoString</key>
- <string>Squeak Stack 5.0.0 http://www.mirandabanda.org</string><!--version-->
- <key>CFBundleShortVersionString</key>
- <string>Squeak Stack 5.0.0</string><!--version-->
- <key>CFBundleVersion</key>
- <string>5.0.0</string><!--version-->
- <key>CFBundleIconFile</key>
- <string>GreenCogSqueak.icns</string>
+ <string>Squeak Stack 5.0.0 http://www.mirandabanda.org</string>
<key>CFBundleIdentifier</key>
- <string>com.squeak.Cog</string>
+ <string>org.squeak.osx6464.cog</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Squeak</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>5.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
- <key>CGDisableCoalescedUpdates</key>
- <true/>
+ <key>CFBundleVersion</key>
+ <string>6</string>
+ <key>LSApplicationCategoryType</key>
+ <string>public.app-category.developer-tools</string>
<key>LSBackgroundOnly</key>
<false/>
- <key>NSServices</key>
- <array>
- <dict>
- <key>NSMenuItem</key>
- <dict>
- <key>default</key>
- <string>Squeak DoIt</string>
- </dict>
- <key>NSMessage</key>
- <string>doitandreturn</string>
- <key>NSPortName</key>
- <string>Squeak</string>
- <key>NSReturnTypes</key>
- <array>
- <string>NSStringPboardType</string>
- </array>
- <key>NSSendTypes</key>
- <array>
- <string>NSStringPboardType</string>
- </array>
- </dict>
- </array>
+ <key>LSMinimumSystemVersion</key>
+ <string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>SqueakBrowserMouseCmdButton1</key>
<integer>3</integer>
<key>SqueakBrowserMouseCmdButton2</key>
@@ -491,5 +467,125 @@
<true/>
<key>SqueakWindowType</key>
<integer>6</integer>
+ <key>SqueakResourceDirectory</key>
+ <string></string>
+ <key>SqueakTrustedDirectory</key>
+ <string>/foobar/tooBar/forSqueak/bogus/</string>
+ <key>NSMainNibFile</key>
+ <string>MainMenu</string>
+ <key>NSPrincipalClass</key>
+ <string>SqueakOSXApplication</string>
+ <key>SqueakUseFileMappedMMAP</key>
+ <false/>
+ <key>SqueakUIFadeForFullScreenInSeconds</key>
+ <real>0.5</real>
+ <key>UTExportedTypeDeclarations</key>
+ <array>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Squeak Image File</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.squeak.image</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>com.apple.ostype</key>
+ <string>STim</string>
+ <key>public.filename-extension</key>
+ <array>
+ <string>image</string>
+ </array>
+ <key>public.mime-type</key>
+ <string>application/squeak-image</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.utf8-plain-text</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Squeak Sources File</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.squeak.sources</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>com.apple.ostype</key>
+ <string>STso</string>
+ <key>public.filename-extension</key>
+ <array>
+ <string>sources</string>
+ </array>
+ <key>public.mime-type</key>
+ <string>application/squeak-sources</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.utf8-plain-text</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Squeak Changes File</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.squeak.changes</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>com.apple.ostype</key>
+ <string>STch</string>
+ <key>public.filename-extension</key>
+ <array>
+ <string>changes</string>
+ </array>
+ <key>public.mime-type</key>
+ <string>application/squeak-changes</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Squeak Script File</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.squeak.script</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>com.apple.ostype</key>
+ <string>SOBJ</string>
+ <key>public.filename-extension</key>
+ <array>
+ <string>sobj</string>
+ </array>
+ <key>public.mime-type</key>
+ <string>application/squeak-script</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Squeak Project File</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.squeak.project</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>com.apple.ostype</key>
+ <string>STpr</string>
+ <key>public.filename-extension</key>
+ <array>
+ <string>pr</string>
+ </array>
+ <key>public.mime-type</key>
+ <string>application/x-squeak-project</string>
+ </dict>
+ </dict>
+ </array>
</dict>
</plist>
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-05-10 17:44:53 UTC (rev 3326)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-05-10 23:14:19 UTC (rev 3327)
@@ -193,7 +193,6 @@
941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; };
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; };
941A3B6709AA144000C9D25A /* interp.h in Headers */ = {isa = PBXBuildFile; fileRef = 948214FE080E3ABE0061C2AB /* interp.h */; };
- 941A3B7209AA144000C9D25A /* Squeak.icns in Resources */ = {isa = PBXBuildFile; fileRef = 664A73DC0300584000A80109 /* Squeak.icns */; };
941A3B7309AA144000C9D25A /* SqueakChanges.icns in Resources */ = {isa = PBXBuildFile; fileRef = 664A73DD0300584000A80109 /* SqueakChanges.icns */; };
941A3B7409AA144000C9D25A /* SqueakImage.icns in Resources */ = {isa = PBXBuildFile; fileRef = 664A73DE0300584000A80109 /* SqueakImage.icns */; };
941A3B7509AA144000C9D25A /* SqueakPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 664A73DF0300584000A80109 /* SqueakPlugin.icns */; };
@@ -320,8 +319,6 @@
0192233A00CCBFCBC0A80109 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
087740A300C6A47FC0A80109 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
087740A700C6A4EDC0A80109 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
- 664A73DB0300584000A80109 /* Squeak VM.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = "Squeak VM.r"; sourceTree = "<group>"; };
- 664A73DC0300584000A80109 /* Squeak.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Squeak.icns; sourceTree = "<group>"; };
664A73DD0300584000A80109 /* SqueakChanges.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = SqueakChanges.icns; sourceTree = "<group>"; };
664A73DE0300584000A80109 /* SqueakImage.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = SqueakImage.icns; sourceTree = "<group>"; };
664A73DF0300584000A80109 /* SqueakPlugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = SqueakPlugin.icns; sourceTree = "<group>"; };
@@ -745,9 +742,7 @@
08773F0500C6A1C4C0A80109 /* Resources */ = {
isa = PBXGroup;
children = (
- 664A73DB0300584000A80109 /* Squeak VM.r */,
DAFA08930AA64625008DF459 /* GreenCogSqueak.icns */,
- 664A73DC0300584000A80109 /* Squeak.icns */,
664A73DD0300584000A80109 /* SqueakChanges.icns */,
664A73DE0300584000A80109 /* SqueakImage.icns */,
664A73DF0300584000A80109 /* SqueakPlugin.icns */,
@@ -1708,7 +1703,7 @@
941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */,
941A3B6709AA144000C9D25A /* interp.h in Headers */,
94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */,
- 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */,
+ 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */,
9426FF2209F489D200ECEDDC /* internal.h in Headers */,
9426FF2409F489D200ECEDDC /* pcre.h in Headers */,
9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */,
@@ -1796,6 +1791,7 @@
941A3B2C09AA144000C9D25A /* Headers */,
941A3B7109AA144000C9D25A /* Resources */,
733AC8E70FEAAE29007C6206 /* ShellScript */,
+ 9422C3B01AFFE30E00448DC0 /* ShellScript */,
941A3B7A09AA144000C9D25A /* Sources */,
941A3BFA09AA144000C9D25A /* Frameworks */,
941A3C0409AA144000C9D25A /* Rez */,
@@ -1813,6 +1809,14 @@
/* Begin PBXProject section */
08773EB400C6A1C4C0A80109 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0630;
+ TargetAttributes = {
+ 941A3B2B09AA144000C9D25A = {
+ DevelopmentTeam = DTYH6QWG79;
+ };
+ };
+ };
buildConfigurationList = 94D95B1D0923E6810034C6F0 /* Build configuration list for PBXProject "CoreVM" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -1838,7 +1842,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 941A3B7209AA144000C9D25A /* Squeak.icns in Resources */,
941A3B7309AA144000C9D25A /* SqueakChanges.icns in Resources */,
941A3B7409AA144000C9D25A /* SqueakImage.icns in Resources */,
941A3B7509AA144000C9D25A /* SqueakPlugin.icns in Resources */,
@@ -1885,6 +1888,19 @@
shellPath = /bin/sh;
shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n";
};
+ 9422C3B01AFFE30E00448DC0 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "./Crashlytics.framework/run add501476623fc20212a60334cd537d16dfd566f 13e3689c06f20298b962843af75360f1ab580a821134076b9e2309f73b72c5f1";
+ };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -2072,9 +2088,9 @@
73BCFAF20EFB043300B7BA8D /* Assert */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = x86_64;
+ CODE_SIGN_IDENTITY = "Developer ID Application";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- DEBUGGING_SYMBOLS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 1;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -2087,30 +2103,18 @@
SQUEAK_BUILTIN_PLUGIN,
HAVE_SYS_TIME_H,
);
- GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "TZ=\\\"$TZ\\\"";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
- HEADER_SEARCH_PATHS = (
- /Developer/Headers/FlatCarbon,
- $SRCROOT,
- );
INFOPLIST_FILE = CoreVM.plist;
- MACOSX_DEPLOYMENT_TARGET = 10.5;
- OTHER_LDFLAGS = "";
- OTHER_REZFLAGS = "";
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = Squeak;
- SECTORDER_FLAGS = "";
- UNSTRIPPED_PRODUCT = YES;
- WARNING_CFLAGS = "";
WRAPPER_EXTENSION = app;
- ZERO_LINK = NO;
};
name = Assert;
};
73BCFAF30EFB043300B7BA8D /* Assert */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = x86_64;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUGVM=0",
"USE_GLOBAL_STRUCT=0",
@@ -2125,16 +2129,17 @@
/Developer/Headers/FlatCarbon,
$SRCROOT,
);
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
+ VALID_ARCHS = x86_64;
};
name = Assert;
};
941A3C0809AA144000C9D25A /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = x86_64;
+ CODE_SIGN_IDENTITY = "Developer ID Application";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- DEBUGGING_SYMBOLS = YES;
GCC_DYNAMIC_NO_PIC = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2151,7 +2156,6 @@
HAVE_SYS_TIME_H,
"EXTERNALPRIMSDEBUG=1",
);
- GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "TZ=\\\"$TZ\\\"";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
@@ -2162,32 +2166,22 @@
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = (
- /Developer/Headers/FlatCarbon,
- $SRCROOT,
- );
INFOPLIST_FILE = CoreVM.plist;
- MACOSX_DEPLOYMENT_TARGET = 10.5;
- OTHER_LDFLAGS = "";
- OTHER_REZFLAGS = "";
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = Squeak;
- WARNING_CFLAGS = "";
WRAPPER_EXTENSION = app;
- ZERO_LINK = NO;
};
name = Development;
};
941A3C0909AA144000C9D25A /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = x86_64;
+ CODE_SIGN_IDENTITY = "Developer ID Application";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
- GCC_AUTO_VECTORIZATION = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_ENABLE_SSE3_EXTENSIONS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_MODEL_TUNING = "";
- GCC_OPTIMIZATION_LEVEL = 3;
+ GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"DEBUGVM=0",
@@ -2198,37 +2192,25 @@
HAVE_SYS_TIME_H,
);
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "$(GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1)";
- GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1 = "BUILD_VERSION=\"\\\"Squeak Stack Spur OS/X 5.0.0\\\"\"";
- GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "TZ=\\\"$TZ\\\"";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_UNROLL_LOOPS = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
- HEADER_SEARCH_PATHS = (
- /Developer/Headers/FlatCarbon,
- $SRCROOT,
- );
INFOPLIST_FILE = CoreVM.plist;
- MACOSX_DEPLOYMENT_TARGET = 10.5;
- OTHER_LDFLAGS = "";
- OTHER_REZFLAGS = "";
- PER_ARCH_CFLAGS_x86_64 = "-O3 -falign-functions=16 -fno-gcse -mtune=prescott -march=pentium4 -mfpmath=sse -finline-functions -Wall -DUSE_INLINE_MEMORY_ACCESSORS";
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = Squeak;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = "";
WRAPPER_EXTENSION = app;
- ZERO_LINK = NO;
};
name = Deployment;
};
941A3C0A09AA144000C9D25A /* DeploymentSymbols */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = x86_64;
+ CODE_SIGN_IDENTITY = "Developer ID Application";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- DEBUGGING_SYMBOLS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = 3;
+ GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"DEBUGVM=0",
@@ -2239,30 +2221,18 @@
SQUEAK_BUILTIN_PLUGIN,
HAVE_SYS_TIME_H,
);
- GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "TZ=\\\"$TZ\\\"";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
- HEADER_SEARCH_PATHS = (
- /Developer/Headers/FlatCarbon,
- $SRCROOT,
- );
INFOPLIST_FILE = CoreVM.plist;
- MACOSX_DEPLOYMENT_TARGET = 10.5;
- OTHER_LDFLAGS = "";
- OTHER_REZFLAGS = "";
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = Squeak;
- SECTORDER_FLAGS = "";
- UNSTRIPPED_PRODUCT = YES;
- WARNING_CFLAGS = "";
WRAPPER_EXTENSION = app;
- ZERO_LINK = NO;
};
name = DeploymentSymbols;
};
94D95B1E0923E6810034C6F0 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = x86_64;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUGVM=1",
"USE_GLOBAL_STRUCT=0",
@@ -2278,14 +2248,14 @@
/Developer/Headers/FlatCarbon,
$SRCROOT,
);
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
+ VALID_ARCHS = x86_64;
};
name = Development;
};
94D95B1F0923E6810034C6F0 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = x86_64;
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"DEBUGVM=0",
@@ -2296,19 +2266,19 @@
TARGET_API_MAC_CARBON,
);
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1 = "TZ=\\\"$TZ\\\"";
- GCC_VERSION = 4.2;
+ GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
/Developer/Headers/FlatCarbon,
$SRCROOT,
);
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
+ VALID_ARCHS = x86_64;
};
name = Deployment;
};
94D95B200923E6810034C6F0 /* DeploymentSymbols */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = x86_64;
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"USE_GLOBAL_STRUCT=0",
@@ -2322,7 +2292,8 @@
/Developer/Headers/FlatCarbon,
$SRCROOT,
);
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
+ VALID_ARCHS = x86_64;
};
name = DeploymentSymbols;
};
Added: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Crashlytics
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Crashlytics (rev 0)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Crashlytics 2015-05-10 23:14:19 UTC (rev 3327)
@@ -0,0 +1 @@
+link Versions/Current/Crashlytics
\ No newline at end of file
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Crashlytics
___________________________________________________________________
Added: svn:special
+ *
Added: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Headers
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Headers (rev 0)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Headers 2015-05-10 23:14:19 UTC (rev 3327)
@@ -0,0 +1 @@
+link Versions/Current/Headers
\ No newline at end of file
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Headers
___________________________________________________________________
Added: svn:special
+ *
Added: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Modules
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Modules (rev 0)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Modules 2015-05-10 23:14:19 UTC (rev 3327)
@@ -0,0 +1 @@
+link Versions/Current/Modules
\ No newline at end of file
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Modules
___________________________________________________________________
Added: svn:special
+ *
Added: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Resources
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Resources (rev 0)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Resources 2015-05-10 23:14:19 UTC (rev 3327)
@@ -0,0 +1 @@
+link Versions/Current/Resources
\ No newline at end of file
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Resources
___________________________________________________________________
Added: svn:special
+ *
Added: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Crashlytics
===================================================================
(Binary files differ)
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Crashlytics
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Headers/Crashlytics.h
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Headers/Crashlytics.h (rev 0)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Headers/Crashlytics.h 2015-05-10 23:14:19 UTC (rev 3327)
@@ -0,0 +1,220 @@
+//
+// Crashlytics.h
+// Crashlytics
+//
+// Copyright 2013 Crashlytics, Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+/**
+ *
+ * The CLS_LOG macro provides as easy way to gather more information in your log messages that are
+ * sent with your crash data. CLS_LOG prepends your custom log message with the function name and
+ * line number where the macro was used. If your app was built with the DEBUG preprocessor macro
+ * defined CLS_LOG uses the CLSNSLog function which forwards your log message to NSLog and CLSLog.
+ * If the DEBUG preprocessor macro is not defined CLS_LOG uses CLSLog only.
+ *
+ * Example output:
+ * -[AppDelegate login:] line 134 $ login start
+ *
+ * If you would like to change this macro, create a new header file, unset our define and then define
+ * your own version. Make sure this new header file is imported after the Crashlytics header file.
+ *
+ * #undef CLS_LOG
+ * #define CLS_LOG(__FORMAT__, ...) CLSNSLog...
+ *
+ **/
+#ifdef DEBUG
+#define CLS_LOG(__FORMAT__, ...) CLSNSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
+#else
+#define CLS_LOG(__FORMAT__, ...) CLSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
+#endif
+
+/**
+ *
+ * Add logging that will be sent with your crash data. This logging will not show up in the system.log
+ * and will only be visible in your Crashlytics dashboard.
+ *
+ **/
+OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
+OBJC_EXTERN void CLSLogv(NSString *format, va_list args) NS_FORMAT_FUNCTION(1,0);
+
+/**
+ *
+ * Add logging that will be sent with your crash data. This logging will show up in the system.log
+ * and your Crashlytics dashboard. It is not recommended for Release builds.
+ *
+ **/
+OBJC_EXTERN void CLSNSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
+OBJC_EXTERN void CLSNSLogv(NSString *format, va_list args) NS_FORMAT_FUNCTION(1,0);
+
+
+ at protocol CrashlyticsDelegate;
+
+ at interface Crashlytics : NSObject
+
+ at property (nonatomic, readonly, copy) NSString *apiKey;
+ at property (nonatomic, readonly, copy) NSString *version;
+ at property (nonatomic, assign) BOOL debugMode;
+
+ at property (nonatomic, assign) NSObject <CrashlyticsDelegate> *delegate;
+
+/**
+ *
+ * The recommended way to install Crashlytics into your application is to place a call
+ * to +startWithAPIKey: in your -application:didFinishLaunchingWithOptions: method.
+ *
+ * This delay defaults to 1 second in order to generally give the application time to
+ * fully finish launching.
+ *
+ **/
++ (Crashlytics *)startWithAPIKey:(NSString *)apiKey;
++ (Crashlytics *)startWithAPIKey:(NSString *)apiKey afterDelay:(NSTimeInterval)delay;
+
+/**
+ *
+ * If you need the functionality provided by the CrashlyticsDelegate protocol, you can use
+ * these convenience methods to activate the framework and set the delegate in one call.
+ *
+ **/
++ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(NSObject <CrashlyticsDelegate> *)delegate;
++ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(NSObject <CrashlyticsDelegate> *)delegate afterDelay:(NSTimeInterval)delay;
+
+/**
+ *
+ * Access the singleton Crashlytics instance.
+ *
+ **/
++ (Crashlytics *)sharedInstance;
+
+/**
+ *
+ * The easiest way to cause a crash - great for testing!
+ *
+ **/
+- (void)crash;
+
+/**
+ *
+ * Many of our customers have requested the ability to tie crashes to specific end-users of their
+ * application in order to facilitate responses to support requests or permit the ability to reach
+ * out for more information. We allow you to specify up to three separate values for display within
+ * the Crashlytics UI - but please be mindful of your end-user's privacy.
+ *
+ * We recommend specifying a user identifier - an arbitrary string that ties an end-user to a record
+ * in your system. This could be a database id, hash, or other value that is meaningless to a
+ * third-party observer but can be indexed and queried by you.
+ *
+ * Optionally, you may also specify the end-user's name or username, as well as email address if you
+ * do not have a system that works well with obscured identifiers.
+ *
+ * Pursuant to our EULA, this data is transferred securely throughout our system and we will not
+ * disseminate end-user data unless required to by law. That said, if you choose to provide end-user
+ * contact information, we strongly recommend that you disclose this in your application's privacy
+ * policy. Data privacy is of our utmost concern.
+ *
+ **/
+- (void)setUserIdentifier:(NSString *)identifier;
+- (void)setUserName:(NSString *)name;
+- (void)setUserEmail:(NSString *)email;
+
++ (void)setUserIdentifier:(NSString *)identifier;
++ (void)setUserName:(NSString *)name;
++ (void)setUserEmail:(NSString *)email;
+
+/**
+ *
+ * Set a value for a key to be associated with your crash data.
+ *
+ **/
+- (void)setObjectValue:(id)value forKey:(NSString *)key;
+- (void)setIntValue:(int)value forKey:(NSString *)key;
+- (void)setBoolValue:(BOOL)value forKey:(NSString *)key;
+- (void)setFloatValue:(float)value forKey:(NSString *)key;
+
++ (void)setObjectValue:(id)value forKey:(NSString *)key;
++ (void)setIntValue:(int)value forKey:(NSString *)key;
++ (void)setBoolValue:(BOOL)value forKey:(NSString *)key;
++ (void)setFloatValue:(float)value forKey:(NSString *)key;
+
+ at end
+
+/**
+ * The CLSCrashReport protocol exposes methods that you can call on crash report objects passed
+ * to delegate methods. If you want these values or the entire object to stay in memory retain
+ * them or copy them.
+ **/
+ at protocol CLSCrashReport <NSObject>
+ at required
+
+/**
+ * Returns the session identifier for the crash report.
+ **/
+ at property (nonatomic, readonly) NSString *identifier;
+
+/**
+ * Returns the custom key value data for the crash report.
+ **/
+ at property (nonatomic, readonly) NSDictionary *customKeys;
+
+/**
+ * Returns the CFBundleVersion of the application that crashed.
+ **/
+ at property (nonatomic, readonly) NSString *bundleVersion;
+
+/**
+ * Returns the CFBundleShortVersionString of the application that crashed.
+ **/
+ at property (nonatomic, readonly) NSString *bundleShortVersionString;
+
+/**
+ * Returns the date that the application crashed at.
+ **/
+ at property (nonatomic, readonly) NSDate *crashedOnDate;
+
+/**
+ * Returns the os version that the application crashed on.
+ **/
+ at property (nonatomic, readonly) NSString *OSVersion;
+
+/**
+ * Returns the os build version that the application crashed on.
+ **/
+ at property (nonatomic, readonly) NSString *OSBuildVersion;
+
+ at end
+
+/**
+ *
+ * The CrashlyticsDelegate protocol provides a mechanism for your application to take
+ * action on events that occur in the Crashlytics crash reporting system. You can make
+ * use of these calls by assigning an object to the Crashlytics' delegate property directly,
+ * or through the convenience startWithAPIKey:delegate:... methods.
+ *
+ **/
+ at protocol CrashlyticsDelegate <NSObject>
+ at optional
+
+/**
+ *
+ * Called once a Crashlytics instance has determined that the last execution of the
+ * application ended in a crash. This is called some time after the crash reporting
+ * process has begun. If you have specified a delay in one of the
+ * startWithAPIKey:... calls, this will take at least that long to be invoked.
+ *
+ **/
+- (void)crashlyticsDidDetectCrashDuringPreviousExecution:(Crashlytics *)crashlytics;
+
+/**
+ *
+ * Just like crashlyticsDidDetectCrashDuringPreviousExecution this delegate method is
+ * called once a Crashlytics instance has determined that the last execution of the
+ * application ended in a crash. A CLSCrashReport is passed back that contains data about
+ * the last crash report that was generated. See the CLSCrashReport protocol for method details.
+ * This method is called after crashlyticsDidDetectCrashDuringPreviousExecution.
+ *
+ **/
+- (void)crashlytics:(Crashlytics *)crashlytics didDetectCrashDuringPreviousExecution:(id <CLSCrashReport>)crash;
+
+ at end
Added: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Modules/module.modulemap
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Modules/module.modulemap (rev 0)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Modules/module.modulemap 2015-05-10 23:14:19 UTC (rev 3327)
@@ -0,0 +1,6 @@
+framework module Crashlytics {
+ umbrella header "Crashlytics.h"
+
+ export *
+ module * { export * }
+}
Added: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Resources/Info.plist
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Resources/Info.plist (rev 0)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/A/Resources/Info.plist 2015-05-10 23:14:19 UTC (rev 3327)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>Crashlytics</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.crashlytics.sdk.mac</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>Crashlytics</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleShortVersionString</key>
+ <string>2.2.5</string>
+ <key>CFBundleSupportedPlatforms</key>
+ <array>
+ <string>macosx</string>
+ </array>
+ <key>CFBundleVersion</key>
+ <string>39</string>
+ <key>DTPlatformName</key>
+ <string>macosx</string>
+ <key>MinimumOSVersion</key>
+ <string>10.6</string>
+</dict>
+</plist>
Added: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/Current
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/Current (rev 0)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/Current 2015-05-10 23:14:19 UTC (rev 3327)
@@ -0,0 +1 @@
+link A
\ No newline at end of file
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/Versions/Current
___________________________________________________________________
Added: svn:special
+ *
Added: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/run
===================================================================
(Binary files differ)
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/Crashlytics.framework/run
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/Contents.json
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/Contents.json (rev 0)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/Contents.json 2015-05-10 23:14:19 UTC (rev 3327)
@@ -0,0 +1,65 @@
+{
+ "images" : [
+ {
+ "size" : "16x16",
+ "idiom" : "mac",
+ "filename" : "GreenCogSqueak.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "16x16",
+ "idiom" : "mac",
+ "filename" : "GreenCogSqueak-1.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "32x32",
+ "idiom" : "mac",
+ "filename" : "GreenCogSqueak-1-1.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "32x32",
+ "idiom" : "mac",
+ "filename" : "GreenCogSqueak-2.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "128x128",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "128x128",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "256x256",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "256x256",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "512x512",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "mac",
+ "size" : "512x512",
+ "scale" : "2x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ },
+ "properties" : {
+ "pre-rendered" : true
+ }
+}
\ No newline at end of file
Added: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak-1-1.png
===================================================================
(Binary files differ)
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak-1-1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak-1.png
===================================================================
(Binary files differ)
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak-1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak-2.png
===================================================================
(Binary files differ)
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak-2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak.png
===================================================================
(Binary files differ)
Property changes on: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjc64*64/Images.xcassets/AppIcon.appiconset/GreenCogSqueak.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2015-05-10 17:44:53 UTC (rev 3326)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2015-05-10 23:14:19 UTC (rev 3327)
@@ -3,18 +3,15 @@
AioPlugin \
ADPCMCodecPlugin \
AsynchFilePlugin \
-B3DAcceleratorPlugin \
B2DPlugin \
BitBltPlugin \
BMPReadWriterPlugin \
-ClipboardExtendedPlugin \
ZipPlugin \
DropPlugin \
DSAPrims \
FFTPlugin \
FilePlugin \
IA32ABI \
-InternetConfigPlugin \
JoystickTabletPlugin \
JPEGReaderPlugin \
JPEGReadWriter2Plugin \
@@ -23,7 +20,6 @@
LocalePlugin \
MacMenubarPlugin \
Matrix2x3Plugin \
-MIDIPlugin \
MiscPrimitivePlugin \
RePlugin \
SecurityPlugin \
@@ -36,3 +32,8 @@
SurfacePlugin \
UUIDPlugin \
VMProfileMacSupportPlugin \
+
+#B3DAcceleratorPlugin \
+#ClipboardExtendedPlugin \
+#MIDIPlugin \
+#InternetConfigPlugin \
Deleted: branches/Cog/platforms/Mac OS/Resources/Squeak VM.r
===================================================================
--- branches/Cog/platforms/Mac OS/Resources/Squeak VM.r 2015-05-10 17:44:53 UTC (rev 3326)
+++ branches/Cog/platforms/Mac OS/Resources/Squeak VM.r 2015-05-10 23:14:19 UTC (rev 3327)
@@ -1,25 +0,0 @@
-#include <Carbon.r>
-
-resource 'STR ' (1001, purgeable) {
- "Squeak, a pure object oriented programming environment "
- "based on Smalltalk-80 and work done at Apple and Disney"
-};
-
-resource 'open' (128)
-{
- 'FAST', { '????','****' , 'STim', 'STch', 'SOBJ', 'TEXT', 'HTML', 'RTF ', 'ttro', 'JPEG', 'TIFF', 'PICT',
- 'URL ', 'ZIP ', 'zip ', 'BINA', 'GIFf', 'PNGf', 'MP3 ', 'MP3!', 'MP3U', 'MPEG', 'mp3!', 'MPG2', 'MPG3',
- 'MPG ', 'Mp3 ', 'M3U ', 'SRCS', 'Chng', 'HPS5' }
-};
-
-resource 'kind' (1000)
-{
- 'FAST',
- verUS,
- {
- 'apnm', "Squeak",
- 'STim', "Squeak Image File",
- 'STch', "Squeak Changes File",
- 'SOBJ', "Squeak Script File"
- }
-};
Deleted: branches/Cog/platforms/Mac OS/Resources/Squeak.icns
===================================================================
(Binary files differ)
Modified: branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.h
===================================================================
--- branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.h 2015-05-10 17:44:53 UTC (rev 3326)
+++ branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.h 2015-05-10 23:14:19 UTC (rev 3327)
@@ -13,10 +13,10 @@
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
- *
+ *
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -29,10 +29,15 @@
*/
/* The virtual machine proxy definition */
#include "sqVirtualMachine.h"
+#ifdef BUILD_FOR_OSX
+typedef NSPasteboard * CLIPBOARDTYPE;
+#else
+typedef UIPasteboard * CLIPBOARDTYPE;
+#endif
-void sqPasteboardClear( void * inPasteboard );
-sqInt sqPasteboardGetItemCount ( void *inPasteboard );
-sqInt sqPasteboardCopyItemFlavorsitemNumber ( void *inPasteboard, sqInt formatNumber );
+void sqPasteboardClear( CLIPBOARDTYPE inPasteboard );
+sqInt sqPasteboardGetItemCount ( CLIPBOARDTYPE inPasteboard );
+sqInt sqPasteboardCopyItemFlavorsitemNumber ( CLIPBOARDTYPE inPasteboard, sqInt formatNumber );
void * sqCreateClipboard( void );
-void sqPasteboardPutItemFlavordatalengthformatTypeformatLength ( void *inPasteboard, char* inData, sqInt dataLength, char* format, sqInt formatLength);
-sqInt sqPasteboardCopyItemFlavorDataformatformatLength ( void* inPasteboard, char* format, sqInt formatLength);
+void sqPasteboardPutItemFlavordatalengthformatTypeformatLength ( CLIPBOARDTYPE inPasteboard, char* inData, sqInt dataLength, char* format, sqInt formatLength);
+sqInt sqPasteboardCopyItemFlavorDataformatformatLength ( CLIPBOARDTYPE inPasteboard, char* format, sqInt formatLength);
Modified: branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m
===================================================================
--- branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m 2015-05-10 17:44:53 UTC (rev 3326)
+++ branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m 2015-05-10 23:14:19 UTC (rev 3327)
@@ -13,10 +13,10 @@
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
- *
+ *
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -31,83 +31,74 @@
#include "sqMacExtendedClipboard.h"
#import <Cocoa/Cocoa.h>
-
extern struct VirtualMachine* interpreterProxy;
-void sqPasteboardClear(void *inPasteboard )
+void sqPasteboardClear(CLIPBOARDTYPE inPasteboard )
{
- NSArray *arrayOfTypes = [[NSArray alloc] init];
-
- [(NSPasteboard*) inPasteboard declareTypes: arrayOfTypes owner: nil];
- [arrayOfTypes release];
-
+ NSArray *arrayOfTypes = [NSArray array];
+
+ [inPasteboard declareTypes: arrayOfTypes owner: nil];
+
}
-sqInt sqPasteboardGetItemCount (void *inPasteboard )
+sqInt sqPasteboardGetItemCount (CLIPBOARDTYPE inPasteboard )
{
- return [[(NSPasteboard *)inPasteboard types] count];
+ return [[inPasteboard types] count];
}
-sqInt sqPasteboardCopyItemFlavorsitemNumber ( void *inPasteboard, sqInt formatNumber )
+sqInt sqPasteboardCopyItemFlavorsitemNumber ( CLIPBOARDTYPE inPasteboard, sqInt formatNumber )
{
-
- sqInt formatTypeLength;
- sqInt flavorCount;
-
- flavorCount = [[(NSPasteboard *)inPasteboard types] count];
- if (formatNumber > flavorCount) {
- return interpreterProxy->nilObject();
- }
-
- NSString *formatType = [[(NSPasteboard *)inPasteboard types] objectAtIndex: formatNumber-1];
-
- const char *utf8data = [formatType UTF8String];
- formatTypeLength = strlen(utf8data);
- sqInt outData = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classString(), formatTypeLength);
- unsigned char* formatConverted = interpreterProxy->firstIndexableField(outData);
- memcpy(formatConverted,utf8data,formatTypeLength);
-
- return outData;
+
+ sqInt formatTypeLength;
+ sqInt flavorCount;
+
+ flavorCount = [[inPasteboard types] count];
+ if (formatNumber > flavorCount) {
+ return interpreterProxy->nilObject();
+ }
+
+ NSString *formatType = [inPasteboard types][formatNumber-1];
+
+ const char *utf8data = [formatType UTF8String];
+ formatTypeLength = strlen(utf8data);
+ sqInt outData = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classString(), formatTypeLength);
+ unsigned char* formatConverted = interpreterProxy->firstIndexableField(outData);
+ memcpy(formatConverted,utf8data,formatTypeLength);
+
+ return outData;
}
void * sqCreateClipboard( void )
{
- return (void*) [NSPasteboard generalPasteboard];
+ return (__bridge void*) [NSPasteboard generalPasteboard];
}
-void sqPasteboardPutItemFlavordatalengthformatTypeformatLength ( void *inPasteboard, char* inData, sqInt dataLength, char* format, sqInt formatLength)
-{
- NSString *formatType = [[NSString alloc] initWithBytes: format length: formatLength encoding: NSUTF8StringEncoding];
- NSData* data = [[NSData alloc ] initWithBytes: inData length: dataLength];
- NSArray *arrayOfTypes = [[NSArray alloc] initWithObjects: formatType,nil];
-
- [(NSPasteboard *)inPasteboard declareTypes: arrayOfTypes owner: nil];
- [(NSPasteboard *)inPasteboard setData: data forType: formatType];
-
- [arrayOfTypes release];
- [data release];
- [formatType release];
-}
-
-sqInt sqPasteboardCopyItemFlavorDataformatformatLength ( void *inPasteboard, char* format, sqInt formatLength)
+void sqPasteboardPutItemFlavordatalengthformatTypeformatLength ( CLIPBOARDTYPE inPasteboard, char* inData, sqInt dataLength, char* format, sqInt formatLength)
{
- NSString *formatType = [[NSString alloc] initWithBytes: format length: formatLength encoding: NSUTF8StringEncoding];
- NSArray *arrayOfTypes = [[NSArray alloc] initWithObjects: formatType,nil];
- NSString *type= [(NSPasteboard *)inPasteboard availableTypeFromArray: arrayOfTypes];
-
- if (type == NULL) {
- [formatType release];
- [arrayOfTypes release];
- return interpreterProxy->nilObject();
- }
+ NSString *formatType = [[NSString alloc] initWithBytes: format length: formatLength encoding: NSUTF8StringEncoding];
+ NSData* data = [[NSData alloc ] initWithBytes: inData length: dataLength];
+ NSArray *arrayOfTypes = @[formatType];
+
+ [inPasteboard declareTypes: arrayOfTypes owner: nil];
+ [inPasteboard setData: data forType: formatType];
+
+}
- NSData *dataBuffer = [(NSPasteboard *)inPasteboard dataForType: type];
- sqInt dataLength = [dataBuffer length];
- sqInt outData = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), dataLength );
- char *outDataPtr = (char *) interpreterProxy->firstIndexableField(outData);
- [dataBuffer getBytes: outDataPtr];
-
- [formatType release];
- [arrayOfTypes release];
- return outData;
+sqInt sqPasteboardCopyItemFlavorDataformatformatLength ( CLIPBOARDTYPE inPasteboard, char* format, sqInt formatLength)
+{
+ NSString *formatType = [[NSString alloc] initWithBytes: format length: formatLength encoding: NSUTF8StringEncoding];
+ NSArray *arrayOfTypes = @[formatType];
+ NSString *type= [inPasteboard availableTypeFromArray: arrayOfTypes];
+
+ if (type == NULL) {
+ return interpreterProxy->nilObject();
+ }
+
+ NSData *dataBuffer = [inPasteboard dataForType: type];
+ sqInt dataLength = [dataBuffer length];
+ sqInt outData = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), dataLength );
+ char *outDataPtr = (char *) interpreterProxy->firstIndexableField(outData);
+ [dataBuffer getBytes: outDataPtr];
+
+ return outData;
}
\ No newline at end of file
Modified: branches/Cog/platforms/iOS/plugins/MacMenubarPlugin/MacMenuOS9ToOSX.m
===================================================================
--- branches/Cog/platforms/iOS/plugins/MacMenubarPlugin/MacMenuOS9ToOSX.m 2015-05-10 17:44:53 UTC (rev 3326)
+++ branches/Cog/platforms/iOS/plugins/MacMenubarPlugin/MacMenuOS9ToOSX.m 2015-05-10 23:14:19 UTC (rev 3327)
@@ -21,7 +21,7 @@
MenuRef GetMenuHandle(MenuID menuID){
NSMenu *mainMenu = [[NSApplication sharedApplication] mainMenu];
NSMenuItem *menuRef = [mainMenu itemAtIndex: menuID];
- MenuRef handle = (MenuRef)menuRef;
+ MenuRef handle = (__bridge MenuRef)menuRef;
return handle;
};
@@ -222,7 +222,7 @@
MenuID GetMenuID(MenuRef menu){
NSMenu *mainMenu = [[NSApplication sharedApplication] mainMenu];
- NSMenuItem *menuItem = (NSMenuItem *) menu;
+ NSMenuItem *menuItem = (__bridge NSMenuItem *) menu;
return (MenuID) [mainMenu indexOfItem: menuItem];
};
@@ -273,6 +273,6 @@
MenuItemIndex * outIndex){
NSMenu *mainMenu = [[NSApplication sharedApplication] mainMenu];
- NSMenuItem *inputMenu = (NSMenuItem *) inMenu;
+ NSMenuItem *inputMenu = (__bridge NSMenuItem *) inMenu;
OSType inputCommandID = inCommandID;
};
Modified: branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h
===================================================================
--- branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h 2015-05-10 17:44:53 UTC (rev 3326)
+++ branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h 2015-05-10 23:14:19 UTC (rev 3327)
@@ -89,8 +89,8 @@
@property (nonatomic) AudioStreamBasicDescription* inputFormat;
@property (nonatomic) AudioQueueBufferRef * outputBuffers;
@property (nonatomic) AudioQueueBufferRef * inputBuffers;
- at property (nonatomic,retain) Queue* soundOutQueue;
- at property (nonatomic,retain) Queue* soundInQueue;
+ at property (nonatomic,strong) Queue* soundOutQueue;
+ at property (nonatomic,strong) Queue* soundInQueue;
@end
@interface soundAtom : NSObject {
@@ -98,7 +98,7 @@
usqInt byteCount;
usqInt startOffset;
}
-- (id) initWith: (char*) buffer count: (usqInt) bytes;
+- (instancetype) initWith: (char*) buffer count: (usqInt) bytes;
@property (nonatomic,assign) char * data;
@property (nonatomic,assign) usqInt byteCount;
Modified: branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m
===================================================================
--- branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m 2015-05-10 17:44:53 UTC (rev 3326)
+++ branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m 2015-05-10 23:14:19 UTC (rev 3327)
@@ -40,15 +40,14 @@
#define SqueakFrameSize 4 // guaranteed (see class SoundPlayer)
extern struct VirtualMachine* interpreterProxy;
-void MyAudioQueueOutputCallback (void *inUserData,
+void MyAudioQueueOutputCallback (sqSqueakSoundCoreAudio *inUserData,
AudioQueueRef inAQ,
AudioQueueBufferRef inBuffer);
-void MyAudioQueueOutputCallback (void *inUserData,
+void MyAudioQueueOutputCallback (sqSqueakSoundCoreAudio *myInstance,
AudioQueueRef inAQ,
AudioQueueBufferRef inBuffer) {
- sqSqueakSoundCoreAudio * myInstance = ( sqSqueakSoundCoreAudio *)inUserData;
soundAtom *atom = [myInstance.soundOutQueue returnOldest];
if (!atom) {
@@ -60,7 +59,6 @@
atom = [myInstance.soundOutQueue returnAndRemoveOldest];
inBuffer->mAudioDataByteSize = (int) atom.byteCount;
memcpy(inBuffer->mAudioData,atom.data,atom.byteCount);
- [atom release];
//NSLog(@"%i Fill sound buffer with %i bytesA",ioMSecs(),inBuffer->mAudioDataByteSize);
} else {
inBuffer->mAudioDataByteSize = (int) MIN(atom.byteCount - atom.startOffset,inBuffer->mAudioDataBytesCapacity);
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list