Title: [160594] trunk/Source
- Revision
- 160594
- Author
- mr...@apple.com
- Date
- 2013-12-14 02:13:51 -0800 (Sat, 14 Dec 2013)
Log Message
Build fix after r160557.
Source/_javascript_Core:
r160557 added the first generated header to _javascript_Core that needs to be installed in to
the framework wrapper. Sadly _javascript_Core's Derived Sources target was not set to generate
headers when invoked as part of the installhdrs action. This resulted in the build failing
due to Xcode being unable to find the header file to install. The fix for this is to configure
the Derived Sources target to use _javascript_Core.xcconfig, which sets INSTALLHDRS_SCRIPT_PHASE
to YES and allows Xcode to generate derived sources during the installhdrs action.
Enabling INSTALLHDRS_SCRIPT_PHASE required tweaking the Generate Derived Sources script build
phase to skip running code related to offlineasm that depends on JSCLLIntOffsetExtractor
having been compiled, which isn't the case at installhdrs time.
* _javascript_Core.xcodeproj/project.pbxproj:
Source/WebCore:
* Configurations/WebCore.xcconfig: Find _javascript_Core.framework below SDKROOT so that we'll pick
up the built version in production builds rather than the system version.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (160593 => 160594)
--- trunk/Source/_javascript_Core/ChangeLog 2013-12-14 09:03:58 UTC (rev 160593)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-12-14 10:13:51 UTC (rev 160594)
@@ -1,3 +1,20 @@
+2013-12-14 Mark Rowe <mr...@apple.com>
+
+ Build fix after r160557.
+
+ r160557 added the first generated header to _javascript_Core that needs to be installed in to
+ the framework wrapper. Sadly _javascript_Core's Derived Sources target was not set to generate
+ headers when invoked as part of the installhdrs action. This resulted in the build failing
+ due to Xcode being unable to find the header file to install. The fix for this is to configure
+ the Derived Sources target to use _javascript_Core.xcconfig, which sets INSTALLHDRS_SCRIPT_PHASE
+ to YES and allows Xcode to generate derived sources during the installhdrs action.
+
+ Enabling INSTALLHDRS_SCRIPT_PHASE required tweaking the Generate Derived Sources script build
+ phase to skip running code related to offlineasm that depends on JSCLLIntOffsetExtractor
+ having been compiled, which isn't the case at installhdrs time.
+
+ * _javascript_Core.xcodeproj/project.pbxproj:
+
2013-12-13 Joseph Pecoraro <pecor...@apple.com>
Some Set and Map prototype functions have incorrect function lengths
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (160593 => 160594)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2013-12-14 09:03:58 UTC (rev 160593)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2013-12-14 10:13:51 UTC (rev 160594)
@@ -5403,7 +5403,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\n\n/bin/ln -sfh \"${SRCROOT}\" _javascript_Core\nexport _javascript_Core=\"_javascript_Core\"\nexport BUILT_PRODUCTS_DIR=\"../..\"\n\nmake --no-builtin-rules -f \"_javascript_Core/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.ncpu` || exit 1\n\n/usr/bin/env ruby _javascript_Core/offlineasm/asm.rb _javascript_Core/llint/LowLevelInterpreter.asm ${BUILT_PRODUCTS_DIR}/JSCLLIntOffsetsExtractor LLIntAssembly.h || exit 1\n";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\n\n/bin/ln -sfh \"${SRCROOT}\" _javascript_Core\nexport _javascript_Core=\"_javascript_Core\"\nexport BUILT_PRODUCTS_DIR=\"../..\"\n\nmake --no-builtin-rules -f \"_javascript_Core/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.ncpu` || exit 1\n\nif [[ \"${ACTION}\" == \"installhdrs\" ]]; then\n exit 0\nfi\n\n/usr/bin/env ruby _javascript_Core/offlineasm/asm.rb _javascript_Core/llint/LowLevelInterpreter.asm ${BUILT_PRODUCTS_DIR}/JSCLLIntOffsetsExtractor LLIntAssembly.h || exit 1\n";
};
A55DEAA416703DF7003DB841 /* Check For Inappropriate Macros in External Headers */ = {
isa = PBXShellScriptBuildPhase;
@@ -6296,6 +6296,7 @@
};
65FB3F7809D11EBD00F49DEB /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */;
buildSettings = {
PRODUCT_NAME = "Generate Derived Sources";
};
@@ -6303,6 +6304,7 @@
};
65FB3F7909D11EBD00F49DEB /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */;
buildSettings = {
PRODUCT_NAME = "Generate Derived Sources";
};
@@ -6310,6 +6312,7 @@
};
65FB3F7A09D11EBD00F49DEB /* Production */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */;
buildSettings = {
PRODUCT_NAME = "Generate Derived Sources";
};
@@ -6340,6 +6343,7 @@
};
A76148400E6402F700E357FA /* Profiling */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */;
buildSettings = {
PRODUCT_NAME = "Generate Derived Sources";
};
Modified: trunk/Source/WebCore/ChangeLog (160593 => 160594)
--- trunk/Source/WebCore/ChangeLog 2013-12-14 09:03:58 UTC (rev 160593)
+++ trunk/Source/WebCore/ChangeLog 2013-12-14 10:13:51 UTC (rev 160594)
@@ -1,3 +1,10 @@
+2013-12-14 Mark Rowe <mr...@apple.com>
+
+ Build fix after r160557.
+
+ * Configurations/WebCore.xcconfig: Find _javascript_Core.framework below SDKROOT so that we'll pick
+ up the built version in production builds rather than the system version.
+
2013-12-14 Brendan Long <b.l...@cablelabs.com>
[GStreamer] Use GMutexLocker instead of g_mutex_lock
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (160593 => 160594)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-12-14 09:03:58 UTC (rev 160593)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-12-14 10:13:51 UTC (rev 160594)
@@ -102,7 +102,7 @@
_javascript_CORE_PRIVATE_HEADERS_DIR = $(_javascript_CORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
_javascript_CORE_PRIVATE_HEADERS_DIR_Release = $(_javascript_CORE_PRIVATE_HEADERS_engineering);
_javascript_CORE_PRIVATE_HEADERS_DIR_Debug = $(_javascript_CORE_PRIVATE_HEADERS_engineering);
-_javascript_CORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/_javascript_Core.framework/PrivateHeaders;
+_javascript_CORE_PRIVATE_HEADERS_DIR_Production = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/_javascript_Core.framework/PrivateHeaders;
_javascript_CORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/_javascript_Core.framework/PrivateHeaders;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
