25612 2009-05-07 01:50:53 -0700 Add support for feature conditionals in the generated JSC bindings code 2009-05-25 05:39:25 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hausmann webkit-unassigned laszlo.gombos sam oldest_to_newest 120253 0 hausmann 2009-05-07 01:50:53 -0700 Currently features in IDL files are configured through preprocessor macros. The patches attached to this bug report add support for moving these #ifdefs into the generated code, making the generated code independent from the features are code generation time. 120254 1 30093 hausmann 2009-05-07 01:52:20 -0700 Created attachment 30093 Patch for moving feature #ifdefs into generated JSC bindings code This patch adds support for the conditional attribute for IDL attributes, which places feature #ifdefs into the generated code, replacing #ifdefs in the IDL files. 120255 2 30094 hausmann 2009-05-07 01:53:29 -0700 Created attachment 30094 Patch to add support for feature #ifdefs in the genertaed tag factory code This patch allows moving #ifdefs in the tagnames.in files into the generated tag factory code. 120256 3 30094 hausmann 2009-05-07 02:02:24 -0700 Comment on attachment 30094 Patch to add support for feature #ifdefs in the genertaed tag factory code Clearing review, this patch doesn't work entirely anymore. Will update soon. 122518 4 mjs 2009-05-21 20:06:08 -0700 It might be good for Sam to look at this. Sounds like a good idea. 122523 5 eric 2009-05-21 20:21:46 -0700 Won't we still end up re-generating the code every time you change FEATURE_DEFINES? We'll certainly do a full recompile (at least in xcode/gcc land), so this savings seems minimal. It's not necessarily a bad idea though. 122674 6 hausmann 2009-05-22 08:50:22 -0700 (In reply to comment #5) > Won't we still end up re-generating the code every time you change > FEATURE_DEFINES? We'll certainly do a full recompile (at least in xcode/gcc > land), so this savings seems minimal. It's not necessarily a bad idea though. Yes, that is currently the case. However my long term goal is to have generated files that can be used with different configurations without the need to re-generate them. The generation can take a long time on older platforms :). We're _almost_ there with the existing #ifdef's that exist for example for the SVG files. AFAICS it's just a few IDL files that need tweaking :) 122786 7 30093 mjs 2009-05-22 21:31:47 -0700 Comment on attachment 30093 Patch for moving feature #ifdefs into generated JSC bindings code Looks good. 122963 8 30093 hausmann 2009-05-24 11:11:37 -0700 Comment on attachment 30093 Patch for moving feature #ifdefs into generated JSC bindings code Thanks for the review, landed this one in r44116. Keeping the bug open though because of the pending tags patch. 122964 9 30631 hausmann 2009-05-24 11:17:06 -0700 Created attachment 30631 Patch to add support for feature #ifdefs in the genertaed tag factory code (take 2) 122973 10 laszlo.gombos 2009-05-24 12:41:30 -0700 (In reply to comment #8) > (From update of attachment 30093 [review]) > Thanks for the review, landed this one in r44116. Keeping the bug open though > because of the pending tags patch. > JSDOMWindow.cpp fails to build for me, when VIDEO is off after changeset 44116. generated/release/JSDOMWindow.cpp:91:32: error: JSHTMLAudioElement.h: No such file or directory generated/release/JSDOMWindow.cpp:125:32: error: JSHTMLMediaElement.h: No such file or directory generated/release/JSDOMWindow.cpp:149:32: error: JSHTMLVideoElement.h: No such file or directory generated/release/JSDOMWindow.cpp:151:26: error: JSMediaError.h: No such file or directory #include's might need guards as well. 123034 11 hausmann 2009-05-25 05:36:35 -0700 (In reply to comment #10) > (In reply to comment #8) > > (From update of attachment 30093 [review] [review]) > > Thanks for the review, landed this one in r44116. Keeping the bug open though > > because of the pending tags patch. > > > > JSDOMWindow.cpp fails to build for me, when VIDEO is off after changeset 44116. > > generated/release/JSDOMWindow.cpp:91:32: error: JSHTMLAudioElement.h: No such > file or directory > generated/release/JSDOMWindow.cpp:125:32: error: JSHTMLMediaElement.h: No such > file or directory > generated/release/JSDOMWindow.cpp:149:32: error: JSHTMLVideoElement.h: No such > file or directory > generated/release/JSDOMWindow.cpp:151:26: error: JSMediaError.h: No such file > or directory > > #include's might need guards as well. > Well spotted, fixed in r44126. 123035 12 hausmann 2009-05-25 05:39:25 -0700 Landed in r44128 30093 2009-05-07 01:52:20 -0700 2009-05-24 11:11:37 -0700 Patch for moving feature #ifdefs into generated JSC bindings code 0001-jscodegen.patch text/plain 6740 hausmann RnJvbSBjMTZmZGRmYzAxNGJlYWMzMGNhZTAwOTJmNWYyZTViNjMyZTgxNDM5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTaW1vbiBIYXVzbWFubiA8c2ltb24uaGF1c21hbm5Abm9raWEu Y29tPgpEYXRlOiBXZWQsIDYgTWF5IDIwMDkgMTA6NTg6MTYgKzAyMDAKU3ViamVjdDogW1BBVENI IDEvMl0gMjAwOS0wNS0wNyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5j b20+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBBZGQgc3Vw cG9ydCBjb25kaXRpb25hbHMgaW4gdGhlIEpTQyBiaW5kaW5ncyBnZW5lcmF0b3IgY29kZSBmb3Ig YXR0cmlidXRlcywKICAgICAgICBieSBwbGFjaW5nIGZlYXR1cmUgI2lmZGVmcyBhcm91bmQgdGhl IHNldHRlcnMvZ2V0dGVycy4KCiAgICAgICAgTWFkZSB0aGUgYXVkaW8gYW5kIHZpZGVvIGVsZW1l bnQgc3BlY2lmaWMgRE9NIGF0dHJpYnV0ZXMgY29uZGl0aW9uYWwKICAgICAgICBpbiB0aGUgZ2Vu ZXJhdGVkIGNvZGUsIGJ5IG1vdmluZyB0aGUgI2lmZGVmcyBmcm9tIHRoZSBJREwgZmlsZXMgaW50 bwogICAgICAgIHRoZSBnZW5lcmF0ZWQgY29kZS4gVGhpcyBhbGxvd3MgZm9yIHJlLXVzaW5nIHRo ZSBzYW1lIGdlbmVyYXRlZCBjb2RlCiAgICAgICAgd2l0aCBvciB3aXRob3V0IEVOQUJMRShWSURF TykuCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MTUgKysrKysrKysrKysKIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG0gfCAgIDM2ICsrKysrKysrKysrKysrKysrKysrKysrKystCiBXZWJDb3JlL3BhZ2UvRE9NV2lu ZG93LmlkbCAgICAgICAgICAgICAgICAgIHwgICAxMiArKystLS0tLQogMyBmaWxlcyBjaGFuZ2Vk LCA1NCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUv Q2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTc3MTBiZC4uYjNmMGY4MyAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAwOS0wNS0wNyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBu b2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIHN1cHBvcnQgY29uZGl0aW9uYWxzIGluIHRoZSBKU0MgYmluZGluZ3MgZ2VuZXJhdG9y IGNvZGUgZm9yIGF0dHJpYnV0ZXMsCisgICAgICAgIGJ5IHBsYWNpbmcgZmVhdHVyZSAjaWZkZWZz IGFyb3VuZCB0aGUgc2V0dGVycy9nZXR0ZXJzLgorCisgICAgICAgIE1hZGUgdGhlIGF1ZGlvIGFu ZCB2aWRlbyBlbGVtZW50IHNwZWNpZmljIERPTSBhdHRyaWJ1dGVzIGNvbmRpdGlvbmFsCisgICAg ICAgIGluIHRoZSBnZW5lcmF0ZWQgY29kZSwgYnkgbW92aW5nIHRoZSAjaWZkZWZzIGZyb20gdGhl IElETCBmaWxlcyBpbnRvCisgICAgICAgIHRoZSBnZW5lcmF0ZWQgY29kZS4gVGhpcyBhbGxvd3Mg Zm9yIHJlLXVzaW5nIHRoZSBzYW1lIGdlbmVyYXRlZCBjb2RlCisgICAgICAgIHdpdGggb3Igd2l0 aG91dCBFTkFCTEUoVklERU8pLgorCisgICAgICAgICogcGFnZS9ET01XaW5kb3cuaWRsOgorICAg ICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOgorCiAyMDA5LTA1LTA3 ICBBZGFtIExhbmdsZXkgIDxhZ2xAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBF cmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2Vu ZXJhdG9ySlMucG0gYi9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt CmluZGV4IGQ2Y2VlMDIuLjgxYTJkM2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0Nv ZGVHZW5lcmF0b3JKUy5wbQpAQCAtNzgyLDYgKzc4Miw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVu dGF0aW9uCiAgICAgICAgIG15IEBoYXNoU3BlY2lhbHMgPSAoKTsKICAgICAgICAgbXkgQGhhc2hW YWx1ZTEgPSAoKTsKICAgICAgICAgbXkgQGhhc2hWYWx1ZTIgPSAoKTsKKyAgICAgICAgbXkgJWNv bmRpdGlvbmFscyA9ICgpOwogCiAgICAgICAgIG15IEBlbnRyaWVzID0gKCk7CiAKQEAgLTgwNSw2 ICs4MDYsMTEgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICAgICAgICBt eSAkc2V0dGVyID0gInNldEpTIiAuICRpbnRlcmZhY2VOYW1lIC4gJGNvZGVHZW5lcmF0b3ItPldL X3VjZmlyc3QoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5uYW1lKSAuICgkYXR0cmlidXRlLT5zaWdu YXR1cmUtPnR5cGUgPX4gL0NvbnN0cnVjdG9yJC8gPyAiQ29uc3RydWN0b3IiIDogIiIpOwogICAg ICAgICAgICAgICAgIHB1c2goQGhhc2hWYWx1ZTIsICRzZXR0ZXIpOwogICAgICAgICAgICAgfQor CisgICAgICAgICAgICBteSAkY29uZGl0aW9uYWwgPSAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4 dGVuZGVkQXR0cmlidXRlcy0+eyJDb25kaXRpb25hbCJ9OworICAgICAgICAgICAgaWYgKCRjb25k aXRpb25hbCkgeworICAgICAgICAgICAgICAgICRjb25kaXRpb25hbHN7JG5hbWV9ID0gJGNvbmRp dGlvbmFsOworICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAgaWYgKCRkYXRhTm9k ZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkdlbmVyYXRlQ29uc3RydWN0b3IifSkgewpAQCAtODE3 LDcgKzgyMyw4IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAKICAgICAgICAgJG9iamVj dC0+R2VuZXJhdGVIYXNoVGFibGUoJGhhc2hOYW1lLCAkaGFzaFNpemUsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFxAaGFzaEtleXMsIFxAaGFzaFNwZWNpYWxzLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcQGhhc2hWYWx1ZTEsIFxAaGFzaFZhbHVlMik7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxAaGFzaFZhbHVlMSwgXEBoYXNo VmFsdWUyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcJWNvbmRpdGlvbmFs cyk7CiAgICAgfQogCiAgICAgbXkgJG51bUNvbnN0YW50cyA9IEB7JGRhdGFOb2RlLT5jb25zdGFu dHN9OwpAQCAtMTA5Miw2ICsxMDk5LDEyIEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAg ICAgICAgICAgICAgICAgbXkgJGdldEZ1bmN0aW9uTmFtZSA9ICJqcyIgLiAkaW50ZXJmYWNlTmFt ZSAuICAkY29kZUdlbmVyYXRvci0+V0tfdWNmaXJzdCgkYXR0cmlidXRlLT5zaWduYXR1cmUtPm5h bWUpIC4gKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+dHlwZSA9fiAvQ29uc3RydWN0b3IkLyA/ICJD b25zdHJ1Y3RvciIgOiAiIik7CiAgICAgICAgICAgICAgICAgbXkgJGltcGxHZXR0ZXJGdW5jdGlv bk5hbWUgPSAkY29kZUdlbmVyYXRvci0+V0tfbGNmaXJzdCgkbmFtZSk7CiAKKyAgICAgICAgICAg ICAgICBteSAkY29uZGl0aW9uYWwgPSAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0 cmlidXRlcy0+eyJDb25kaXRpb25hbCJ9OworICAgICAgICAgICAgICAgIGlmICgkY29uZGl0aW9u YWwpIHsKKyAgICAgICAgICAgICAgICAgICAgJGNvbmRpdGlvbmFsU3RyaW5nID0gIkVOQUJMRSgi IC4gam9pbigiKSAmJiBFTkFCTEUoIiwgc3BsaXQoLyYvLCAkY29uZGl0aW9uYWwpKSAuICIpIjsK KyAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIjaWYgJHtjb25kaXRpb25h bFN0cmluZ31cbiIpOworICAgICAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50LCAiSlNWYWx1ZSAke2dldEZ1bmN0aW9uTmFtZX0oRXhlY1N0YXRlKiBleGVj LCBjb25zdCBJZGVudGlmaWVyJiwgY29uc3QgUHJvcGVydHlTbG90JiBzbG90KVxuIik7CiAgICAg ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJ7XG4iKTsKIApAQCAtMTE2Niw3ICsxMTc5 LDEzIEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgICAgICAgICAgICAgICAgICAgIHB1 c2goQGltcGxDb250ZW50LCAiICAgIHJldHVybiByZXN1bHQ7XG4iKTsKICAgICAgICAgICAgICAg ICB9CiAKLSAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIn1cblxuIik7CisgICAg ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJ9XG4iKTsKKworICAgICAgICAgICAgICAg IGlmICgkY29uZGl0aW9uYWwpIHsKKyAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRl bnQsICIjZW5kaWZcbiIpOworICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIHB1 c2goQGltcGxDb250ZW50LCAiXG4iKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYg KCRkYXRhTm9kZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkdlbmVyYXRlQ29uc3RydWN0b3IifSkg ewpAQCAtMTc3Miw2ICsxNzkxLDcgQEAgc3ViIEdlbmVyYXRlSGFzaFRhYmxlCiAgICAgbXkgJHNw ZWNpYWxzID0gc2hpZnQ7CiAgICAgbXkgJHZhbHVlMSA9IHNoaWZ0OwogICAgIG15ICR2YWx1ZTIg PSBzaGlmdDsKKyAgICBteSAkY29uZGl0aW9uYWxzID0gc2hpZnQ7CiAKICAgICAjIEdlbmVyYXRl IHNpemUgZGF0YSBmb3IgdHdvIGhhc2ggdGFibGVzCiAgICAgIyAtIFRoZSAncGVyZmVjdCcgc2l6 ZSBtYWtlcyBhIHRhYmxlIGxhcmdlIGVub3VnaCBmb3IgcGVyZmVjdCBoYXNoaW5nCkBAIC0xODU2 LDcgKzE4NzYsMTkgQEAgdGFibGVTaXplTG9vcDoKICAgICBwdXNoKEBpbXBsQ29udGVudCwgIlxu c3RhdGljIGNvbnN0IEhhc2hUYWJsZVZhbHVlICRuYW1lRW50cmllc1xbJGNvdW50XF0gPVxuXHtc biIpOwogICAgICRpID0gMDsKICAgICBmb3JlYWNoIG15ICRrZXkgKEB7JGtleXN9KSB7CisgICAg ICAgIG15ICRjb25kaXRpb25hbDsKKworICAgICAgICBpZiAoJGNvbmRpdGlvbmFscykgeworICAg ICAgICAgICAgJGNvbmRpdGlvbmFsID0gJGNvbmRpdGlvbmFscy0+eyRrZXl9OworICAgICAgICB9 CisgICAgICAgIGlmICgkY29uZGl0aW9uYWwpIHsKKyAgICAgICAgICAgIG15ICRjb25kaXRpb25h bFN0cmluZyA9ICJFTkFCTEUoIiAuIGpvaW4oIikgJiYgRU5BQkxFKCIsIHNwbGl0KC8mLywgJGNv bmRpdGlvbmFsKSkgLiAiKSI7CisgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiNpZiAk e2NvbmRpdGlvbmFsU3RyaW5nfVxuIik7CisgICAgICAgIH0KICAgICAgICAgcHVzaChAaW1wbENv bnRlbnQsICIgICAgeyBcIiRrZXlcIiwgQCRzcGVjaWFsc1skaV0sIChpbnRwdHJfdClAJHZhbHVl MVskaV0sIChpbnRwdHJfdClAJHZhbHVlMlskaV0gfSxcbiIpOworICAgICAgICBpZiAoJGNvbmRp dGlvbmFsKSB7CisgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiNlbmRpZlxuIik7Cisg ICAgICAgIH0KICAgICAgICAgKyskaTsKICAgICB9CiAgICAgcHVzaChAaW1wbENvbnRlbnQsICIg ICAgeyAwLCAwLCAwLCAwIH1cbiIpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0RPTVdpbmRv dy5pZGwgYi9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmlkbAppbmRleCA2NjUyZDMwLi5lMGNiMDll IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmlkbAorKysgYi9XZWJDb3JlL3Bh Z2UvRE9NV2luZG93LmlkbApAQCAtNDI0LDEzICs0MjQsMTEgQEAgbW9kdWxlIHdpbmRvdyB7CiAg ICAgICAgIGF0dHJpYnV0ZSBTdG9yYWdlRXZlbnRDb25zdHJ1Y3RvciBTdG9yYWdlRXZlbnQ7CiAj ZW5kaWYKIAotI2lmIEVOQUJMRV9WSURFTwotICAgICAgICBhdHRyaWJ1dGUgW0N1c3RvbUdldHRl cl0gSFRNTEF1ZGlvRWxlbWVudENvbnN0cnVjdG9yIEF1ZGlvOyAvLyBVc2FibGUgd2l0aCB0aGUg bmV3IG9wZXJhdG9yCi0gICAgICAgIGF0dHJpYnV0ZSBIVE1MQXVkaW9FbGVtZW50Q29uc3RydWN0 b3IgSFRNTEF1ZGlvRWxlbWVudDsKLSAgICAgICAgYXR0cmlidXRlIEhUTUxNZWRpYUVsZW1lbnRD b25zdHJ1Y3RvciBIVE1MTWVkaWFFbGVtZW50OwotICAgICAgICBhdHRyaWJ1dGUgSFRNTFZpZGVv RWxlbWVudENvbnN0cnVjdG9yIEhUTUxWaWRlb0VsZW1lbnQ7Ci0gICAgICAgIGF0dHJpYnV0ZSBN ZWRpYUVycm9yQ29uc3RydWN0b3IgTWVkaWFFcnJvcjsKLSNlbmRpZgorICAgICAgICBhdHRyaWJ1 dGUgW0N1c3RvbUdldHRlcixDb25kaXRpb25hbD1WSURFT10gSFRNTEF1ZGlvRWxlbWVudENvbnN0 cnVjdG9yIEF1ZGlvOyAvLyBVc2FibGUgd2l0aCB0aGUgbmV3IG9wZXJhdG9yCisgICAgICAgIGF0 dHJpYnV0ZSBbQ29uZGl0aW9uYWw9VklERU9dIEhUTUxBdWRpb0VsZW1lbnRDb25zdHJ1Y3RvciBI VE1MQXVkaW9FbGVtZW50OworICAgICAgICBhdHRyaWJ1dGUgW0NvbmRpdGlvbmFsPVZJREVPXSBI VE1MTWVkaWFFbGVtZW50Q29uc3RydWN0b3IgSFRNTE1lZGlhRWxlbWVudDsKKyAgICAgICAgYXR0 cmlidXRlIFtDb25kaXRpb25hbD1WSURFT10gSFRNTFZpZGVvRWxlbWVudENvbnN0cnVjdG9yIEhU TUxWaWRlb0VsZW1lbnQ7CisgICAgICAgIGF0dHJpYnV0ZSBbQ29uZGl0aW9uYWw9VklERU9dIE1l ZGlhRXJyb3JDb25zdHJ1Y3RvciBNZWRpYUVycm9yOwogCiAjaWYgRU5BQkxFX1hQQVRICiAgICAg ICAgIGF0dHJpYnV0ZSBYUGF0aEV2YWx1YXRvckNvbnN0cnVjdG9yIFhQYXRoRXZhbHVhdG9yOwot LSAKMS42LjMucmMzCgo= 30094 2009-05-07 01:53:29 -0700 2009-05-24 11:17:06 -0700 Patch to add support for feature #ifdefs in the genertaed tag factory code 0002-tagfactory.patch text/plain 4675 hausmann RnJvbSA2NGRjYmQ2NTdiNTIwY2UwNGY2MTU2OGY1M2M1ZWEyYWYwZTEzYTYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTaW1vbiBIYXVzbWFubiA8c2ltb24uaGF1c21hbm5Abm9raWEu Y29tPgpEYXRlOiBXZWQsIDYgTWF5IDIwMDkgMTA6NTk6MTcgKzAyMDAKU3ViamVjdDogW1BBVENI IDIvMl0gMjAwOS0wNS0wNyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5j b20+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBTdXBwb3J0 IGNvbmRpdGlvbmFscyBpbiB0aGUgdGFnIGZhY3RvcmllcywgYnkgcGxhY2luZwogICAgICAgIGZl YXR1cmUgI2lmZGVmcyBhcm91bmQgdGhlIGluZGl2aWR1YWwgZmFjdG9yeSBmdW5jdGlvbnMKICAg ICAgICBhbmQgdGhlIHJlZ2lzdHJhdGlvbi4KCiAgICAgICAgTWFkZSB0aGUgQXVkaW8gYW5kIFZp ZGVvIGVsZW1lbnRzIGNvbmRpdGlvbmFsIGluIHRoZSB0YWcgZmFjdG9yaWVzCi0tLQogV2ViQ29y ZS9DaGFuZ2VMb2cgICAgICAgICAgICB8ICAgMTMgKysrKysrKysrKysrKwogV2ViQ29yZS9kb20v bWFrZV9uYW1lcy5wbCAgICB8ICAgMjIgKysrKysrKysrKysrKysrKysrKysrLQogV2ViQ29yZS9o dG1sL0hUTUxUYWdOYW1lcy5pbiB8ICAgMTIgKysrLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQs IDM3IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUv Q2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNmMGY4My4uYTE3Y2I5OCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIs NiArMiwxOSBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAg ICAgIFN1cHBvcnQgY29uZGl0aW9uYWxzIGluIHRoZSB0YWcgZmFjdG9yaWVzLCBieSBwbGFjaW5n CisgICAgICAgIGZlYXR1cmUgI2lmZGVmcyBhcm91bmQgdGhlIGluZGl2aWR1YWwgZmFjdG9yeSBm dW5jdGlvbnMKKyAgICAgICAgYW5kIHRoZSByZWdpc3RyYXRpb24uCisKKyAgICAgICAgTWFkZSB0 aGUgQXVkaW8gYW5kIFZpZGVvIGVsZW1lbnRzIGNvbmRpdGlvbmFsIGluIHRoZSB0YWcgZmFjdG9y aWVzCisKKyAgICAgICAgKiBodG1sL0hUTUxUYWdOYW1lcy5pbjoKKyAgICAgICAgKiBkb20vbWFr ZV9uYW1lcy5wbDoKKworMjAwOS0wNS0wNyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFu bkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAg ICAgICAgQWRkIHN1cHBvcnQgY29uZGl0aW9uYWxzIGluIHRoZSBKU0MgYmluZGluZ3MgZ2VuZXJh dG9yIGNvZGUgZm9yIGF0dHJpYnV0ZXMsCiAgICAgICAgIGJ5IHBsYWNpbmcgZmVhdHVyZSAjaWZk ZWZzIGFyb3VuZCB0aGUgc2V0dGVycy9nZXR0ZXJzLgogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Rv bS9tYWtlX25hbWVzLnBsIGIvV2ViQ29yZS9kb20vbWFrZV9uYW1lcy5wbAppbmRleCBmMmE3YTc2 Li4xMTUxMWQ4IDEwMDc1NQotLS0gYS9XZWJDb3JlL2RvbS9tYWtlX25hbWVzLnBsCisrKyBiL1dl YkNvcmUvZG9tL21ha2VfbmFtZXMucGwKQEAgLTk0LDcgKzk0LDggQEAgc3ViIGluaXRpYWxpemVU YWdQcm9wZXJ0eUhhc2gKICAgICAgICAgICAgICMgQnkgZGVmYXVsdCwgdGhlIEpTSW50ZXJmYWNl TmFtZSBpcyB0aGUgc2FtZSBhcyB0aGUgaW50ZXJmYWNlTmFtZS4KICAgICAgICAgICAgICdKU0lu dGVyZmFjZU5hbWUnID0+IGRlZmF1bHRJbnRlcmZhY2VOYW1lKCRfWzBdKSwKICAgICAgICAgICAg ICdtYXBUb1RhZ05hbWUnID0+ICcnLAotICAgICAgICAgICAgJ3dyYXBwZXJPbmx5SWZNZWRpYUlz QXZhaWxhYmxlJyA9PiAwKTsKKyAgICAgICAgICAgICd3cmFwcGVyT25seUlmTWVkaWFJc0F2YWls YWJsZScgPT4gMCwKKyAgICAgICAgICAgICdjb25kaXRpb25hbCcgPT4gMCk7CiB9CiAKIHN1YiBp bml0aWFsaXplQXR0clByb3BlcnR5SGFzaApAQCAtODQ1LDYgKzg0NiwxMiBAQCBzdWIgcHJpbnRX cmFwcGVyRnVuY3Rpb25zCiAgICAgICAgIG5leHQgaWYgZGVmaW5lZCgkdGFnc1NlZW57JEpTSW50 ZXJmYWNlTmFtZX0pIHx8IHVzZXNEZWZhdWx0SlNXcmFwcGVyKCR0YWdOYW1lKTsKICAgICAgICAg JHRhZ3NTZWVueyRKU0ludGVyZmFjZU5hbWV9ID0gMTsKIAorICAgICAgICBteSAkY29uZGl0aW9u YWwgPSAkdGFnc3skdGFnTmFtZX17ImNvbmRpdGlvbmFsIn07CisgICAgICAgIGlmICgkY29uZGl0 aW9uYWwpIHsKKyAgICAgICAgICAgIG15ICRjb25kaXRpb25hbFN0cmluZyA9ICJFTkFCTEUoIiAu IGpvaW4oIikgJiYgRU5BQkxFKCIsIHNwbGl0KC8mLywgJGNvbmRpdGlvbmFsKSkgLiAiKSI7Cisg ICAgICAgICAgICBwcmludCBGICIjaWYgJHtjb25kaXRpb25hbFN0cmluZ31cblxuIjsKKyAgICAg ICAgfQorCiAgICAgICAgICMgSGFjayBmb3IgdGhlIG1lZGlhIHRhZ3MKICAgICAgICAgaWYgKCR0 YWdzeyR0YWdOYW1lfXsid3JhcHBlck9ubHlJZk1lZGlhSXNBdmFpbGFibGUifSkgewogICAgICAg ICAgICAgcHJpbnQgRiA8PEVORApAQCAtODY3LDYgKzg3NCw5IEBAIHN0YXRpYyBKU05vZGUqIGNy ZWF0ZSR7SlNJbnRlcmZhY2VOYW1lfVdyYXBwZXIoRXhlY1N0YXRlKiBleGVjLCBQYXNzUmVmUHRy PCRwYXJhCiBFTkQKIDsKICAgICAgICAgfQorICAgICAgICBpZiAoJGNvbmRpdGlvbmFsKSB7Cisg ICAgICAgICAgICBwcmludCBGICIjZW5kaWZcblxuIjsKKyAgICAgICAgfQogICAgIH0KIH0KIApA QCAtOTE5LDggKzkyOSwxOCBAQCBFTkQKICAgICAgICAgIyBEbyBub3QgYWRkIHRoZSBuYW1lIHRv IHRoZSBtYXAgaWYgaXQgZG9lcyBub3QgaGF2ZSBhIEpTIHdyYXBwZXIgY29uc3RydWN0b3Igb3Ig dXNlcyB0aGUgZGVmYXVsdCB3cmFwcGVyLgogICAgICAgICBuZXh0IGlmIHVzZXNEZWZhdWx0SlNX cmFwcGVyKCR0YWcsIFwldGFncyk7CiAKKyAgICAgICAgbXkgJGNvbmRpdGlvbmFsID0gJHRhZ3N7 JHRhZ317ImNvbmRpdGlvbmFsIn07CisgICAgICAgIGlmICgkY29uZGl0aW9uYWwpIHsKKyAgICAg ICAgICAgIG15ICRjb25kaXRpb25hbFN0cmluZyA9ICJFTkFCTEUoIiAuIGpvaW4oIikgJiYgRU5B QkxFKCIsIHNwbGl0KC8mLywgJGNvbmRpdGlvbmFsKSkgLiAiKSI7CisgICAgICAgICAgICBwcmlu dCBGICIjaWYgJHtjb25kaXRpb25hbFN0cmluZ31cbiI7CisgICAgICAgIH0KKwogICAgICAgICBt eSAkdWNUYWcgPSAkdGFnc3skdGFnfXsiSlNJbnRlcmZhY2VOYW1lIn07CiAgICAgICAgIHByaW50 IEYgIiAgICAgICBtYXAuc2V0KCR7dGFnfVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksIGNyZWF0ZSR7 dWNUYWd9V3JhcHBlcik7XG4iOworCisgICAgICAgIGlmICgkY29uZGl0aW9uYWwpIHsKKyAgICAg ICAgICAgIHByaW50IEYgIiNlbmRpZlxuIjsKKyAgICAgICAgfQogICAgIH0KIAogICAgIHByaW50 IEYgPDxFTkQKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVGFnTmFtZXMuaW4gYi9XZWJD b3JlL2h0bWwvSFRNTFRhZ05hbWVzLmluCmluZGV4IGVmOGYzOTYuLjAwMmNhMDkgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaHRtbC9IVE1MVGFnTmFtZXMuaW4KKysrIGIvV2ViQ29yZS9odG1sL0hUTUxU YWdOYW1lcy5pbgpAQCAtOCw5ICs4LDcgQEAgYWNyb255bSBpbnRlcmZhY2VOYW1lPUhUTUxFbGVt ZW50CiBhZGRyZXNzIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGFwcGxldAogYXJlYQotI2lm IEVOQUJMRV9WSURFTwotYXVkaW8gd3JhcHBlck9ubHlJZk1lZGlhSXNBdmFpbGFibGUKLSNlbmRp ZgorYXVkaW8gd3JhcHBlck9ubHlJZk1lZGlhSXNBdmFpbGFibGUsY29uZGl0aW9uYWw9VklERU8K IGIgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogYmFzZQogYmFzZWZvbnQgaW50ZXJmYWNlTmFt ZT1IVE1MQmFzZUZvbnRFbGVtZW50CkBAIC04OCw5ICs4Niw3IEBAIHNhbXAgaW50ZXJmYWNlTmFt ZT1IVE1MRWxlbWVudAogc2NyaXB0IGNvbnN0cnVjdG9yTmVlZHNDcmVhdGVkQnlQYXJzZXIKIHNl bGVjdCBjb25zdHJ1Y3Rvck5lZWRzRm9ybUVsZW1lbnQKIHNtYWxsIGludGVyZmFjZU5hbWU9SFRN TEVsZW1lbnQKLSNpZiBFTkFCTEVfVklERU8KLXNvdXJjZSB3cmFwcGVyT25seUlmTWVkaWFJc0F2 YWlsYWJsZQotI2VuZGlmCitzb3VyY2Ugd3JhcHBlck9ubHlJZk1lZGlhSXNBdmFpbGFibGUsY29u ZGl0aW9uYWw9VklERU8KIHNwYW4gaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogc3RyaWtlIGlu dGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIHN0cm9uZyBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50 CkBAIC0xMTAsOCArMTA2LDYgQEAgdHQgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogdSBpbnRl cmZhY2VOYW1lPUhUTUxFbGVtZW50CiB1bCBpbnRlcmZhY2VOYW1lPUhUTUxVTGlzdEVsZW1lbnQK IHZhciBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50Ci0jaWYgRU5BQkxFX1ZJREVPCi12aWRlbyB3 cmFwcGVyT25seUlmTWVkaWFJc0F2YWlsYWJsZQotI2VuZGlmCit2aWRlbyB3cmFwcGVyT25seUlm TWVkaWFJc0F2YWlsYWJsZSxjb25kaXRpb25hbD1WSURFTwogd2JyIGludGVyZmFjZU5hbWU9SFRN TEVsZW1lbnQKIHhtcCBpbnRlcmZhY2VOYW1lPUhUTUxQcmVFbGVtZW50Ci0tIAoxLjYuMy5yYzMK Cg== 30631 2009-05-24 11:17:06 -0700 2009-05-25 05:37:19 -0700 Patch to add support for feature #ifdefs in the genertaed tag factory code (take 2) patch.txt text/plain 6091 hausmann Y29tbWl0IDA5NzJiMTRlYzIxZjEwMTNlZWVlZjkyMjE4OGE1NThhOTdhYjIzYTcKQXV0aG9yOiBT aW1vbiBIYXVzbWFubiA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgpEYXRlOiAgIFdlZCBNYXkg NiAxMDo1OToxNyAyMDA5ICswMjAwCgogICAgMjAwOS0wNS0wNyAgU2ltb24gSGF1c21hbm4gIDxz aW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAgICAKICAgICAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCiAgICAKICAgICAgICAgICAgU3VwcG9ydCBjb25kaXRpb25hbHMgaW4gdGhl IHRhZyBmYWN0b3JpZXMsIGJ5IHBsYWNpbmcKICAgICAgICAgICAgZmVhdHVyZSAjaWZkZWZzIGFy b3VuZCB0aGUgaW5kaXZpZHVhbCBmYWN0b3J5IGZ1bmN0aW9ucwogICAgICAgICAgICBhbmQgdGhl IHJlZ2lzdHJhdGlvbi4KICAgIAogICAgICAgICAgICBNYWRlIHRoZSBBdWRpbyBhbmQgVmlkZW8g ZWxlbWVudHMgY29uZGl0aW9uYWwgaW4gdGhlIHRhZyBmYWN0b3JpZXMKCmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDE0YTU5NTguLmYzYjFm M2IgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDkgKzEsMjIgQEAKIDIwMDktMDUtMjQgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1 c21hbm5Abm9raWEuY29tPgogCi0gICAgICAgIFJldmlld2VkIGJ5IE1hY2llaiBTdGFjaG93aWFr LgorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU2MTIKIAorICAgICAgICBTdXBwb3J0 IGNvbmRpdGlvbmFscyBpbiB0aGUgdGFnIGZhY3RvcmllcywgYnkgcGxhY2luZworICAgICAgICBm ZWF0dXJlICNpZmRlZnMgYXJvdW5kIHRoZSBpbmRpdmlkdWFsIGZhY3RvcnkgZnVuY3Rpb25zCisg ICAgICAgIGFuZCB0aGUgcmVnaXN0cmF0aW9uLgorCisgICAgICAgIE1hZGUgdGhlIEF1ZGlvIGFu ZCBWaWRlbyBlbGVtZW50cyBjb25kaXRpb25hbCBpbiB0aGUgdGFnIGZhY3RvcmllcworCisgICAg ICAgICogaHRtbC9IVE1MVGFnTmFtZXMuaW46CisgICAgICAgICogZG9tL21ha2VfbmFtZXMucGw6 CisKKzIwMDktMDUtMDcgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE1hY2llaiBTdGFjaG93aWFrLgorCiAgICAgICAgIEFk ZCBzdXBwb3J0IGNvbmRpdGlvbmFscyBpbiB0aGUgSlNDIGJpbmRpbmdzIGdlbmVyYXRvciBjb2Rl IGZvciBhdHRyaWJ1dGVzLAogICAgICAgICBieSBwbGFjaW5nIGZlYXR1cmUgI2lmZGVmcyBhcm91 bmQgdGhlIHNldHRlcnMvZ2V0dGVycy4KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vbWFrZV9u YW1lcy5wbCBiL1dlYkNvcmUvZG9tL21ha2VfbmFtZXMucGwKaW5kZXggNjI2YjZlOS4uMTJmMGVj NyAxMDA3NTUKLS0tIGEvV2ViQ29yZS9kb20vbWFrZV9uYW1lcy5wbAorKysgYi9XZWJDb3JlL2Rv bS9tYWtlX25hbWVzLnBsCkBAIC05NSw3ICs5NSw4IEBAIHN1YiBpbml0aWFsaXplVGFnUHJvcGVy dHlIYXNoCiAgICAgICAgICAgICAjIEJ5IGRlZmF1bHQsIHRoZSBKU0ludGVyZmFjZU5hbWUgaXMg dGhlIHNhbWUgYXMgdGhlIGludGVyZmFjZU5hbWUuCiAgICAgICAgICAgICAnSlNJbnRlcmZhY2VO YW1lJyA9PiBkZWZhdWx0SW50ZXJmYWNlTmFtZSgkX1swXSksCiAgICAgICAgICAgICAnbWFwVG9U YWdOYW1lJyA9PiAnJywKLSAgICAgICAgICAgICd3cmFwcGVyT25seUlmTWVkaWFJc0F2YWlsYWJs ZScgPT4gMCk7CisgICAgICAgICAgICAnd3JhcHBlck9ubHlJZk1lZGlhSXNBdmFpbGFibGUnID0+ IDAsCisgICAgICAgICAgICAnY29uZGl0aW9uYWwnID0+IDApOwogfQogCiBzdWIgaW5pdGlhbGl6 ZUF0dHJQcm9wZXJ0eUhhc2gKQEAgLTMxMiw4ICszMTMsMTggQEAgc3ViIHByaW50Q29uc3RydWN0 b3JzCiAKICAgICAgICAgJHVuaXF1ZVRhZ3N7JGludGVyZmFjZU5hbWV9ID0gJzEnOwogCisgICAg ICAgIG15ICRjb25kaXRpb25hbCA9ICR0YWdzeyR0YWdOYW1lfXsiY29uZGl0aW9uYWwifTsKKyAg ICAgICAgaWYgKCRjb25kaXRpb25hbCkgeworICAgICAgICAgICAgbXkgJGNvbmRpdGlvbmFsU3Ry aW5nID0gIkVOQUJMRSgiIC4gam9pbigiKSAmJiBFTkFCTEUoIiwgc3BsaXQoLyYvLCAkY29uZGl0 aW9uYWwpKSAuICIpIjsKKyAgICAgICAgICAgIHByaW50IEYgIiNpZiAke2NvbmRpdGlvbmFsU3Ry aW5nfVxuXG4iOworICAgICAgICB9CisKICAgICAgICAgcHJpbnRDb25zdHJ1Y3RvclNpZ25hdHVy ZSgkRiwgJHRhZ05hbWUsICR0YWdDb25zdHJ1Y3Rvck1hcHskdGFnTmFtZX0sICJ0YWdOYW1lIik7 CiAgICAgICAgIHByaW50Q29uc3RydWN0b3JJbnRlcmlvcigkRiwgJHRhZ05hbWUsICRpbnRlcmZh Y2VOYW1lLCAidGFnTmFtZSIpOworCisgICAgICAgIGlmICgkY29uZGl0aW9uYWwpIHsKKyAgICAg ICAgICAgIHByaW50IEYgIiNlbmRpZlxuXG4iOworICAgICAgICB9CiAgICAgfQogCiAgICAgIyBN YXBwZWQgdGFnIG5hbWUgdXNlcyBhIHNwZWNpYWwgd3JhcHBlciB0byBrZWVwIHRoZWlyIHByZWZp eCBhbmQgbmFtZXNwYWNlVVJJIHdoaWxlIHVzaW5nIHRoZSBtYXBwZWQgbG9jYWxuYW1lLgpAQCAt MzM0LDExICszNDUsMjIgQEAgc3ViIHByaW50RnVuY3Rpb25Jbml0cwogICAgIG15ICV0YWdDb25z dHJ1Y3Rvck1hcCA9ICUkdGFnQ29uc3RydWN0b3JNYXA7CiAKICAgICBmb3IgbXkgJHRhZ05hbWUg KHNvcnQga2V5cyAldGFnQ29uc3RydWN0b3JNYXApIHsKKworICAgICAgICBteSAkY29uZGl0aW9u YWwgPSAkdGFnc3skdGFnTmFtZX17ImNvbmRpdGlvbmFsIn07CisgICAgICAgIGlmICgkY29uZGl0 aW9uYWwpIHsKKyAgICAgICAgICAgIG15ICRjb25kaXRpb25hbFN0cmluZyA9ICJFTkFCTEUoIiAu IGpvaW4oIikgJiYgRU5BQkxFKCIsIHNwbGl0KC8mLywgJGNvbmRpdGlvbmFsKSkgLiAiKSI7Cisg ICAgICAgICAgICBwcmludCBGICIjaWYgJHtjb25kaXRpb25hbFN0cmluZ31cbiI7CisgICAgICAg IH0KKwogICAgICAgICBpZiAoJHRhZ3N7JHRhZ05hbWV9eydtYXBUb1RhZ05hbWUnfSkgewogICAg ICAgICAgICAgcHJpbnQgRiAiICAgIGFkZFRhZygke3RhZ05hbWV9VGFnLCAkdGFnc3skdGFnTmFt ZX17J21hcFRvVGFnTmFtZSd9VG8ke3RhZ05hbWV9Q29uc3RydWN0b3IpO1xuIjsKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgIHByaW50IEYgIiAgICBhZGRUYWcoJHt0YWdOYW1lfVRhZywg JHRhZ0NvbnN0cnVjdG9yTWFweyR0YWdOYW1lfUNvbnN0cnVjdG9yKTtcbiI7CiAgICAgICAgIH0K KworICAgICAgICBpZiAoJGNvbmRpdGlvbmFsKSB7CisgICAgICAgICAgICBwcmludCBGICIjZW5k aWZcblxuIjsKKyAgICAgICAgfQogICAgIH0KIH0KIApAQCAtODQ2LDYgKzg2OCwxMiBAQCBzdWIg cHJpbnRXcmFwcGVyRnVuY3Rpb25zCiAgICAgICAgIG5leHQgaWYgZGVmaW5lZCgkdGFnc1NlZW57 JEpTSW50ZXJmYWNlTmFtZX0pIHx8IHVzZXNEZWZhdWx0SlNXcmFwcGVyKCR0YWdOYW1lKTsKICAg ICAgICAgJHRhZ3NTZWVueyRKU0ludGVyZmFjZU5hbWV9ID0gMTsKIAorICAgICAgICBteSAkY29u ZGl0aW9uYWwgPSAkdGFnc3skdGFnTmFtZX17ImNvbmRpdGlvbmFsIn07CisgICAgICAgIGlmICgk Y29uZGl0aW9uYWwpIHsKKyAgICAgICAgICAgIG15ICRjb25kaXRpb25hbFN0cmluZyA9ICJFTkFC TEUoIiAuIGpvaW4oIikgJiYgRU5BQkxFKCIsIHNwbGl0KC8mLywgJGNvbmRpdGlvbmFsKSkgLiAi KSI7CisgICAgICAgICAgICBwcmludCBGICIjaWYgJHtjb25kaXRpb25hbFN0cmluZ31cblxuIjsK KyAgICAgICAgfQorCiAgICAgICAgICMgSGFjayBmb3IgdGhlIG1lZGlhIHRhZ3MKICAgICAgICAg aWYgKCR0YWdzeyR0YWdOYW1lfXsid3JhcHBlck9ubHlJZk1lZGlhSXNBdmFpbGFibGUifSkgewog ICAgICAgICAgICAgcHJpbnQgRiA8PEVORApAQCAtODY4LDYgKzg5Niw5IEBAIHN0YXRpYyBKU05v ZGUqIGNyZWF0ZSR7SlNJbnRlcmZhY2VOYW1lfVdyYXBwZXIoRXhlY1N0YXRlKiBleGVjLCBQYXNz UmVmUHRyPCRwYXJhCiBFTkQKIDsKICAgICAgICAgfQorICAgICAgICBpZiAoJGNvbmRpdGlvbmFs KSB7CisgICAgICAgICAgICBwcmludCBGICIjZW5kaWZcblxuIjsKKyAgICAgICAgfQogICAgIH0K IH0KIApAQCAtOTIwLDggKzk1MSwxOCBAQCBFTkQKICAgICAgICAgIyBEbyBub3QgYWRkIHRoZSBu YW1lIHRvIHRoZSBtYXAgaWYgaXQgZG9lcyBub3QgaGF2ZSBhIEpTIHdyYXBwZXIgY29uc3RydWN0 b3Igb3IgdXNlcyB0aGUgZGVmYXVsdCB3cmFwcGVyLgogICAgICAgICBuZXh0IGlmIHVzZXNEZWZh dWx0SlNXcmFwcGVyKCR0YWcsIFwldGFncyk7CiAKKyAgICAgICAgbXkgJGNvbmRpdGlvbmFsID0g JHRhZ3N7JHRhZ317ImNvbmRpdGlvbmFsIn07CisgICAgICAgIGlmICgkY29uZGl0aW9uYWwpIHsK KyAgICAgICAgICAgIG15ICRjb25kaXRpb25hbFN0cmluZyA9ICJFTkFCTEUoIiAuIGpvaW4oIikg JiYgRU5BQkxFKCIsIHNwbGl0KC8mLywgJGNvbmRpdGlvbmFsKSkgLiAiKSI7CisgICAgICAgICAg ICBwcmludCBGICIjaWYgJHtjb25kaXRpb25hbFN0cmluZ31cbiI7CisgICAgICAgIH0KKwogICAg ICAgICBteSAkdWNUYWcgPSAkdGFnc3skdGFnfXsiSlNJbnRlcmZhY2VOYW1lIn07CiAgICAgICAg IHByaW50IEYgIiAgICAgICBtYXAuc2V0KCR7dGFnfVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksIGNy ZWF0ZSR7dWNUYWd9V3JhcHBlcik7XG4iOworCisgICAgICAgIGlmICgkY29uZGl0aW9uYWwpIHsK KyAgICAgICAgICAgIHByaW50IEYgIiNlbmRpZlxuIjsKKyAgICAgICAgfQogICAgIH0KIAogICAg IHByaW50IEYgPDxFTkQKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVGFnTmFtZXMuaW4g Yi9XZWJDb3JlL2h0bWwvSFRNTFRhZ05hbWVzLmluCmluZGV4IGEzNGM2YzkuLjE0MTE5ZWYgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVGFnTmFtZXMuaW4KKysrIGIvV2ViQ29yZS9odG1s L0hUTUxUYWdOYW1lcy5pbgpAQCAtOCw5ICs4LDcgQEAgYWNyb255bSBpbnRlcmZhY2VOYW1lPUhU TUxFbGVtZW50CiBhZGRyZXNzIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGFwcGxldAogYXJl YQotI2lmIEVOQUJMRV9WSURFTwotYXVkaW8gd3JhcHBlck9ubHlJZk1lZGlhSXNBdmFpbGFibGUK LSNlbmRpZgorYXVkaW8gd3JhcHBlck9ubHlJZk1lZGlhSXNBdmFpbGFibGUsY29uZGl0aW9uYWw9 VklERU8KIGIgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogYmFzZQogYmFzZWZvbnQgaW50ZXJm YWNlTmFtZT1IVE1MQmFzZUZvbnRFbGVtZW50CkBAIC05Miw5ICs5MCw3IEBAIHNhbXAgaW50ZXJm YWNlTmFtZT1IVE1MRWxlbWVudAogc2NyaXB0IGNvbnN0cnVjdG9yTmVlZHNDcmVhdGVkQnlQYXJz ZXIKIHNlbGVjdCBjb25zdHJ1Y3Rvck5lZWRzRm9ybUVsZW1lbnQKIHNtYWxsIGludGVyZmFjZU5h bWU9SFRNTEVsZW1lbnQKLSNpZiBFTkFCTEVfVklERU8KLXNvdXJjZSB3cmFwcGVyT25seUlmTWVk aWFJc0F2YWlsYWJsZQotI2VuZGlmCitzb3VyY2Ugd3JhcHBlck9ubHlJZk1lZGlhSXNBdmFpbGFi bGUsY29uZGl0aW9uYWw9VklERU8KIHNwYW4gaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogc3Ry aWtlIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIHN0cm9uZyBpbnRlcmZhY2VOYW1lPUhUTUxF bGVtZW50CkBAIC0xMTQsOCArMTEwLDYgQEAgdHQgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAog dSBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiB1bCBpbnRlcmZhY2VOYW1lPUhUTUxVTGlzdEVs ZW1lbnQKIHZhciBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50Ci0jaWYgRU5BQkxFX1ZJREVPCi12 aWRlbyB3cmFwcGVyT25seUlmTWVkaWFJc0F2YWlsYWJsZQotI2VuZGlmCit2aWRlbyB3cmFwcGVy T25seUlmTWVkaWFJc0F2YWlsYWJsZSxjb25kaXRpb25hbD1WSURFTwogd2JyIGludGVyZmFjZU5h bWU9SFRNTEVsZW1lbnQKIHhtcCBpbnRlcmZhY2VOYW1lPUhUTUxQcmVFbGVtZW50Cg==