Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 16:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix GIT_BRANCH pulling-in.

Browse source
This commit is contained in:
David Baker 2015-02-04 21:39:53 +00:00
parent 4c0633b47f
commit 3d76d4d91c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
matrixConsole.xcodeproj/project.pbxproj
View file

@ -735,7 +735,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
GIT_BRANCH = null; GIT_BRANCH = 0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
@ -777,7 +777,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
GIT_BRANCH = null; GIT_BRANCH = 0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;

4
matrixConsole/AppDelegate.m
View file

@ -53,10 +53,10 @@
NSString *buildBranch = nil; NSString *buildBranch = nil;
NSString *buildNumber = nil; NSString *buildNumber = nil;
// Check whether GIT_BRANCH and BUILD_NUMBER were provided during compilation in command line argument. // Check whether GIT_BRANCH and BUILD_NUMBER were provided during compilation in command line argument.
#if !(MACRO_GIT_BRANCH == null) #if MACRO_GIT_BRANCH
buildBranch = NSStringize(MACRO_GIT_BRANCH); buildBranch = NSStringize(MACRO_GIT_BRANCH);
#endif #endif
#if MACRO_BUILD_NUMBER != 0 #if MACRO_BUILD_NUMBER
buildNumber = [NSString stringWithFormat:@"#%d", MACRO_BUILD_NUMBER]; buildNumber = [NSString stringWithFormat:@"#%d", MACRO_BUILD_NUMBER];
#endif #endif
if (buildBranch && buildNumber) { if (buildBranch && buildNumber) {