40104 2010-06-02 23:08:37 -0700 [chromium] refactor WebKit.gyp's DRT section so the conditions are less messy 2010-06-03 00:10:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony tony tkent oldest_to_newest 233623 0 tony 2010-06-02 23:08:37 -0700 [chromium] refactor WebKit.gyp's DRT section so the conditions are less messy 233624 1 57736 tony 2010-06-02 23:10:14 -0700 Created attachment 57736 Patch 233625 2 57737 tony 2010-06-02 23:13:07 -0700 Created attachment 57737 Patch 233626 3 tony 2010-06-02 23:14:22 -0700 The new format is one if/else per platform type. The code for generating the pak file has been consolidated in the OS!=win section. 233629 4 57737 tkent 2010-06-02 23:19:16 -0700 Comment on attachment 57737 Patch OK 233638 5 tony 2010-06-03 00:10:47 -0700 Committed r60610: <http://trac.webkit.org/changeset/60610> 57736 2010-06-02 23:10:14 -0700 2010-06-02 23:13:04 -0700 Patch bug-40104-20100602231013.patch text/plain 6287 tony ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDIyOWViMGFmODc2YTU0NWYyY2JkYTM1Y2YxM2IwMjRlYjIxZjQ5ODAu LmI5Y2MyMjlkMTVkZTkyMTA3MmMyMzY2NzcxOGI0OWVkZjFhNjNhZjUgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDE0IEBACiAyMDEwLTA2LTAyICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5v cmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSByZWZhY3RvciBXZWJLaXQuZ3lwJ3MgRFJUIHNlY3Rpb24gc28gdGhlIGNvbmRpdGlv bnMgYXJlIGxlc3MgbWVzc3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQwMTA0CisKKyAgICAgICAgKiBXZWJLaXQuZ3lwOgorCisyMDEwLTA2LTAyICBU b255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgTm90IHJldmlld2VkLCBi dWlsZCBmaXggaW4gZG93bnN0cmVhbSBjaHJvbWl1bS4KIAogICAgICAgICBGaXggdGhlIHBhdGgg dG8gcmVwYWNrLnB5IHNvIGl0IHdvcmtzIGluIGEgY2hyb21pdW0gY2hlY2tvdXQgdG9vLgpkaWZm IC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAgYi9XZWJLaXQvY2hyb21pdW0vV2Vi S2l0Lmd5cAppbmRleCBhZDNmMTgzYzBmMDc1M2QyYjk1MGI3ZTdmMTAzMTZhNmJiNGY0ZTcyLi44 YTdkNjBmMDdjNzJhMTJhZjliYTM5NTkwMjhkMjI1MDI3YzMzOTFjIDEwMDY0NAotLS0gYS9XZWJL aXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApA QCAtNjAxLDIyICs2MDEsOSBAQAogICAgICAgICAgICAgICAgICAgICAgICAgJ2Rlc3RpbmF0aW9u JzogJzwoUFJPRFVDVF9ESVIpJywKICAgICAgICAgICAgICAgICAgICAgICAgICdmaWxlcyc6IFsn PChhaGVtX3BhdGgpJ10sCiAgICAgICAgICAgICAgICAgICAgIH1dLAotICAgICAgICAgICAgICAg IH1dLAotICAgICAgICAgICAgICAgIFsnT1M9PSJtYWMiJywgewotICAgICAgICAgICAgICAgICAg ICAnZGVwZW5kZW5jaWVzJzogWydMYXlvdXRUZXN0SGVscGVyJ10sCi0KLSAgICAgICAgICAgICAg ICAgICAgJ21hY19idW5kbGVfcmVzb3VyY2VzJzogWwotICAgICAgICAgICAgICAgICAgICAgICAg JzwoYWhlbV9wYXRoKScsCi0gICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvZm9udHMvV2ViS2l0V2VpZ2h0V2F0Y2hlcjEwMC50dGYnLAotICAg ICAgICAgICAgICAgICAgICAgICAgJy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Zv bnRzL1dlYktpdFdlaWdodFdhdGNoZXIyMDAudHRmJywKLSAgICAgICAgICAgICAgICAgICAgICAg ICcuLi8uLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWlnaHRXYXRj aGVyMzAwLnR0ZicsCi0gICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvZm9udHMvV2ViS2l0V2VpZ2h0V2F0Y2hlcjQwMC50dGYnLAotICAgICAg ICAgICAgICAgICAgICAgICAgJy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2ZvbnRz L1dlYktpdFdlaWdodFdhdGNoZXI1MDAudHRmJywKLSAgICAgICAgICAgICAgICAgICAgICAgICcu Li8uLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWlnaHRXYXRjaGVy NjAwLnR0ZicsCi0gICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0VG9vbHMvRHVt cFJlbmRlclRyZWUvZm9udHMvV2ViS2l0V2VpZ2h0V2F0Y2hlcjcwMC50dGYnLAotICAgICAgICAg ICAgICAgICAgICAgICAgJy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2ZvbnRzL1dl YktpdFdlaWdodFdhdGNoZXI4MDAudHRmJywKLSAgICAgICAgICAgICAgICAgICAgICAgICcuLi8u Li9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWlnaHRXYXRjaGVyOTAw LnR0ZicsCi0gICAgICAgICAgICAgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJ Uikvd2Via2l0L3RleHRBcmVhUmVzaXplQ29ybmVyLnBuZycsCisgICAgICAgICAgICAgICAgfSx7 ICMgT1MhPSJ3aW4iCisgICAgICAgICAgICAgICAgICAgICdzb3VyY2VzLyc6IFsKKyAgICAgICAg ICAgICAgICAgICAgICAgIFsnZXhjbHVkZScsICdXaW5cXC5jcHAkJ10sCiAgICAgICAgICAgICAg ICAgICAgIF0sCiAgICAgICAgICAgICAgICAgICAgICdhY3Rpb25zJzogWwogICAgICAgICAgICAg ICAgICAgICAgICAgewpAQCAtNjQwLDYgKzYyNywyOCBAQAogICAgICAgICAgICAgICAgICAgICAg ICAgfSwKICAgICAgICAgICAgICAgICAgICAgXSwgIyBhY3Rpb25zCiAgICAgICAgICAgICAgICAg fV0sCisgICAgICAgICAgICAgICAgWydPUz09Im1hYyInLCB7CisgICAgICAgICAgICAgICAgICAg ICdkZXBlbmRlbmNpZXMnOiBbJ0xheW91dFRlc3RIZWxwZXInXSwKKworICAgICAgICAgICAgICAg ICAgICAnbWFjX2J1bmRsZV9yZXNvdXJjZXMnOiBbCisgICAgICAgICAgICAgICAgICAgICAgICAn PChhaGVtX3BhdGgpJywKKyAgICAgICAgICAgICAgICAgICAgICAgICcuLi8uLi9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWlnaHRXYXRjaGVyMTAwLnR0ZicsCisgICAg ICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZm9u dHMvV2ViS2l0V2VpZ2h0V2F0Y2hlcjIwMC50dGYnLAorICAgICAgICAgICAgICAgICAgICAgICAg Jy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2ZvbnRzL1dlYktpdFdlaWdodFdhdGNo ZXIzMDAudHRmJywKKyAgICAgICAgICAgICAgICAgICAgICAgICcuLi8uLi9XZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWlnaHRXYXRjaGVyNDAwLnR0ZicsCisgICAgICAg ICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZm9udHMv V2ViS2l0V2VpZ2h0V2F0Y2hlcjUwMC50dGYnLAorICAgICAgICAgICAgICAgICAgICAgICAgJy4u Ly4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2ZvbnRzL1dlYktpdFdlaWdodFdhdGNoZXI2 MDAudHRmJywKKyAgICAgICAgICAgICAgICAgICAgICAgICcuLi8uLi9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWlnaHRXYXRjaGVyNzAwLnR0ZicsCisgICAgICAgICAg ICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZm9udHMvV2Vi S2l0V2VpZ2h0V2F0Y2hlcjgwMC50dGYnLAorICAgICAgICAgICAgICAgICAgICAgICAgJy4uLy4u L1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2ZvbnRzL1dlYktpdFdlaWdodFdhdGNoZXI5MDAu dHRmJywKKyAgICAgICAgICAgICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElS KS93ZWJraXQvdGV4dEFyZWFSZXNpemVDb3JuZXIucG5nJywKKyAgICAgICAgICAgICAgICAgICAg XSwKKyAgICAgICAgICAgICAgICB9LHsgIyBPUyE9Im1hYyIKKyAgICAgICAgICAgICAgICAgICAg J3NvdXJjZXMvJzogWworICAgICAgICAgICAgICAgICAgICAgICAgIyAubW0gaXMgYWxyZWFkeSBl eGNsdWRlZCBieSBjb21tb24uZ3lwaQorICAgICAgICAgICAgICAgICAgICAgICAgWydleGNsdWRl JywgJ01hY1xcLmNwcCQnXSwKKyAgICAgICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgICAg IH1dLAogICAgICAgICAgICAgICAgIFsnT1M9PSJsaW51eCIgb3IgT1M9PSJmcmVlYnNkIiBvciBP Uz09Im9wZW5ic2QiIG9yIE9TPT0ic29sYXJpcyInLCB7CiAgICAgICAgICAgICAgICAgICAgICdj b3BpZXMnOiBbewogICAgICAgICAgICAgICAgICAgICAgICAgJ2Rlc3RpbmF0aW9uJzogJzwoUFJP RFVDVF9ESVIpJywKQEAgLTY0OSw0NiArNjU4LDExIEBACiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJzwoSU5URVJNRURJQVRFX0RJUikvcmVwYWNrL0R1bXBSZW5kZXJUcmVlLnBhaycsCiAg ICAgICAgICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICAgICAgICAgIH1dLAotICAgICAg ICAgICAgICAgICAgICAnYWN0aW9ucyc6IFsKLSAgICAgICAgICAgICAgICAgICAgICAgIHsKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAnYWN0aW9uX25hbWUnOiAndGVzdF9zaGVsbF9yZXBh Y2snLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICd2YXJpYWJsZXMnOiB7Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICdwYWtfaW5wdXRzJzogWwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL25ldC9uZXRf cmVzb3VyY2VzLnBhaycsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnPChT SEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L3dlYmtpdF9jaHJvbWl1bV9yZXNvdXJjZXMu cGFrJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRF Uk1FRElBVEVfRElSKS93ZWJraXQvd2Via2l0X3Jlc291cmNlcy5wYWsnLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dlYmtp dC93ZWJraXRfc3RyaW5nc19lbi1VUy5wYWsnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBdLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAncmVwYWNrX3BhdGgnOiAn PChjaHJvbWl1bV9zcmNfZGlyKS90b29scy9kYXRhX3BhY2svcmVwYWNrLnB5JywKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJ3Bha19wYXRoJzogJzwoSU5URVJNRURJQVRFX0RJUikv cmVwYWNrL0R1bXBSZW5kZXJUcmVlLnBhaycsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg fSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAnaW5wdXRzJzogWwotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnPChyZXBhY2tfcGF0aCknLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnPEAocGFrX2lucHV0cyknLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIF0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgJ291dHB1dHMnOiBbCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICc8KHBha19wYXRoKScsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAnYWN0aW9uJzogWydw eXRob24nLCAnPChyZXBhY2tfcGF0aCknLCAnPEAoX291dHB1dHMpJywgJzxAKHBha19pbnB1dHMp J10sCi0gICAgICAgICAgICAgICAgICAgICAgICB9LAotICAgICAgICAgICAgICAgICAgICBdLAot ICAgICAgICAgICAgICAgIH1dLAotICAgICAgICAgICAgICAgIFsnT1MhPSJsaW51eCIgYW5kIE9T IT0iZnJlZWJzZCIgYW5kIE9TIT0ib3BlbmJzZCInLCB7CisgICAgICAgICAgICAgICAgfSx7ICMg T1MhPSJsaW51eCIgYW5kIE9TIT0iZnJlZWJzZCIgYW5kIE9TIT0ib3BlbmJzZCIgYW5kIE9TIT0i c29sYXJpcyIKICAgICAgICAgICAgICAgICAgICAgJ3NvdXJjZXMvJzogWwogICAgICAgICAgICAg ICAgICAgICAgICAgWydleGNsdWRlJywgJyhHdGt8TGludXgpXFwuY3BwJCddCiAgICAgICAgICAg ICAgICAgICAgIF0KICAgICAgICAgICAgICAgICB9XSwKLSAgICAgICAgICAgICAgICBbJ09TIT0i d2luIicsIHsKLSAgICAgICAgICAgICAgICAgICAgJ3NvdXJjZXMvJzogWwotICAgICAgICAgICAg ICAgICAgICAgICAgWydleGNsdWRlJywgJ1dpblxcLmNwcCQnXSwKLSAgICAgICAgICAgICAgICAg ICAgXQotICAgICAgICAgICAgICAgIH1dLAotICAgICAgICAgICAgICAgIFsnT1MhPSJtYWMiJywg ewotICAgICAgICAgICAgICAgICAgICAnc291cmNlcy8nOiBbCi0gICAgICAgICAgICAgICAgICAg ICAgICAjIC5tbSBpcyBhbHJlYWR5IGV4Y2x1ZGVkIGJ5IGNvbW1vbi5neXBpCi0gICAgICAgICAg ICAgICAgICAgICAgICBbJ2V4Y2x1ZGUnLCAnTWFjXFwuY3BwJCddLAotICAgICAgICAgICAgICAg ICAgICBdCi0gICAgICAgICAgICAgICAgfV0sCiAgICAgICAgICAgICBdLAogICAgICAgICB9LAog ICAgIF0sICMgdGFyZ2V0cwo= 57737 2010-06-02 23:13:07 -0700 2010-06-02 23:19:15 -0700 Patch bug-40104-20100602231306.patch text/plain 6884 tony ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDIyOWViMGFmODc2YTU0NWYyY2JkYTM1Y2YxM2IwMjRlYjIxZjQ5ODAu LmI5Y2MyMjlkMTVkZTkyMTA3MmMyMzY2NzcxOGI0OWVkZjFhNjNhZjUgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDE0IEBACiAyMDEwLTA2LTAyICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5v cmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2No cm9taXVtXSByZWZhY3RvciBXZWJLaXQuZ3lwJ3MgRFJUIHNlY3Rpb24gc28gdGhlIGNvbmRpdGlv bnMgYXJlIGxlc3MgbWVzc3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQwMTA0CisKKyAgICAgICAgKiBXZWJLaXQuZ3lwOgorCisyMDEwLTA2LTAyICBU b255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgTm90IHJldmlld2VkLCBi dWlsZCBmaXggaW4gZG93bnN0cmVhbSBjaHJvbWl1bS4KIAogICAgICAgICBGaXggdGhlIHBhdGgg dG8gcmVwYWNrLnB5IHNvIGl0IHdvcmtzIGluIGEgY2hyb21pdW0gY2hlY2tvdXQgdG9vLgpkaWZm IC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAgYi9XZWJLaXQvY2hyb21pdW0vV2Vi S2l0Lmd5cAppbmRleCBhZDNmMTgzYzBmMDc1M2QyYjk1MGI3ZTdmMTAzMTZhNmJiNGY0ZTcyLi5i NDhhZjgxMjI0MmQ0NTEzMDJiMWFmMGYxODM2NGNlYjY3MmRhOWZhIDEwMDY0NAotLS0gYS9XZWJL aXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApA QCAtNjAxLDIyICs2MDEsOSBAQAogICAgICAgICAgICAgICAgICAgICAgICAgJ2Rlc3RpbmF0aW9u JzogJzwoUFJPRFVDVF9ESVIpJywKICAgICAgICAgICAgICAgICAgICAgICAgICdmaWxlcyc6IFsn PChhaGVtX3BhdGgpJ10sCiAgICAgICAgICAgICAgICAgICAgIH1dLAotICAgICAgICAgICAgICAg IH1dLAotICAgICAgICAgICAgICAgIFsnT1M9PSJtYWMiJywgewotICAgICAgICAgICAgICAgICAg ICAnZGVwZW5kZW5jaWVzJzogWydMYXlvdXRUZXN0SGVscGVyJ10sCi0KLSAgICAgICAgICAgICAg ICAgICAgJ21hY19idW5kbGVfcmVzb3VyY2VzJzogWwotICAgICAgICAgICAgICAgICAgICAgICAg JzwoYWhlbV9wYXRoKScsCi0gICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvZm9udHMvV2ViS2l0V2VpZ2h0V2F0Y2hlcjEwMC50dGYnLAotICAg ICAgICAgICAgICAgICAgICAgICAgJy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Zv bnRzL1dlYktpdFdlaWdodFdhdGNoZXIyMDAudHRmJywKLSAgICAgICAgICAgICAgICAgICAgICAg ICcuLi8uLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWlnaHRXYXRj aGVyMzAwLnR0ZicsCi0gICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvZm9udHMvV2ViS2l0V2VpZ2h0V2F0Y2hlcjQwMC50dGYnLAotICAgICAg ICAgICAgICAgICAgICAgICAgJy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2ZvbnRz L1dlYktpdFdlaWdodFdhdGNoZXI1MDAudHRmJywKLSAgICAgICAgICAgICAgICAgICAgICAgICcu Li8uLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWlnaHRXYXRjaGVy NjAwLnR0ZicsCi0gICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0VG9vbHMvRHVt cFJlbmRlclRyZWUvZm9udHMvV2ViS2l0V2VpZ2h0V2F0Y2hlcjcwMC50dGYnLAotICAgICAgICAg ICAgICAgICAgICAgICAgJy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2ZvbnRzL1dl YktpdFdlaWdodFdhdGNoZXI4MDAudHRmJywKLSAgICAgICAgICAgICAgICAgICAgICAgICcuLi8u Li9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWlnaHRXYXRjaGVyOTAw LnR0ZicsCi0gICAgICAgICAgICAgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJ Uikvd2Via2l0L3RleHRBcmVhUmVzaXplQ29ybmVyLnBuZycsCisgICAgICAgICAgICAgICAgfSx7 ICMgT1MhPSJ3aW4iCisgICAgICAgICAgICAgICAgICAgICdzb3VyY2VzLyc6IFsKKyAgICAgICAg ICAgICAgICAgICAgICAgIFsnZXhjbHVkZScsICdXaW5cXC5jcHAkJ10sCiAgICAgICAgICAgICAg ICAgICAgIF0sCiAgICAgICAgICAgICAgICAgICAgICdhY3Rpb25zJzogWwogICAgICAgICAgICAg ICAgICAgICAgICAgewpAQCAtNjI0LDYgKzYxMSw3IEBACiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJ3ZhcmlhYmxlcyc6IHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3Jl cGFja19wYXRoJzogJzwoY2hyb21pdW1fc3JjX2RpcikvdG9vbHMvZGF0YV9wYWNrL3JlcGFjay5w eScsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdwYWtfaW5wdXRzJzogWworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9E SVIpL25ldC9uZXRfcmVzb3VyY2VzLnBhaycsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L3dlYmtpdF9jaHJvbWl1 bV9yZXNvdXJjZXMucGFrJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICc8 KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQvd2Via2l0X3N0cmluZ3NfZW4tVVMucGFr JywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1F RElBVEVfRElSKS93ZWJraXQvd2Via2l0X3Jlc291cmNlcy5wYWsnLApAQCAtNjQwLDYgKzYyOCwy OCBAQAogICAgICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAgICAgXSwg IyBhY3Rpb25zCiAgICAgICAgICAgICAgICAgfV0sCisgICAgICAgICAgICAgICAgWydPUz09Im1h YyInLCB7CisgICAgICAgICAgICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbJ0xheW91dFRlc3RI ZWxwZXInXSwKKworICAgICAgICAgICAgICAgICAgICAnbWFjX2J1bmRsZV9yZXNvdXJjZXMnOiBb CisgICAgICAgICAgICAgICAgICAgICAgICAnPChhaGVtX3BhdGgpJywKKyAgICAgICAgICAgICAg ICAgICAgICAgICcuLi8uLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRX ZWlnaHRXYXRjaGVyMTAwLnR0ZicsCisgICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZm9udHMvV2ViS2l0V2VpZ2h0V2F0Y2hlcjIwMC50dGYn LAorICAgICAgICAgICAgICAgICAgICAgICAgJy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL2ZvbnRzL1dlYktpdFdlaWdodFdhdGNoZXIzMDAudHRmJywKKyAgICAgICAgICAgICAgICAg ICAgICAgICcuLi8uLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWln aHRXYXRjaGVyNDAwLnR0ZicsCisgICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvZm9udHMvV2ViS2l0V2VpZ2h0V2F0Y2hlcjUwMC50dGYnLAor ICAgICAgICAgICAgICAgICAgICAgICAgJy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L2ZvbnRzL1dlYktpdFdlaWdodFdhdGNoZXI2MDAudHRmJywKKyAgICAgICAgICAgICAgICAgICAg ICAgICcuLi8uLi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9mb250cy9XZWJLaXRXZWlnaHRX YXRjaGVyNzAwLnR0ZicsCisgICAgICAgICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvZm9udHMvV2ViS2l0V2VpZ2h0V2F0Y2hlcjgwMC50dGYnLAorICAg ICAgICAgICAgICAgICAgICAgICAgJy4uLy4uL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Zv bnRzL1dlYktpdFdlaWdodFdhdGNoZXI5MDAudHRmJywKKyAgICAgICAgICAgICAgICAgICAgICAg ICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQvdGV4dEFyZWFSZXNpemVDb3JuZXIu cG5nJywKKyAgICAgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICB9LHsgIyBPUyE9 Im1hYyIKKyAgICAgICAgICAgICAgICAgICAgJ3NvdXJjZXMvJzogWworICAgICAgICAgICAgICAg ICAgICAgICAgIyAubW0gaXMgYWxyZWFkeSBleGNsdWRlZCBieSBjb21tb24uZ3lwaQorICAgICAg ICAgICAgICAgICAgICAgICAgWydleGNsdWRlJywgJ01hY1xcLmNwcCQnXSwKKyAgICAgICAgICAg ICAgICAgICAgXQorICAgICAgICAgICAgICAgIH1dLAogICAgICAgICAgICAgICAgIFsnT1M9PSJs aW51eCIgb3IgT1M9PSJmcmVlYnNkIiBvciBPUz09Im9wZW5ic2QiIG9yIE9TPT0ic29sYXJpcyIn LCB7CiAgICAgICAgICAgICAgICAgICAgICdjb3BpZXMnOiBbewogICAgICAgICAgICAgICAgICAg ICAgICAgJ2Rlc3RpbmF0aW9uJzogJzwoUFJPRFVDVF9ESVIpJywKQEAgLTY0OSw0NiArNjU5LDEx IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJzwoSU5URVJNRURJQVRFX0RJUikvcmVw YWNrL0R1bXBSZW5kZXJUcmVlLnBhaycsCiAgICAgICAgICAgICAgICAgICAgICAgICBdCiAgICAg ICAgICAgICAgICAgICAgIH1dLAotICAgICAgICAgICAgICAgICAgICAnYWN0aW9ucyc6IFsKLSAg ICAgICAgICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAnYWN0 aW9uX25hbWUnOiAndGVzdF9zaGVsbF9yZXBhY2snLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICd2YXJpYWJsZXMnOiB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdwYWtf aW5wdXRzJzogWwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJzwoU0hBUkVE X0lOVEVSTUVESUFURV9ESVIpL25ldC9uZXRfcmVzb3VyY2VzLnBhaycsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0 L3dlYmtpdF9jaHJvbWl1bV9yZXNvdXJjZXMucGFrJywKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQvd2Via2l0X3Jl c291cmNlcy5wYWsnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJzwoU0hB UkVEX0lOVEVSTUVESUFURV9ESVIpL3dlYmtpdC93ZWJraXRfc3RyaW5nc19lbi1VUy5wYWsnLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBdLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAncmVwYWNrX3BhdGgnOiAnPChjaHJvbWl1bV9zcmNfZGlyKS90b29scy9kYXRh X3BhY2svcmVwYWNrLnB5JywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3Bha19w YXRoJzogJzwoSU5URVJNRURJQVRFX0RJUikvcmVwYWNrL0R1bXBSZW5kZXJUcmVlLnBhaycsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnaW5wdXRzJzogWwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnPChyZXBhY2tf cGF0aCknLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnPEAocGFrX2lucHV0cykn LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgJ291dHB1dHMnOiBbCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICc8KHBh a19wYXRoKScsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnYWN0aW9uJzogWydweXRob24nLCAnPChyZXBhY2tfcGF0aCknLCAnPEAo X291dHB1dHMpJywgJzxAKHBha19pbnB1dHMpJ10sCi0gICAgICAgICAgICAgICAgICAgICAgICB9 LAotICAgICAgICAgICAgICAgICAgICBdLAotICAgICAgICAgICAgICAgIH1dLAotICAgICAgICAg ICAgICAgIFsnT1MhPSJsaW51eCIgYW5kIE9TIT0iZnJlZWJzZCIgYW5kIE9TIT0ib3BlbmJzZCIn LCB7CisgICAgICAgICAgICAgICAgfSx7ICMgT1MhPSJsaW51eCIgYW5kIE9TIT0iZnJlZWJzZCIg YW5kIE9TIT0ib3BlbmJzZCIgYW5kIE9TIT0ic29sYXJpcyIKICAgICAgICAgICAgICAgICAgICAg J3NvdXJjZXMvJzogWwogICAgICAgICAgICAgICAgICAgICAgICAgWydleGNsdWRlJywgJyhHdGt8 TGludXgpXFwuY3BwJCddCiAgICAgICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgICAgICB9 XSwKLSAgICAgICAgICAgICAgICBbJ09TIT0id2luIicsIHsKLSAgICAgICAgICAgICAgICAgICAg J3NvdXJjZXMvJzogWwotICAgICAgICAgICAgICAgICAgICAgICAgWydleGNsdWRlJywgJ1dpblxc LmNwcCQnXSwKLSAgICAgICAgICAgICAgICAgICAgXQotICAgICAgICAgICAgICAgIH1dLAotICAg ICAgICAgICAgICAgIFsnT1MhPSJtYWMiJywgewotICAgICAgICAgICAgICAgICAgICAnc291cmNl cy8nOiBbCi0gICAgICAgICAgICAgICAgICAgICAgICAjIC5tbSBpcyBhbHJlYWR5IGV4Y2x1ZGVk IGJ5IGNvbW1vbi5neXBpCi0gICAgICAgICAgICAgICAgICAgICAgICBbJ2V4Y2x1ZGUnLCAnTWFj XFwuY3BwJCddLAotICAgICAgICAgICAgICAgICAgICBdCi0gICAgICAgICAgICAgICAgfV0sCiAg ICAgICAgICAgICBdLAogICAgICAgICB9LAogICAgIF0sICMgdGFyZ2V0cwo=