Title: [218884] trunk/Source/WebCore/PAL
- Revision
- 218884
- Author
- jbed...@apple.com
- Date
- 2017-06-28 12:17:46 -0700 (Wed, 28 Jun 2017)
Log Message
Build fix for PAL
https://bugs.webkit.org/show_bug.cgi?id=173896
Reviewed by Dan Bernstein.
Remove the workaround build fix in r218863.
* PAL.xcodeproj/project.pbxproj: We should be using PROJECT_DIR instead of SRCROOT
when in a nested Xcode project.
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (218883 => 218884)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-06-28 18:12:35 UTC (rev 218883)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-06-28 19:17:46 UTC (rev 218884)
@@ -1,3 +1,15 @@
+2017-06-28 Jonathan Bedard <jbed...@apple.com>
+
+ Build fix for PAL
+ https://bugs.webkit.org/show_bug.cgi?id=173896
+
+ Reviewed by Dan Bernstein.
+
+ Remove the workaround build fix in r218863.
+
+ * PAL.xcodeproj/project.pbxproj: We should be using PROJECT_DIR instead of SRCROOT
+ when in a nested Xcode project.
+
2017-06-27 Jonathan Bedard <jbed...@apple.com>
Build fix for PAL
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (218883 => 218884)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2017-06-28 18:12:35 UTC (rev 218883)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2017-06-28 19:17:46 UTC (rev 218884)
@@ -208,7 +208,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}\"\n\n# Work-around for <rdar://problem/33019376>\nTEMP_SRCROOT=\"${SRCROOT}\"\nif [[ \"${TEMP_SRCROOT}\" != *PAL ]]; then\n TEMP_SRCROOT=\"${TEMP_SRCROOT}/PAL\"\nfi\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${TEMP_SRCROOT}/pal/\" \"${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}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${PROJECT_DIR}/pal/\" \"${PRIVATE_HEADERS_PATH}\"\n";
};
/* End PBXShellScriptBuildPhase section */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
