Changeset 162434 in webkit for trunk/Source/JavaScriptCore/Configurations

Timestamp:

Jan 21, 2014, 3:47:42 AM (11 years ago)

Author:

[email protected]

Message:

Mac production build fix.

Move the shell script build phase to copy jsc into JavaScriptCore.framework
out of the jsc target and in to the All target so that it's not run during
production builds. Xcode appears to the parent directories of paths referenced
in the Output Files of the build phase, which leads to problems when the
SYMROOT for the JavaScriptCore framework and the jsc executables are later merged.

I've also fixed the path to the Resources folder in the script while I'm here.
On iOS the framework bundle is shallow so the correct destination is Resources/
rather than Versions/A/Resources. This is handled by tweaking the
JAVASCRIPTCORE_RESOURCES_DIR configuration setting to be relative rather than
a complete path so we can reuse it in the script. The references in JSC.xcconfig
and ToolExecutable.xcconfig are updated to prepend JAVASCRIPTCORE_FRAMEWORKS_DIR
to preserve their former values.

• Configurations/Base.xcconfig:
• Configurations/JSC.xcconfig:
• Configurations/ToolExecutable.xcconfig:
• JavaScriptCore.xcodeproj/project.pbxproj:

Location:

trunk/Source/JavaScriptCore/Configurations

Files:

• Base.xcconfig (modified) (1 diff)
• JSC.xcconfig (modified) (1 diff)
• ToolExecutable.xcconfig (modified) (1 diff)

trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

@@ -102 +102 @@
 
 JAVASCRIPTCORE_RESOURCES_DIR = $(JAVASCRIPTCORE_RESOURCES_DIR_$(PLATFORM_NAME));
-JAVASCRIPTCORE_RESOURCES_DIR_iphoneos = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources;
+JAVASCRIPTCORE_RESOURCES_DIR_iphoneos = JavaScriptCore.framework/Resources;
 JAVASCRIPTCORE_RESOURCES_DIR_iphonesimulator = $(JAVASCRIPTCORE_RESOURCES_DIR_iphoneos);
-JAVASCRIPTCORE_RESOURCES_DIR_macosx = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Versions/A/Resources;
+JAVASCRIPTCORE_RESOURCES_DIR_macosx = JavaScriptCore.framework/Versions/A/Resources;
 
 // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.

trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig

@@ -25 +25 @@
 #include "Version.xcconfig"
 
-INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_RESOURCES_DIR);
+INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
 PRODUCT_NAME = jsc;
 CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME));

trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig

@@ -25 +25 @@
 #include "Version.xcconfig"
 
-INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_RESOURCES_DIR);
+INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
 PRODUCT_NAME = $(TARGET_NAME);
 CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME)_$(TARGET_NAME));