Changeset 177027 in webkit for trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig

Timestamp:

Dec 9, 2014, 11:08:43 AM (10 years ago)

Author:

[email protected]

Message:

Switch from using PLATFORM_NAME to SDK selectors in ANGLE, bmalloc, gtest, JavaScriptCore, WTF
<​http://webkit.org/b/139212>

Reviewed by Joseph Pecoraro.

Source/bmalloc:

• Configurations/Base.xcconfig:
• Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS on OS X.
• Configurations/DebugRelease.xcconfig:
• Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.

Source/JavaScriptCore:

• Configurations/Base.xcconfig:
• Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS on OS X.
• Only set LLVM_LOCAL_HEADER_PATH and LLVM_SYSTEM_HEADER_PATH on OS X.
• Set JAVASCRIPTCORE_CONTENTS_DIR and JAVASCRIPTCORE_FRAMEWORKS_DIR separately for iOS and OS X.

• Configurations/DebugRelease.xcconfig:
• Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.

• Configurations/JSC.xcconfig:
• Only set CODE_SIGN_ENTITLEMENTS for iOS hardware builds.

• Configurations/JavaScriptCore.xcconfig:
• Set OTHER_LDFLAGS separately for iOS and OS X.
• Set SECTORDER_FLAGS separately for iOS and OS X, but only for Production builds.
• Only set EXCLUDED_SOURCE_FILE_NAMES for iOS.

• Configurations/LLVMForJSC.xcconfig:
• Rename LLVM_LIBS_iphoneos to LLVM_LIBS_ios.
• Set LLVM_LIBRARY_PATHS and OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT separately for iOS hardware and OS X.
• Fix curly braces in LIBRARY_SEARCH_PATHS.
• Merge OTHER_LDFLAGS_BASE into OTHER_LDFLAGS. (Could have been done before this patch.)

• Configurations/ToolExecutable.xcconfig:
• Only set CODE_SIGN_ENTITLEMENTS for iOS, per target.
• Only set CLANG_ENABLE_OBJC_ARC for i386 on the iOS Simulator.
• Add missing newline.

• Configurations/Version.xcconfig:
• Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.

Source/ThirdParty:

• gtest/xcode/Config/General.xcconfig:
• Only set SDKROOT and TOOLCHAINS on OS X.

Source/ThirdParty/ANGLE:

• Configurations/Base.xcconfig:
• Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS on OS X.
• Configurations/DebugRelease.xcconfig:
• Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.

Source/WTF:

• Configurations/Base.xcconfig:
• Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS on OS X.
• Configurations/DebugRelease.xcconfig:
• Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.

File:

• trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig (modified) (2 diffs)

trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig

@@ -27 +27 @@
 INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
 PRODUCT_NAME = $(TARGET_NAME);
-CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME)_$(TARGET_NAME));
-CODE_SIGN_ENTITLEMENTS_iphoneos_minidom = entitlements.plist;
-CODE_SIGN_ENTITLEMENTS_iphoneos_testapi = entitlements.plist;
-CODE_SIGN_ENTITLEMENTS_iphoneos_testRegExp = entitlements.plist;
+CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = $(CODE_SIGN_ENTITLEMENTS_ios_$(TARGET_NAME));
+CODE_SIGN_ENTITLEMENTS_ios_minidom = entitlements.plist;
+CODE_SIGN_ENTITLEMENTS_ios_testapi = entitlements.plist;
+CODE_SIGN_ENTITLEMENTS_ios_testRegExp = entitlements.plist;
 
 SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
@@ -39 +39 @@
 GCC_ENABLE_OBJC_GC = NO;
 CLANG_ENABLE_OBJC_ARC = $(CLANG_ENABLE_OBJC_ARC_$(CURRENT_ARCH));
-CLANG_ENABLE_OBJC_ARC_i386 = $(CLANG_ENABLE_OBJC_ARC_i386_$(PLATFORM_NAME));
-CLANG_ENABLE_OBJC_ARC_i386_iphonesimulator = YES; # For iOS Simulator version 4.0 and greater
+CLANG_ENABLE_OBJC_ARC_i386[sdk=iphonesimulator*] = YES;
 CLANG_ENABLE_OBJC_ARC_x86_64 = YES;
 CLANG_ENABLE_OBJC_ARC_armv7 = YES;