Updated to support 64bit experimental, new source url, and custom prefix.

This commit is contained in:
GRMrGecko 2014-10-08 09:07:49 -05:00
parent c32d8b873a
commit 0efa118a96
10 changed files with 877 additions and 1625 deletions

View File

@ -407,6 +407,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.4;
"MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5;
PRODUCT_NAME = Chromatic;
SDKROOT = macosx10.6;
VALID_ARCHS = "i386 x86_64";
};
name = Debug;
@ -430,6 +431,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.4;
"MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5;
PRODUCT_NAME = Chromatic;
SDKROOT = macosx10.6;
VALID_ARCHS = "i386 x86_64";
};
name = Release;

View File

@ -0,0 +1,41 @@
<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>F9B4A13A-E126-4DB2-8E59-049F754DF060</string>
<key>IDESourceControlProjectName</key>
<string>Chromatic</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>277CEC585978A4E13E82B13D4603A3C476DC02BD</key>
<string>mrgeckosmedia.com:public/Chromatic</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>Chromatic.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>277CEC585978A4E13E82B13D4603A3C476DC02BD</key>
<string>../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>mrgeckosmedia.com:public/Chromatic</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>277CEC585978A4E13E82B13D4603A3C476DC02BD</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>277CEC585978A4E13E82B13D4603A3C476DC02BD</string>
<key>IDESourceControlWCCName</key>
<string>Chromatic</string>
</dict>
</array>
</dict>
</plist>

View File

@ -22,10 +22,12 @@
@class MGMAbout, MGMPreferences, MGMURLConnectionManager, MGMURLBasicHandler, WebView;
extern NSString * const MGMCustomSnapshotURL;
extern NSString * const MGMCustomSnapshotPrefix;
extern NSString * const MGMMoveToTrash;
extern NSString * const MGMDoneSound;
extern NSString * const MGMLaunchWhenDone;
extern NSString * const MGMQuitAfterLaunch;
extern NSString * const MGM64bit;
@interface MGMController : NSObject
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)

View File

@ -30,10 +30,12 @@ NSString * const MGMLaunchCount = @"MGMLaunchCount";
NSString * const MGMChannel = @"MGMChannel";
NSString * const MGMChromiumPath = @"MGMChromiumPath";
NSString * const MGMCustomSnapshotURL = @"MGMCustomSnapshotURL";
NSString * const MGMCustomSnapshotPrefix = @"MGMCustomSnapshotPrefix";
NSString * const MGMMoveToTrash = @"MGMMoveToTrash";
NSString * const MGMDoneSound = @"MGMDoneSound";
NSString * const MGMLaunchWhenDone = @"MGMLaunchWhenDone";
NSString * const MGMQuitAfterLaunch = @"MGMQuitAfterLaunch";
NSString * const MGM64bit = @"MGM64bit";
NSString * const MGMCPApplications = @"/Applications";
NSString * const MGMCPUserApplications = @"~/Applications";
@ -42,8 +44,8 @@ NSString * const MGMChromiumZip = @"chrome-mac.zip";
NSString * const MGMTMPPath = @"/tmp";
NSString * const MGMChannelsURL = @"https://omahaproxy.appspot.com/all.json?os=mac";
static NSString *MGMSnapshotURL = @"https://commondatastorage.googleapis.com/chromium-browser-snapshots/";
NSString * const MGMSnapshotPrefix = @"Mac/";
static NSString *MGMSnapshotURL = @"https://storage.googleapis.com/chromium-browser-continuous/";//https://commondatastorage.googleapis.com/chromium-browser-snapshots/
static NSString * MGMSnapshotPrefix = @"Mac/";
NSString * const MGMSVNLogsURL = @"http://build.chromium.org/f/chromium/perf/dashboard/ui/changelog.html?url=/trunk/src&range=%@:%@&mode=html&os=mac";
NSString * const MGMCChannel = @"channel";
@ -114,9 +116,19 @@ NSString * const MGMUBCancel = @"Cancel";
}
}
if ([[NSUserDefaults standardUserDefaults] boolForKey:MGM64bit]) {
MGMSnapshotURL = @"https://storage.googleapis.com/chromium-qa/";
MGMSnapshotPrefix = @"Chromium_Mac_10_8_x64__experimental_/";
}
if ([defaults objectForKey:MGMCustomSnapshotURL]!=nil && ![[defaults objectForKey:MGMCustomSnapshotURL] isEqual:@""])
MGMSnapshotURL = [defaults objectForKey:MGMCustomSnapshotURL];
if ([defaults objectForKey:MGMCustomSnapshotPrefix]!=nil && ![[defaults objectForKey:MGMCustomSnapshotPrefix] isEqual:@""])
MGMSnapshotPrefix = [defaults objectForKey:MGMCustomSnapshotPrefix];
about = [MGMAbout new];
preferences = [MGMPreferences new];
[preferences addPreferencesPaneClassName:@"MGMGeneralPane"];
@ -169,6 +181,7 @@ NSString * const MGMUBCancel = @"Cancel";
[defaults setObject:[NSNumber numberWithBool:YES] forKey:MGMDoneSound];
[defaults setObject:[NSNumber numberWithBool:NO] forKey:MGMLaunchWhenDone];
[defaults setObject:[NSNumber numberWithBool:NO] forKey:MGMQuitAfterLaunch];
[defaults setObject:[NSNumber numberWithBool:NO] forKey:MGM64bit];
[[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
}
@ -383,12 +396,12 @@ NSString * const MGMUBCancel = @"Cancel";
}
- (void)revisionDidFinish:(MGMURLBasicHandler *)theHandler {
NSDictionary *revisionInfo = [[theHandler data] parseJSON];
NSString *webkit = [NSString stringWithFormat:@"%@", [revisionInfo objectForKey:@"webkit_revision"]];
NSString *webkit = [[revisionInfo objectForKey:@"webkit_revision"] description];
if (webkit!=nil)
[webKitBuildField setStringValue:webkit];
else
[webKitBuildField setStringValue:@"0"];
NSString *v8 = [NSString stringWithFormat:@"%@", [revisionInfo objectForKey:@"v8_revision"]];
NSString *v8 = [[revisionInfo objectForKey:@"v8_revision"] description];
if (v8!=nil)
[v8BuildField setStringValue:v8];
else

View File

@ -24,6 +24,7 @@
IBOutlet NSView *mainView;
IBOutlet NSTextField *snapshotField;
IBOutlet NSTextField *prefixField;
IBOutlet NSButton *trashButton;
}
- (id)initWithPreferences:(MGMPreferences *)thePreferences;

