Modified: trunk/Source/WTF/ChangeLog (131818 => 131819)
--- trunk/Source/WTF/ChangeLog 2012-10-18 22:42:40 UTC (rev 131818)
+++ trunk/Source/WTF/ChangeLog 2012-10-18 23:06:53 UTC (rev 131819)
@@ -1,3 +1,15 @@
+2012-10-18 Michael Saboff <[email protected]>
+
+ Mac WTF build checks dependencies before copying header files
+ https://bugs.webkit.org/show_bug.cgi?id=99770
+
+ Reviewed by Geoffrey Garen.
+
+ Added a new build target "Copy WTF HEaders" to copy the header files and made that new target a dependency
+ for the main WTF build target. Moved the "Copy WTF Headers" phase from WTF target to the new target.
+
+ * WTF.xcodeproj/project.pbxproj:
+
2012-10-17 Anders Carlsson <[email protected]>
Clean up Vector.h
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (131818 => 131819)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2012-10-18 22:42:40 UTC (rev 131818)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2012-10-18 23:06:53 UTC (rev 131819)
@@ -284,6 +284,16 @@
F3FBC720161AF7CD00BB4BD4 /* MemoryInstrumentationSequence.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FBC71F161AF7CD00BB4BD4 /* MemoryInstrumentationSequence.h */; };
/* End PBXBuildFile section */
+/* Begin PBXContainerItemProxy section */
+ 65AFA28D1630B99E003D723C /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 5D247B5914689B8600E78B76 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 65AFA16F1630B977003D723C;
+ remoteInfo = "Copy Headers";
+ };
+/* End PBXContainerItemProxy section */
+
/* Begin PBXFileReference section */
0FD81AC4154FB22E00983E72 /* FastBitVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastBitVector.h; sourceTree = "<group>"; };
143F611D1565F0F900DB514A /* RAMSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RAMSize.cpp; sourceTree = "<group>"; };
@@ -1191,7 +1201,6 @@
isa = PBXNativeTarget;
buildConfigurationList = 5D247B6614689B8600E78B76 /* Build configuration list for PBXNativeTarget "WTF" */;
buildPhases = (
- 5D247CF11468A3CD00E78B76 /* Copy WTF Headers */,
5D247E9D1468AEE200E78B76 /* Detect Available Headers */,
5D247B5E14689B8600E78B76 /* Sources */,
5D247B5F14689B8600E78B76 /* Frameworks */,
@@ -1200,12 +1209,27 @@
buildRules = (
);
dependencies = (
+ 65AFA28E1630B99E003D723C /* PBXTargetDependency */,
);
name = WTF;
productName = WTF;
productReference = 5D247B6214689B8600E78B76 /* libWTF.a */;
productType = "com.apple.product-type.library.static";
};
+ 65AFA16F1630B977003D723C /* Copy WTF Headers */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 65AFA2881630B977003D723C /* Build configuration list for PBXNativeTarget "Copy WTF Headers" */;
+ buildPhases = (
+ 65AFA1701630B977003D723C /* Copy WTF Headers */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = "Copy WTF Headers";
+ productName = "Copy WTF Headers";
+ productType = "com.apple.product-type.tool";
+ };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -1227,40 +1251,41 @@
projectRoot = "";
targets = (
5D247B6114689B8600E78B76 /* WTF */,
+ 65AFA16F1630B977003D723C /* Copy WTF Headers */,
);
};
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 5D247CF11468A3CD00E78B76 /* Copy WTF Headers */ = {
+ 5D247E9D1468AEE200E78B76 /* Detect Available Headers */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
+ "$(SDKROOT)/System/Library/CoreServices/SystemVersion.plist",
);
- name = "Copy WTF Headers";
+ name = "Detect Available Headers";
outputPaths = (
+ "$(BUILT_PRODUCTS_DIR)/DerivedSources/WTF/HeaderDetection.h",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%%/}${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n PRIVATE_HEADERS_PATH=\"${DSTROOT%%/}${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/wtf/\" \"${PRIVATE_HEADERS_PATH}\"\n";
+ shellScript = "OUTPUT_FILE=\"${BUILT_PRODUCTS_DIR}/DerivedSources/WTF/HeaderDetection.h\"\necho \"/* This is a generated file. Do not edit. */\" > \"${OUTPUT_FILE}\"\n\nif [[ -f \"${SDKROOT}/System/Library/Frameworks/System.framework/PrivateHeaders/pthread_machdep.h\" ]]; then\n echo \"#define HAVE_PTHREAD_MACHDEP_H 1\" >> \"${OUTPUT_FILE}\"\nfi\n";
};
- 5D247E9D1468AEE200E78B76 /* Detect Available Headers */ = {
+ 65AFA1701630B977003D723C /* Copy WTF Headers */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
- "$(SDKROOT)/System/Library/CoreServices/SystemVersion.plist",
);
- name = "Detect Available Headers";
+ name = "Copy WTF Headers";
outputPaths = (
- "$(BUILT_PRODUCTS_DIR)/DerivedSources/WTF/HeaderDetection.h",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "OUTPUT_FILE=\"${BUILT_PRODUCTS_DIR}/DerivedSources/WTF/HeaderDetection.h\"\necho \"/* This is a generated file. Do not edit. */\" > \"${OUTPUT_FILE}\"\n\nif [[ -f \"${SDKROOT}/System/Library/Frameworks/System.framework/PrivateHeaders/pthread_machdep.h\" ]]; then\n echo \"#define HAVE_PTHREAD_MACHDEP_H 1\" >> \"${OUTPUT_FILE}\"\nfi\n";
+ shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%%/}${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n PRIVATE_HEADERS_PATH=\"${DSTROOT%%/}${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/wtf/\" \"${PRIVATE_HEADERS_PATH}\"\n\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -1351,6 +1376,14 @@
};
/* End PBXSourcesBuildPhase section */
+/* Begin PBXTargetDependency section */
+ 65AFA28E1630B99E003D723C /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 65AFA16F1630B977003D723C /* Copy WTF Headers */;
+ targetProxy = 65AFA28D1630B99E003D723C /* PBXContainerItemProxy */;
+ };
+/* End PBXTargetDependency section */
+
/* Begin XCBuildConfiguration section */
5D247B6414689B8600E78B76 /* Debug */ = {
isa = XCBuildConfiguration;
@@ -1398,6 +1431,30 @@
};
name = Production;
};
+ 65AFA2891630B977003D723C /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
+ buildSettings = {
+ PRODUCT_NAME = "WTF copy";
+ };
+ name = Debug;
+ };
+ 65AFA28A1630B977003D723C /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
+ buildSettings = {
+ PRODUCT_NAME = "WTF copy";
+ };
+ name = Release;
+ };
+ 65AFA28B1630B977003D723C /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 5D247B7314689C4700E78B76 /* WTF.xcconfig */;
+ buildSettings = {
+ PRODUCT_NAME = "WTF copy";
+ };
+ name = Production;
+ };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -1421,6 +1478,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
+ 65AFA2881630B977003D723C /* Build configuration list for PBXNativeTarget "Copy WTF Headers" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 65AFA2891630B977003D723C /* Debug */,
+ 65AFA28A1630B977003D723C /* Release */,
+ 65AFA28B1630B977003D723C /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
/* End XCConfigurationList section */
};
rootObject = 5D247B5914689B8600E78B76 /* Project object */;
