82209 2012-03-26 07:44:59 -0700 [jhbuild] Use $MAKE if it is defined to build jhbuild itself. 2012-03-26 15:15:26 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rakuco rakuco d-r gustavo mrobinson pnormand oldest_to_newest 587736 0 rakuco 2012-03-26 07:44:59 -0700 [jhbuild] Use $MAKE if it is defined to build jhbuild itself. 587737 1 133812 rakuco 2012-03-26 07:46:01 -0700 Created attachment 133812 Patch 587762 2 133812 gustavo 2012-03-26 08:23:00 -0700 Comment on attachment 133812 Patch A few lines before that we strip MAKE out, so this won't do good. 587771 3 rakuco 2012-03-26 08:30:10 -0700 Actually, I wonder if it really makes sense to pass env_without_make to that call to make itself -- I mean, if you explicitly invoke "make", setting $MAKE to something else doesn't seem to have any effect. 587800 4 gustavo 2012-03-26 09:02:51 -0700 That's a good point. If it still works if you set MAKE='make -j4' and remove that, then sure, it doesn't hurt to have it though. 588033 5 133872 rakuco 2012-03-26 13:03:44 -0700 Created attachment 133872 Patch 588036 6 rakuco 2012-03-26 13:04:38 -0700 (In reply to comment #4) > That's a good point. If it still works if you set MAKE='make -j4' and remove that, then sure, it doesn't hurt to have it though. It does, and r112139 removed the os.environ workaround which was in place. 588041 7 133872 mrobinson 2012-03-26 13:11:12 -0700 Comment on attachment 133872 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133872&action=review > Tools/jhbuild/jhbuild-wrapper:96 > + make = shlex.split(os.environ.get('MAKE', 'make')) Why not just os.environ.get('MAKE', 'make').split()[0] ? 588042 8 rakuco 2012-03-26 13:12:40 -0700 (In reply to comment #7) > (From update of attachment 133872 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133872&action=review > > > Tools/jhbuild/jhbuild-wrapper:96 > > + make = shlex.split(os.environ.get('MAKE', 'make')) > > Why not just os.environ.get('MAKE', 'make').split()[0] ? If MAKE is set to "make -j3" that will only give me "make" and "-j3" will be lost. shlex.split("make -j3") gives me ['make', '-j3']. 588065 9 mrobinson 2012-03-26 13:25:07 -0700 (In reply to comment #8) > If MAKE is set to "make -j3" that will only give me "make" and "-j3" will be lost. shlex.split("make -j3") gives me ['make', '-j3']. In that case, why not os.environ.get('MAKE', 'make').split()? >>> "make -j4".split() ['make', '-j4'] 588070 10 rakuco 2012-03-26 13:29:05 -0700 (In reply to comment #9) > (In reply to comment #8) > > > If MAKE is set to "make -j3" that will only give me "make" and "-j3" will be lost. shlex.split("make -j3") gives me ['make', '-j3']. > > In that case, why not os.environ.get('MAKE', 'make').split()? > > >>> "make -j4".split() > ['make', '-j4'] Mostly because subprocess.Popen's documentation recommends using shlex.split() for proper argument tokenization. I can move to just using str.split() if that's preferred, though. 588138 11 133872 mrobinson 2012-03-26 14:41:10 -0700 Comment on attachment 133872 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133872&action=review >>> Tools/jhbuild/jhbuild-wrapper:96 >>> + make = shlex.split(os.environ.get('MAKE', 'make')) >> >> Why not just os.environ.get('MAKE', 'make').split()[0] ? > > If MAKE is set to "make -j3" that will only give me "make" and "-j3" will be lost. shlex.split("make -j3") gives me ['make', '-j3']. Makes sense, thanks! 588184 12 rakuco 2012-03-26 15:15:26 -0700 Committed r112153: <http://trac.webkit.org/changeset/112153> 133812 2012-03-26 07:46:01 -0700 2012-03-26 13:03:37 -0700 Patch bug-82209-20120326114559.patch text/plain 1613 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMDQ2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGQwNWI2ZjM1MmE1ZjFjZTRjMzFlYzE3ZmJhNDIxMzhh NjljMjZiMi4uOThkNTAwZTgzMjAyNDkyZjEwMjM4MDcyMzdiOWM0MDIyYzVmMTdmMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTAzLTI2ICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29ARnJlZUJTRC5v cmc+CisKKyAgICAgICAgW2poYnVpbGRdIFVzZSAkTUFLRSBpZiBpdCBpcyBkZWZpbmVkIHRvIGJ1 aWxkIGpoYnVpbGQgaXRzZWxmLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODIyMDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZXNwZWN0aW5nIHRoZSAkTUFLRSBlbnZpcm9ubWVudCB2YXJpYWJsZSB3aGVu IGl0IGlzIGRlZmluZWQgbWFrZXMKKyAgICAgICAgYnVpbGRpbmcgamhidWlsZCBtb3JlIHBvcnRh YmxlLCBhcyBzb21lIHBsYXRmb3JtcyBtYXkgaGF2ZSBHTlUKKyAgICAgICAgbWFrZSBhcyBnbWFr ZSwgZm9yIGV4YW1wbGUuCisKKyAgICAgICAgKiBqaGJ1aWxkL2poYnVpbGQtd3JhcHBlcjoKKyAg ICAgICAgKGluc3RhbGxfamhidWlsZCk6CisKIDIwMTItMDMtMjQgIENocmlzIEZsZWl6YWNoICA8 Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogU3VwcG9ydCBzb2x1dGlvbiB0byBo YW5kbGUgaW52YWxpZCBheCB0ZXh0IG1hcmtlcgpkaWZmIC0tZ2l0IGEvVG9vbHMvamhidWlsZC9q aGJ1aWxkLXdyYXBwZXIgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlcgppbmRleCBkNDFj ZThkN2E5OGY1YmUzYWQyMmE2MGVmNzc0NDI4MTcyMzA0ZmFjLi44NTdjZmUxODAzOTJiMzYxOTIw NWM5OGMzY2YyYWNjMWIzZjkyMTQyIDEwMDc1NQotLS0gYS9Ub29scy9qaGJ1aWxkL2poYnVpbGQt d3JhcHBlcgorKysgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlcgpAQCAtOTcsNyArOTcs NyBAQCBkZWYgaW5zdGFsbF9qaGJ1aWxkKCk6CiAgICAgaWYgcHJvY2Vzcy5yZXR1cm5jb2RlICE9 IDA6CiAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbignamhidWlsZCBjb25maWd1cmUgZmFpbGVkIHdp dGggcmV0dXJuIGNvZGU6ICVpJyAlIHByb2Nlc3MucmV0dXJuY29kZSkKIAotICAgIHByb2Nlc3Mg PSBzdWJwcm9jZXNzLlBvcGVuKFsnbWFrZScsICdpbnN0YWxsJ10sIGN3ZD1qaGJ1aWxkX3NvdXJj ZV9wYXRoLCBlbnY9ZW52X3dpdGhvdXRfbWFrZSkKKyAgICBwcm9jZXNzID0gc3VicHJvY2Vzcy5Q b3Blbihbb3MuZW52aXJvbi5nZXQoJ01BS0UnLCAnbWFrZScpLCAnaW5zdGFsbCddLCBjd2Q9amhi dWlsZF9zb3VyY2VfcGF0aCwgZW52PWVudl93aXRob3V0X21ha2UpCiAgICAgcHJvY2Vzcy53YWl0 KCkKICAgICBpZiBwcm9jZXNzLnJldHVybmNvZGUgIT0gMDoKICAgICAgICAgcmFpc2UgRXhjZXB0 aW9uKCdqaGJ1aWxkIGNvbmZpZ3VyZSBmYWlsZWQgd2l0aCByZXR1cm4gY29kZTogJWknICUgcHJv Y2Vzcy5yZXR1cm5jb2RlKQo= 133872 2012-03-26 13:03:44 -0700 2012-03-26 14:41:10 -0700 Patch bug-82209-20120326170342.patch text/plain 2003 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMTM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzk4M2JjMWQ5NTMyNTAyNDllZjNmNTQ4OTJmYjM1MTgx YzU0MTQ2OS4uNDBlN2U5ZTY3NThhNWU1OGEzMGI0MzBmYWM5NDdlN2Q0MzgxYzUzZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5 IEBACiAyMDEyLTAzLTI2ICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29ARnJlZUJTRC5v cmc+CiAKKyAgICAgICAgW2poYnVpbGRdIFVzZSAkTUFLRSBpZiBpdCBpcyBkZWZpbmVkIHRvIGJ1 aWxkIGpoYnVpbGQgaXRzZWxmLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODIyMDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZXNwZWN0aW5nIHRoZSAkTUFLRSBlbnZpcm9ubWVudCB2YXJpYWJsZSB3aGVu IGl0IGlzIGRlZmluZWQgbWFrZXMKKyAgICAgICAgYnVpbGRpbmcgamhidWlsZCBtb3JlIHBvcnRh YmxlLCBhcyBzb21lIHBsYXRmb3JtcyBtYXkgaGF2ZSBHTlUKKyAgICAgICAgbWFrZSBhcyBnbWFr ZSwgZm9yIGV4YW1wbGUuCisKKyAgICAgICAgKiBqaGJ1aWxkL2poYnVpbGQtd3JhcHBlcjoKKyAg ICAgICAgKGluc3RhbGxfamhidWlsZCk6CisKKzIwMTItMDMtMjYgIFJhcGhhZWwgS3VibyBkYSBD b3N0YSAgPHJha3Vjb0BGcmVlQlNELm9yZz4KKwogICAgICAgICBbamhidWlsZF0gUmV2ZXJ0ICRN QUtFIGVudmlyb25tZW50IGhhY2sgaW50cm9kdWNlZCBpbiByMTAxOTI5LgogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODIyMzQKIApkaWZmIC0tZ2l0IGEv VG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3Jh cHBlcgppbmRleCBkY2NiY2M4YTBjMmVhNjI2ZTYyMDE3NTEzOWFiYmNiMzQ4MDYyNGRkLi45Nzdl ZGRiZjU5YWU3YzMwYmQ0YzZmM2M4NDJmZTdmZjhkYTk3MGY4IDEwMDc1NQotLS0gYS9Ub29scy9q aGJ1aWxkL2poYnVpbGQtd3JhcHBlcgorKysgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBl cgpAQCAtMTgsNiArMTgsNyBAQAogIyBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJl ZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAwMjExMC0xMzAxICBVU0EKIAogaW1wb3J0IG9z CitpbXBvcnQgc2hsZXgKIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKQEAgLTkwLDcg KzkxLDExIEBAIGRlZiBpbnN0YWxsX2poYnVpbGQoKToKICAgICBpZiBwcm9jZXNzLnJldHVybmNv ZGUgIT0gMDoKICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdqaGJ1aWxkIGNvbmZpZ3VyZSBmYWls ZWQgd2l0aCByZXR1cm4gY29kZTogJWknICUgcHJvY2Vzcy5yZXR1cm5jb2RlKQogCi0gICAgcHJv Y2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oWydtYWtlJywgJ2luc3RhbGwnXSwgY3dkPWpoYnVpbGRf c291cmNlX3BhdGgpCisgICAgIyBUaGlzIGlzIGEgaGFja2lzaCBhcHByb2FjaCB0byBtYWtlIHRo ZSBzdWJwcm9jZXNzLlBvcGVuIGNhbGwgZXZlbiB3aGVuIHBlb3BsZSBzZXQKKyAgICAjIE1BS0Ug dG8gJ21ha2UgLWozJyBpbnN0ZWFkIG9mIHVzaW5nIHRoZSBNQUtFRkxBR1MgZW52aXJvbm1lbnQg dmFyaWFibGUuCisgICAgbWFrZSA9IHNobGV4LnNwbGl0KG9zLmVudmlyb24uZ2V0KCdNQUtFJywg J21ha2UnKSkKKworICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKG1ha2UgKyBbJ2luc3Rh bGwnXSwgY3dkPWpoYnVpbGRfc291cmNlX3BhdGgpCiAgICAgcHJvY2Vzcy53YWl0KCkKICAgICBp ZiBwcm9jZXNzLnJldHVybmNvZGUgIT0gMDoKICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdqaGJ1 aWxkIGNvbmZpZ3VyZSBmYWlsZWQgd2l0aCByZXR1cm4gY29kZTogJWknICUgcHJvY2Vzcy5yZXR1 cm5jb2RlKQo=