118195 2013-06-28 10:44:34 -0700 [Tools] Add support for "webKitBranchBuild" git option when calculating jhbuildPath 2013-06-28 15:21:43 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 nick.diego webkit-unassigned commit-queue dbates mrobinson pnormand rakuco sergio oldest_to_newest 904693 0 nick.diego 2013-06-28 10:44:34 -0700 [Tools] Add support for "webKitBranchBuild" git option when calculating jhbuildPath 904695 1 205726 nick.diego 2013-06-28 10:47:24 -0700 Created attachment 205726 Patch 904696 2 nick.diego 2013-06-28 10:48:53 -0700 Currently, ports that use jhbuild fail to determine jhbuild directory when "webKitBranchBuild" git configuration property is enabled. To reproduce that issue in Efl port, enable that flag in .git/config, switch to a git branch other than "master" and try to build webkit. The build will fail to locate dependencies due to lack of pkg-config paths which should be set by jhbuild. For more details about "webKitBranchBuild" option, see: https://trac.webkit.org/wiki/UsingGitWithWebKit 904710 3 205727 nick.diego 2013-06-28 11:25:01 -0700 Created attachment 205727 Patch Updated ChangeLog 904731 4 205727 dbates 2013-06-28 12:38:39 -0700 Comment on attachment 205727 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205727&action=review > Tools/Scripts/webkitdirs.pm:1884 > + pop(@jhbuildPath); This line is error prone as it depends on the implementation detail that baseProductDir() always appends a "/" to the end of the base product path when it's a Git branch build by line 239 of webkitdirs.pm (r152104), <http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitdirs.pm?rev=152104#L239>. This detail is likely to change as we move towards using File::Spec operations to build a file system path instead of string concatenation to build a path. I suggest that we pop() the last directory only if it's a Git branch build and gitBranch() is a non-empty string. 904739 5 nick.diego 2013-06-28 13:01:46 -0700 (In reply to comment #4) > (From update of attachment 205727 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=205727&action=review > > > Tools/Scripts/webkitdirs.pm:1884 > > + pop(@jhbuildPath); > > This line is error prone as it depends on the implementation detail that baseProductDir() always appends a "/" to the end of the base product path when it's a Git branch build by line 239 of webkitdirs.pm (r152104), <http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitdirs.pm?rev=152104#L239>. This detail is likely to change as we move towards using File::Spec operations to build a file system path instead of string concatenation to build a path. I suggest that we pop() the last directory only if it's a Git branch build and gitBranch() is a non-empty string. Yes, you're right. I'll add that checking (non-empty gitBranch()). thanks 904741 6 205736 nick.diego 2013-06-28 13:19:36 -0700 Created attachment 205736 Patch Added checking for non-empty git branch to determine jhbuild path. 904749 7 205736 dbates 2013-06-28 13:43:12 -0700 Comment on attachment 205736 Patch r=me 904777 8 205736 commit-queue 2013-06-28 15:21:40 -0700 Comment on attachment 205736 Patch Clearing flags on attachment: 205736 Committed r152191: <http://trac.webkit.org/changeset/152191> 904778 9 commit-queue 2013-06-28 15:21:43 -0700 All reviewed patches have been landed. Closing bug. 205726 2013-06-28 10:47:24 -0700 2013-06-28 11:24:48 -0700 Patch bug-118195-20130628135603.patch text/plain 2009 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMTY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmFkMzI5ZWVlMDk4MzYyMjc2NzM2OWQ5ZTczNWYyNGRk YWZhOGUyYS4uYjY3NDhiY2VlYjQyMjczMzM0OThmMTY1MjU0ZTA0ZjY0OGZiMzk4NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEzLTA2LTI4ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgW1Rvb2xzXSBBZGQgc3VwcG9ydCBmb3IgIndlYktpdEJyYW5jaEJ1 aWxkIiBnaXQgb3B0aW9uIHdoZW4gY2FsY3VsYXRpbmcgamhidWlsZFBhdGgKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODE5NQorCisgICAgICAgIEN1 cnJlbnRseSwgcG9ydHMgdGhhdCB1c2UgamhidWlsZCBmYWlsIHRvIGRldGVybWluZSBqaGJ1aWxk IGRpcmVjdG9yeQorICAgICAgICB3aGVuICJ3ZWJLaXRCcmFuY2hCdWlsZCIgZ2l0IGNvbmZpZ3Vy YXRpb24gcHJvcGVydHkgaXMgZW5hYmxlZC4gVG8gcmVwcm9kdWNlCisgICAgICAgIHRoYXQgaXNz dWUgaW4gRWZsIHBvcnQsIGVuYWJsZSB0aGF0IGZsYWcgaW4gLmdpdC9jb25maWcsIHN3aXRjaCB0 byBhIGdpdCBicmFuY2gKKyAgICAgICAgb3RoZXIgdGhhbiAibWFzdGVyIiBhbmQgdHJ5IHRvIGJ1 aWxkIHdlYmtpdC4gVGhlIGJ1aWxkIHdpbGwgZmFpbCB0bworICAgICAgICBsb2NhdGUgZGVwZW5k ZW5jaWVzIGR1ZSB0byBsYWNrIG9mIHBrZy1jb25maWcgcGF0aHMgd2hpY2ggc2hvdWxkIGJlIHNl dAorICAgICAgICBieSBqaGJ1aWxkLgorCisgICAgICAgIEZvciBtb3JlIGRldGFpbHMgYWJvdXQg IndlYktpdEJyYW5jaEJ1aWxkIiBvcHRpb24sIHNlZToKKyAgICAgICAgaHR0cHM6Ly90cmFjLndl YmtpdC5vcmcvd2lraS9Vc2luZ0dpdFdpdGhXZWJLaXQKKworICAgICAgICBbVG9vbHNdIEFkZCBz dXBwb3J0IGZvciAid2ViS2l0QnJhbmNoQnVpbGQiIGdpdCBvcHRpb24gd2hlbiBjYWxjdWxhdGlu ZyBqaGJ1aWxkUGF0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE4MTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChnZXRKaGJ1aWxkUGF0aCk6 CisKIDIwMTMtMDYtMjYgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAg IFtNYWNdIEFkZCBNYXZlcmlja3Mgc3lzdGVtIGZvbnQgdG8gVGVzdCBzeXN0ZW1zCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KaW5kZXggZWQ0YjEwNTc5YjhhZmRiZTYzZTJkZWRlNDA2ZThmZWVmZDI2MGZmMC4uY2E0 ZjRiNTJkOTRiZDgxNTVkMTFlNjc4MzRjOGQwZmRjYmJhNmJiNyAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpA QCAtMTg3OSw3ICsxODc5LDEyIEBAIHN1YiBydW5BdXRvZ2VuRm9yQXV0b3Rvb2xzUHJvamVjdElm TmVjZXNzYXJ5KCRAKQogCiBzdWIgZ2V0SmhidWlsZFBhdGgoKQogewotICAgIHJldHVybiBqb2lu KCcvJywgYmFzZVByb2R1Y3REaXIoKSwgIkRlcGVuZGVuY2llcyIpOworICAgIG15IEBqaGJ1aWxk UGF0aCA9IEZpbGU6OlNwZWMtPnNwbGl0ZGlyKGJhc2VQcm9kdWN0RGlyKCkpOworICAgIGlmIChp c0dpdCgpICYmIGlzR2l0QnJhbmNoQnVpbGQoKSkgeworICAgICAgICBwb3AoQGpoYnVpbGRQYXRo KTsKKyAgICB9CisgICAgcHVzaChAamhidWlsZFBhdGgsICJEZXBlbmRlbmNpZXMiKTsKKyAgICBy ZXR1cm4gRmlsZTo6U3BlYy0+Y2F0ZGlyKEBqaGJ1aWxkUGF0aCk7CiB9CiAKIHN1YiBtdXN0UmVS dW5BdXRvZ2VuKCRAKQo= 205727 2013-06-28 11:25:01 -0700 2013-06-28 13:19:22 -0700 Patch bug-118195-20130628143339.patch text/plain 1858 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMTY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmFkMzI5ZWVlMDk4MzYyMjc2NzM2OWQ5ZTczNWYyNGRk YWZhOGUyYS4uNGI2NDZkNThlNDdlODk1ZWI3MTgzZTIwZWNkOGU5ZWFhNGRiMjI5MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEzLTA2LTI4ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgW1Rvb2xzXSBBZGQgc3VwcG9ydCBmb3IgIndlYktpdEJyYW5jaEJ1 aWxkIiBnaXQgb3B0aW9uIHdoZW4gY2FsY3VsYXRpbmcgamhidWlsZFBhdGgKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODE5NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgcG9ydHMgdGhh dCB1c2UgamhidWlsZCBmYWlsIHRvIGRldGVybWluZSBqaGJ1aWxkIGRpcmVjdG9yeQorICAgICAg ICB3aGVuICJ3ZWJLaXRCcmFuY2hCdWlsZCIgZ2l0IGNvbmZpZ3VyYXRpb24gcHJvcGVydHkgaXMg ZW5hYmxlZC4gVG8gcmVwcm9kdWNlCisgICAgICAgIHRoYXQgaXNzdWUgaW4gRWZsIHBvcnQsIGVu YWJsZSB0aGF0IGZsYWcgaW4gLmdpdC9jb25maWcsIHN3aXRjaCB0byBhIGdpdCBicmFuY2gKKyAg ICAgICAgb3RoZXIgdGhhbiAibWFzdGVyIiBhbmQgdHJ5IHRvIGJ1aWxkIHdlYmtpdC4gVGhlIGJ1 aWxkIHdpbGwgZmFpbCB0bworICAgICAgICBsb2NhdGUgZGVwZW5kZW5jaWVzIGR1ZSB0byBsYWNr IG9mIHBrZy1jb25maWcgcGF0aHMgd2hpY2ggc2hvdWxkIGJlIHNldAorICAgICAgICBieSBqaGJ1 aWxkLgorCisgICAgICAgIEZvciBtb3JlIGRldGFpbHMgYWJvdXQgIndlYktpdEJyYW5jaEJ1aWxk IiBvcHRpb24sIHNlZToKKyAgICAgICAgaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvd2lraS9Vc2lu Z0dpdFdpdGhXZWJLaXQKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAg ICAgKGdldEpoYnVpbGRQYXRoKToKKwogMjAxMy0wNi0yNiAgRGVhbiBKYWNrc29uICA8ZGlub0Bh cHBsZS5jb20+CiAKICAgICAgICAgW01hY10gQWRkIE1hdmVyaWNrcyBzeXN0ZW0gZm9udCB0byBU ZXN0IHN5c3RlbXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBlZDRiMTA1NzliOGFmZGJlNjNlMmRlZGU0 MDZlOGZlZWZkMjYwZmYwLi5jYTRmNGI1MmQ5NGJkODE1NWQxMWU2NzgzNGM4ZDBmZGNiYmE2YmI3 IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xODc5LDcgKzE4NzksMTIgQEAgc3ViIHJ1bkF1dG9nZW5G b3JBdXRvdG9vbHNQcm9qZWN0SWZOZWNlc3NhcnkoJEApCiAKIHN1YiBnZXRKaGJ1aWxkUGF0aCgp CiB7Ci0gICAgcmV0dXJuIGpvaW4oJy8nLCBiYXNlUHJvZHVjdERpcigpLCAiRGVwZW5kZW5jaWVz Iik7CisgICAgbXkgQGpoYnVpbGRQYXRoID0gRmlsZTo6U3BlYy0+c3BsaXRkaXIoYmFzZVByb2R1 Y3REaXIoKSk7CisgICAgaWYgKGlzR2l0KCkgJiYgaXNHaXRCcmFuY2hCdWlsZCgpKSB7CisgICAg ICAgIHBvcChAamhidWlsZFBhdGgpOworICAgIH0KKyAgICBwdXNoKEBqaGJ1aWxkUGF0aCwgIkRl cGVuZGVuY2llcyIpOworICAgIHJldHVybiBGaWxlOjpTcGVjLT5jYXRkaXIoQGpoYnVpbGRQYXRo KTsKIH0KIAogc3ViIG11c3RSZVJ1bkF1dG9nZW4oJEApCg== 205736 2013-06-28 13:19:36 -0700 2013-06-28 15:21:40 -0700 Patch bug-118195-20130628162815.patch text/plain 1873 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMTY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmFkMzI5ZWVlMDk4MzYyMjc2NzM2OWQ5ZTczNWYyNGRk YWZhOGUyYS4uNGI2NDZkNThlNDdlODk1ZWI3MTgzZTIwZWNkOGU5ZWFhNGRiMjI5MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEzLTA2LTI4ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3Nz YS5vcmc+CisKKyAgICAgICAgW1Rvb2xzXSBBZGQgc3VwcG9ydCBmb3IgIndlYktpdEJyYW5jaEJ1 aWxkIiBnaXQgb3B0aW9uIHdoZW4gY2FsY3VsYXRpbmcgamhidWlsZFBhdGgKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODE5NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgcG9ydHMgdGhh dCB1c2UgamhidWlsZCBmYWlsIHRvIGRldGVybWluZSBqaGJ1aWxkIGRpcmVjdG9yeQorICAgICAg ICB3aGVuICJ3ZWJLaXRCcmFuY2hCdWlsZCIgZ2l0IGNvbmZpZ3VyYXRpb24gcHJvcGVydHkgaXMg ZW5hYmxlZC4gVG8gcmVwcm9kdWNlCisgICAgICAgIHRoYXQgaXNzdWUgaW4gRWZsIHBvcnQsIGVu YWJsZSB0aGF0IGZsYWcgaW4gLmdpdC9jb25maWcsIHN3aXRjaCB0byBhIGdpdCBicmFuY2gKKyAg ICAgICAgb3RoZXIgdGhhbiAibWFzdGVyIiBhbmQgdHJ5IHRvIGJ1aWxkIHdlYmtpdC4gVGhlIGJ1 aWxkIHdpbGwgZmFpbCB0bworICAgICAgICBsb2NhdGUgZGVwZW5kZW5jaWVzIGR1ZSB0byBsYWNr IG9mIHBrZy1jb25maWcgcGF0aHMgd2hpY2ggc2hvdWxkIGJlIHNldAorICAgICAgICBieSBqaGJ1 aWxkLgorCisgICAgICAgIEZvciBtb3JlIGRldGFpbHMgYWJvdXQgIndlYktpdEJyYW5jaEJ1aWxk IiBvcHRpb24sIHNlZToKKyAgICAgICAgaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvd2lraS9Vc2lu Z0dpdFdpdGhXZWJLaXQKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAg ICAgKGdldEpoYnVpbGRQYXRoKToKKwogMjAxMy0wNi0yNiAgRGVhbiBKYWNrc29uICA8ZGlub0Bh cHBsZS5jb20+CiAKICAgICAgICAgW01hY10gQWRkIE1hdmVyaWNrcyBzeXN0ZW0gZm9udCB0byBU ZXN0IHN5c3RlbXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBlZDRiMTA1NzliOGFmZGJlNjNlMmRlZGU0 MDZlOGZlZWZkMjYwZmYwLi5hYmQyZDAyMDk0YTdhOTFmZGE2NWE3YzQ3MDBkOTFjZDJiZWQ5Yzc0 IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xODc5LDcgKzE4NzksMTIgQEAgc3ViIHJ1bkF1dG9nZW5G b3JBdXRvdG9vbHNQcm9qZWN0SWZOZWNlc3NhcnkoJEApCiAKIHN1YiBnZXRKaGJ1aWxkUGF0aCgp CiB7Ci0gICAgcmV0dXJuIGpvaW4oJy8nLCBiYXNlUHJvZHVjdERpcigpLCAiRGVwZW5kZW5jaWVz Iik7CisgICAgbXkgQGpoYnVpbGRQYXRoID0gRmlsZTo6U3BlYy0+c3BsaXRkaXIoYmFzZVByb2R1 Y3REaXIoKSk7CisgICAgaWYgKGlzR2l0KCkgJiYgaXNHaXRCcmFuY2hCdWlsZCgpICYmIGdpdEJy YW5jaCgpKSB7CisgICAgICAgIHBvcChAamhidWlsZFBhdGgpOworICAgIH0KKyAgICBwdXNoKEBq aGJ1aWxkUGF0aCwgIkRlcGVuZGVuY2llcyIpOworICAgIHJldHVybiBGaWxlOjpTcGVjLT5jYXRk aXIoQGpoYnVpbGRQYXRoKTsKIH0KIAogc3ViIG11c3RSZVJ1bkF1dG9nZW4oJEApCg==