83001 2012-04-02 23:33:53 -0700 Introduce another file-to-array script 2012-04-03 02:33:07 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 53961 83011 1 tkent tkent haraken morrita oldest_to_newest 594227 0 tkent 2012-04-02 23:33:53 -0700 Introduce another file-to-array script 594233 1 135280 tkent 2012-04-02 23:43:48 -0700 Created attachment 135280 Patch 594236 2 tkent 2012-04-02 23:45:00 -0700 This will be used in Bug 53961. A WIP patch in Bug 53961 demonstrates how to use this. 594244 3 135280 haraken 2012-04-02 23:59:38 -0700 Comment on attachment 135280 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135280&action=review > Source/WebCore/ChangeLog:12 > + - No whitespace stripping for CSS files Maybe we want to support an option to strip whitespaces in make-file-arrays.py, and then remove make-css-file-arrays.pl (in another patch). > Source/WebCore/make-file-arrays.py:30 > +# Usage: make-file-arrays.py [--condition=condition-string] --out-h=<header-file-name> --out-cpp=<cpp-file-name> <input-file>... Nit: [--condition=conditional-flag-name] might be descriptive. > Source/WebCore/make-file-arrays.py:39 > + result = re.match(r"(\w+)\.(\w+)", os.path.basename(file_name)) r"([\w\d_]+)\.([\w\d_]+))" might be better? 594248 4 tkent 2012-04-03 00:03:43 -0700 (In reply to comment #3) > (From update of attachment 135280 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=135280&action=review > > > Source/WebCore/ChangeLog:12 > > + - No whitespace stripping for CSS files > > Maybe we want to support an option to strip whitespaces in make-file-arrays.py, and then remove make-css-file-arrays.pl (in another patch). Yes. I'd like to integrate make-css-file-arrays.pl and xxd.pl into this in the future. > > Source/WebCore/make-file-arrays.py:30 > > +# Usage: make-file-arrays.py [--condition=condition-string] --out-h=<header-file-name> --out-cpp=<cpp-file-name> <input-file>... > > Nit: [--condition=conditional-flag-name] might be descriptive. We can specify this flag like --condition="ENABLE(CALENDAR_PICKER) && ENABLE(PAGE_POPUP)". So, this isn't a name. > > Source/WebCore/make-file-arrays.py:39 > > + result = re.match(r"(\w+)\.(\w+)", os.path.basename(file_name)) > > r"([\w\d_]+)\.([\w\d_]+))" might be better? Looks nice. I'll apply it. 594252 5 tkent 2012-04-03 00:15:11 -0700 Committed r112988: <http://trac.webkit.org/changeset/112988> 135280 2012-04-02 23:43:48 -0700 2012-04-02 23:59:38 -0700 Patch bug-83001-20120403154346.patch text/plain 5377 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyOTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWZkMjFkMjQxNmE0ZDRj NmU5NTNiMGQ5OWQ5NzgzZDFmNDljNjNjZC4uZGVmOTMwZDgzN2I4ODViOThjNzAxZDZlZTQyMjJh MTNmNDMxZmQyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA0LTAyICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbnRyb2R1Y2UgYW5vdGhl ciBmaWxlLXRvLWFycmF5IHNjcmlwdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODMwMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBtYWtlLWZpbGUtYXJyYXlzLnB5IGlzIGEgc2NyaXB0IHRvIGNvbnZlcnQg YSBiaW5hcnkgZmlsZSB0byBhIEMrKworICAgICAgICBjaGFyIGFycmF5LiBUaGUgZGlmZmVyZW5j ZXMgZnJvbSBjc3MvbWFrZS1jc3MtZmlsZS1hcnJheXMucGwgYW5kCisgICAgICAgIGluc3BlY3Rv ci94eGQucGwgYXJlOgorICAgICAgICAKKyAgICAgICAgLSBObyB3aGl0ZXNwYWNlIHN0cmlwcGlu ZyBmb3IgQ1NTIGZpbGVzCisgICAgICAgIC0gV2UgY2FuIG1ha2UgY29uZGl0aW9uYWwgYXJyYXlz LgorICAgICAgICBlLmcuIEFuIGFycmF5IGVuY2xvc2VkIHdpdGggI2lmIEVOQUJMRSguLi4pIC0g I2VuZGlmLgorCisgICAgICAgIFRoaXMgc2NyaXB0IHdpbGwgYmUgdXNlZCB0byBpbXBsZW1lbnQg YSBjYWxlbmRhciBwaWNrZXIgZm9yIDxpbnB1dAorICAgICAgICB0eXBlPWRhdGU+LgorCisgICAg ICAgICogbWFrZS1maWxlLWFycmF5cy5weTogQWRkZWQuCisKIDIwMTItMDQtMDIgIERhbmEgSmFu c2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUg U2tDYW52YXM6OkxheWVySXRlciB1c2UgZnJvbSBPcGFxdWVSZWdpb25Ta2lhCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9tYWtlLWZpbGUtYXJyYXlzLnB5IGIvU291cmNlL1dlYkNvcmUvbWFr ZS1maWxlLWFycmF5cy5weQpuZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zZjdmOTBiMGMxNjU1ZTMwOWU2NWNhMWE2NTIz MjdlYTFhZjVmMTNmCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvbWFrZS1maWxl LWFycmF5cy5weQpAQCAtMCwwICsxLDk5IEBACisjIS91c3IvYmluL2VudiBweXRob24KKyMgQ29w eXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29y IG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAg ICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMK KyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0 cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdy aXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUg Q09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQ UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVE IFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVT UyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X RVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElH RU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgorCisjIFVzYWdlOiBtYWtlLWZpbGUtYXJyYXlzLnB5IFstLWNvbmRpdGlvbj1j b25kaXRpb24tc3RyaW5nXSAtLW91dC1oPTxoZWFkZXItZmlsZS1uYW1lPiAtLW91dC1jcHA9PGNw cC1maWxlLW5hbWU+IDxpbnB1dC1maWxlPi4uLgorCitpbXBvcnQgb3MucGF0aAoraW1wb3J0IHJl CitpbXBvcnQgc3lzCitmcm9tIG9wdHBhcnNlIGltcG9ydCBPcHRpb25QYXJzZXIKKworCitkZWYg bWFrZV92YXJpYWJsZV9uYW1lX2FuZF9yZWFkKGZpbGVfbmFtZSk6CisgICAgcmVzdWx0ID0gcmUu bWF0Y2gociIoXHcrKVwuKFx3KykiLCBvcy5wYXRoLmJhc2VuYW1lKGZpbGVfbmFtZSkpCisgICAg aWYgbm90IHJlc3VsdDoKKyAgICAgICAgcHJpbnQgIkludmFsaWQgaW5wdXQgZmlsZSBuYW1lOiIs IG9zLnBhdGguYmFzZW5hbWUoZmlsZV9uYW1lKQorICAgICAgICBzeXMuZXhpdCgxKQorICAgIHZh cmlhYmxlX25hbWUgPSByZXN1bHQuZ3JvdXAoMSlbMF0ubG93ZXIoKSArIHJlc3VsdC5ncm91cCgx KVsxOl0gKyByZXN1bHQuZ3JvdXAoMikuY2FwaXRhbGl6ZSgpCisgICAgZmlsZSA9IG9wZW4oZmls ZV9uYW1lLCAicmIiKQorICAgIGNvbnRlbnQgPSBmaWxlLnJlYWQoKQorICAgIGZpbGUuY2xvc2Uo KQorICAgIHJldHVybiAodmFyaWFibGVfbmFtZSwgY29udGVudCkKKworCitkZWYgbWFpbigpOgor ICAgIHBhcnNlciA9IE9wdGlvblBhcnNlcigpCisgICAgcGFyc2VyLmFkZF9vcHRpb24oIi0tb3V0 LWgiLCBkZXN0PSJvdXRfaGVhZGVyIikKKyAgICBwYXJzZXIuYWRkX29wdGlvbigiLS1vdXQtY3Bw IiwgZGVzdD0ib3V0X2NwcCIpCisgICAgcGFyc2VyLmFkZF9vcHRpb24oIi0tY29uZGl0aW9uIiwg ZGVzdD0iZmxhZyIpCisgICAgKG9wdGlvbnMsIGFyZ3MpID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQor ICAgIGlmIGxlbihhcmdzKSA8IDE6CisgICAgICAgIHBhcnNlci5lcnJvcigiTmVlZCBvbmUgb3Ig bW9yZSBpbnB1dCBmaWxlcyIpCisgICAgaWYgbm90IG9wdGlvbnMub3V0X2hlYWRlcjoKKyAgICAg ICAgcGFyc2VyLmVycm9yKCJOZWVkIHRvIHNwZWNpZnkgLS1vdXQtaD1maWxlbmFtZSIpCisgICAg aWYgbm90IG9wdGlvbnMub3V0X2NwcDoKKyAgICAgICAgcGFyc2VyLmVycm9yKCJOZWVkIHRvIHNw ZWNpZnkgLS1vdXQtY3BwPWZpbGVuYW1lIikKKworICAgIGhlYWRlcl9maWxlID0gb3BlbihvcHRp b25zLm91dF9oZWFkZXIsICJ3IikKKyAgICBpZiBvcHRpb25zLmZsYWc6CisgICAgICAgIGhlYWRl cl9maWxlLndyaXRlKCIjaWYgIiArIG9wdGlvbnMuZmxhZyArICJcbiIpCisgICAgaGVhZGVyX2Zp bGUud3JpdGUoIm5hbWVzcGFjZSBXZWJDb3JlIHtcbiIpCisKKyAgICBjcHBfZmlsZSA9IG9wZW4o b3B0aW9ucy5vdXRfY3BwLCAidyIpCisgICAgY3BwX2ZpbGUud3JpdGUoIiNpbmNsdWRlIFwiY29u ZmlnLmhcIlxuIikKKyAgICBjcHBfZmlsZS53cml0ZSgiI2luY2x1ZGUgXCIiICsgb3MucGF0aC5i YXNlbmFtZShvcHRpb25zLm91dF9oZWFkZXIpICsgIlwiXG4iKQorICAgIGlmIG9wdGlvbnMuZmxh ZzoKKyAgICAgICAgY3BwX2ZpbGUud3JpdGUoIiNpZiAiICsgb3B0aW9ucy5mbGFnICsgIlxuIikK KyAgICBjcHBfZmlsZS53cml0ZSgibmFtZXNwYWNlIFdlYkNvcmUge1xuIikKKworICAgIGZvciBm aWxlX25hbWUgaW4gYXJnczoKKyAgICAgICAgKHZhcmlhYmxlX25hbWUsIGNvbnRlbnQpID0gbWFr ZV92YXJpYWJsZV9uYW1lX2FuZF9yZWFkKGZpbGVfbmFtZSkKKyAgICAgICAgc2l6ZSA9IGxlbihj b250ZW50KQorICAgICAgICBoZWFkZXJfZmlsZS53cml0ZSgiZXh0ZXJuIGNvbnN0IGNoYXIgJXNb JWRdO1xuIiAlICh2YXJpYWJsZV9uYW1lLCBzaXplKSkKKyAgICAgICAgY3BwX2ZpbGUud3JpdGUo ImNvbnN0IGNoYXIgJXNbJWRdID0ge1xuIiAlICh2YXJpYWJsZV9uYW1lLCBzaXplKSkKKyAgICAg ICAgZm9yIGluZGV4IGluIHJhbmdlKHNpemUpOgorICAgICAgICAgICAgY3BwX2ZpbGUud3JpdGUo IiVkIiAlIG9yZChjb250ZW50W2luZGV4XSkpCisgICAgICAgICAgICBjcHBfZmlsZS53cml0ZSgi LCIgaWYgaW5kZXggIT0gbGVuKGNvbnRlbnQpIC0gMSBlbHNlICJ9O1xuIikKKyAgICAgICAgICAg IGlmIGluZGV4ICUgMjAgPT0gMTk6CisgICAgICAgICAgICAgICAgY3BwX2ZpbGUud3JpdGUoIlxu IikKKyAgICAgICAgY3BwX2ZpbGUud3JpdGUoIlxuIikKKworICAgIGhlYWRlcl9maWxlLndyaXRl KCJ9XG4iKQorICAgIGlmIG9wdGlvbnMuZmxhZzoKKyAgICAgICAgaGVhZGVyX2ZpbGUud3JpdGUo IiNlbmRpZlxuIikKKyAgICBoZWFkZXJfZmlsZS5jbG9zZSgpCisKKyAgICBjcHBfZmlsZS53cml0 ZSgifVxuIikKKyAgICBpZiBvcHRpb25zLmZsYWc6CisgICAgICAgIGNwcF9maWxlLndyaXRlKCIj ZW5kaWZcbiIpCisgICAgY3BwX2ZpbGUuY2xvc2UoKQorCisKK2lmIF9fbmFtZV9fID09ICJfX21h aW5fXyI6CisgICAgbWFpbigpCg==