View File

@ -31,6 +31,8 @@
} else {
if ([preferences stringForKey:MGMCustomSnapshotURL]!=nil)
[snapshotField setStringValue:[preferences stringForKey:MGMCustomSnapshotURL]];
if ([preferences stringForKey:MGMCustomSnapshotPrefix]!=nil)
[prefixField setStringValue:[preferences stringForKey:MGMCustomSnapshotPrefix]];
[trashButton setState:([preferences boolForKey:MGMMoveToTrash] ? NSOnState : NSOffState)];
}
}
@ -55,6 +57,7 @@
- (IBAction)save:(id)sender {
[preferences setObject:[snapshotField stringValue] forKey:MGMCustomSnapshotURL];
[preferences setObject:[prefixField stringValue] forKey:MGMCustomSnapshotPrefix];
[preferences setBool:([trashButton state]==NSOnState) forKey:MGMMoveToTrash];
}
@end

View File

@ -26,6 +26,7 @@
IBOutlet NSButton *doneSoundButton;
IBOutlet NSButton *launchWhenDoneButton;
IBOutlet NSButton *quitAfterLaunchButton;
IBOutlet NSButton *experimentalButton;
}
- (id)initWithPreferences:(MGMPreferences *)thePreferences;
+ (void)setUpToolbarItem:(NSToolbarItem *)theItem;

View File

@ -32,6 +32,7 @@
[doneSoundButton setState:([preferences boolForKey:MGMDoneSound] ? NSOnState : NSOffState)];
[launchWhenDoneButton setState:([preferences boolForKey:MGMLaunchWhenDone] ? NSOnState : NSOffState)];
[quitAfterLaunchButton setState:([preferences boolForKey:MGMQuitAfterLaunch] ? NSOnState : NSOffState)];
[experimentalButton setState:([preferences boolForKey:MGM64bit] ? NSOnState : NSOffState)];
}
}
return self;
@ -56,5 +57,6 @@
[preferences setBool:([doneSoundButton state]==NSOnState) forKey:MGMDoneSound];
[preferences setBool:([launchWhenDoneButton state]==NSOnState) forKey:MGMLaunchWhenDone];
[preferences setBool:([quitAfterLaunchButton state]==NSOnState) forKey:MGMQuitAfterLaunch];
[preferences setBool:([experimentalButton state]==NSOnState) forKey:MGM64bit];
}
@end

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff