github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make REST_API a global define and make it a C string

Browse Source
This commit is contained in:
Allan Odgaard
2014-04-25 20:31:23 +07:00
parent 7c31761e21
commit 397fdb52d4
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Applications/TextMate/src/AppController.mm
View File

@@ -276,9 +276,9 @@ BOOL HasDocumentWindow (NSArray* windows)
NSString* parms = [NSString stringWithFormat:@"v=%@&os=%zu.%zu.%zu", [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], oak::os_major(), oak::os_minor(), oak::os_patch()];
[swUpdate setSignee:key_chain_t::key_t("org.textmate.duff", "Allan Odgaard", "-----BEGIN PUBLIC KEY-----\nMIIBtjCCASsGByqGSM44BAEwggEeAoGBAPIE9PpXPK3y2eBDJ0dnR/D8xR1TiT9m\n8DnPXYqkxwlqmjSShmJEmxYycnbliv2JpojYF4ikBUPJPuerlZfOvUBC99ERAgz7\nN1HYHfzFIxVo1oTKWurFJ1OOOsfg8AQDBDHnKpS1VnwVoDuvO05gK8jjQs9E5LcH\ne/opThzSrI7/AhUAy02E9H7EOwRyRNLofdtPxpa10o0CgYBKDfcBscidAoH4pkHR\nIOEGTCYl3G2Pd1yrblCp0nCCUEBCnvmrWVSXUTVa2/AyOZUTN9uZSC/Kq9XYgqwj\nhgzqa8h/a8yD+ao4q8WovwGeb6Iso3WlPl8waz6EAPR/nlUTnJ4jzr9t6iSH9owS\nvAmWrgeboia0CI2AH++liCDvigOBhAACgYAFWO66xFvmF2tVIB+4E7CwhrSi2uIk\ndeBrpmNcZZ+AVFy1RXJelNe/cZ1aXBYskn/57xigklpkfHR6DGqpEbm6KC/47Jfy\ny5GEx+F/eBWEePi90XnLinytjmXRmS2FNqX6D15XNG1xJfjociA8bzC7s4gfeTUd\nlpQkBq2z71yitA==\n-----END PUBLIC KEY-----\n")];
[swUpdate setChannels:@{
kSoftwareUpdateChannelRelease : [NSURL URLWithString:[NSString stringWithFormat:REST_API @"/releases/release?%@", parms]],
kSoftwareUpdateChannelBeta : [NSURL URLWithString:[NSString stringWithFormat:REST_API @"/releases/beta?%@", parms]],
kSoftwareUpdateChannelNightly : [NSURL URLWithString:[NSString stringWithFormat:REST_API @"/releases/nightly?%@", parms]],
kSoftwareUpdateChannelRelease : [NSURL URLWithString:[NSString stringWithFormat:@"%s/releases/release?%@", REST_API, parms]],
kSoftwareUpdateChannelBeta : [NSURL URLWithString:[NSString stringWithFormat:@"%s/releases/beta?%@", REST_API, parms]],
kSoftwareUpdateChannelNightly : [NSURL URLWithString:[NSString stringWithFormat:@"%s/releases/nightly?%@", REST_API, parms]],
}];
[self userDefaultsDidChange:nil]; // setup mate/rmate server
@@ -297,7 +297,7 @@ BOOL HasDocumentWindow (NSArray* windows)
[[BundlesManager sharedInstance] setAutoUpdateBundles:YES];
[[CrashReporter sharedInstance] applicationDidFinishLaunching:aNotification];
[[CrashReporter sharedInstance] postNewCrashReportsToURLString:REST_API @"/crashes"];
[[CrashReporter sharedInstance] postNewCrashReportsToURLString:[NSString stringWithFormat:@"%s/crashes", REST_API]];
[OakCommitWindowServer sharedInstance]; // Setup server

1
Applications/TextMate/target
View File

@@ -3,7 +3,6 @@ CP_Resources = resources/* icons/*.icns about/* @PrivilegedTool @mate @t
CP_SharedSupport = support/*
CP_PlugIns = @Dialog @Dialog2
CP_Library/QuickLook = @TextMateQL
FLAGS += -DREST_API='@"$rest_api"'
LINK += bundles cf command document editor io network ns plist settings text kvdb
LINK += BundleMenu BundleEditor BundlesManager CrashReporter DocumentWindow Find HTMLOutputWindow OakAppKit OakFilterList OakFoundation OakSystem OakTextView Preferences SoftwareUpdate updater license
LINK += CommitWindow

1
Frameworks/DocumentWindow/target
View File

@@ -1,6 +1,5 @@
SOURCES = src/*.mm
CP_Resources = resources/*
FLAGS += -DREST_API='"$rest_api"'
LINK += kvdb command text authorization scm bundles cf Find HTMLOutputWindow io ns OakAppKit OakFileBrowser OakFilterList OakFoundation OakSystem OakTextView BundleEditor network Preferences encoding
EXPORT = src/DocumentController.h
FRAMEWORKS = Cocoa

1
Frameworks/updater/target
View File

@@ -1,4 +1,3 @@
SOURCES = src/*.cc
FLAGS += -DREST_API='"$rest_api"'
LINK += text io network plist
EXPORT = src/updater.h

1
target
View File

@@ -4,6 +4,7 @@ FLAGS += -c -pipe -fPIC -gdwarf-2
FLAGS += -m64 -mmacosx-version-min=$APP_MIN_OS -isysroot "$sdk"
FLAGS += -funsigned-char
FLAGS += -D'NULL_STR="\uFFFF"'
FLAGS += -DREST_API='"$rest_api"'
FLAGS += -Wall -Wwrite-strings -Wformat -Winit-self -Wmissing-include-dirs -Wno-parentheses -Wno-sign-compare -Wno-switch
FLAGS += -Wno-address-of-temporary
FLAGS += -IShared/include