From a729c9546be3d940b573b29359d46ea58f088f72 Mon Sep 17 00:00:00 2001 From: GRMrGecko Date: Wed, 28 Dec 2011 10:36:16 -0600 Subject: [PATCH] Fixed issue with Chromatic not being able to parse the channel causing the whole program to stop working. --- Chromatic.xcodeproj/project.pbxproj | 88 +++++++++++++++++++ .../contents.xcworkspacedata | 7 ++ Classes/MGMController.m | 3 +- Resources/Info.plist | 6 +- 4 files changed, 100 insertions(+), 4 deletions(-) create mode 100644 Chromatic.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Chromatic.xcodeproj/project.pbxproj b/Chromatic.xcodeproj/project.pbxproj index bae81bb..54ac1d3 100644 --- a/Chromatic.xcodeproj/project.pbxproj +++ b/Chromatic.xcodeproj/project.pbxproj @@ -6,6 +6,20 @@ objectVersion = 45; objects = { +/* Begin PBXAggregateTarget section */ + 2A933E6114AB7B0900D92693 /* Build Directory */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 2A933E6214AB7B0B00D92693 /* Build configuration list for PBXAggregateTarget "Build Directory" */; + buildPhases = ( + 2A933E6514AB7B1E00D92693 /* ShellScript */, + ); + dependencies = ( + ); + name = "Build Directory"; + productName = "Build Directory"; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; }; 256AC3DA0F4B6AC300CF3369 /* MGMController.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* MGMController.m */; }; @@ -32,6 +46,16 @@ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 2A933E6B14AB7B6300D92693 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 2A933E6114AB7B0900D92693; + remoteInfo = "Build Directory"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 2A53916813A0FEFD00CA59E3 /* Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -217,10 +241,12 @@ 8D11072C0486CEB800E47090 /* Sources */, 8D11072E0486CEB800E47090 /* Frameworks */, 2A53916813A0FEFD00CA59E3 /* Frameworks */, + 2A933E6F14AB7C0700D92693 /* ShellScript */, ); buildRules = ( ); dependencies = ( + 2A933E6C14AB7B6300D92693 /* PBXTargetDependency */, ); name = Chromatic; productInstallPath = "$(HOME)/Applications"; @@ -248,6 +274,7 @@ projectRoot = ""; targets = ( 8D1107260486CEB800E47090 /* Chromatic */, + 2A933E6114AB7B0900D92693 /* Build Directory */, ); }; /* End PBXProject section */ @@ -272,6 +299,35 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 2A933E6514AB7B1E00D92693 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/bash\n#\n# Build Directory\n#\n# Created by Mr. Gecko on 4/21/11.\n# No Copyright Claimed. Public Domain.\n#\n# DISCLAIMER: This script is provided as-is. I am not responsible if this script somehow causes harm to you or your system in any way, I am providing this for free in hope that it will of use to someone. I WILL NOT pay you any amount of money if anything happen to your data or you because of the changes this script makes nor am I obligated to help you fix issues this causes.\n#\n\nif [ \"$SRCROOT/build\" != \"$SYMROOT\" ]; then\nif [ -d \"$SRCROOT/build\" ]; then\n/bin/rm -Rf \"$SRCROOT/build\"\nfi\n/bin/ln -fs \"$SYMROOT\" \"$SRCROOT/build\"\nfi"; + }; + 2A933E6F14AB7C0700D92693 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/bash\n#\n# Git Version\n#\n# Created by Mr. Gecko on 4/21/11.\n# No Copyright Claimed. Public Domain.\n#\n# DISCLAIMER: This script is provided as-is. I am not responsible if this script somehow causes harm to you or your system in any way, I am providing this for free in hope that it will of use to someone. I WILL NOT pay you any amount of money if anything happen to your data or you because of the changes this script makes nor am I obligated to help you fix issues this causes.\n#\n\nPATH=\"${PATH}:/usr/local/git/bin/\"\n\nINFO=\"${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Info\"\nGITDIR=\"${PROJECT_DIR}/.git\"\n\nVERSION=`defaults read \"${INFO}\" CFBundleVersion`\nif [ -d \"${GITDIR}\" ]; then\nREVISION=`git --git-dir=\"${GITDIR}\" rev-parse --short HEAD`\ndefaults write \"${INFO}\" CFBundleShortVersionString -string \"${VERSION} (${REVISION})\"\nelse\ndefaults write \"${INFO}\" CFBundleShortVersionString -string \"${VERSION}\"\nfi"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 8D11072C0486CEB800E47090 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -287,6 +343,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 2A933E6C14AB7B6300D92693 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 2A933E6114AB7B0900D92693 /* Build Directory */; + targetProxy = 2A933E6B14AB7B6300D92693 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -307,6 +371,20 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 2A933E6314AB7B0B00D92693 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 2A933E6414AB7B0B00D92693 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -333,6 +411,7 @@ "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; PRODUCT_NAME = Chromatic; SDKROOT = macosx10.5; + VALID_ARCHS = "ppc i386 x86_64"; }; name = Debug; }; @@ -359,6 +438,7 @@ "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; PRODUCT_NAME = Chromatic; SDKROOT = macosx10.5; + VALID_ARCHS = "ppc i386 x86_64"; }; name = Release; }; @@ -391,6 +471,14 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 2A933E6214AB7B0B00D92693 /* Build configuration list for PBXAggregateTarget "Build Directory" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2A933E6314AB7B0B00D92693 /* Debug */, + 2A933E6414AB7B0B00D92693 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Chromatic" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Chromatic.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Chromatic.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..3fc3416 --- /dev/null +++ b/Chromatic.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Classes/MGMController.m b/Classes/MGMController.m index d5798d1..cfe0834 100644 --- a/Classes/MGMController.m +++ b/Classes/MGMController.m @@ -203,7 +203,8 @@ NSString * const MGMUBCancel = @"Cancel"; } for (int i=0; i<[versions count]; i++) { NSDictionary *versionInfo = [versions objectAtIndex:i]; - [channelRevisions setObject:[[versionInfo objectForKey:MGMCRevision] stringValue] forKey:[versionInfo objectForKey:MGMCChannel]]; + id channel = [versionInfo objectForKey:MGMCRevision]; + [channelRevisions setObject:([channel isKindOfClass:[NSString class]] ? channel : [channel stringValue]) forKey:[versionInfo objectForKey:MGMCChannel]]; } [progress setIndeterminate:NO]; diff --git a/Resources/Info.plist b/Resources/Info.plist index a2a36e0..2064bf8 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.2.1 + 0.2.2 CFBundleSignature ???? CFBundleVersion - 0.2.1 + 0.2.2 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} MGMGRBugsEmail @@ -37,7 +37,7 @@ MGMGRTimeZone CST NSHumanReadableCopyright - Copyright (c) 2011 Mr. Gecko's Media (James Coleman). http://mrgeckosmedia.com/ + Copyright (c) 2011 Mr. Gecko's Media (James Coleman). http://mrgeckosmedia.com/ NSMainNibFile MainMenu NSPrincipalClass