MobileMiniBrowser using the wrong toolchain
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Dec 2017 23:13:37 +0000 (23:13 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Dec 2017 23:13:37 +0000 (23:13 +0000)
https://bugs.webkit.org/show_bug.cgi?id=180716
<rdar://problem/36002951>

Reviewed by Tim Horton.

Move Debug/Release configurations from xcodeproj into Base.xcconfig.

* MobileMiniBrowser/Configurations/Base.xcconfig:
* MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225815 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/MobileMiniBrowser/Configurations/Base.xcconfig
Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj

index 3cfeedd..734d640 100644 (file)
@@ -1,3 +1,16 @@
+2017-12-12  Jonathan Bedard  <jbedard@apple.com>
+
+        MobileMiniBrowser using the wrong toolchain
+        https://bugs.webkit.org/show_bug.cgi?id=180716
+        <rdar://problem/36002951>
+
+        Reviewed by Tim Horton.
+
+        Move Debug/Release configurations from xcodeproj into Base.xcconfig.
+
+        * MobileMiniBrowser/Configurations/Base.xcconfig:
+        * MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj:
+
 2017-12-12  Youenn Fablet  <youenn@apple.com>
 
         Update ContentFiltering.LazilyLoadPlatformFrameworks test to account for libwebrtc using VideoProcessing framework
index f4b8151..2a5df41 100644 (file)
@@ -28,31 +28,56 @@ USE_INTERNAL_SDK_Production = YES;
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
+ALWAYS_SEARCH_USER_PATHS = NO;
+CLANG_ANALYZER_NONNULL = YES;
 CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
 CLANG_CXX_LIBRARY = libc++;
+CLANG_ENABLE_MODULES = YES;
+CLANG_ENABLE_OBJC_ARC = YES;
+CLANG_WARN_BOOL_CONVERSION = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+CLANG_WARN_CONSTANT_CONVERSION = YES;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;
+CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+CLANG_WARN_EMPTY_BODY = YES;
+CLANG_WARN_ENUM_CONVERSION = YES;
+CLANG_WARN_INFINITE_RECURSION = YES;
+CLANG_WARN_INT_CONVERSION = YES;
 CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+CLANG_WARN_SUSPICIOUS_MOVES = YES;
+CLANG_WARN_UNREACHABLE_CODE = YES;
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+COPY_PHASE_STRIP = NO;
+DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ENABLE_NS_ASSERTIONS = NO;
+ENABLE_STRICT_OBJC_MSGSEND = YES;
 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include;
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
 PREBINDING = NO
 GCC_C_LANGUAGE_STANDARD = gnu99
 GCC_ENABLE_CPP_EXCEPTIONS = NO;
 GCC_ENABLE_CPP_RTTI = NO;
+GCC_NO_COMMON_BLOCKS = YES;
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 GCC_TREAT_WARNINGS_AS_ERRORS = YES
-GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
+GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+GCC_WARN_UNDECLARED_SELECTOR = YES;
+GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 GCC_WARN_UNUSED_FUNCTION = YES
 GCC_WARN_UNUSED_VARIABLE = YES
 GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64*] = NO;
 GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
