From de36a2f4d19164b2ed4e5f66c2518bf12468f7eb Mon Sep 17 00:00:00 2001 From: David Richardson Date: Mon, 3 Sep 2018 02:29:43 -0600 Subject: [PATCH] Fixed: Update XcodeCapp code and Jakefile to install properly and launch without crashing when built with Xcode 10/ macOSSDK10.14 (#2773) Disable YRKSpinningProgressIndicator threaded animation (causing immediate crash on launch since Xcode 10 beta 6). Simplify Jakefile build process to 'xcodebuild install' to avoid permissions problems when building (still requires sudo when using Cappuccino defaults). Increment version number to 4.0.1 to reflect minor nature of change. Update About window version number field to fully display and properly align longer version numbers. --- Tools/XcodeCapp/Jakefile | 8 +- .../XcodeCapp.xcodeproj/project.pbxproj | 2 + .../XcodeCapp/Base.lproj/MainMenu.xib | 89 ++++++++----------- Tools/XcodeCapp/XcodeCapp/Info.plist | 6 +- .../XcodeCapp/YRKSpinningProgressIndicator.m | 1 + 5 files changed, 48 insertions(+), 58 deletions(-) diff --git a/Tools/XcodeCapp/Jakefile b/Tools/XcodeCapp/Jakefile index 3ae57348a..2ee1083fc 100644 --- a/Tools/XcodeCapp/Jakefile +++ b/Tools/XcodeCapp/Jakefile @@ -44,14 +44,14 @@ task ("build", function() if (executableExists("xcodebuild")) { - var args = "-sdk macosx -alltargets -configuration Release", - installPath = FILE.join("/", "Applications", applicationName); + var args = installPath = FILE.join("/", "Applications", applicationName); - // Remove an old symlink, the application is built directly into /Applications now. + // Remove old symlink, if present. + //The application is now built directly into /Applications if (FILE.isLink(installPath)) FILE.remove(installPath); - if (OS.system("xcodebuild " + args)) + if (!OS.system("xcodebuild install")) colorPrint("Unable to build XcodeCapp. Skipping", "orange"); } else diff --git a/Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj b/Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj index 59d960f67..c19b750d1 100644 --- a/Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj +++ b/Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj @@ -517,6 +517,7 @@ COMBINE_HIDPI_IMAGES = YES; DSTROOT = /; INFOPLIST_FILE = XcodeCapp/Info.plist; + INSTALL_PATH = "$(LOCAL_APPS_DIR)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_BUNDLE_IDENTIFIER = org.cappuccino.xcodecapp; @@ -532,6 +533,7 @@ COMBINE_HIDPI_IMAGES = YES; DSTROOT = /; INFOPLIST_FILE = XcodeCapp/Info.plist; + INSTALL_PATH = "$(LOCAL_APPS_DIR)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_BUNDLE_IDENTIFIER = org.cappuccino.xcodecapp; diff --git a/Tools/XcodeCapp/XcodeCapp/Base.lproj/MainMenu.xib b/Tools/XcodeCapp/XcodeCapp/Base.lproj/MainMenu.xib index 61be0ea93..76ab0fa72 100644 --- a/Tools/XcodeCapp/XcodeCapp/Base.lproj/MainMenu.xib +++ b/Tools/XcodeCapp/XcodeCapp/Base.lproj/MainMenu.xib @@ -1,9 +1,9 @@ - - + + - - + + @@ -375,10 +375,10 @@ - + - + @@ -409,22 +409,19 @@ - + - + - + - - - @@ -533,10 +530,10 @@ - + - + @@ -582,19 +579,16 @@ - + - + - + - - - @@ -625,10 +619,10 @@ - + - + @@ -680,12 +674,9 @@ - + - - - @@ -696,7 +687,6 @@ - @@ -721,7 +711,7 @@ - + @@ -738,18 +728,6 @@ - - - - - - - - - - - - @@ -764,12 +742,24 @@ + + + + + + + + + + + + - + @@ -838,10 +828,10 @@ - + - + @@ -883,10 +873,10 @@ - + - + @@ -894,17 +884,14 @@ - + - - - - + - + diff --git a/Tools/XcodeCapp/XcodeCapp/Info.plist b/Tools/XcodeCapp/XcodeCapp/Info.plist index 49d970dab..b5d62c923 100644 --- a/Tools/XcodeCapp/XcodeCapp/Info.plist +++ b/Tools/XcodeCapp/XcodeCapp/Info.plist @@ -2,8 +2,6 @@ - NSUserNotificationAlertStyle - alert CFBundleDevelopmentRegion en CFBundleDocumentTypes @@ -36,7 +34,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - Version 4.0 + Version 4.0.1 CFBundleSignature ???? CFBundleVersion @@ -51,6 +49,8 @@ MainMenu NSPrincipalClass NSApplication + NSUserNotificationAlertStyle + alert XCCCompatibilityVersion 4 XCCLastCappuccinoMasterBranchURL diff --git a/Tools/XcodeCapp/XcodeCapp/YRKSpinningProgressIndicator.m b/Tools/XcodeCapp/XcodeCapp/YRKSpinningProgressIndicator.m index 2e2b36763..5aca51c46 100755 --- a/Tools/XcodeCapp/XcodeCapp/YRKSpinningProgressIndicator.m +++ b/Tools/XcodeCapp/XcodeCapp/YRKSpinningProgressIndicator.m @@ -66,6 +66,7 @@ const NSTimeInterval kFadeOutTime = 0.7; // seconds _indeterminate = YES; _currentValue = 0.0; _maxValue = 100.0; + _usesThreadedAnimation = NO; // YES crashes on launch when compiled with Xcode 10 beta 6 } #pragma mark - NSView overrides