27510 2009-07-21 12:39:35 -0700 [S60 QtWebKit] Don't put some intermediate generated files into the final mmp project file for linking. 2009-07-23 13:48:37 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) S60 Emulator Other RESOLVED FIXED Qt P2 Normal --- 27065 1 yongjun.zhang webkit-unassigned hausmann laszlo.gombos oldest_to_newest 133559 0 yongjun.zhang 2009-07-21 12:39:35 -0700 Some generated files (like CSSPropertyNames.cpp, ColorData.c, tokenizer.cpp) are to be included in WebCore source files. In S60 port, they are put into the final mmp project, perceived as normal source file. This breaks the build in S60 qtwebkit because some of them are not intended for building separately. 133562 1 33201 yongjun.zhang 2009-07-21 12:47:10 -0700 Created attachment 33201 Point variable_out properties of effected custom compilers to empty, to avoid putting generated files into mmp project file. 134217 2 33359 yongjun.zhang 2009-07-23 13:16:51 -0700 Created attachment 33359 update the patch discription to mention it is a workaround for qmake bug in Symbian port. 134236 3 33359 hausmann 2009-07-23 13:46:00 -0700 Comment on attachment 33359 update the patch discription to mention it is a workaround for qmake bug in Symbian port. r=me 134237 4 hausmann 2009-07-23 13:48:37 -0700 Landed in r46284 33201 2009-07-21 12:47:10 -0700 2009-07-23 13:16:51 -0700 Point variable_out properties of effected custom compilers to empty, to avoid putting generated files into mmp project file. variable_out_fix.patch text/plain 4877 yongjun.zhang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjE4NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDctMjEgIFlvbmdqdW4gWmhhbmcgIDx5b25nanVuLnpoYW5n QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1MTAKKyAgICAg ICAgW1M2MCBRdFdlYktpdF0gRG9uJ3QgcHV0IHNvbWUgaW50ZXJtZWRpYXRlIGdlbmVyYXRlZCBm aWxlcyBpbnRvIHRoZSBmaW5hbCBtbXAgcHJvamVjdCAKKyAgICAgICAgZmlsZSBmb3IgbGlua2lu Zy4KKworICAgICAgICBQb2ludCB2YXJpYWJsZV9vdXQgcHJvcGVydGllcyBvZiByZWxhdmFudCBj dXN0b21lciBjb21waWxlcnMgdG8gZW1wdHksIHRvIGF2b2lkIAorICAgICAgICBwdXR0aW5nIHRo ZWlyIGdlbmVyYXRlZCBmaWxlcyBpbnRvIG1tcCBwcm9qZWN0IGZpbGUuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBXZWJDb3JlLnBybzoKKwogMjAwOS0wNy0y MSAgSmFtZXMgSGF3a2lucyAgPGpoYXdraW5zQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGF2aWQgSHlhdHQuCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUucHJvCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvV2ViQ29yZS5wcm8JKHJldmlzaW9uIDQ2MTc5KQorKysgV2ViQ29yZS9XZWJD b3JlLnBybwkod29ya2luZyBjb3B5KQpAQCAtMjk2NSw2ICsyOTY1LDcgQEAgY29udGFpbnMoREVG SU5FUywgRU5BQkxFX1NWRz0xKSB7CiAgICAgY3NzcHJvcHMuaW5wdXQgPSBXQUxET0NTU1BST1BT CiAgICAgY3NzcHJvcHMuY29tbWFuZHMgPSBwZXJsIC1uZSBcInByaW50IGxjXCIgJHtRTUFLRV9G SUxFX05BTUV9ICQkREFTSEJPQVJEU1VQUE9SVENTU1BST1BFUlRJRVMgJCRTVkdDU1NQUk9QRVJU SUVTID4gJCR7R0VORVJBVEVEX1NPVVJDRVNfRElSfSQke1FNQUtFX0RJUl9TRVB9JHtRTUFLRV9G SUxFX0JBU0V9LmluICYmIGNkICQkR0VORVJBVEVEX1NPVVJDRVNfRElSICYmIHBlcmwgJCRQV0Qv Y3NzL21ha2Vwcm9wLnBsICYmICQoREVMX0ZJTEUpICR7UU1BS0VfRklMRV9CQVNFfS5zdHJpcCAk e1FNQUtFX0ZJTEVfQkFTRX0uaW4gJHtRTUFLRV9GSUxFX0JBU0V9LmdwZXJmCiAgICAgY3NzcHJv cHMuQ09ORklHID0gdGFyZ2V0X3ByZWRlcHMgbm9fbGluaworICAgIGNzc3Byb3BzLnZhcmlhYmxl X291dCA9CiAgICAgY3NzcHJvcHMuZGVwZW5kID0gJHtRTUFLRV9GSUxFX05BTUV9IERBU0hCT0FS RFNVUFBPUlRDU1NQUk9QRVJUSUVTIFNWR0NTU1BST1BFUlRJRVMKICAgICBhZGRFeHRyYUNvbXBp bGVyV2l0aEhlYWRlcihjc3Nwcm9wcykKIApAQCAtMjk3Myw2ICsyOTc0LDcgQEAgY29udGFpbnMo REVGSU5FUywgRU5BQkxFX1NWRz0xKSB7CiAgICAgY3NzdmFsdWVzLmlucHV0ID0gV0FMRE9DU1NW QUxVRVMKICAgICBjc3N2YWx1ZXMuY29tbWFuZHMgPSBwZXJsIC1uZSBcInByaW50IGxjXCIgJHtR TUFLRV9GSUxFX05BTUV9ICQkU1ZHQ1NTVkFMVUVTID4gJCR7R0VORVJBVEVEX1NPVVJDRVNfRElS fSQke1FNQUtFX0RJUl9TRVB9JHtRTUFLRV9GSUxFX0JBU0V9LmluICYmIGNkICQkR0VORVJBVEVE X1NPVVJDRVNfRElSICYmIHBlcmwgJCRQV0QvY3NzL21ha2V2YWx1ZXMucGwgJiYgJChERUxfRklM RSkgJHtRTUFLRV9GSUxFX0JBU0V9LmluICR7UU1BS0VfRklMRV9CQVNFfS5zdHJpcCAke1FNQUtF X0ZJTEVfQkFTRX0uZ3BlcmYKICAgICBjc3N2YWx1ZXMuQ09ORklHID0gdGFyZ2V0X3ByZWRlcHMg bm9fbGluaworICAgIGNzc3ZhbHVlcy52YXJpYWJsZV9vdXQgPQogICAgIGNzc3ZhbHVlcy5kZXBl bmQgPSAke1FNQUtFX0ZJTEVfTkFNRX0gU1ZHQ1NTVkFMVUVTCiAgICAgYWRkRXh0cmFDb21waWxl cldpdGhIZWFkZXIoY3NzdmFsdWVzKQogfSBlbHNlIHsKQEAgLTI5ODEsNiArMjk4Myw3IEBAIGNv bnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkc9MSkgewogICAgIGNzc3Byb3BzLmlucHV0ID0gV0FM RE9DU1NQUk9QUwogICAgIGNzc3Byb3BzLmNvbW1hbmRzID0gcGVybCAtbmUgXCJwcmludCBsY1wi ICR7UU1BS0VfRklMRV9OQU1FfSAkJERBU0hCT0FSRFNVUFBPUlRDU1NQUk9QRVJUSUVTID4gJCR7 R0VORVJBVEVEX1NPVVJDRVNfRElSfSQke1FNQUtFX0RJUl9TRVB9JHtRTUFLRV9GSUxFX0JBU0V9 LmluICYmIGNkICQkR0VORVJBVEVEX1NPVVJDRVNfRElSICYmIHBlcmwgJCRQV0QvY3NzL21ha2Vw cm9wLnBsICYmICQoREVMX0ZJTEUpICR7UU1BS0VfRklMRV9CQVNFfS5zdHJpcCAke1FNQUtFX0ZJ TEVfQkFTRX0uaW4gJHtRTUFLRV9GSUxFX0JBU0V9LmdwZXJmCiAgICAgY3NzcHJvcHMuQ09ORklH ID0gdGFyZ2V0X3ByZWRlcHMgbm9fbGluaworICAgIGNzc3Byb3BzLnZhcmlhYmxlX291dCA9CiAg ICAgY3NzcHJvcHMuZGVwZW5kID0gJHtRTUFLRV9GSUxFX05BTUV9IERBU0hCT0FSRFNVUFBPUlRD U1NQUk9QRVJUSUVTCiAgICAgYWRkRXh0cmFDb21waWxlcldpdGhIZWFkZXIoY3NzcHJvcHMpCiAK QEAgLTI5ODksNiArMjk5Miw3IEBAIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkc9MSkgewog ICAgIGNzc3ZhbHVlcy5pbnB1dCA9IFdBTERPQ1NTVkFMVUVTCiAgICAgY3NzdmFsdWVzLmNvbW1h bmRzID0gcGVybCAtbmUgXCJwcmludCBsY1wiICR7UU1BS0VfRklMRV9OQU1FfSA+ICQke0dFTkVS QVRFRF9TT1VSQ0VTX0RJUn0kJHtRTUFLRV9ESVJfU0VQfSR7UU1BS0VfRklMRV9CQVNFfS5pbiAm JiBjZCAkJEdFTkVSQVRFRF9TT1VSQ0VTX0RJUiAmJiBwZXJsICQkUFdEL2Nzcy9tYWtldmFsdWVz LnBsICYmICQoREVMX0ZJTEUpICR7UU1BS0VfRklMRV9CQVNFfS5pbiAke1FNQUtFX0ZJTEVfQkFT RX0uc3RyaXAgJHtRTUFLRV9GSUxFX0JBU0V9LmdwZXJmCiAgICAgY3NzdmFsdWVzLkNPTkZJRyA9 IHRhcmdldF9wcmVkZXBzIG5vX2xpbmsKKyAgICBjc3N2YWx1ZXMudmFyaWFibGVfb3V0ID0KICAg ICBjc3N2YWx1ZXMuY2xlYW4gPSAke1FNQUtFX0ZJTEVfT1VUfSAke1FNQUtFX1ZBUl9HRU5FUkFU RURfU09VUkNFU19ESVJfU0xBU0h9JHtRTUFLRV9GSUxFX0JBU0V9LmgKICAgICBhZGRFeHRyYUNv bXBpbGVyKGNzc3ZhbHVlcykKIH0KQEAgLTMwNDUsNiArMzA0OSw3IEBAIHRva2VuaXplci5jb21t YW5kcyA9IGZsZXggLXQgPCAke1FNQUtFX0YKIHRva2VuaXplci5kZXBlbmRlbmN5X3R5cGUgPSBU WVBFX0MKIHRva2VuaXplci5pbnB1dCA9IFRPS0VOSVpFUgogdG9rZW5pemVyLkNPTkZJRyArPSB0 YXJnZXRfcHJlZGVwcyBub19saW5rCit0b2tlbml6ZXIudmFyaWFibGVfb3V0ID0KIGFkZEV4dHJh Q29tcGlsZXIodG9rZW5pemVyKQogCiAjIEdFTkVSQVRPUiA0OiBDU1MgZ3JhbW1hcgpAQCAtMzA5 OSw2ICszMTA0LDcgQEAgZW50aXRpZXMuY29tbWFuZHMgPSBncGVyZiAtYSAtTCBBTlNJLUMgLQog ZW50aXRpZXMuaW5wdXQgPSBFTlRJVElFU19HUEVSRgogZW50aXRpZXMuZGVwZW5kZW5jeV90eXBl ID0gVFlQRV9DCiBlbnRpdGllcy5DT05GSUcgPSB0YXJnZXRfcHJlZGVwcyBub19saW5rCitlbnRp dGllcy52YXJpYWJsZV9vdXQgPQogZW50aXRpZXMuY2xlYW4gPSAke1FNQUtFX0ZJTEVfT1VUfQog YWRkRXh0cmFDb21waWxlcihlbnRpdGllcykKIApAQCAtMzEwOCw2ICszMTE0LDcgQEAgZG9jdHlw ZXN0cmluZ3MuaW5wdXQgPSBET0NUWVBFU1RSSU5HUwogZG9jdHlwZXN0cmluZ3MuY29tbWFuZHMg PSBwZXJsIC1lIFwicHJpbnQgXCckJHtMSVRFUkFMX0hBU0h9aW5jbHVkZSA8c3RyaW5nLmg+XCc7 XCIgPiAke1FNQUtFX0ZJTEVfT1VUfSAmJiBlY2hvIC8vIGJvZ3VzID4+ICR7UU1BS0VfRklMRV9P VVR9ICYmIGdwZXJmIC1DRW90IC1MIEFOU0ktQyAtLWtleS1wb3NpdGlvbnM9IioiIC1OIGZpbmRE b2N0eXBlRW50cnkgLUYgLFB1YklESW5mbzo6ZUFsbW9zdFN0YW5kYXJkcyxQdWJJREluZm86OmVB bG1vc3RTdGFuZGFyZHMgPCAke1FNQUtFX0ZJTEVfTkFNRX0gPj4gJHtRTUFLRV9GSUxFX09VVH0K IGRvY3R5cGVzdHJpbmdzLmRlcGVuZGVuY3lfdHlwZSA9IFRZUEVfQwogZG9jdHlwZXN0cmluZ3Mu Q09ORklHICs9IHRhcmdldF9wcmVkZXBzIG5vX2xpbmsKK2RvY3R5cGVzdHJpbmdzLnZhcmlhYmxl X291dCA9CiBkb2N0eXBlc3RyaW5ncy5jbGVhbiA9ICR7UU1BS0VfRklMRV9PVVR9CiBhZGRFeHRy YUNvbXBpbGVyKGRvY3R5cGVzdHJpbmdzKQogCkBAIC0zMTE2LDYgKzMxMjMsNyBAQCBjb2xvcmRh dGEub3V0cHV0ID0gJCR7R0VORVJBVEVEX1NPVVJDRVNfCiBjb2xvcmRhdGEuY29tbWFuZHMgPSBw ZXJsIC1lIFwicHJpbnQgXCckJHtMSVRFUkFMX0hBU0h9aW5jbHVkZSA8c3RyaW5nLmg+XCc7XCIg PiAke1FNQUtFX0ZJTEVfT1VUfSAmJiBlY2hvIC8vIGJvZ3VzID4+ICR7UU1BS0VfRklMRV9PVVR9 ICYmIGdwZXJmIC1DREVvdCAtTCBBTlNJLUMgLS1rZXktcG9zaXRpb25zPSIqIiAtTiBmaW5kQ29s b3IgLUQgLXMgMiA8ICR7UU1BS0VfRklMRV9OQU1FfSA+PiAke1FNQUtFX0ZJTEVfT1VUfQogY29s b3JkYXRhLmlucHV0ID0gQ09MT1JEQVRfR1BFUkYKIGNvbG9yZGF0YS5DT05GSUcgPSB0YXJnZXRf cHJlZGVwcyBub19saW5rCitjb2xvcmRhdGEudmFyaWFibGVfb3V0ID0KIGFkZEV4dHJhQ29tcGls ZXIoY29sb3JkYXRhKQogCiAjIEdFTkVSQVRPUiA5Ogo= 33359 2009-07-23 13:16:51 -0700 2009-07-23 13:46:00 -0700 update the patch discription to mention it is a workaround for qmake bug in Symbian port. qmake_workaround.patch text/plain 4839 yongjun.zhang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjI4MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMDctMjMgIFlvbmdqdW4gWmhhbmcgIDx5b25nanVuLnpoYW5n QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1MTAKKyAgICAg ICAgW1M2MCBRdFdlYktpdF0gRG9uJ3QgcHV0IHNvbWUgaW50ZXJtZWRpYXRlIGdlbmVyYXRlZCBm aWxlcyBpbnRvIHRoZSBmaW5hbCBtbXAgcHJvamVjdAorICAgICAgICBmaWxlIGZvciBsaW5raW5n LiBUaGlzIGlzIGEgdGVtcG9yYXJ5IHdvcmthcm91bmQgZm9yIHFtYWtlIGJ1ZyBpbiBTeW1iaWFu IHBvcnQsIHNob3VsZCAKKyAgICAgICAgYmUgcmV2ZXJ0ZWQgYWZ0ZXIgcW1ha2UgaXMgZml4ZWQu ICAgICAgICAKKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIFdl YkNvcmUucHJvOgorCiAyMDA5LTA3LTIzICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogV2ViQ29yZS9XZWJD b3JlLnBybwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUucHJvCShyZXZpc2lvbiA0NjI4 MikKKysrIFdlYkNvcmUvV2ViQ29yZS5wcm8JKHdvcmtpbmcgY29weSkKQEAgLTI5NzQsNiArMjk3 NCw3IEBAIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkc9MSkgewogICAgIGNzc3Byb3BzLmlu cHV0ID0gV0FMRE9DU1NQUk9QUwogICAgIGNzc3Byb3BzLmNvbW1hbmRzID0gcGVybCAtbmUgXCJw cmludCBsY1wiICR7UU1BS0VfRklMRV9OQU1FfSAkJERBU0hCT0FSRFNVUFBPUlRDU1NQUk9QRVJU SUVTICQkU1ZHQ1NTUFJPUEVSVElFUyA+ICQke0dFTkVSQVRFRF9TT1VSQ0VTX0RJUn0kJHtRTUFL RV9ESVJfU0VQfSR7UU1BS0VfRklMRV9CQVNFfS5pbiAmJiBjZCAkJEdFTkVSQVRFRF9TT1VSQ0VT X0RJUiAmJiBwZXJsICQkUFdEL2Nzcy9tYWtlcHJvcC5wbCAmJiAkKERFTF9GSUxFKSAke1FNQUtF X0ZJTEVfQkFTRX0uc3RyaXAgJHtRTUFLRV9GSUxFX0JBU0V9LmluICR7UU1BS0VfRklMRV9CQVNF fS5ncGVyZgogICAgIGNzc3Byb3BzLkNPTkZJRyA9IHRhcmdldF9wcmVkZXBzIG5vX2xpbmsKKyAg ICBjc3Nwcm9wcy52YXJpYWJsZV9vdXQgPQogICAgIGNzc3Byb3BzLmRlcGVuZCA9ICR7UU1BS0Vf RklMRV9OQU1FfSBEQVNIQk9BUkRTVVBQT1JUQ1NTUFJPUEVSVElFUyBTVkdDU1NQUk9QRVJUSUVT CiAgICAgYWRkRXh0cmFDb21waWxlcldpdGhIZWFkZXIoY3NzcHJvcHMpCiAKQEAgLTI5ODIsNiAr Mjk4Myw3IEBAIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9TVkc9MSkgewogICAgIGNzc3ZhbHVl cy5pbnB1dCA9IFdBTERPQ1NTVkFMVUVTCiAgICAgY3NzdmFsdWVzLmNvbW1hbmRzID0gcGVybCAt bmUgXCJwcmludCBsY1wiICR7UU1BS0VfRklMRV9OQU1FfSAkJFNWR0NTU1ZBTFVFUyA+ICQke0dF TkVSQVRFRF9TT1VSQ0VTX0RJUn0kJHtRTUFLRV9ESVJfU0VQfSR7UU1BS0VfRklMRV9CQVNFfS5p biAmJiBjZCAkJEdFTkVSQVRFRF9TT1VSQ0VTX0RJUiAmJiBwZXJsICQkUFdEL2Nzcy9tYWtldmFs dWVzLnBsICYmICQoREVMX0ZJTEUpICR7UU1BS0VfRklMRV9CQVNFfS5pbiAke1FNQUtFX0ZJTEVf QkFTRX0uc3RyaXAgJHtRTUFLRV9GSUxFX0JBU0V9LmdwZXJmCiAgICAgY3NzdmFsdWVzLkNPTkZJ RyA9IHRhcmdldF9wcmVkZXBzIG5vX2xpbmsKKyAgICBjc3N2YWx1ZXMudmFyaWFibGVfb3V0ID0K ICAgICBjc3N2YWx1ZXMuZGVwZW5kID0gJHtRTUFLRV9GSUxFX05BTUV9IFNWR0NTU1ZBTFVFUwog ICAgIGFkZEV4dHJhQ29tcGlsZXJXaXRoSGVhZGVyKGNzc3ZhbHVlcykKIH0gZWxzZSB7CkBAIC0y OTkwLDYgKzI5OTIsNyBAQCBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZHPTEpIHsKICAgICBj c3Nwcm9wcy5pbnB1dCA9IFdBTERPQ1NTUFJPUFMKICAgICBjc3Nwcm9wcy5jb21tYW5kcyA9IHBl cmwgLW5lIFwicHJpbnQgbGNcIiAke1FNQUtFX0ZJTEVfTkFNRX0gJCREQVNIQk9BUkRTVVBQT1JU Q1NTUFJPUEVSVElFUyA+ICQke0dFTkVSQVRFRF9TT1VSQ0VTX0RJUn0kJHtRTUFLRV9ESVJfU0VQ fSR7UU1BS0VfRklMRV9CQVNFfS5pbiAmJiBjZCAkJEdFTkVSQVRFRF9TT1VSQ0VTX0RJUiAmJiBw ZXJsICQkUFdEL2Nzcy9tYWtlcHJvcC5wbCAmJiAkKERFTF9GSUxFKSAke1FNQUtFX0ZJTEVfQkFT RX0uc3RyaXAgJHtRTUFLRV9GSUxFX0JBU0V9LmluICR7UU1BS0VfRklMRV9CQVNFfS5ncGVyZgog ICAgIGNzc3Byb3BzLkNPTkZJRyA9IHRhcmdldF9wcmVkZXBzIG5vX2xpbmsKKyAgICBjc3Nwcm9w cy52YXJpYWJsZV9vdXQgPQogICAgIGNzc3Byb3BzLmRlcGVuZCA9ICR7UU1BS0VfRklMRV9OQU1F fSBEQVNIQk9BUkRTVVBQT1JUQ1NTUFJPUEVSVElFUwogICAgIGFkZEV4dHJhQ29tcGlsZXJXaXRo SGVhZGVyKGNzc3Byb3BzKQogCkBAIC0yOTk4LDYgKzMwMDEsNyBAQCBjb250YWlucyhERUZJTkVT LCBFTkFCTEVfU1ZHPTEpIHsKICAgICBjc3N2YWx1ZXMuaW5wdXQgPSBXQUxET0NTU1ZBTFVFUwog ICAgIGNzc3ZhbHVlcy5jb21tYW5kcyA9IHBlcmwgLW5lIFwicHJpbnQgbGNcIiAke1FNQUtFX0ZJ TEVfTkFNRX0gPiAkJHtHRU5FUkFURURfU09VUkNFU19ESVJ9JCR7UU1BS0VfRElSX1NFUH0ke1FN QUtFX0ZJTEVfQkFTRX0uaW4gJiYgY2QgJCRHRU5FUkFURURfU09VUkNFU19ESVIgJiYgcGVybCAk JFBXRC9jc3MvbWFrZXZhbHVlcy5wbCAmJiAkKERFTF9GSUxFKSAke1FNQUtFX0ZJTEVfQkFTRX0u aW4gJHtRTUFLRV9GSUxFX0JBU0V9LnN0cmlwICR7UU1BS0VfRklMRV9CQVNFfS5ncGVyZgogICAg IGNzc3ZhbHVlcy5DT05GSUcgPSB0YXJnZXRfcHJlZGVwcyBub19saW5rCisgICAgY3NzdmFsdWVz LnZhcmlhYmxlX291dCA9CiAgICAgY3NzdmFsdWVzLmNsZWFuID0gJHtRTUFLRV9GSUxFX09VVH0g JHtRTUFLRV9WQVJfR0VORVJBVEVEX1NPVVJDRVNfRElSX1NMQVNIfSR7UU1BS0VfRklMRV9CQVNF fS5oCiAgICAgYWRkRXh0cmFDb21waWxlcihjc3N2YWx1ZXMpCiB9CkBAIC0zMDU0LDYgKzMwNTgs NyBAQCB0b2tlbml6ZXIuY29tbWFuZHMgPSBmbGV4IC10IDwgJHtRTUFLRV9GCiB0b2tlbml6ZXIu ZGVwZW5kZW5jeV90eXBlID0gVFlQRV9DCiB0b2tlbml6ZXIuaW5wdXQgPSBUT0tFTklaRVIKIHRv a2VuaXplci5DT05GSUcgKz0gdGFyZ2V0X3ByZWRlcHMgbm9fbGluawordG9rZW5pemVyLnZhcmlh YmxlX291dCA9CiBhZGRFeHRyYUNvbXBpbGVyKHRva2VuaXplcikKIAogIyBHRU5FUkFUT1IgNDog Q1NTIGdyYW1tYXIKQEAgLTMxMDgsNiArMzExMyw3IEBAIGVudGl0aWVzLmNvbW1hbmRzID0gZ3Bl cmYgLWEgLUwgQU5TSS1DIC0KIGVudGl0aWVzLmlucHV0ID0gRU5USVRJRVNfR1BFUkYKIGVudGl0 aWVzLmRlcGVuZGVuY3lfdHlwZSA9IFRZUEVfQwogZW50aXRpZXMuQ09ORklHID0gdGFyZ2V0X3By ZWRlcHMgbm9fbGluaworZW50aXRpZXMudmFyaWFibGVfb3V0ID0KIGVudGl0aWVzLmNsZWFuID0g JHtRTUFLRV9GSUxFX09VVH0KIGFkZEV4dHJhQ29tcGlsZXIoZW50aXRpZXMpCiAKQEAgLTMxMTcs NiArMzEyMyw3IEBAIGRvY3R5cGVzdHJpbmdzLmlucHV0ID0gRE9DVFlQRVNUUklOR1MKIGRvY3R5 cGVzdHJpbmdzLmNvbW1hbmRzID0gcGVybCAtZSBcInByaW50IFwnJCR7TElURVJBTF9IQVNIfWlu Y2x1ZGUgPHN0cmluZy5oPlwnO1wiID4gJHtRTUFLRV9GSUxFX09VVH0gJiYgZWNobyAvLyBib2d1 cyA+PiAke1FNQUtFX0ZJTEVfT1VUfSAmJiBncGVyZiAtQ0VvdCAtTCBBTlNJLUMgLS1rZXktcG9z aXRpb25zPSIqIiAtTiBmaW5kRG9jdHlwZUVudHJ5IC1GICxQdWJJREluZm86OmVBbG1vc3RTdGFu ZGFyZHMsUHViSURJbmZvOjplQWxtb3N0U3RhbmRhcmRzIDwgJHtRTUFLRV9GSUxFX05BTUV9ID4+ ICR7UU1BS0VfRklMRV9PVVR9CiBkb2N0eXBlc3RyaW5ncy5kZXBlbmRlbmN5X3R5cGUgPSBUWVBF X0MKIGRvY3R5cGVzdHJpbmdzLkNPTkZJRyArPSB0YXJnZXRfcHJlZGVwcyBub19saW5rCitkb2N0 eXBlc3RyaW5ncy52YXJpYWJsZV9vdXQgPQogZG9jdHlwZXN0cmluZ3MuY2xlYW4gPSAke1FNQUtF X0ZJTEVfT1VUfQogYWRkRXh0cmFDb21waWxlcihkb2N0eXBlc3RyaW5ncykKIApAQCAtMzEyNSw2 ICszMTMyLDcgQEAgY29sb3JkYXRhLm91dHB1dCA9ICQke0dFTkVSQVRFRF9TT1VSQ0VTXwogY29s b3JkYXRhLmNvbW1hbmRzID0gcGVybCAtZSBcInByaW50IFwnJCR7TElURVJBTF9IQVNIfWluY2x1 ZGUgPHN0cmluZy5oPlwnO1wiID4gJHtRTUFLRV9GSUxFX09VVH0gJiYgZWNobyAvLyBib2d1cyA+ PiAke1FNQUtFX0ZJTEVfT1VUfSAmJiBncGVyZiAtQ0RFb3QgLUwgQU5TSS1DIC0ta2V5LXBvc2l0 aW9ucz0iKiIgLU4gZmluZENvbG9yIC1EIC1zIDIgPCAke1FNQUtFX0ZJTEVfTkFNRX0gPj4gJHtR TUFLRV9GSUxFX09VVH0KIGNvbG9yZGF0YS5pbnB1dCA9IENPTE9SREFUX0dQRVJGCiBjb2xvcmRh dGEuQ09ORklHID0gdGFyZ2V0X3ByZWRlcHMgbm9fbGluaworY29sb3JkYXRhLnZhcmlhYmxlX291 dCA9CiBhZGRFeHRyYUNvbXBpbGVyKGNvbG9yZGF0YSkKIAogIyBHRU5FUkFUT1IgOToK