91108 2012-07-12 09:44:41 -0700 [ANGLE] On QT, use Bison and Flex during ANGLE build 2012-07-18 04:49:36 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 91105 1 mvujovic hausmann hausmann vestbo webkit.review.bot oldest_to_newest 667880 0 mvujovic 2012-07-12 09:44:41 -0700 See description in bug 91105. 670323 1 hausmann 2012-07-16 07:29:40 -0700 Good idea. My feeling is that we should do this in WebCore/DerivedSources.pri and call bison/flex directly, i.e. avoid the generate_parser.sh script. The main reason for avoiding the scripts would be that we don't require bash for the build of the Qt port on Windows. 670454 2 mvujovic 2012-07-16 10:47:25 -0700 (In reply to comment #1) > Good idea. My feeling is that we should do this in WebCore/DerivedSources.pri and call bison/flex directly, i.e. avoid the generate_parser.sh script. That makes sense to me, too. > The main reason for avoiding the scripts would be that we don't require bash for the build of the Qt port on Windows. That's really good to know. Thanks, Simon. 671092 3 152720 hausmann 2012-07-17 01:43:45 -0700 Created attachment 152720 Patch 671093 4 hausmann 2012-07-17 01:47:37 -0700 I think this patch could be applied even today, we just won't compile the generated sources that exist in Thirdparty/Angle. I noticed that the "new processor" files don't seem to be currently used though. 671739 5 mvujovic 2012-07-17 16:35:06 -0700 (In reply to comment #4) > I think this patch could be applied even today, we just won't compile the generated sources that exist in Thirdparty/Angle. Thanks for the patch, Simon! Just a heads up- we landed a big ANGLE update to r1170 today in bug 89039, so you'll have to make a (hopefully small) change to your patch. The following files were renamed in the new version of ANGLE: ANGLE/src/compiler/preprocessor/new/pp.l -> Tokenizer.l ANGLE/src/compiler/preprocessor/new/pp.y -> ExpressionParser.y You'll need to remove Tokenizer.cpp and ExpressionParser.cpp from WebCore/Target.pri as well, since you'll be generating them now. > I noticed that the "new processor" files don't seem to be currently used though. I think those files are now required for the new version of ANGLE to build. However, the new preprocessor isn't enabled in the current WebKit ANGLE source. Next time we update ANGLE though, it will be using the the new preprocessor. 672072 6 152950 hausmann 2012-07-18 00:25:32 -0700 Created attachment 152950 Patch 672214 7 152950 kenneth 2012-07-18 03:47:04 -0700 Comment on attachment 152950 Patch rs=me 672247 8 hausmann 2012-07-18 04:49:36 -0700 Committed r122947: <http://trac.webkit.org/changeset/122947> 152720 2012-07-17 01:43:45 -0700 2012-07-18 00:25:26 -0700 Patch bug-91108-20120717104356.patch text/plain 6113 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGYyMGVmNDNjNGM3YjYz YWVlNDE0YjU5NzQzY2Y5YjM4MGI4NDBjYi4uYzAwMGIyODFiM2VkNmNiOGVlYzcwNDkyNTUwN2Vl NzUwMDEzMWEzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA3LTE3ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbQU5HTEVd IE9uIFFULCB1c2UgQmlzb24gYW5kIEZsZXggZHVyaW5nIEFOR0xFIGJ1aWxkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTEwOAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBkZXJpdmVkIHNvdXJjZSBn ZW5lcmF0b3JzIGZvciB0aGUgdHdvIGFuZ2xlIGJpc29uIHBhcnNlcnMgYW5kIGZsZXggYmFzZWQg bGV4ZXJzLgorCisgICAgICAgICogRGVyaXZlZFNvdXJjZXMucHJpOgorICAgICAgICAqIFRhcmdl dC5wcmk6CisKIDIwMTItMDctMTYgIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJraXQub3JnPgog CiAgICAgICAgIEF0dGVtcHQgdG8gZml4IHRoZSBDaHJvbWl1bSBNYWMgYnVpbGQgYWZ0ZXIgPGh0 dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEyMjgwMj4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLnByaSBiL1NvdXJjZS9XZWJDb3JlL0Rlcml2ZWRTb3Vy Y2VzLnByaQppbmRleCAyZjkzYzRhZTBiZWNkYWVkOTRlN2ExMzgyZjhmMGU4Y2Q1NDljNzEzLi41 NWQ0YTExZjJmYzlkNjZiMmYyMWMzZGNkMjk0MmY3YzE3ZGRkMzQyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9EZXJpdmVkU291cmNlcy5wcmkKKysrIGIvU291cmNlL1dlYkNvcmUvRGVyaXZl ZFNvdXJjZXMucHJpCkBAIC05NDAsMyArOTQwLDM2IEBAIHY4IHsKICAgICByZXRnZW4uY29tbWFu ZHMgPSBweXRob24gJCRyZXRnZW4uc2NyaXB0ID4gJHtRTUFLRV9GSUxFX09VVH0KICAgICBHRU5F UkFUT1JTICs9IHJldGdlbgogfQorCisjIEdlbmVyYXRvciAxMjogQW5nbGUgcGFyc2VycworY29u dGFpbnMoREVGSU5FUywgV1RGX1VTRV8zRF9HUkFQSElDUz0xKSB7CisKKyAgICBBTkdMRV9ESVIg PSAkJHJlcGxhY2UoUFdELCAiV2ViQ29yZSIsICJUaGlyZFBhcnR5L0FOR0xFIikKKworICAgIEFO R0xFX0ZMRVhfU09VUkNFUyA9IFwKKyAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL2ds c2xhbmcubCBcCisgICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3Iv bmV3L3BwLmwKKworICAgIGFuZ2xlZmxleC5vdXRwdXQgPSAke1FNQUtFX0ZJTEVfQkFTRX1fbGV4 LmNwcAorICAgIGFuZ2xlZmxleC5pbnB1dCA9IEFOR0xFX0ZMRVhfU09VUkNFUworICAgIGFuZ2xl ZmxleC5jb21tYW5kcyA9IGZsZXggLS1ub2xpbmUgLS1ub3VuaXN0ZCAtLW91dGZpbGU9JHtRTUFL RV9GSUxFX09VVH0gJHtRTUFLRV9GSUxFX0lOfQorICAgICpnKysqOiBhbmdsZWZsZXgudmFyaWFi bGVfb3V0ID0gQU5HTEVfU09VUkNFUworICAgIEdFTkVSQVRPUlMgKz0gYW5nbGVmbGV4CisKKyAg ICBBTkdMRV9CSVNPTl9TT1VSQ0VTID0gXAorICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGls ZXIvZ2xzbGFuZy55IFwKKyAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL3ByZXByb2Nl c3Nvci9uZXcvcHAueQorCisgICAgYW5nbGViaXNvbl9kZWNsLm91dHB1dCA9ICR7UU1BS0VfRklM RV9CQVNFfV90YWIuaAorICAgIGFuZ2xlYmlzb25fZGVjbC5pbnB1dCA9IEFOR0xFX0JJU09OX1NP VVJDRVMKKyAgICBhbmdsZWJpc29uX2RlY2wuY29tbWFuZHMgPSBiaXNvbiAtLW5vLWxpbmVzIC0t c2tlbGV0b249eWFjYy5jIC0tZGVmaW5lcz0ke1FNQUtFX0ZJTEVfT1VUfSAtLW91dHB1dD0ke1FN QUtFX0ZVTkNfRklMRV9PVVRfUEFUSH0kJHtRTUFLRV9ESVJfU0VQfSR7UU1BS0VfRklMRV9PVVRf QkFTRX0uY3BwICR7UU1BS0VfRklMRV9JTn0KKyAgICBhbmdsZWJpc29uX2RlY2wudmFyaWFibGVf b3V0ID0gR0VORVJBVEVEX0ZJTEVTCisgICAgR0VORVJBVE9SUyArPSBhbmdsZWJpc29uX2RlY2wK KworICAgIGFuZ2xlYmlzb25faW1wbC5pbnB1dCA9IEFOR0xFX0JJU09OX1NPVVJDRVMKKyAgICBh bmdsZWJpc29uX2ltcGwuY29tbWFuZHMgPSAkJGVzY2FwZV9leHBhbmQoXFxuKQorICAgIGFuZ2xl Ymlzb25faW1wbC5kZXBlbmRzID0gJHtRTUFLRV9GSUxFX0JBU0V9X3RhYi5oCisgICAgYW5nbGVi aXNvbl9pbXBsLm91dHB1dCA9ICR7UU1BS0VfRklMRV9CQVNFfV90YWIuY3BwCisgICAgKmcrKyo6 IGFuZ2xlYmlzb25faW1wbC52YXJpYWJsZV9vdXQgPSBBTkdMRV9TT1VSQ0VTCisgICAgR0VORVJB VE9SUyArPSBhbmdsZWJpc29uX2ltcGwKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1Rh cmdldC5wcmkgYi9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCmluZGV4IDhmMGUzM2ViNzk3Yjhi MDRhNjk1NTc2ZjZlM2M3ZDhiMWNhYjU3NjAuLmMxN2Y2NGVlMDE2ZDc5OGQ2OGI0NDNkYzIwZjIz NGM2MDQzYTY5MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKKysrIGIv U291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQpAQCAtMzk5Niw3ICszOTk2LDEwIEBAIGNvbnRhaW5z KERFRklORVMsIFdURl9VU0VfM0RfR1JBUEhJQ1M9MSkgewogCiAgICAgQU5HTEVfRElSID0gJCRy ZXBsYWNlKFBXRCwgIldlYkNvcmUiLCAiVGhpcmRQYXJ0eS9BTkdMRSIpCiAKLSAgICBJTkNMVURF UEFUSCArPSAkJEFOR0xFX0RJUi9zcmMgJCRBTkdMRV9ESVIvaW5jbHVkZQorICAgIElOQ0xVREVQ QVRIICs9IFwKKyAgICAgICAgJCRBTkdMRV9ESVIvc3JjIFwKKyAgICAgICAgJCRBTkdMRV9ESVIv c3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcgXAorICAgICAgICAkJEFOR0xFX0RJUi9pbmNs dWRlCiAKICAgICBBTkdMRV9IRUFERVJTICs9IFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2Nv bXBpbGVyL0Jhc2VUeXBlcy5oIFwKQEAgLTQwMDgsNyArNDAxMSw2IEBAIGNvbnRhaW5zKERFRklO RVMsIFdURl9VU0VfM0RfR1JBUEhJQ1M9MSkgewogICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29t cGlsZXIvRXh0ZW5zaW9uQmVoYXZpb3IuaCBcCiAgICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21w aWxlci9Gb3JMb29wVW5yb2xsLmggXAogICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGlsZXIv Z2xzbGFuZy5oIFwKLSAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL2dsc2xhbmdfdGFi LmggXAogICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGlsZXIvSW5mb1NpbmsuaCBcCiAgICAg ICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9Jbml0aWFsaXplRGxsLmggXAogICAgICAgICAk JEFOR0xFX0RJUi9zcmMvY29tcGlsZXIvSW5pdGlhbGl6ZUdsb2JhbHMuaCBcCkBAIC00MDYwLDgg KzQwNjIsNiBAQCBjb250YWlucyhERUZJTkVTLCBXVEZfVVNFXzNEX0dSQVBISUNTPTEpIHsKICAg ICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL2RlYnVnLmNwcCBcCiAgICAgICAgICQkQU5H TEVfRElSL3NyYy9jb21waWxlci9EZXRlY3RSZWN1cnNpb24uY3BwIFwKICAgICAgICAgJCRBTkdM RV9ESVIvc3JjL2NvbXBpbGVyL0Zvckxvb3BVbnJvbGwuY3BwIFwKLSAgICAgICAgJCRBTkdMRV9E SVIvc3JjL2NvbXBpbGVyL2dsc2xhbmdfbGV4LmNwcCBcCi0gICAgICAgICQkQU5HTEVfRElSL3Ny Yy9jb21waWxlci9nbHNsYW5nX3RhYi5jcHAgXAogICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29t cGlsZXIvSW5mb1NpbmsuY3BwIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL0lu aXRpYWxpemUuY3BwIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL0luaXRpYWxp emVEbGwuY3BwIFwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCAxMDg3MWYwZTJmYTJkMDc5YzlkYTQ0NWRmMmZlOGIzYmI1MGQ0MTgzLi4yYjVjM2Nk ZjBiNGRhMjkxZjI4MWYyNWMyNmY4MWMzNjk4YTZjNDM2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDctMTcg IFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgorCisgICAgICAgIFtB TkdMRV0gT24gUVQsIHVzZSBCaXNvbiBhbmQgRmxleCBkdXJpbmcgQU5HTEUgYnVpbGQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxMTA4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBxbWFrZS9ta3NwZWNz L2ZlYXR1cmVzL2RlZmF1bHRfcG9zdC5wcmY6IEFkZCBzdXBwb3J0IGZvciB2YXJpYWJsZV9vdXQg dG8gb3VyIGdlbmVyYXRvcnMsIHRvIGFsbG93CisgICAgICAgIGdlbmVyYXRpbmcgbm90IG9ubHkg Zm9yIFNPVVJDRVMgYnV0IGFsc28gQU5HTEVfU09VUkNFUyAoaW4gdGhpcyBidWcpCisKIDIwMTIt MDctMTcgIERhdmlkIEJhcnIgIDxkYXZpZGJhcnJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIElu dHJvZHVjZSBFTkFCTEVfQ1NTX0lNQUdFX09SSUVOVEFUSU9OIGNvbXBpbGUgZmxhZwpkaWZmIC0t Z2l0IGEvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmIGIvVG9v bHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmCmluZGV4IDc2N2U1NjM3 MjM3OTBhOTJmMjVhMWVmYzE5MTk3ZGM0OWE1MDE2MWUuLjc4YTBhODJiNGQ4YjE2MTgxZDhlMmU2 ZDFjNTQ0NDI2MWVkNjczOTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVy ZXMvZGVmYXVsdF9wb3N0LnByZgorKysgYi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2Rl ZmF1bHRfcG9zdC5wcmYKQEAgLTk1LDYgKzk1LDggQEAgY29udGFpbnMoVEVNUExBVEUsIGRlcml2 ZWQpIHsKICAgICAgICAgb3V0cHV0ID0gJCRldmFsKCQke2dlbmVyYXRvcn0ub3V0cHV0KQogICAg ICAgICBpbnB1dCA9ICQkZXZhbCgkJHtnZW5lcmF0b3J9LmlucHV0KQogICAgICAgICBpbnB1dF9m aWxlcyA9ICQkZXZhbCgkJGlucHV0KQorICAgICAgICBvdXRwdXRfdmFyaWFibGUgPSAkJGV2YWwo JCR7Z2VuZXJhdG9yfS52YXJpYWJsZV9vdXQpCisgICAgICAgIGlzRW1wdHkob3V0cHV0X3Zhcmlh YmxlKTogb3V0cHV0X3ZhcmlhYmxlID0gU09VUkNFUwogCiAgICAgICAgIGlzRW1wdHkoJCR7Z2Vu ZXJhdG9yfS5vdXRwdXRfZnVuY3Rpb24pIHsKICAgICAgICAgICAgIHByZXBlbmRFYWNoKG91dHB1 dCwgJCR7R0VORVJBVEVEX1NPVVJDRVNfREVTVERJUn0vKQpAQCAtMTA0LDEzICsxMDYsMTMgQEAg Y29udGFpbnMoVEVNUExBVEUsIGRlcml2ZWQpIHsKICAgICAgICAgICAgICAgICBiYXNlIH49IHMv XFwuLisvLwogICAgICAgICAgICAgICAgIG91dHB1dF9maWxlID0gJCRyZXBsYWNlKG91dHB1dCxc XCRcXHtRTUFLRV9GSUxFX0JBU0VcXH0sICQkYmFzZSkKIAotICAgICAgICAgICAgICAgIFNPVVJD RVMgKz0gJCRvdXRwdXRfZmlsZQorICAgICAgICAgICAgICAgIGV2YWwoJCRvdXRwdXRfdmFyaWFi bGUgKz0gJCRvdXRwdXRfZmlsZSkKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgIGZ1bmN0aW9uID0gJCRldmFsKCQke2dlbmVyYXRvcn0ub3V0cHV0X2Z1bmN0aW9u KQogICAgICAgICAgICAgZm9yKGlucHV0X2ZpbGUsIGlucHV0X2ZpbGVzKSB7CiAgICAgICAgICAg ICAgICAgZXZhbChvdXRwdXRfZmlsZSA9IFwkXCQkJGZ1bmN0aW9uXCgkJGlucHV0X2ZpbGVcKSkK LSAgICAgICAgICAgICAgICBTT1VSQ0VTICs9ICQkb3V0cHV0X2ZpbGUKKyAgICAgICAgICAgICAg ICBldmFsKCQkb3V0cHV0X3ZhcmlhYmxlICs9ICQkb3V0cHV0X2ZpbGUpCiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KIAo= 152950 2012-07-18 00:25:32 -0700 2012-07-18 03:47:04 -0700 Patch bug-91108-20120718092546.patch text/plain 7799 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyOTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzMyZDI4ZDY0MDU5YTY3 MjlmNzRkZTVlOTUwZTAwNzhhMTRjMzQ4My4uM2I4ZDhkMWQwMDMyODEwNjQxZTk0YWY1MmYyNTIw NjBmZGY2MzMyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA3LTE3ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbQU5HTEVd IE9uIFFULCB1c2UgQmlzb24gYW5kIEZsZXggZHVyaW5nIEFOR0xFIGJ1aWxkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTEwOAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBkZXJpdmVkIHNvdXJjZSBn ZW5lcmF0b3JzIGZvciB0aGUgdHdvIGFuZ2xlIGJpc29uIHBhcnNlcnMgYW5kIGZsZXggYmFzZWQg bGV4ZXJzLgorCisgICAgICAgICogRGVyaXZlZFNvdXJjZXMucHJpOgorICAgICAgICAqIFRhcmdl dC5wcmk6CisKIDIwMTItMDctMTcgIFlvc2hpZnVtaSBJbm91ZSAgPHlvc2luQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBEZWNpbWFsIGNvbnN0cnVjdG9yIHdpdGggOTk5OTk5OTk5OTk5OTk5OTkg bG9zZXMgbGFzdCBkaWdpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJj ZXMucHJpIGIvU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMucHJpCmluZGV4IGFmM2EwYzk4 NTg3OTQ0YTUxMGU0NDYyMjI1Y2ZhZGM3MTQ2OTY1MjUuLjJjMjljOGY1MmE2MjgwNWZhYzU2NDk3 MDY0NTE4M2E3MDI2NzFhZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0Rlcml2ZWRTb3Vy Y2VzLnByaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNlcy5wcmkKQEAgLTkwMSwz ICs5MDEsMzYgQEAgd2Via2l0dmVyc2lvbi5jb21tYW5kcyA9IHBlcmwgJCR3ZWJraXR2ZXJzaW9u LnNjcmlwdCAtLWNvbmZpZyAkJFBXRC8uLi9XZWJLaXQvbWEKIHdlYmtpdHZlcnNpb24uY2xlYW4g PSAke1FNQUtFX0ZVTkNfRklMRV9PVVRfUEFUSH0vV2ViS2l0VmVyc2lvbi5oCiB3ZWJraXR2ZXJz aW9uLmFkZF9vdXRwdXRfdG9fc291cmNlcyA9IGZhbHNlCiBHRU5FUkFUT1JTICs9IHdlYmtpdHZl cnNpb24KKworIyBHZW5lcmF0b3IgMTI6IEFuZ2xlIHBhcnNlcnMKK2NvbnRhaW5zKERFRklORVMs IFdURl9VU0VfM0RfR1JBUEhJQ1M9MSkgeworCisgICAgQU5HTEVfRElSID0gJCRyZXBsYWNlKFBX RCwgIldlYkNvcmUiLCAiVGhpcmRQYXJ0eS9BTkdMRSIpCisKKyAgICBBTkdMRV9GTEVYX1NPVVJD RVMgPSBcCisgICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9nbHNsYW5nLmwgXAorICAg ICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9Ub2tlbml6ZXIu bAorCisgICAgYW5nbGVmbGV4Lm91dHB1dCA9ICR7UU1BS0VfRklMRV9CQVNFfV9sZXguY3BwCisg ICAgYW5nbGVmbGV4LmlucHV0ID0gQU5HTEVfRkxFWF9TT1VSQ0VTCisgICAgYW5nbGVmbGV4LmNv bW1hbmRzID0gZmxleCAtLW5vbGluZSAtLW5vdW5pc3RkIC0tb3V0ZmlsZT0ke1FNQUtFX0ZJTEVf T1VUfSAke1FNQUtFX0ZJTEVfSU59CisgICAgKmcrKyo6IGFuZ2xlZmxleC52YXJpYWJsZV9vdXQg PSBBTkdMRV9TT1VSQ0VTCisgICAgR0VORVJBVE9SUyArPSBhbmdsZWZsZXgKKworICAgIEFOR0xF X0JJU09OX1NPVVJDRVMgPSBcCisgICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9nbHNs YW5nLnkgXAorICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25l dy9FeHByZXNzaW9uUGFyc2VyLnkKKworICAgIGFuZ2xlYmlzb25fZGVjbC5vdXRwdXQgPSAke1FN QUtFX0ZJTEVfQkFTRX1fdGFiLmgKKyAgICBhbmdsZWJpc29uX2RlY2wuaW5wdXQgPSBBTkdMRV9C SVNPTl9TT1VSQ0VTCisgICAgYW5nbGViaXNvbl9kZWNsLmNvbW1hbmRzID0gYmlzb24gLS1uby1s aW5lcyAtLXNrZWxldG9uPXlhY2MuYyAtLWRlZmluZXM9JHtRTUFLRV9GSUxFX09VVH0gLS1vdXRw dXQ9JHtRTUFLRV9GVU5DX0ZJTEVfT1VUX1BBVEh9JCR7UU1BS0VfRElSX1NFUH0ke1FNQUtFX0ZJ TEVfT1VUX0JBU0V9LmNwcCAke1FNQUtFX0ZJTEVfSU59CisgICAgYW5nbGViaXNvbl9kZWNsLnZh cmlhYmxlX291dCA9IEdFTkVSQVRFRF9GSUxFUworICAgIEdFTkVSQVRPUlMgKz0gYW5nbGViaXNv bl9kZWNsCisKKyAgICBhbmdsZWJpc29uX2ltcGwuaW5wdXQgPSBBTkdMRV9CSVNPTl9TT1VSQ0VT CisgICAgYW5nbGViaXNvbl9pbXBsLmNvbW1hbmRzID0gJCRlc2NhcGVfZXhwYW5kKFxcbikKKyAg ICBhbmdsZWJpc29uX2ltcGwuZGVwZW5kcyA9ICR7UU1BS0VfRklMRV9CQVNFfV90YWIuaAorICAg IGFuZ2xlYmlzb25faW1wbC5vdXRwdXQgPSAke1FNQUtFX0ZJTEVfQkFTRX1fdGFiLmNwcAorICAg ICpnKysqOiBhbmdsZWJpc29uX2ltcGwudmFyaWFibGVfb3V0ID0gQU5HTEVfU09VUkNFUworICAg IEdFTkVSQVRPUlMgKz0gYW5nbGViaXNvbl9pbXBsCit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9UYXJnZXQucHJpIGIvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQppbmRleCA5N2EzZDg4 N2NkMTAwZGYzNmIwYTVhZDg0ZDAwZjQ4ODgwZGU4OWY2Li4zMjQ0YmJjMDQwNDdmNTg1YTE4YjYx Yjg4OTFjMTQyMzI0ZmE4ZDIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJp CisrKyBiL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKQEAgLTM3MTYsNyArMzcxNiwxMCBAQCBj b250YWlucyhERUZJTkVTLCBXVEZfVVNFXzNEX0dSQVBISUNTPTEpIHsKIAogICAgIEFOR0xFX0RJ UiA9ICQkcmVwbGFjZShQV0QsICJXZWJDb3JlIiwgIlRoaXJkUGFydHkvQU5HTEUiKQogCi0gICAg SU5DTFVERVBBVEggKz0gJCRBTkdMRV9ESVIvc3JjICQkQU5HTEVfRElSL2luY2x1ZGUKKyAgICBJ TkNMVURFUEFUSCArPSBcCisgICAgICAgICQkQU5HTEVfRElSL3NyYyBcCisgICAgICAgICQkQU5H TEVfRElSL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3IFwKKyAgICAgICAgJCRBTkdMRV9E SVIvaW5jbHVkZQogCiAgICAgQU5HTEVfSEVBREVSUyArPSBcCiAgICAgICAgICQkQU5HTEVfRElS L3NyYy9jb21waWxlci9CYXNlVHlwZXMuaCBcCkBAIC0zNzM0LDcgKzM3MzcsNiBAQCBjb250YWlu cyhERUZJTkVTLCBXVEZfVVNFXzNEX0dSQVBISUNTPTEpIHsKICAgICAgICAgJCRBTkdMRV9ESVIv c3JjL2NvbXBpbGVyL0V4dGVuc2lvbkJlaGF2aW9yLmggXAogICAgICAgICAkJEFOR0xFX0RJUi9z cmMvY29tcGlsZXIvRm9yTG9vcFVucm9sbC5oIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2Nv bXBpbGVyL2dsc2xhbmcuaCBcCi0gICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9nbHNs YW5nX3RhYi5oIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL0luZm9TaW5rLmgg XAogICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGlsZXIvSW5pdGlhbGl6ZURsbC5oIFwKICAg ICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL0luaXRpYWxpemVHbG9iYWxzLmggXApAQCAt Mzc1NCw3ICszNzU2LDYgQEAgY29udGFpbnMoREVGSU5FUywgV1RGX1VTRV8zRF9HUkFQSElDUz0x KSB7CiAgICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L0Rp YWdub3N0aWNzLmggXAogICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGlsZXIvcHJlcHJvY2Vz c29yL25ldy9EaXJlY3RpdmVIYW5kbGVyLmggXAogICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29t cGlsZXIvcHJlcHJvY2Vzc29yL25ldy9EaXJlY3RpdmVQYXJzZXIuaCBcCi0gICAgICAgICQkQU5H TEVfRElSL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L0V4cHJlc3Npb25QYXJzZXIuaCBc CiAgICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L0lucHV0 LmggXAogICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9M ZXhlci5oIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9u ZXcvTWFjcm8uaCBcCkBAIC0zODA5LDggKzM4MTAsNiBAQCBjb250YWlucyhERUZJTkVTLCBXVEZf VVNFXzNEX0dSQVBISUNTPTEpIHsKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL0Rp YWdub3N0aWNzLmNwcCBcCiAgICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9EaXJlY3Rp dmVIYW5kbGVyLmNwcCBcCiAgICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9Gb3JMb29w VW5yb2xsLmNwcCBcCi0gICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9nbHNsYW5nX2xl eC5jcHAgXAotICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGlsZXIvZ2xzbGFuZ190YWIuY3Bw IFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL0luZm9TaW5rLmNwcCBcCiAgICAg ICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9Jbml0aWFsaXplLmNwcCBcCiAgICAgICAgICQk QU5HTEVfRElSL3NyYy9jb21waWxlci9Jbml0aWFsaXplRGxsLmNwcCBcCkBAIC0zODUxLDE0ICsz ODUwLDEyIEBAIGNvbnRhaW5zKERFRklORVMsIFdURl9VU0VfM0RfR1JBUEhJQ1M9MSkgewogICAg ICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9EaWFnbm9zdGlj c0Jhc2UuY3BwIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nv ci9uZXcvRGlyZWN0aXZlSGFuZGxlckJhc2UuY3BwIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3Jj L2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvRGlyZWN0aXZlUGFyc2VyLmNwcCBcCi0gICAgICAg ICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9wcmVwcm9jZXNzb3IvbmV3L0V4cHJlc3Npb25QYXJz ZXIuY3BwIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9u ZXcvSW5wdXQuY3BwIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL3ByZXByb2Nl c3Nvci9uZXcvTGV4ZXIuY3BwIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL3By ZXByb2Nlc3Nvci9uZXcvTWFjcm8uY3BwIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBp bGVyL3ByZXByb2Nlc3Nvci9uZXcvTWFjcm9FeHBhbmRlci5jcHAgXAogICAgICAgICAkJEFOR0xF X0RJUi9zcmMvY29tcGlsZXIvcHJlcHJvY2Vzc29yL25ldy9QcmVwcm9jZXNzb3IuY3BwIFwKICAg ICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvVG9rZW4uY3Bw IFwKLSAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL3ByZXByb2Nlc3Nvci9uZXcvVG9r ZW5pemVyLmNwcCBcCiAgICAgICAgICQkQU5HTEVfRElSL3NyYy9jb21waWxlci9wcmVwcm9jZXNz b3Ivc2Nhbm5lci5jIFwKICAgICAgICAgJCRBTkdMRV9ESVIvc3JjL2NvbXBpbGVyL3ByZXByb2Nl c3Nvci9zeW1ib2xzLmMgXAogICAgICAgICAkJEFOR0xFX0RJUi9zcmMvY29tcGlsZXIvcHJlcHJv Y2Vzc29yL3Rva2Vucy5jCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggYTlhNjI1ZmVjNGZhYWM1OGM2ZDQ4YjZlOGFiYTJlNDYyNmI4ZTdjMS4uMzFm MDgzOWE0MGExYzMzODc4NWQ1OTdmYzBjMWI4M2U1MmI4ZGY1ZCAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA3 LTE3ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAg ICBbQU5HTEVdIE9uIFFULCB1c2UgQmlzb24gYW5kIEZsZXggZHVyaW5nIEFOR0xFIGJ1aWxkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTEwOAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcW1ha2UvbWtz cGVjcy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmOiBBZGQgc3VwcG9ydCBmb3IgdmFyaWFibGVf b3V0IHRvIG91ciBnZW5lcmF0b3JzLCB0byBhbGxvdworICAgICAgICBnZW5lcmF0aW5nIG5vdCBv bmx5IGZvciBTT1VSQ0VTIGJ1dCBhbHNvIEFOR0xFX1NPVVJDRVMgKGluIHRoaXMgYnVnKQorCiAy MDEyLTA3LTE3ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFJ1biByZWYgdGVzdHMgdG9nZXRoZXIgdG8gYXZvaWQg ZXhwZW5zaXZlIGRyaXZlciByZXN0YXJ0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvcW1ha2UvbWtzcGVj cy9mZWF0dXJlcy9kZWZhdWx0X3Bvc3QucHJmIGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJl cy9kZWZhdWx0X3Bvc3QucHJmCmluZGV4IDc2N2U1NjM3MjM3OTBhOTJmMjVhMWVmYzE5MTk3ZGM0 OWE1MDE2MWUuLjc4YTBhODJiNGQ4YjE2MTgxZDhlMmU2ZDFjNTQ0NDI2MWVkNjczOTggMTAwNjQ0 Ci0tLSBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZGVmYXVsdF9wb3N0LnByZgorKysg Yi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2RlZmF1bHRfcG9zdC5wcmYKQEAgLTk1LDYg Kzk1LDggQEAgY29udGFpbnMoVEVNUExBVEUsIGRlcml2ZWQpIHsKICAgICAgICAgb3V0cHV0ID0g JCRldmFsKCQke2dlbmVyYXRvcn0ub3V0cHV0KQogICAgICAgICBpbnB1dCA9ICQkZXZhbCgkJHtn ZW5lcmF0b3J9LmlucHV0KQogICAgICAgICBpbnB1dF9maWxlcyA9ICQkZXZhbCgkJGlucHV0KQor ICAgICAgICBvdXRwdXRfdmFyaWFibGUgPSAkJGV2YWwoJCR7Z2VuZXJhdG9yfS52YXJpYWJsZV9v dXQpCisgICAgICAgIGlzRW1wdHkob3V0cHV0X3ZhcmlhYmxlKTogb3V0cHV0X3ZhcmlhYmxlID0g U09VUkNFUwogCiAgICAgICAgIGlzRW1wdHkoJCR7Z2VuZXJhdG9yfS5vdXRwdXRfZnVuY3Rpb24p IHsKICAgICAgICAgICAgIHByZXBlbmRFYWNoKG91dHB1dCwgJCR7R0VORVJBVEVEX1NPVVJDRVNf REVTVERJUn0vKQpAQCAtMTA0LDEzICsxMDYsMTMgQEAgY29udGFpbnMoVEVNUExBVEUsIGRlcml2 ZWQpIHsKICAgICAgICAgICAgICAgICBiYXNlIH49IHMvXFwuLisvLwogICAgICAgICAgICAgICAg IG91dHB1dF9maWxlID0gJCRyZXBsYWNlKG91dHB1dCxcXCRcXHtRTUFLRV9GSUxFX0JBU0VcXH0s ICQkYmFzZSkKIAotICAgICAgICAgICAgICAgIFNPVVJDRVMgKz0gJCRvdXRwdXRfZmlsZQorICAg ICAgICAgICAgICAgIGV2YWwoJCRvdXRwdXRfdmFyaWFibGUgKz0gJCRvdXRwdXRfZmlsZSkKICAg ICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGZ1bmN0aW9uID0gJCRl dmFsKCQke2dlbmVyYXRvcn0ub3V0cHV0X2Z1bmN0aW9uKQogICAgICAgICAgICAgZm9yKGlucHV0 X2ZpbGUsIGlucHV0X2ZpbGVzKSB7CiAgICAgICAgICAgICAgICAgZXZhbChvdXRwdXRfZmlsZSA9 IFwkXCQkJGZ1bmN0aW9uXCgkJGlucHV0X2ZpbGVcKSkKLSAgICAgICAgICAgICAgICBTT1VSQ0VT ICs9ICQkb3V0cHV0X2ZpbGUKKyAgICAgICAgICAgICAgICBldmFsKCQkb3V0cHV0X3ZhcmlhYmxl ICs9ICQkb3V0cHV0X2ZpbGUpCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAo=