134832 2014-07-11 06:22:23 -0700 [GTK] Simplify make-dist command line arguments 2014-07-21 02:05:28 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bunhere commit-queue gustavo gyuyoung.kim pnormand rakuco sergio oldest_to_newest 1021834 0 cgarcia 2014-07-11 06:22:23 -0700 It's a bit unconvenient to use, specially when launched manually 1021835 1 234762 cgarcia 2014-07-11 06:29:15 -0700 Created attachment 234762 Patch Now I can do: Release$ ../../Tools/gtk/make-dist.py -s ../../ ../../Tools/gtk/manifest.txt instead of: Release$ ../../Tools/gtk/make-dist.py -c -s ../../ --build-dir=./ --tarball-root=/webkitgtk-2.5.1 -o webkitgtk-2.5.1.tar ../../Tools/gtk/manifest.txt 1021839 2 234762 mrobinson 2014-07-11 07:52:31 -0700 Comment on attachment 234762 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234762&action=review > Tools/gtk/make-dist.py:294 > + tarball_root = "webkitgtk" You don't need the leading slash? 1022101 3 cgarcia 2014-07-13 01:39:38 -0700 (In reply to comment #2) > (From update of attachment 234762 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=234762&action=review > > > Tools/gtk/make-dist.py:294 > > + tarball_root = "webkitgtk" > > You don't need the leading slash? No, that's already normalized in the Manifest constructor 1022127 4 234762 mrobinson 2014-07-13 11:46:46 -0700 Comment on attachment 234762 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234762&action=review Looks good, but consider moving the code that calculate the current version. > Tools/gtk/make-dist.py:303 > + pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit2/webkit2gtk-3.0.pc") > + if os.path.isfile(pkgconfig_file): > + p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE) > + version = p.communicate()[0] > + if version: > + tarball_root += '-' + version.rstrip('\n') Would it make sense to move to this after argument parsing so that other parts of the code can use arguments.version safely in the future? 1023646 5 cgarcia 2014-07-21 02:05:28 -0700 Committed r171297: <http://trac.webkit.org/changeset/171297> 234762 2014-07-11 06:29:15 -0700 2014-07-13 11:46:45 -0700 Patch wk-simplify-distcheck.diff text/plain 6087 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA5ZTc2Y2YxLi45OWI1MjA5 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTQtMDctMTEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIFNpbXBsaWZ5IG1ha2UtZGlzdCBjb21tYW5kIGxpbmUgYXJndW1lbnRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ4MzIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNvdXJj ZS9QbGF0Zm9ybUdUSy5jbWFrZTogVXNlIC0tdmVyc2lvbiBpbnN0ZWFkIG9mCisgICAgICAgIC0t dGFyYmFsbC1yb290IHdoZW4gcnVubmluZyBtYWtlLWRpc3QucHkuCisKIDIwMTQtMDctMTAgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIEZpeCB0 aGUgYnVpbGQgd2l0aCBWSURFTyBlbmFibGVkIGJ1dCBWSURFT19UUkFDSyBkaXNhYmxlZApkaWZm IC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1BsYXRmb3JtR1RLLmNt YWtlCmluZGV4IDc1OWEyYzkuLmRkMDIwZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybUdU Sy5jbWFrZQorKysgYi9Tb3VyY2UvUGxhdGZvcm1HVEsuY21ha2UKQEAgLTU3LDggKzU3LDcgQEAg aWYgKEVOQUJMRV9XRUJLSVQyKQogICAgICAgICBDT01NQU5EICR7VE9PTFNfRElSfS9ndGsvbWFr ZS1kaXN0LnB5CiAgICAgICAgICAgICAgICAgLS1zb3VyY2UtZGlyPSR7Q01BS0VfU09VUkNFX0RJ Un0KICAgICAgICAgICAgICAgICAtLWJ1aWxkLWRpcj0ke0NNQUtFX0JJTkFSWV9ESVJ9Ci0gICAg ICAgICAgICAgICAgLS10YXJiYWxsLXJvb3Q9L3dlYmtpdGd0ay0ke1BST0pFQ1RfVkVSU0lPTn0K LSAgICAgICAgICAgICAgICAtbyAke0NNQUtFX0JJTkFSWV9ESVJ9L3dlYmtpdGd0ay0ke1BST0pF Q1RfVkVSU0lPTn0udGFyCisgICAgICAgICAgICAgICAgLS12ZXJzaW9uPSR7UFJPSkVDVF9WRVJT SU9OfQogICAgICAgICAgICAgICAgICR7VE9PTFNfRElSfS9ndGsvbWFuaWZlc3QudHh0CiAgICAg KQogCkBAIC04MSw4ICs4MCw3IEBAIGlmIChFTkFCTEVfV0VCS0lUMikKICAgICAgICAgICAgICAg ICAtLWNoZWNrCiAgICAgICAgICAgICAgICAgLS1zb3VyY2UtZGlyPSR7Q01BS0VfU09VUkNFX0RJ Un0KICAgICAgICAgICAgICAgICAtLWJ1aWxkLWRpcj0ke0NNQUtFX0JJTkFSWV9ESVJ9Ci0gICAg ICAgICAgICAgICAgLS10YXJiYWxsLXJvb3Q9L3dlYmtpdGd0ay0ke1BST0pFQ1RfVkVSU0lPTn0K LSAgICAgICAgICAgICAgICAtbyAke0NNQUtFX0JJTkFSWV9ESVJ9L3dlYmtpdGd0ay0ke1BST0pF Q1RfVkVSU0lPTn0udGFyCisgICAgICAgICAgICAgICAgLS12ZXJzaW9uPS93ZWJraXRndGstJHtQ Uk9KRUNUX1ZFUlNJT059CiAgICAgICAgICAgICAgICAgJHtUT09MU19ESVJ9L2d0ay9tYW5pZmVz dC50eHQKICAgICAgICAgQ09NTUFORCB4eiAtZiAke0NNQUtFX0JJTkFSWV9ESVJ9L3dlYmtpdGd0 ay0ke1BST0pFQ1RfVkVSU0lPTn0udGFyCiAgICAgKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDlmMWZjOWUuLjYyOTA1MzEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAor MjAxNC0wNy0xMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisK KyAgICAgICAgW0dUS10gU2ltcGxpZnkgbWFrZS1kaXN0IGNvbW1hbmQgbGluZSBhcmd1bWVudHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDgzMgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSAt LXRhcmJhbGwtcm9vdCBhbmQgLW8gY29tbWFuZCBsaW5lIG9wdGlvbnMgYW5kIGFkZAorICAgICAg ICAtLXZlcnNpb24sIHNpbmNlIHRoZSB2ZXJzaW9uIGNhbiBiZSB1c2VkIHRvIGJ1aWxkIGJvdGgs IHRoZQorICAgICAgICB0YXJiYWxsIHJvb3QgYW5kIHRoZSBvdXRwdXQgZmlsZW5hbWUuIFdoZW4g dGhlIHZlcnNpb24gaXQncyBub3QKKyAgICAgICAgcHJvdmlkZWQsIHRoZSBwa2ctY29uZmlnIGZp bGUgaXMgdXNlZCB0byBnZXQgdGhlIHZlcnNpb24uIEFsc28KKyAgICAgICAgY2hhbmdlIHRoZSBk ZWZhdWx0IHZhbHVlIG9mIGJ1aWxkLWRpciB0byB0aGUgY3VycmVudCBkaXJlY3RvcnksCisgICAg ICAgIHNpbmNlIGl0J3MgdmVyeSBjb21tb24gdG8gY2FsbCBtYWtlLWRpc3QucHkgZnJvbSB0aGUg YnVpbGQgZGlyLgorCisgICAgICAgICogZ3RrL21ha2UtZGlzdC5weToKKyAgICAgICAgKGdldF90 YXJiYWxsX3Jvb3RfYW5kX291dHB1dF9maWxlbmFtZV9mcm9tX2FyZ3VtZW50cyk6CisKIDIwMTQt MDctMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHVEtdIERvIG5vdCBpbmNsdWRlIGZpbGVzIHRoYXQgYXJlIG5vdCBpbiBnaXQgaW4gdGhl IHRhcmJhbGwKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9tYWtlLWRpc3QucHkgYi9Ub29scy9ndGsv bWFrZS1kaXN0LnB5CmluZGV4IGJiZjIyYzIuLmVkMDVjZTQgMTAwNzU1Ci0tLSBhL1Rvb2xzL2d0 ay9tYWtlLWRpc3QucHkKKysrIGIvVG9vbHMvZ3RrL21ha2UtZGlzdC5weQpAQCAtMjkwLDE5ICsy OTAsMzMgQEAgaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgICAgICAgZGVmIF9fY2FsbF9f KHNlbGYsIHBhcnNlciwgbmFtZXNwYWNlLCB2YWx1ZXMsIG9wdGlvbl9zdHJpbmc9Tm9uZSk6CiAg ICAgICAgICAgICBzZXRhdHRyKG5hbWVzcGFjZSwgc2VsZi5kZXN0LCBvcy5wYXRoLmFic3BhdGgo dmFsdWVzKSkKIAorICAgIGRlZiBnZXRfdGFyYmFsbF9yb290X2FuZF9vdXRwdXRfZmlsZW5hbWVf ZnJvbV9hcmd1bWVudHMoYXJndW1lbnRzKToKKyAgICAgICAgdGFyYmFsbF9yb290ID0gIndlYmtp dGd0ayIKKyAgICAgICAgaWYgYXJndW1lbnRzLnZlcnNpb24gaXMgbm90IE5vbmU6CisgICAgICAg ICAgICB0YXJiYWxsX3Jvb3QgKz0gJy0nICsgYXJndW1lbnRzLnZlcnNpb24KKyAgICAgICAgZWxz ZToKKyAgICAgICAgICAgIHBrZ2NvbmZpZ19maWxlID0gb3MucGF0aC5qb2luKGFyZ3VtZW50cy5i dWlsZF9kaXIsICJTb3VyY2UvV2ViS2l0Mi93ZWJraXQyZ3RrLTMuMC5wYyIpCisgICAgICAgICAg ICBpZiBvcy5wYXRoLmlzZmlsZShwa2djb25maWdfZmlsZSk6CisgICAgICAgICAgICAgICAgcCA9 IHN1YnByb2Nlc3MuUG9wZW4oWydwa2ctY29uZmlnJywgJy0tbW9kdmVyc2lvbicsIHBrZ2NvbmZp Z19maWxlXSwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkKKyAgICAgICAgICAgICAgICB2ZXJzaW9u ID0gcC5jb21tdW5pY2F0ZSgpWzBdCisgICAgICAgICAgICAgICAgaWYgdmVyc2lvbjoKKyAgICAg ICAgICAgICAgICAgICAgdGFyYmFsbF9yb290ICs9ICctJyArIHZlcnNpb24ucnN0cmlwKCdcbicp CisKKyAgICAgICAgb3V0cHV0X2ZpbGVuYW1lID0gb3MucGF0aC5qb2luKGFyZ3VtZW50cy5idWls ZF9kaXIsIHRhcmJhbGxfcm9vdCArICIudGFyIikKKworICAgICAgICByZXR1cm4gdGFyYmFsbF9y b290LCBvdXRwdXRfZmlsZW5hbWUKKwogICAgIHBhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFy c2VyKGRlc2NyaXB0aW9uPSdCdWlsZCBhIGRpc3RyaWJ1dGlvbiBidW5kbGUuJykKICAgICBwYXJz ZXIuYWRkX2FyZ3VtZW50KCctYycsICctLWNoZWNrJywgYWN0aW9uPSdzdG9yZV90cnVlJywKICAg ICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J0NoZWNrIHRoZSB0YXJiYWxsJykKICAgICBwYXJz ZXIuYWRkX2FyZ3VtZW50KCctcycsICctLXNvdXJjZS1kaXInLCB0eXBlPXN0ciwgYWN0aW9uPUZp bGVQYXRoQWN0aW9uLCBkZWZhdWx0PW9zLmdldGN3ZCgpLAogICAgICAgICAgICAgICAgICAgICAg ICAgaGVscD0nVGhlIHRvcC1sZXZlbCBkaXJlY3Rvcnkgb2YgdGhlIHNvdXJjZSBkaXN0cmlidXRp b24uICcgKyBcCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnRGlyZWN0b3J5IGZvciBy ZWxhdGl2ZSBwYXRocy4gRGVmYXVsdHMgdG8gY3VycmVudCBkaXJlY3RvcnkuJykKLSAgICBwYXJz ZXIuYWRkX2FyZ3VtZW50KCctLXRhcmJhbGwtcm9vdCcsIHR5cGU9c3RyLCBkZWZhdWx0PScvJywK LSAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J1RoZSB0b3AtbGV2ZWwgcGF0aCBvZiB0aGUg dGFyYmFsbC4gQnkgZGVmYXVsdCBmaWxlcyBhcmUgYWRkZWQgdG8gdGhlIHJvb3Qgb2YgdGhlIHRh cmJhbGwuJykKLSAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctYicsICctLWJ1aWxkLWRpcicsIHR5 cGU9c3RyLCBhY3Rpb249RmlsZVBhdGhBY3Rpb24sIGRlZmF1bHQ9Tm9uZSwKKyAgICBwYXJzZXIu YWRkX2FyZ3VtZW50KCctLXZlcnNpb24nLCB0eXBlPXN0ciwgZGVmYXVsdD1Ob25lLAorICAgICAg ICAgICAgICAgICAgICAgICAgaGVscD0nVGhlIHZlcnNpb24gb2YgdGhlIHRhcmJhbGwgdG8gZ2Vu ZXJhdGUnKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy1iJywgJy0tYnVpbGQtZGlyJywgdHlw ZT1zdHIsIGFjdGlvbj1GaWxlUGF0aEFjdGlvbiwgZGVmYXVsdD1vcy5nZXRjd2QoKSwKICAgICAg ICAgICAgICAgICAgICAgICAgIGhlbHA9J1RoZSB0b3AtbGV2ZWwgcGF0aCBvZiBkaXJlY3Rvcnkg b2YgdGhlIGJ1aWxkIHJvb3QuICcgKyBcCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn QnkgZGVmYXVsdCB0aGVyZSBpcyBubyBidWlsZCByb290LicpCi0gICAgcGFyc2VyLmFkZF9hcmd1 bWVudCgnLW8nLCB0eXBlPXN0ciwgYWN0aW9uPUZpbGVQYXRoQWN0aW9uLCBkZWZhdWx0PSdvdXQu dGFyJywgZGVzdD0ib3V0cHV0X2ZpbGVuYW1lIiwKLSAgICAgICAgICAgICAgICAgICAgICAgIGhl bHA9J1RoZSB0YXJmaWxlIHRvIHByb2R1Y2UuIEJ5IGRlZmF1bHQgdGhpcyBpcyAib3V0LnRhciIn KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ0J5IGRlZmF1bHQgaXMgdGhlIGN1cnJl bnQgZGlyZWN0b3J5LicpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnbWFuaWZlc3RfZmlsZW5h bWUnLCBtZXRhdmFyPSJtYW5pZmVzdCIsIHR5cGU9c3RyLCBhY3Rpb249RmlsZVBhdGhBY3Rpb24s IGhlbHA9J1RoZSBwYXRoIHRvIHRoZSBtYW5pZmVzdCBmaWxlLicpCiAKICAgICBhcmd1bWVudHMg PSBwYXJzZXIucGFyc2VfYXJncygpCkBAIC0zMTIsOCArMzI2LDEwIEBAIGlmIF9fbmFtZV9fID09 ICJfX21haW5fXyI6CiAgICAgIyB0byBiZSB0aGUgc291cmNlIGRpcmVjdG9yeS4KICAgICBvcy5j aGRpcihhcmd1bWVudHMuc291cmNlX2RpcikKIAotICAgIG1hbmlmZXN0ID0gTWFuaWZlc3QoYXJn dW1lbnRzLm1hbmlmZXN0X2ZpbGVuYW1lLCBhcmd1bWVudHMuc291cmNlX2RpciwgYXJndW1lbnRz LmJ1aWxkX2RpciwgYXJndW1lbnRzLnRhcmJhbGxfcm9vdCkKLSAgICBtYW5pZmVzdC5jcmVhdGVf dGFyZmlsZShhcmd1bWVudHMub3V0cHV0X2ZpbGVuYW1lKQorICAgIHRhcmJhbGxfcm9vdCwgb3V0 cHV0X2ZpbGVuYW1lID0gZ2V0X3RhcmJhbGxfcm9vdF9hbmRfb3V0cHV0X2ZpbGVuYW1lX2Zyb21f YXJndW1lbnRzKGFyZ3VtZW50cykKKworICAgIG1hbmlmZXN0ID0gTWFuaWZlc3QoYXJndW1lbnRz Lm1hbmlmZXN0X2ZpbGVuYW1lLCBhcmd1bWVudHMuc291cmNlX2RpciwgYXJndW1lbnRzLmJ1aWxk X2RpciwgdGFyYmFsbF9yb290KQorICAgIG1hbmlmZXN0LmNyZWF0ZV90YXJmaWxlKG91dHB1dF9m aWxlbmFtZSkKIAogICAgIGlmIGFyZ3VtZW50cy5jaGVjazoKLSAgICAgICAgRGlzdGNoZWNrKGFy Z3VtZW50cy5zb3VyY2VfZGlyLCBhcmd1bWVudHMuYnVpbGRfZGlyKS5jaGVjayhhcmd1bWVudHMu b3V0cHV0X2ZpbGVuYW1lKQorICAgICAgICBEaXN0Y2hlY2soYXJndW1lbnRzLnNvdXJjZV9kaXIs IGFyZ3VtZW50cy5idWlsZF9kaXIpLmNoZWNrKG91dHB1dF9maWxlbmFtZSkK