Fjalapeno has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199276
Change subject: Setup Xcode to use config files - setting the bundle id based
on the configuration.
......................................................................
Setup Xcode to use config files - setting the bundle id based on the
configuration.
Change-Id: I6b8fee70aa86aba61f5f13eb855bc9882da62ccc
---
A AlphaConfig.xcconfig
A DebugConfig.xcconfig
A ReleaseConfig.xcconfig
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/Wikipedia-Info.plist
5 files changed, 129 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/76/199276/1
diff --git a/AlphaConfig.xcconfig b/AlphaConfig.xcconfig
new file mode 100644
index 0000000..3b81135
--- /dev/null
+++ b/AlphaConfig.xcconfig
@@ -0,0 +1,2 @@
+
+APP_ID_SUFFIX = .tfbeta
diff --git a/DebugConfig.xcconfig b/DebugConfig.xcconfig
new file mode 100644
index 0000000..21a6a4e
--- /dev/null
+++ b/DebugConfig.xcconfig
@@ -0,0 +1,3 @@
+
+APP_ID_SUFFIX = .debug
+
diff --git a/ReleaseConfig.xcconfig b/ReleaseConfig.xcconfig
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/ReleaseConfig.xcconfig
@@ -0,0 +1 @@
+
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index d1724df..7e308ce 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -732,6 +732,9 @@
08D631F61A69B1AB00D87AD0 /* WMFImageGalleryViewController.m */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; name = WMFImageGalleryViewController.m; path = "Image
Gallery/WMFImageGalleryViewController.m"; sourceTree = "<group>"; };
08D631F81A69B8CD00D87AD0 /* WMFImageGalleryCollectionViewCell.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; name = WMFImageGalleryCollectionViewCell.h; path = "Image
Gallery/WMFImageGalleryCollectionViewCell.h"; sourceTree = "<group>"; };
08D631F91A69B8CD00D87AD0 /* WMFImageGalleryCollectionViewCell.m
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; name = WMFImageGalleryCollectionViewCell.m; path = "Image
Gallery/WMFImageGalleryCollectionViewCell.m"; sourceTree = "<group>"; };
+ 0E4F85DE1AC1BFD4004CA3CD /* AlphaConfig.xcconfig */ = {isa =
PBXFileReference; lastKnownFileType = text.xcconfig; path =
AlphaConfig.xcconfig; sourceTree = "<group>"; };
+ 0E4F85DF1AC1C1CC004CA3CD /* ReleaseConfig.xcconfig */ = {isa =
PBXFileReference; lastKnownFileType = text.xcconfig; path =
ReleaseConfig.xcconfig; sourceTree = "<group>"; };
+ 0E4F85E01AC1C1EF004CA3CD /* DebugConfig.xcconfig */ = {isa =
PBXFileReference; lastKnownFileType = text.xcconfig; path =
DebugConfig.xcconfig; sourceTree = "<group>"; };
0EA4402C1AA6281200B09DBA /* NSDateFormatter+WMFExtensions.h */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; name = "NSDateFormatter+WMFExtensions.h"; path =
"Wikipedia/Categories/NSDateFormatter+WMFExtensions.h"; sourceTree =
SOURCE_ROOT; };
0EA4402D1AA6281200B09DBA /* NSDateFormatter+WMFExtensions.m */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; name = "NSDateFormatter+WMFExtensions.m"; path =
"Wikipedia/Categories/NSDateFormatter+WMFExtensions.m"; sourceTree =
SOURCE_ROOT; };
17A2F22335C5256576CEDBDD /*
Pods-WikipediaUnitTests.release.xcconfig */ = {isa = PBXFileReference;
includeInIndex = 1; lastKnownFileType = text.xcconfig; name =
"Pods-WikipediaUnitTests.release.xcconfig"; path = "Pods/Target Support
Files/Pods-WikipediaUnitTests/Pods-WikipediaUnitTests.release.xcconfig";
sourceTree = "<group>"; };
@@ -1996,6 +1999,16 @@
name = "Image Gallery";
sourceTree = "<group>";
};
+ 0E4F85E11AC1C2BA004CA3CD /* Config Files */ = {
+ isa = PBXGroup;
+ children = (
+ 0E4F85DE1AC1BFD4004CA3CD /*
AlphaConfig.xcconfig */,
+ 0E4F85E01AC1C1EF004CA3CD /*
DebugConfig.xcconfig */,
+ 0E4F85DF1AC1C1CC004CA3CD /*
ReleaseConfig.xcconfig */,
+ );
+ name = "Config Files";
+ sourceTree = "<group>";
+ };
BC8309941A7BF935003FC5C7 /* WikipediaUnitTests */ = {
isa = PBXGroup;
children = (
@@ -2254,6 +2267,7 @@
D499142C181D51DE00E6073C = {
isa = PBXGroup;
children = (
+ 0E4F85E11AC1C2BA004CA3CD /* Config Files */,
D499143E181D51DE00E6073C /* Wikipedia */,
BCB669A31A83F6C300C7B1FE /* MediaWikiKit */,
04E9A78218F73C7200F7ECF7 /* www */,
@@ -3346,6 +3360,109 @@
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
+ 0E4F85D71AC1BF56004CA3CD /* Alpha */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 0E4F85DE1AC1BFD4004CA3CD
/* AlphaConfig.xcconfig */;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = YES;
+ ENABLE_NS_ASSERTIONS = NO;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "NDEBUG=1",
+ "$(inherited)",
+ );
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ RUN_CLANG_STATIC_ANALYZER = YES;
+ SDKROOT = iphoneos;
+ TARGETED_DEVICE_FAMILY = "1,2";
+ VALIDATE_PRODUCT = YES;
+ };
+ name = Alpha;
+ };
+ 0E4F85D81AC1BF56004CA3CD /* Alpha */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 357504E50DA104E39C6ACFEB
/* Pods.release.xcconfig */;
+ buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME =
LaunchImage;
+ CODE_SIGN_IDENTITY = "iPhone Developer";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone
Developer";
+ FRAMEWORK_SEARCH_PATHS = (
+ "\"$(PROJECT_DIR)/vendor/Frameworks\"",
+ "$(inherited)",
+ );
+ GCC_OPTIMIZATION_LEVEL = 3;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER =
"wikipedia/Wikipedia-Prefix.pch";
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ "$(SDKROOT)/usr/include/libxml2",
+
"$(PROJECT_DIR)/cocoapods/Pods/Headers/Public/AFNetworking",
+
"$(PROJECT_DIR)/cocoapods/Pods/Headers/Public/hpple",
+
"$(PROJECT_DIR)/MediaWikiKit/MediaWikiKit",
+ "$(PROJECT_DIR)/OldDataSchema/**",
+ );
+ INFOPLIST_FILE =
"Wikipedia/Wikipedia-Info.plist";
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ LIBRARY_SEARCH_PATHS = "$(inherited)";
+ OTHER_LDFLAGS = "$(inherited)";
+ PRODUCT_NAME = Wikipedia;
+ PROVISIONING_PROFILE = "";
+ RUN_CLANG_STATIC_ANALYZER = NO;
+ WARNING_CFLAGS = (
+ "$(inherited)",
+ "-Werror=switch",
+ "-Werror=arc-retain-cycles",
+ "-Werror=incompatible-pointer-types",
+ "-Werror=incomplete-implementation",
+ );
+ WRAPPER_EXTENSION = app;
+ };
+ name = Alpha;
+ };
+ 0E4F85D91AC1BF56004CA3CD /* Alpha */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 17A2F22335C5256576CEDBDD
/* Pods-WikipediaUnitTests.release.xcconfig */;
+ buildSettings = {
+ BUNDLE_LOADER = "$(TEST_HOST)";
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CODE_SIGN_IDENTITY = "iPhone Developer";
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ FRAMEWORK_SEARCH_PATHS = (
+
"$(SDKROOT)/Developer/Library/Frameworks",
+ "$(inherited)",
+ );
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ INFOPLIST_FILE = WikipediaUnitTests/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited)
@executable_path/Frameworks @loader_path/Frameworks";
+ MTL_ENABLE_DEBUG_INFO = NO;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ TEST_HOST =
"$(BUILT_PRODUCTS_DIR)/Wikipedia.app/Wikipedia";
+ };
+ name = Alpha;
+ };
BC42735B1A7C736800068882 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC96DA4AAD521D734849D20F
/* Pods-WikipediaUnitTests.debug.xcconfig */;
@@ -3396,6 +3513,7 @@
};
D4991468181D51DF00E6073C /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 0E4F85E01AC1C1EF004CA3CD
/* DebugConfig.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
@@ -3437,6 +3555,7 @@
};
D4991469181D51DF00E6073C /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 0E4F85DF1AC1C1CC004CA3CD
/* ReleaseConfig.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
@@ -3563,6 +3682,7 @@
buildConfigurations = (
BC42735B1A7C736800068882 /* Debug */,
BC42735C1A7C736800068882 /* Release */,
+ 0E4F85D91AC1BF56004CA3CD /* Alpha */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -3572,6 +3692,7 @@
buildConfigurations = (
D4991468181D51DF00E6073C /* Debug */,
D4991469181D51DF00E6073C /* Release */,
+ 0E4F85D71AC1BF56004CA3CD /* Alpha */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -3581,6 +3702,7 @@
buildConfigurations = (
D499146B181D51DF00E6073C /* Debug */,
D499146C181D51DF00E6073C /* Release */,
+ 0E4F85D81AC1BF56004CA3CD /* Alpha */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist
index 09bcb8c..14a1a20 100644
--- a/wikipedia/Wikipedia-Info.plist
+++ b/wikipedia/Wikipedia-Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
- <string>org.wikimedia.wikipedia.developer</string>
+ <string>org.wikimedia.wikipedia${APP_ID_SUFFIX}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
--
To view, visit https://gerrit.wikimedia.org/r/199276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b8fee70aa86aba61f5f13eb855bc9882da62ccc
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
