[webkit-changes] [156122] trunk/Source/JavaScriptCore

Thu, 19 Sep 2013 16:15:58 -0700

Title: [156122] trunk/Source/_javascript_Core
Revision
156122
Author
[email protected]
Date
2013-09-19 15:16:16 -0700 (Thu, 19 Sep 2013)

Log Message

[iOS] Add more iOS logic to the _javascript_Core build configuration files
https://bugs.webkit.org/show_bug.cgi?id=121635

Reviewed by Geoffrey Garen.

Towards building _javascript_Core for both OS X and iOS using the same
set of configuration files, add more iOS logic.

* Configurations/Base.xcconfig:
* Configurations/JSC.xcconfig:
* Configurations/_javascript_Core.xcconfig:
* Configurations/ToolExecutable.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (156121 => 156122)


--- trunk/Source/_javascript_Core/ChangeLog	2013-09-19 22:12:26 UTC (rev 156121)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-09-19 22:16:16 UTC (rev 156122)
@@ -1,3 +1,18 @@
+2013-09-19  Daniel Bates  <[email protected]>
+
+        [iOS] Add more iOS logic to the _javascript_Core build configuration files
+        https://bugs.webkit.org/show_bug.cgi?id=121635
+
+        Reviewed by Geoffrey Garen.
+
+        Towards building _javascript_Core for both OS X and iOS using the same
+        set of configuration files, add more iOS logic.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/JSC.xcconfig:
+        * Configurations/_javascript_Core.xcconfig:
+        * Configurations/ToolExecutable.xcconfig:
+
 2013-09-19  Filip Pizlo  <[email protected]>
 
         Move CCallHelpers and AssemblyHelpers into jit/ and have JSInterfaceJIT use them

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (156121 => 156122)


--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2013-09-19 22:12:26 UTC (rev 156121)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2013-09-19 22:16:16 UTC (rev 156122)
@@ -76,13 +76,10 @@
 STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
 STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
-NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos);
-NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
+NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/Frameworks;
 
 _javascript_CORE_FRAMEWORKS_DIR = $(_javascript_CORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-_javascript_CORE_FRAMEWORKS_DIR_iphoneos = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos);
+_javascript_CORE_FRAMEWORKS_DIR_iphoneos = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
 _javascript_CORE_FRAMEWORKS_DIR_iphonesimulator = $(_javascript_CORE_FRAMEWORKS_DIR_iphoneos);
 
 _javascript_CORE_FRAMEWORKS_DIR_macosx = $(_javascript_CORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
@@ -90,6 +87,11 @@
 _javascript_CORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
 _javascript_CORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
+_javascript_CORE_RESOURCES_DIR = $(_javascript_CORE_RESOURCES_DIR_$(PLATFORM_NAME));
+_javascript_CORE_RESOURCES_DIR_iphoneos = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Resources;
+_javascript_CORE_RESOURCES_DIR_iphonesimulator = $(_javascript_CORE_RESOURCES_DIR_iphoneos);
+_javascript_CORE_RESOURCES_DIR_macosx = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Versions/A/Resources;
+
 // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
 // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
 DEBUG_DEFINES_debug = ;
@@ -108,7 +110,9 @@
 DEAD_CODE_STRIPPING_normal = YES;
 DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
 
-SECTORDER_FLAGS = -Wl,-order_file,_javascript_Core.order;
+SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
+SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/_javascript_Core.order;
+SECTORDER_FLAGS_macosx = -Wl,-order_file,_javascript_Core.order;
 
 TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
@@ -119,4 +123,5 @@
 SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
 SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;
 
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
 HAVE_DTRACE = 1;

Modified: trunk/Source/_javascript_Core/Configurations/JSC.xcconfig (156121 => 156122)


--- trunk/Source/_javascript_Core/Configurations/JSC.xcconfig	2013-09-19 22:12:26 UTC (rev 156121)
+++ trunk/Source/_javascript_Core/Configurations/JSC.xcconfig	2013-09-19 22:16:16 UTC (rev 156122)
@@ -24,7 +24,7 @@
 #include "FeatureDefines.xcconfig"
 #include "Version.xcconfig"
 
-INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Versions/A/Resources
+INSTALL_PATH_ACTUAL = $(_javascript_CORE_RESOURCES_DIR);
 PRODUCT_NAME = jsc;
 CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME));
 CODE_SIGN_ENTITLEMENTS_iphoneos = entitlements.plist;

Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (156121 => 156122)


--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2013-09-19 22:12:26 UTC (rev 156121)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2013-09-19 22:16:16 UTC (rev 156122)
@@ -48,7 +48,7 @@
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" $(HEADER_SEARCH_PATHS);
 INFOPLIST_FILE = Info.plist;
-INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR);
+INSTALL_PATH_ACTUAL = $(_javascript_CORE_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
 PRODUCT_NAME = _javascript_Core;

Modified: trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (156121 => 156122)


--- trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig	2013-09-19 22:12:26 UTC (rev 156121)
+++ trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig	2013-09-19 22:16:16 UTC (rev 156122)
@@ -24,11 +24,12 @@
 #include "FeatureDefines.xcconfig"
 #include "Version.xcconfig"
 
-INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
-INSTALL_PATH_iphoneos = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Resources;
-INSTALL_PATH_iphonesimulator = $(INSTALL_PATH_iphoneos);
-INSTALL_PATH_macosx = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Versions/A/Resources;
+INSTALL_PATH_ACTUAL = $(_javascript_CORE_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;
 
 SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
 SKIP_INSTALL_ = YES;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to