diff --git a/Chromatic.xcodeproj/project.pbxproj b/Chromatic.xcodeproj/project.pbxproj
index 54ac1d3..749caae 100644
--- a/Chromatic.xcodeproj/project.pbxproj
+++ b/Chromatic.xcodeproj/project.pbxproj
@@ -389,11 +389,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = (
- ppc,
- i386,
- x86_64,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -405,13 +401,13 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Classes/Prefix.pch;
+ GCC_VERSION = "";
INFOPLIST_FILE = Resources/Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.4;
"MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5;
PRODUCT_NAME = Chromatic;
- SDKROOT = macosx10.5;
- VALID_ARCHS = "ppc i386 x86_64";
+ VALID_ARCHS = "i386 x86_64";
};
name = Debug;
};
@@ -419,11 +415,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = (
- ppc,
- i386,
- x86_64,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -432,13 +424,13 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Classes/Prefix.pch;
+ GCC_VERSION = "";
INFOPLIST_FILE = Resources/Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.4;
"MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5;
PRODUCT_NAME = Chromatic;
- SDKROOT = macosx10.5;
- VALID_ARCHS = "ppc i386 x86_64";
+ VALID_ARCHS = "i386 x86_64";
};
name = Release;
};
@@ -452,7 +444,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
- SDKROOT = macosx10.6;
+ SDKROOT = "";
};
name = Debug;
};
@@ -464,7 +456,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
- SDKROOT = macosx10.6;
+ SDKROOT = "";
};
name = Release;
};
@@ -478,6 +470,7 @@
2A933E6414AB7B0B00D92693 /* Release */,
);
defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
};
C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Chromatic" */ = {
isa = XCConfigurationList;
diff --git a/Classes/MGMController.m b/Classes/MGMController.m
index cfe0834..a3c7622 100644
--- a/Classes/MGMController.m
+++ b/Classes/MGMController.m
@@ -38,7 +38,6 @@ NSString * const MGMQuitAfterLaunch = @"MGMQuitAfterLaunch";
NSString * const MGMCPApplications = @"/Applications";
NSString * const MGMCPUserApplications = @"~/Applications";
NSString * const MGMCPChromium = @"Chromium.app";
-NSString * const MGMCPRevision = @"SVNRevision";
NSString * const MGMChromiumZip = @"chrome-mac.zip";
NSString * const MGMTMPPath = @"/tmp";
@@ -432,7 +431,12 @@ NSString * const MGMUBCancel = @"Cancel";
NSFileManager *manager = [NSFileManager defaultManager];
if ([manager fileExistsAtPath:chromiumPath]) {
NSDictionary *chromiumInfo = (NSDictionary *)CFBundleCopyInfoDictionaryInDirectory((CFURLRef)[NSURL fileURLWithPath:chromiumPath]);
- [yourBuildField setStringValue:[chromiumInfo objectForKey:MGMCPRevision]];
+ NSString *build = [chromiumInfo objectForKey:@"SVNRevision"];
+ if (build==nil)
+ build = [chromiumInfo objectForKey:@"SCMRevision"];
+ if (build!=nil)
+ [yourBuildField setStringValue:build];
+
[chromiumInfo release];
NSDictionary *chromeAttributes = [manager attributesOfItemAtPath:chromiumPath];
diff --git a/Frameworks/GeckoReporter.framework/GeckoReporter b/Frameworks/GeckoReporter.framework/GeckoReporter
deleted file mode 120000
index 34f9796..0000000
--- a/Frameworks/GeckoReporter.framework/GeckoReporter
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/GeckoReporter
\ No newline at end of file
diff --git a/Frameworks/GeckoReporter.framework/GeckoReporter b/Frameworks/GeckoReporter.framework/GeckoReporter
new file mode 100644
index 0000000..927fe1b
Binary files /dev/null and b/Frameworks/GeckoReporter.framework/GeckoReporter differ
diff --git a/Frameworks/Sparkle.framework/Sparkle b/Frameworks/Sparkle.framework/Sparkle
deleted file mode 120000
index b2c5273..0000000
--- a/Frameworks/Sparkle.framework/Sparkle
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Sparkle
\ No newline at end of file
diff --git a/Frameworks/Sparkle.framework/Sparkle b/Frameworks/Sparkle.framework/Sparkle
new file mode 100644
index 0000000..b140662
Binary files /dev/null and b/Frameworks/Sparkle.framework/Sparkle differ
diff --git a/Resources/Info.plist b/Resources/Info.plist
index 2064bf8..47b75e9 100644
--- a/Resources/Info.plist
+++ b/Resources/Info.plist
@@ -17,11 +17,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.2.2
+ 0.2.3
CFBundleSignature
????
CFBundleVersion
- 0.2.2
+ 0.2.3
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