+MTL_ENABLE_DEBUG_INFO = NO;
+VALIDATE_PRODUCT = YES;
 WARNING_CFLAGS = -Wall -W -Wno-unused-parameter -Wundef
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator;
-SDKROOT = iphonesimulator;
+SDKROOT = macosx.internal;
 
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
index 998c6e5..22543a7 100644 (file)
                        isa = PBXGroup;
                        children = (
                                CD4DEEE11D78C6F400625986 /* Configurations */,
+                               CD1DAFC01D70E12D00017CF0 /* Frameworks */,
                                CD1DAF941D709E3600017CF0 /* MobileMiniBrowser App */,
                                CD498B3C1D76348000681FA7 /* MobileMiniBrowser Framework */,
                                CD1DAFAE1D709E3600017CF0 /* MobileMiniBrowserUITests */,
                                CD1DAF931D709E3600017CF0 /* Products */,
-                               CD1DAFC01D70E12D00017CF0 /* Frameworks */,
                        );
                        sourceTree = "<group>";
                };
                        isa = PBXGroup;
                        children = (
                                CD1DAF921D709E3600017CF0 /* MobileMiniBrowser.app */,
-                               CD1DAFAB1D709E3600017CF0 /* MobileMiniBrowserUITests.xctest */,
                                CD498B3B1D76348000681FA7 /* MobileMiniBrowser.framework */,
+                               CD1DAFAB1D709E3600017CF0 /* MobileMiniBrowserUITests.xctest */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                CD1DAFAE1D709E3600017CF0 /* MobileMiniBrowserUITests */ = {
                        isa = PBXGroup;
                        children = (
-                               CD1DAFAF1D709E3600017CF0 /* MobileMiniBrowserUITests.m */,
                                CD1DAFB11D709E3600017CF0 /* Info.plist */,
+                               CD1DAFAF1D709E3600017CF0 /* MobileMiniBrowserUITests.m */,
                        );
                        path = MobileMiniBrowserUITests;
                        sourceTree = "<group>";
                CDA985121D76471700EBC399 /* Resources */ = {
                        isa = PBXGroup;
                        children = (
-                               CDA985151D76477900EBC399 /* test.mp4 */,
-                               3F0B439C1D908DE700D186B5 /* test2s.mp4 */,
                                CDA985131D76474100EBC399 /* index.html */,
                                CDA985171D7647CD00EBC399 /* looping.html */,
                                3F0B439A1D908D0C00D186B5 /* looping2s.html */,
+                               CDA985151D76477900EBC399 /* test.mp4 */,
+                               3F0B439C1D908DE700D186B5 /* test2s.mp4 */,
                        );
                        name = Resources;
                        sourceTree = "<group>";
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               CD498B501D763D7600681FA7 /* AppDelegate.h in Headers */,
                                CD498B4A1D763D4800681FA7 /* MobileMiniBrowser.h in Headers */,
-                               CD498B4F1D763D7600681FA7 /* WebViewController.h in Headers */,
                                CD498B4E1D763D7600681FA7 /* TabViewController.h in Headers */,
-                               CD498B501D763D7600681FA7 /* AppDelegate.h in Headers */,
+                               CD498B4F1D763D7600681FA7 /* WebViewController.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               CD1DAFA51D709E3600017CF0 /* LaunchScreen.storyboard in Resources */,
+                               CD4DEEE51D78C6FF00625986 /* Base.xcconfig in Resources */,
                                CD4DEEE61D78C6FF00625986 /* DebugRelease.xcconfig in Resources */,
+                               CD1DAFA51D709E3600017CF0 /* LaunchScreen.storyboard in Resources */,
                                CD4DEEE71D78C6FF00625986 /* MobileMiniBrowser.xcconfig in Resources */,
-                               CD4DEEE51D78C6FF00625986 /* Base.xcconfig in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               CDA9851A1D76483400EBC399 /* index.html in Resources */,
                                CD498B521D763D8800681FA7 /* Assets.xcassets in Resources */,
+                               CDA9851A1D76483400EBC399 /* index.html in Resources */,
+                               CD498B531D763D9300681FA7 /* Info.plist in Resources */,
+                               CDA9851B1D76483400EBC399 /* looping.html in Resources */,
                                3F0B439B1D908D0C00D186B5 /* looping2s.html in Resources */,
                                CD498B511D763D7F00681FA7 /* Main.storyboard in Resources */,
-                               CDA9851B1D76483400EBC399 /* looping.html in Resources */,
-                               CD498B531D763D9300681FA7 /* Info.plist in Resources */,
                                CDA985191D76483400EBC399 /* test.mp4 in Resources */,
                                3F0B439D1D908DE700D186B5 /* test2s.mp4 in Resources */,
                        );
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               CD498B4D1D763D7100681FA7 /* AppDelegate.m in Sources */,
                                CD498B4B1D763D7100681FA7 /* TabViewController.m in Sources */,
                                CD498B4C1D763D7100681FA7 /* WebViewController.m in Sources */,
-                               CD498B4D1D763D7100681FA7 /* AppDelegate.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = CD4DEEE31D78C6FF00625986 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = 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_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INFINITE_RECURSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               COPY_PHASE_STRIP = NO;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               ENABLE_TESTABILITY = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=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_AGGRESSIVE;
-                               GCC_WARN_UNUSED_FUNCTION = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               ONLY_ACTIVE_ARCH = YES;
-                               SDKROOT = iphoneos;
-                               TARGETED_DEVICE_FAMILY = "1,2";
                        };
                        name = Debug;
                };
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = CD4DEEE31D78C6FF00625986 /* DebugRelease.xcconfig */;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = 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_DOCUMENTATION_COMMENTS = YES;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INFINITE_RECURSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               COPY_PHASE_STRIP = NO;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               ENABLE_NS_ASSERTIONS = NO;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               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_AGGRESSIVE;
-                               GCC_WARN_UNUSED_FUNCTION = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               SDKROOT = iphoneos;
-                               TARGETED_DEVICE_FAMILY = "1,2";
-                               VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
                };