27699 2009-07-27 01:37:44 -0700 Would be nice if build-webkit on Mac respected WEBKITOUTPUTDIR and set SYMROOT/OBJROOT accordingly 2009-07-29 02:37:52 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 vestbo vestbo levin mrowe oldest_to_newest 134863 0 vestbo 2009-07-27 01:37:44 -0700 As far as I can tell the only way to build WebKit on Mac in another directory than WebKitBuild is to set com.apple.Xcode PBXApplicationwideBuildSettings or com.apple.Xcode PBXProductDirectory, which would affect all XCode builds, not just WebKit (?). Since all other ports support WEBKITOUTPUTDIR, I figured I'd add support for it on Mac too. The patch restructures the determineBaseProductDir() function a bit so that the git branch is appended (if enabled) regardless of the port, and that baseProductDirOptions (SYMROOT/OBJROOT) is set for Mac even when the the baseProductDir is set by the user (this helps me shadow-build WebKit on mac). 134864 1 33523 vestbo 2009-07-27 01:41:40 -0700 Created attachment 33523 2009-07-27 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed by NOBODY (OOPS!). build-webkit: Reorder logic for determining the baseProductDir https://bugs.webkit.org/show_bug.cgi?id=27699 We now do port-spesific probing for the product dir first, and then fall back to either the generic WEBKITOUTPUTDIR (which now also works on Mac), or WebKitBuild. Then we add the git branch if the git branch build option is enabled. Finally we massage the product dir based on the port. For example the Mac port will now always set the SYMROOT and OBJROOT configuration for XCode. * Scripts/webkitdirs.pm: --- 2 files changed, 40 insertions(+), 25 deletions(-) 135275 2 33523 eric 2009-07-28 10:58:55 -0700 Comment on attachment 33523 2009-07-27 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Looks sane. 135539 3 vestbo 2009-07-29 02:37:52 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/webkitdirs.pm Committed r46532 M WebKitTools/ChangeLog M WebKitTools/Scripts/webkitdirs.pm r46532 = 5cb46a5750423a609fa347a4b0ba1ae2b3c0912f (svn/trunk) No changes between current HEAD and refs/remotes/svn/trunk Resetting to the latest refs/remotes/svn/trunk http://trac.webkit.org/changeset/46532 33523 2009-07-27 01:41:40 -0700 2009-07-28 10:58:55 -0700 2009-07-27 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> bug-27699-20090727104137.patch text/plain 3728 vestbo ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkZjhjMjlhLi5hYThmMTEyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMDct MjcgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1aWxkLXdlYmtpdDog UmVvcmRlciBsb2dpYyBmb3IgZGV0ZXJtaW5pbmcgdGhlIGJhc2VQcm9kdWN0RGlyCisgICAgICAg IAorCWh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzY5OQorCisgICAg ICAgIFdlIG5vdyBkbyBwb3J0LXNwZXNpZmljIHByb2JpbmcgZm9yIHRoZSBwcm9kdWN0IGRpciBm aXJzdCwgYW5kIHRoZW4KKyAgICAgICAgZmFsbCBiYWNrIHRvIGVpdGhlciB0aGUgZ2VuZXJpYyBX RUJLSVRPVVRQVVRESVIgKHdoaWNoIG5vdyBhbHNvIHdvcmtzCisgICAgICAgIG9uIE1hYyksIG9y IFdlYktpdEJ1aWxkLgorICAgICAgICAKKyAgICAgICAgVGhlbiB3ZSBhZGQgdGhlIGdpdCBicmFu Y2ggaWYgdGhlIGdpdCBicmFuY2ggYnVpbGQgb3B0aW9uIGlzIGVuYWJsZWQuCisgICAgICAgIAor ICAgICAgICBGaW5hbGx5IHdlIG1hc3NhZ2UgdGhlIHByb2R1Y3QgZGlyIGJhc2VkIG9uIHRoZSBw b3J0LiBGb3IgZXhhbXBsZSB0aGUKKyAgICAgICAgTWFjIHBvcnQgd2lsbCBub3cgYWx3YXlzIHNl dCB0aGUgU1lNUk9PVCBhbmQgT0JKUk9PVCBjb25maWd1cmF0aW9uIGZvcgorICAgICAgICBYQ29k ZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKwogMjAwOS0wNy0yMSAgSmFr b2IgUGV0c292aXRzICA8amFrb2IucGV0c292aXRzQHRvcmNobW9iaWxlLmNvbT4KIAogICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBUcmVhdC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRl eCAyNzk1MTJiLi45NmNjMmNjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC05Myw2 ICs5Myw3IEBAIHN1YiBkZXRlcm1pbmVCYXNlUHJvZHVjdERpcgogewogICAgIHJldHVybiBpZiBk ZWZpbmVkICRiYXNlUHJvZHVjdERpcjsKICAgICBkZXRlcm1pbmVTb3VyY2VEaXIoKTsKKwogICAg IGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgIyBTaWxlbnRseSByZW1vdmUgfi9M aWJyYXJ5L1ByZWZlcmVuY2VzL3hjb2RlYnVpbGQucGxpc3Qgd2hpY2ggY2FuCiAgICAgICAgICMg Y2F1c2UgYnVpbGQgZmFpbHVyZS4gVGhlIHByZXNlbmNlIG9mCkBAIC0xMjAsMzggKzEyMSwzMiBA QCBzdWIgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIKICAgICAgICAgICAgICAgICB1bmRlZiAkYmFz ZVByb2R1Y3REaXIgdW5sZXNzICRiYXNlUHJvZHVjdERpciA9fiAvXlwvLzsKICAgICAgICAgICAg IH0KICAgICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAgICAgICRiYXNlUHJvZHVjdERpciA9ICRF TlZ7IldFQktJVE9VVFBVVERJUiJ9OwotICAgICAgICBpZiAoaXNBcHBsZVdpbldlYktpdCgpICYm ICRiYXNlUHJvZHVjdERpcikgewotICAgICAgICAgICAgbXkgJHVuaXhCdWlsZFBhdGggPSBgY3ln cGF0aCAtLXVuaXggXCIkYmFzZVByb2R1Y3REaXJcImA7Ci0gICAgICAgICAgICBjaG9tcCAkdW5p eEJ1aWxkUGF0aDsKLSAgICAgICAgICAgICRiYXNlUHJvZHVjdERpciA9ICR1bml4QnVpbGRQYXRo OwotICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKCRiYXNlUHJvZHVjdERpciAmJiBpc0FwcGxl TWFjV2ViS2l0KCkpIHsKKyAgICBpZiAoIWRlZmluZWQoJGJhc2VQcm9kdWN0RGlyKSkgeyAjIFBv cnQtc3Blc2lmaWMgY2hlY2tzIGZhaWxlZCwgdXNlIGRlZmF1bHQKKyAgICAgICAgJGJhc2VQcm9k dWN0RGlyID0gJEVOVnsiV0VCS0lUT1VUUFVURElSIn0gfHwgIiRzb3VyY2VEaXIvV2ViS2l0QnVp bGQiOworICAgIH0KKworICAgIGlmIChpc0dpdCgpICYmIGlzR2l0QnJhbmNoQnVpbGQoKSkgewor ICAgICAgICBteSAkYnJhbmNoID0gZ2l0QnJhbmNoKCk7CisgICAgICAgICRiYXNlUHJvZHVjdERp ciA9ICIkYmFzZVByb2R1Y3REaXIvJGJyYW5jaCI7CisgICAgfQorCisgICAgaWYgKGlzQXBwbGVN YWNXZWJLaXQoKSkgewogICAgICAgICAkYmFzZVByb2R1Y3REaXIgPX4gc3xeXFEkKFNSQ1JPT1Qp Ly4uXEUkfCRzb3VyY2VEaXJ8OwogICAgICAgICAkYmFzZVByb2R1Y3REaXIgPX4gc3xeXFEkKFNS Q1JPT1QpLy4uL3wkc291cmNlRGlyL3w7CiAgICAgICAgICRiYXNlUHJvZHVjdERpciA9fiBzfF5+ L3wkRU5We0hPTUV9L3w7CiAgICAgICAgIGRpZSAiQ2FuJ3QgaGFuZGxlIFhjb2RlIHByb2R1Y3Qg ZGlyZWN0b3J5IHdpdGggYSB+IGluIGl0LlxuIiBpZiAkYmFzZVByb2R1Y3REaXIgPX4gL34vOwog ICAgICAgICBkaWUgIkNhbid0IGhhbmRsZSBYY29kZSBwcm9kdWN0IGRpcmVjdG9yeSB3aXRoIGEg dmFyaWFibGUgaW4gaXQuXG4iIGlmICRiYXNlUHJvZHVjdERpciA9fiAvXCQvOwotICAgICAgICBA YmFzZVByb2R1Y3REaXJPcHRpb24gPSAoKTsKLSAgICB9Ci0KLSAgICBpZiAoIWRlZmluZWQoJGJh c2VQcm9kdWN0RGlyKSkgewotICAgICAgICAkYmFzZVByb2R1Y3REaXIgPSAiJHNvdXJjZURpci9X ZWJLaXRCdWlsZCI7Ci0KLSAgICAgICAgaWYgKGlzR2l0KCkgJiYgaXNHaXRCcmFuY2hCdWlsZCgp KSB7Ci0gICAgICAgICAgICBteSAkYnJhbmNoID0gZ2l0QnJhbmNoKCk7Ci0gICAgICAgICAgICAk YmFzZVByb2R1Y3REaXIgPSAiJGJhc2VQcm9kdWN0RGlyLyRicmFuY2giOwotICAgICAgICB9Ci0K LSAgICAgICAgQGJhc2VQcm9kdWN0RGlyT3B0aW9uID0gKCJTWU1ST09UPSRiYXNlUHJvZHVjdERp ciIsICJPQkpST09UPSRiYXNlUHJvZHVjdERpciIpIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpOwot ICAgICAgICBpZiAoaXNDeWd3aW4oKSkgewotICAgICAgICAgICAgbXkgJGRvc0J1aWxkUGF0aCA9 IGBjeWdwYXRoIC0td2luZG93cyBcIiRiYXNlUHJvZHVjdERpclwiYDsKLSAgICAgICAgICAgIGNo b21wICRkb3NCdWlsZFBhdGg7Ci0gICAgICAgICAgICAkRU5WeyJXRUJLSVRPVVRQVVRESVIifSA9 ICRkb3NCdWlsZFBhdGg7Ci0gICAgICAgIH0KKyAgICAgICAgQGJhc2VQcm9kdWN0RGlyT3B0aW9u ID0gKCJTWU1ST09UPSRiYXNlUHJvZHVjdERpciIsICJPQkpST09UPSRiYXNlUHJvZHVjdERpciIp OworICAgIH0gZWxzaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgeworICAgICAgICBteSAkdW5peEJ1 aWxkUGF0aCA9IGBjeWdwYXRoIC0tdW5peCBcIiRiYXNlUHJvZHVjdERpclwiYDsKKyAgICAgICAg Y2hvbXAgJHVuaXhCdWlsZFBhdGg7CisgICAgICAgICRiYXNlUHJvZHVjdERpciA9ICR1bml4QnVp bGRQYXRoOworICAgIH0gZWxzaWYgKGlzQ3lnd2luKCkpIHsKKyAgICAgICAgbXkgJGRvc0J1aWxk UGF0aCA9IGBjeWdwYXRoIC0td2luZG93cyBcIiRiYXNlUHJvZHVjdERpclwiYDsKKyAgICAgICAg Y2hvbXAgJGRvc0J1aWxkUGF0aDsKKyAgICAgICAgJEVOVnsiV0VCS0lUT1VUUFVURElSIn0gPSAk ZG9zQnVpbGRQYXRoOwogICAgIH0KIH0=