Title: [155171] trunk/Source/WTF
- Revision
- 155171
- Author
- m...@apple.com
- Date
- 2013-09-05 20:50:08 -0700 (Thu, 05 Sep 2013)
Log Message
INSTALL_PATH_PREFIX is used even when not installing
https://bugs.webkit.org/show_bug.cgi?id=120810
Reviewed by Andy Estes.
* Configurations/CopyWTFHeaders.xcconfig: Removed INSTALL_PATH_PREFIX from
the definition of PRIVATE_HEADERS_FOLDER_PATH. Also removed the leading
slash, because the Xcode definition of this build setting is relative.
* WTF.xcodeproj/project.pbxproj: Prepend INSTALL_PATH_PREFIX here when installing.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (155170 => 155171)
--- trunk/Source/WTF/ChangeLog 2013-09-06 03:43:14 UTC (rev 155170)
+++ trunk/Source/WTF/ChangeLog 2013-09-06 03:50:08 UTC (rev 155171)
@@ -1,3 +1,15 @@
+2013-09-05 Dan Bernstein <m...@apple.com>
+
+ INSTALL_PATH_PREFIX is used even when not installing
+ https://bugs.webkit.org/show_bug.cgi?id=120810
+
+ Reviewed by Andy Estes.
+
+ * Configurations/CopyWTFHeaders.xcconfig: Removed INSTALL_PATH_PREFIX from
+ the definition of PRIVATE_HEADERS_FOLDER_PATH. Also removed the leading
+ slash, because the Xcode definition of this build setting is relative.
+ * WTF.xcodeproj/project.pbxproj: Prepend INSTALL_PATH_PREFIX here when installing.
+
2013-09-05 Anders Carlsson <ander...@apple.com>
Fix build with older versions of clang from Xcode.
Modified: trunk/Source/WTF/Configurations/CopyWTFHeaders.xcconfig (155170 => 155171)
--- trunk/Source/WTF/Configurations/CopyWTFHeaders.xcconfig 2013-09-06 03:43:14 UTC (rev 155170)
+++ trunk/Source/WTF/Configurations/CopyWTFHeaders.xcconfig 2013-09-06 03:50:08 UTC (rev 155171)
@@ -21,5 +21,5 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRIVATE_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/wtf;
+PRIVATE_HEADERS_FOLDER_PATH = usr/local/include/wtf;
INSTALLHDRS_SCRIPT_PHASE = YES;
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (155170 => 155171)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2013-09-06 03:43:14 UTC (rev 155170)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2013-09-06 03:50:08 UTC (rev 155171)
@@ -1171,7 +1171,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 --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/wtf/\" \"${PRIVATE_HEADERS_PATH}\"\n\n";
+ shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n PRIVATE_HEADERS_PATH=\"${DSTROOT}${INSTALL_PATH_PREFIX%/}/${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";
};
/* End PBXShellScriptBuildPhase section */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
