Title: [110971] tags/Safari-536.3.1/Source
Diff
Modified: tags/Safari-536.3.1/Source/_javascript_Core/ChangeLog (110970 => 110971)
--- tags/Safari-536.3.1/Source/_javascript_Core/ChangeLog 2012-03-16 08:43:44 UTC (rev 110970)
+++ tags/Safari-536.3.1/Source/_javascript_Core/ChangeLog 2012-03-16 08:43:50 UTC (rev 110971)
@@ -1,3 +1,13 @@
+2012-03-16 Mark Rowe <[email protected]>
+
+ Merge r110969.
+
+ 2012-03-16 Mark Rowe <[email protected]>
+
+ Build fix. Do not preserve owner and group information when installing the WTF headers.
+
+ * _javascript_Core.xcodeproj/project.pbxproj:
+
2012-03-15 Kevin Ollivier <[email protected]>
Move wx port to using export macros
Modified: tags/Safari-536.3.1/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (110970 => 110971)
--- tags/Safari-536.3.1/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2012-03-16 08:43:44 UTC (rev 110970)
+++ tags/Safari-536.3.1/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2012-03-16 08:43:50 UTC (rev 110971)
@@ -3416,7 +3416,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# WTF_PRIVATE_HEADERS_PATH will be replaced by PRIVATE_HEADERS_FOLDER_PATH\n# in the equivalent build-phase when WTF is its own project.\nWTF_PRIVATE_HEADERS_PATH=\"/usr/local/include\"\n\nif [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\nPRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%%/}${WTF_PRIVATE_HEADERS_PATH}\"\nelse\nPRIVATE_HEADERS_PATH=\"${DSTROOT%%/}${WTF_PRIVATE_HEADERS_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/wtf\" \"${PRIVATE_HEADERS_PATH}\"\n";
+ shellScript = "# WTF_PRIVATE_HEADERS_PATH will be replaced by PRIVATE_HEADERS_FOLDER_PATH\n# in the equivalent build-phase when WTF is its own project.\nWTF_PRIVATE_HEADERS_PATH=\"/usr/local/include\"\n\nif [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\nPRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%%/}${WTF_PRIVATE_HEADERS_PATH}\"\nelse\nPRIVATE_HEADERS_PATH=\"${DSTROOT%%/}${WTF_PRIVATE_HEADERS_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";
};
/* End PBXShellScriptBuildPhase section */
Modified: tags/Safari-536.3.1/Source/WTF/ChangeLog (110970 => 110971)
--- tags/Safari-536.3.1/Source/WTF/ChangeLog 2012-03-16 08:43:44 UTC (rev 110970)
+++ tags/Safari-536.3.1/Source/WTF/ChangeLog 2012-03-16 08:43:50 UTC (rev 110971)
@@ -1,3 +1,13 @@
+2012-03-16 Mark Rowe <[email protected]>
+
+ Merge r110969.
+
+ 2012-03-16 Mark Rowe <[email protected]>
+
+ Build fix. Do not preserve owner and group information when installing the WTF headers.
+
+ * WTF.xcodeproj/project.pbxproj:
+
2012-03-07 Mark Rowe <[email protected]>
Teach make to build WTF.
Modified: tags/Safari-536.3.1/Source/WTF/WTF.xcodeproj/project.pbxproj (110970 => 110971)
--- tags/Safari-536.3.1/Source/WTF/WTF.xcodeproj/project.pbxproj 2012-03-16 08:43:44 UTC (rev 110970)
+++ tags/Safari-536.3.1/Source/WTF/WTF.xcodeproj/project.pbxproj 2012-03-16 08:43:50 UTC (rev 110971)
@@ -143,7 +143,7 @@
);
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 --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/\" \"${PRIVATE_HEADERS_PATH}\"\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}/\" \"${PRIVATE_HEADERS_PATH}\"\n";
};
5D247E9D1468AEE200E78B76 /* Detect Available Headers */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
