<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162434] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162434">162434</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2014-01-21 03:47:42 -0800 (Tue, 21 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsBasexcconfig">trunk/Source/JavaScriptCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsJSCxcconfig">trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsToolExecutablexcconfig">trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162433 => 162434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-21 10:50:37 UTC (rev 162433)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-21 11:47:42 UTC (rev 162434)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-21 Mark Rowe <mrowe@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-01-19 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> JSC Parser: Shrink BindingNode.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/Base.xcconfig (162433 => 162434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2014-01-21 10:50:37 UTC (rev 162433)
+++ trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2014-01-21 11:47:42 UTC (rev 162434)
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx"> JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><span class="cx">
</span><span class="cx"> JAVASCRIPTCORE_RESOURCES_DIR = $(JAVASCRIPTCORE_RESOURCES_DIR_$(PLATFORM_NAME));
</span><del>-JAVASCRIPTCORE_RESOURCES_DIR_iphoneos = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources;
</del><ins>+JAVASCRIPTCORE_RESOURCES_DIR_iphoneos = JavaScriptCore.framework/Resources;
</ins><span class="cx"> JAVASCRIPTCORE_RESOURCES_DIR_iphonesimulator = $(JAVASCRIPTCORE_RESOURCES_DIR_iphoneos);
</span><del>-JAVASCRIPTCORE_RESOURCES_DIR_macosx = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Versions/A/Resources;
</del><ins>+JAVASCRIPTCORE_RESOURCES_DIR_macosx = JavaScriptCore.framework/Versions/A/Resources;
</ins><span class="cx">
</span><span class="cx"> // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
</span><span class="cx"> // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsJSCxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig (162433 => 162434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig 2014-01-21 10:50:37 UTC (rev 162433)
+++ trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig 2014-01-21 11:47:42 UTC (rev 162434)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "FeatureDefines.xcconfig"
</span><span class="cx"> #include "Version.xcconfig"
</span><span class="cx">
</span><del>-INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_RESOURCES_DIR);
</del><ins>+INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
</ins><span class="cx"> PRODUCT_NAME = jsc;
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME));
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS_iphoneos = entitlements.plist;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsToolExecutablexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig (162433 => 162434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig 2014-01-21 10:50:37 UTC (rev 162433)
+++ trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig 2014-01-21 11:47:42 UTC (rev 162434)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "FeatureDefines.xcconfig"
</span><span class="cx"> #include "Version.xcconfig"
</span><span class="cx">
</span><del>-INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_RESOURCES_DIR);
</del><ins>+INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
</ins><span class="cx"> PRODUCT_NAME = $(TARGET_NAME);
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME)_$(TARGET_NAME));
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS_iphoneos_minidom = entitlements.plist;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (162433 => 162434)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-01-21 10:50:37 UTC (rev 162433)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-01-21 11:47:42 UTC (rev 162434)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> isa = PBXAggregateTarget;
</span><span class="cx"> buildConfigurationList = 149C276C08902AFE008A9EFC /* Build configuration list for PBXAggregateTarget "All" */;
</span><span class="cx"> buildPhases = (
</span><ins>+ 5DF7E1CC188E6B87003F9A46 /* Copy jsc into JavaScriptCore.framework */,
</ins><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><span class="cx"> 932F5BE70822A1C700736975 /* PBXTargetDependency */,
</span><span class="lines">@@ -5308,7 +5309,6 @@
</span><span class="cx"> buildPhases = (
</span><span class="cx"> 932F5BDC0822A1C700736975 /* Sources */,
</span><span class="cx"> 932F5BDE0822A1C700736975 /* Frameworks */,
</span><del>- 5D5D8ABF0E0D0B0300F9C692 /* Copy Into Framework */,
</del><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="lines">@@ -5472,37 +5472,37 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> shellScript = "TRACING_D=\"$SRCROOT/runtime/Tracing.d\";\nTRACING_H=\"$BUILT_PRODUCTS_DIR/DerivedSources/JavaScriptCore/TracingDtrace.h\";\n\nif [[ \"$HAVE_DTRACE\" = \"1\" && \"$TRACING_D\" -nt \"$TRACING_H\" ]];\nthen\n\tdtrace -h -o \"$TRACING_H\" -s \"$TRACING_D\";\nfi;\n";
</span><span class="cx"> };
</span><del>- 5D5D8ABF0E0D0B0300F9C692 /* Copy Into Framework */ = {
</del><ins>+ 5DAFD6CD146B6B6E00FBEFB4 /* Install Support Script */ = {
</ins><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><del>- buildActionMask = 2147483647;
</del><ins>+ buildActionMask = 8;
</ins><span class="cx"> files = (
</span><span class="cx"> );
</span><span class="cx"> inputPaths = (
</span><del>- "$(BUILT_PRODUCTS_DIR)/jsc",
</del><ins>+ "$(SRCROOT)/API/tests/testapi.js",
</ins><span class="cx"> );
</span><del>- name = "Copy Into Framework";
</del><ins>+ name = "Install Support Script";
</ins><span class="cx"> outputPaths = (
</span><del>- "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/Resources/jsc",
</del><ins>+ "$(DSTROOT)$(INSTALL_PATH)/testapi.js",
</ins><span class="cx"> );
</span><del>- runOnlyForDeploymentPostprocessing = 0;
</del><ins>+ runOnlyForDeploymentPostprocessing = 1;
</ins><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "# Skip for Production builds.\nif [[ ${CONFIGURATION:=Debug} == \"Production\" ]]; then\n exit\nfi\n\n# Copy and update the jsc binary to refer to JavaScriptCore.framework relative to its location.\nditto \"${BUILT_PRODUCTS_DIR}/jsc\" \"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/Resources/jsc\"\ninstall_name_tool -change \"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/Versions/A/JavaScriptCore\" \"@loader_path/../JavaScriptCore\" \"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/Resources/jsc\"\n";
</del><ins>+ shellScript = "if [[ \"${SKIP_INSTALL}\" == \"NO\" ]]; then\n cp \"${SRCROOT}/API/tests/testapi.js\" \"${DSTROOT}${INSTALL_PATH}/testapi.js\"\nfi\n";
</ins><span class="cx"> };
</span><del>- 5DAFD6CD146B6B6E00FBEFB4 /* Install Support Script */ = {
</del><ins>+ 5DF7E1CC188E6B87003F9A46 /* Copy jsc into JavaScriptCore.framework */ = {
</ins><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><del>- buildActionMask = 8;
</del><ins>+ buildActionMask = 2147483647;
</ins><span class="cx"> files = (
</span><span class="cx"> );
</span><span class="cx"> inputPaths = (
</span><del>- "$(SRCROOT)/API/tests/testapi.js",
</del><ins>+ "$(BUILT_PRODUCTS_DIR)/jsc",
</ins><span class="cx"> );
</span><del>- name = "Install Support Script";
</del><ins>+ name = "Copy jsc into JavaScriptCore.framework";
</ins><span class="cx"> outputPaths = (
</span><del>- "$(DSTROOT)$(INSTALL_PATH)/testapi.js",
</del><ins>+ "$(BUILT_PRODUCTS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR)/jsc",
</ins><span class="cx"> );
</span><del>- runOnlyForDeploymentPostprocessing = 1;
</del><ins>+ runOnlyForDeploymentPostprocessing = 0;
</ins><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "if [[ \"${SKIP_INSTALL}\" == \"NO\" ]]; then\n cp \"${SRCROOT}/API/tests/testapi.js\" \"${DSTROOT}${INSTALL_PATH}/testapi.js\"\nfi\n";
</del><ins>+ shellScript = "# Skip for Production builds.\nif [[ ${CONFIGURATION:=Debug} == \"Production\" ]]; then\n exit\nfi\n\n# Copy and update the jsc binary to refer to JavaScriptCore.framework relative to its location.\nditto \"${BUILT_PRODUCTS_DIR}/jsc\" \"${BUILT_PRODUCTS_DIR}/${JAVASCRIPTCORE_RESOURCES_DIR}/jsc\"\ninstall_name_tool -change \"${JAVASCRIPTCORE_FRAMEWORKS_DIR}/JavaScriptCore.framework/Versions/A/JavaScriptCore\" \"@loader_path/../JavaScriptCore\" \"${BUILT_PRODUCTS_DIR}/${JAVASCRIPTCORE_RESOURCES_DIR}/jsc\"\n";
</ins><span class="cx"> };
</span><span class="cx"> 65FB3F6509D11E9100F49DEB /* Generate Derived Sources */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span></span></pre>
</div>
</div>
</body>
</html>