91229 2012-07-13 06:08:57 -0700 [Qt] MSVC: unresolved external symbol __DllMainCRTStartup@12 2012-07-24 06:25:01 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 88300 1 jturcotte hausmann galpeter hausmann joel.dillon ossy vestbo webkit.review.bot oldest_to_newest 668940 0 jturcotte 2012-07-13 06:08:57 -0700 Since the recent build changes in QtWebKit I get this error while linking QtWebKit. From my investigations, this seems to happen since there is no more obj files linked into the DLL, only static libraries. The way the linker usually links to MSVCRT.dll is by looking at linking directives in obj files, which depends if they were compiled with /MD, /MT, etc. I didn't try out yet to fix it but I'm leaving on vacation and this is the result of my investigation. I guess that forcing the correct libs to the linker or adding an empty .cpp file in api.pri just to carry those options to the linker should do the trick. This is using the --no-webkit2 switch. 668991 1 hausmann 2012-07-13 07:09:31 -0700 win32's default_post.prf is supposed to generate the forwarding export .cpp files using generate-win32-export-forwards. The generated sources are added to SOURCES and the resulting obj file should have those linker directives. However I also see the same issue and I do notice that the corresponding build rules for those are not always generated. So the lack of those rules is one issue and we could probably work around this particular linking issue with a dummy main.cpp file. 670120 2 hausmann 2012-07-15 23:38:38 -0700 I think I found the reason. From win32/default_post.prf: ---- # When creating the target DLL, extract exporting linker directives from # all static libraries we're linking into the DLL and make sure they are # also exported from the DLL. shared:contains(TEMPLATE, lib) { for(target, POST_TARGETDEPS) { libdep = $$find(target, .*\\.lib) exists($$libdep): LIBSWITHEXPORTS += $$libdep } } !isEmpty(LIBSWITHEXPORTS) { exportgen.input = LIBSWITHEXPORTS [...] } ---- When the makefiles are generated the first time, the POST_TARGETDEPS are set correctly, but the exists() check prevents the population of LIBSWITHEXPORTS. Therefore the extra compiler is not set up and SOURCES remains empty. 670238 3 152509 hausmann 2012-07-16 04:36:53 -0700 Created attachment 152509 Patch 670240 4 hausmann 2012-07-16 04:40:52 -0700 Fixing bug dependencies, this isn't really a WK2 specific problem. 670250 5 152509 zoltan 2012-07-16 05:05:50 -0700 Comment on attachment 152509 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152509&action=review > Tools/Scripts/generate-win32-export-forwards:31 > + dumpBin = subprocess.Popen("dumpbin /directives " + library, stdout=subprocess.PIPE, universal_newlines=True); Semicolon isn't needed. > Tools/Scripts/generate-win32-export-forwards:33 > + output, errors = dumpBin.communicate(); Since you don't do anything with 'errors' then output = dumpBin.communicate()[0] is enough. > Tools/Scripts/generate-win32-export-forwards:39 > +exportedSymbolRegexp = re.compile("\s*(?P<symbol>/EXPORT:.+)"); Semicolon isn't needed. I didn't test it, but otherwise looks Iwouldr+it. :) 670252 6 galpeter 2012-07-16 05:06:59 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=152509&action=review Some python comments: > Tools/Scripts/generate-win32-export-forwards:31 > + dumpBin = subprocess.Popen("dumpbin /directives " + library, stdout=subprocess.PIPE, universal_newlines=True); no need for the semicolon at the end. > Tools/Scripts/generate-win32-export-forwards:33 > + output, errors = dumpBin.communicate(); ditto > Tools/Scripts/generate-win32-export-forwards:36 > +libraries = sys.argv[1 : len(sys.argv) - 1] you can use negative indexing to get the last argument's index. so this'll be: sys.argv[1:-1] > Tools/Scripts/generate-win32-export-forwards:37 > +outputFileName = sys.argv[len(sys.argv) - 1] ditto: sys.argv[-1] > Tools/Scripts/generate-win32-export-forwards:39 > +exportedSymbolRegexp = re.compile("\s*(?P<symbol>/EXPORT:.+)"); semicolon is not needed > Tools/Scripts/generate-win32-export-forwards:45 > + if match != None: this can simply be: if match: because None is logically false. 670280 7 hausmann 2012-07-16 06:04:24 -0700 Awesome, thanks guys for the suggestions :) 670319 8 152530 hausmann 2012-07-16 07:26:45 -0700 Created attachment 152530 Patch 676633 9 152530 hausmann 2012-07-24 04:14:52 -0700 Comment on attachment 152530 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152530&action=review > Tools/Scripts/generate-win32-export-forwards:37 > +libraries = sys.argv[1 : len(sys.argv) - 1] > +outputFileName = sys.argv[len(sys.argv) - 1] I still need the -1 syntax trick here. > Tools/Scripts/generate-win32-export-forwards:45 > + if match != None: if match: > Tools/qmake/mkspecs/features/win32/default_post.prf:36 > + mac: suffix = _debug I'll remove the mac stuff and win32 scope before landing, since this is in win32/default_post.prf 676746 10 hausmann 2012-07-24 06:25:01 -0700 Committed r123465: <http://trac.webkit.org/changeset/123465> 152509 2012-07-16 04:36:53 -0700 2012-07-16 07:26:38 -0700 Patch bug-91229-20120716133702.patch text/plain 5222 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNzExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTM3YWE5MDg0MzY3Zjc2YzU1ODIxM2U4NjE2OTA2ODE3 NTE3NGM3Yi4uOGExMGI3NzZmMDJmMGRkOGYyYWU2YjIxMWYzZjQ0NDJkMDZhNDc4NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDEyLTA3LTE2ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNv bT4KKworICAgICAgICBbUXRdIE1TVkM6IHVucmVzb2x2ZWQgZXh0ZXJuYWwgc3ltYm9sIF9fRGxs TWFpbkNSVFN0YXJ0dXBAMTIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkxMjI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW4gb3JkZXIgdG8gc3VjY2Vzc2Z1bGx5IGxpbmsgYSBETEwgb24gV2luZG93cyB3 ZSBuZWVkIHRvIGhhdmUgYXQgbGVhc3QKKyAgICAgICAgb25lIG9iamVjdCBmaWxlIChvciBjb21w aWxhdGlvbiB1bml0KS4gVGhlIGZvcndhcmQgZXhwb3J0IGhlYWRlciBmaWxlcyB3ZXJlCisgICAg ICAgIHN1cHBvc2VkIHRvIGJlIHRoYXQsIGJ1dCB1bmZvcnR1bmF0ZWx5IHRoZSBydWxlIGluIHdp bjMyL2RlZmF1bHRfcG9zdC5wcmYgZm9yCisgICAgICAgIGNyZWF0aW5nIHRoZSBoZWFkZXIgZmls ZXMgaGFkIHNvbWUgYnVncywgYW1vbmcgb3RoZXJzIHRoYXQgaXQgZGlkIGFuIGV4aXN0cygpCisg ICAgICAgIGNoZWNrIG9uIHRoZSBkZXBlbmRpbmcgc3RhdGljIGxpYnJhcnkuIEF0IHRoZSB0aW1l IHFtYWtlIGlzIHJhbiB0aG9zZSBsaWJyYXJpZXMKKyAgICAgICAgZG8gbm90IGV4aXN0IHlldCBh bmQgdGhlcmVmb3JlIHRoZSBjb3JyZXNwb25kaW5nIGV4dHJhIGNvbXBpbGVyIHJ1bGVzIHdlcmUg bmV2ZXIKKyAgICAgICAgY3JlYXRlZCwgcmVzdWx0aW5nIGluIGVtcHR5IE9CSkVDVFMvU09VUkNF Uy4KKworICAgICAgICBFdmVuIHdpdGhvdXQgc3VjaCBhbiBleGlzdHMoKSBjaGVjaywgcW1ha2Ug ZXh0cmEgY29tcGlsZXJzIHJlcXVpcmUgdGhlIGZpbGVzCisgICAgICAgIHJlZmVycmVkIHRvIGlu IHRoZSAuaW5wdXQgdmFyaWFibGUgdG8gZXhpc3QgYXQgcW1ha2UgdGltZS4gSW4gdGhpcyBjYXNl IHRoZSBpbnB1dAorICAgICAgICBmaWxlcyB3ZXJlIHRoZSBzdGF0aWMgbGlicmFyaWVzLCB3aGlj aCBkbyBub3QgZXhpc3QgeWV0LgorCisgICAgICAgIFRoaXMgcGF0Y2ggc29sdmVzIHRoaXMgYnkg dXNpbmcgYSBxbWFrZSBleHRyYSB0YXJnZXQgaW5zdGVhZCBvZiBleHRyYQorICAgICAgICBjb21w aWxlciwgd2hpY2ggZG9lcyBub3QgaGF2ZSB0aGlzIGxpbWl0YXRpb24uIFRoZSB0YXJnZXQgaXMg cmVmZXJlbmNlZAorICAgICAgICB0aHJvdWdoIHRoZSBleHRlbnNpb24gb2YgR0VORVJBVEVEX1NP VVJDRVMuCisKKyAgICAgICAgVGhlIHBhdGNoIGFsc28gYWRkcyBhIGQvX2RlYnVnIHN1ZmZpeCBm b3IgZGVidWcgYnVpbGRzLCBkbyBhbGxvdyBmb3Igc2VwYXJhdGUKKyAgICAgICAgc3ltYm9sIGV4 cG9ydHMgaWYgbmVjZXNzYXJ5LgorCisgICAgICAgICogU2NyaXB0cy9nZW5lcmF0ZS13aW4zMi1l eHBvcnQtZm9yd2FyZHM6IFN1cHBvcnQgbXVsdGlwbGUgaW5wdXQgZmlsZXMsIGkuZS4KKyAgICAg ICAgY29uc2lkZXIgdGhlIGxhc3QgYXJndW1lbnQgdG8gYmUgdGhlIG91dHB1dCBmaWxlIGFuZCBl dmVyeXRoaW5nIGVsc2UgaW5wdXQuCisgICAgICAgICogcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy93 aW4zMi9kZWZhdWx0X3Bvc3QucHJmOgorCiAyMDEyLTA3LTE1ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggbWFrZSBk aXN0Y2hlY2suCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2dlbmVyYXRlLXdpbjMyLWV4cG9y dC1mb3J3YXJkcyBiL1Rvb2xzL1NjcmlwdHMvZ2VuZXJhdGUtd2luMzItZXhwb3J0LWZvcndhcmRz CmluZGV4IGU3NWI0MzBmNGU4NmVlZjgxMzkwMWU3NDI1MTc1MjAyMmY0ZjYzMTUuLjc2OGIzYmE5 MzA2YTU2MzQ0MTU4ZjM2NzljYzhjN2QwNjZkZDA1MGYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvZ2VuZXJhdGUtd2luMzItZXhwb3J0LWZvcndhcmRzCisrKyBiL1Rvb2xzL1NjcmlwdHMvZ2Vu ZXJhdGUtd2luMzItZXhwb3J0LWZvcndhcmRzCkBAIC0yNywyMiArMjcsMjcgQEAgaW1wb3J0IHN1 YnByb2Nlc3MKIGltcG9ydCBzeXMKIGltcG9ydCByZQogCi1kdW1wQmluID0gc3VicHJvY2Vzcy5Q b3BlbigiZHVtcGJpbiAvZGlyZWN0aXZlcyAiICsgc3lzLmFyZ3ZbMV0sIHN0ZG91dD1zdWJwcm9j ZXNzLlBJUEUsIHVuaXZlcnNhbF9uZXdsaW5lcz1UcnVlKTsKK2RlZiBleHBvcnRGb3J3YXJkc0Zv ckxpYnJhcnkobGlicmFyeSk6CisgICAgZHVtcEJpbiA9IHN1YnByb2Nlc3MuUG9wZW4oImR1bXBi aW4gL2RpcmVjdGl2ZXMgIiArIGxpYnJhcnksIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHVuaXZl cnNhbF9uZXdsaW5lcz1UcnVlKTsKIAotb3V0cHV0LCBlcnJvcnMgPSBkdW1wQmluLmNvbW11bmlj YXRlKCk7CisgICAgb3V0cHV0LCBlcnJvcnMgPSBkdW1wQmluLmNvbW11bmljYXRlKCk7CisgICAg cmV0dXJuIG91dHB1dAogCi1leHBvcnRlZFN5bWJvbFJlZ2V4cCA9IHJlLmNvbXBpbGUoIlxzKig/ UDxzeW1ib2w+L0VYUE9SVDouKykiKTsKK2xpYnJhcmllcyA9IHN5cy5hcmd2WzEgOiBsZW4oc3lz LmFyZ3YpIC0gMV0KK291dHB1dEZpbGVOYW1lID0gc3lzLmFyZ3ZbbGVuKHN5cy5hcmd2KSAtIDFd CiAKK2V4cG9ydGVkU3ltYm9sUmVnZXhwID0gcmUuY29tcGlsZSgiXHMqKD9QPHN5bWJvbD4vRVhQ T1JUOi4rKSIpOwogc3ltYm9scyA9IHNldCgpCiAKLWZvciBsaW5lIGluIG91dHB1dC5zcGxpdGxp bmVzKCk6Ci0gICAgbWF0Y2ggPSBleHBvcnRlZFN5bWJvbFJlZ2V4cC5tYXRjaChsaW5lKQotICAg IGlmIG1hdGNoICE9IE5vbmU6Ci0gICAgICAgIHN5bWJvbHMuYWRkKG1hdGNoLmdyb3VwKCJzeW1i b2wiKSkKK2ZvciBsaWIgaW4gbGlicmFyaWVzOgorICAgIGZvciBsaW5lIGluIGV4cG9ydEZvcndh cmRzRm9yTGlicmFyeShsaWIpLnNwbGl0bGluZXMoKToKKyAgICAgICAgbWF0Y2ggPSBleHBvcnRl ZFN5bWJvbFJlZ2V4cC5tYXRjaChsaW5lKQorICAgICAgICBpZiBtYXRjaCAhPSBOb25lOgorICAg ICAgICAgICAgc3ltYm9scy5hZGQobWF0Y2guZ3JvdXAoInN5bWJvbCIpKQogCi1wcmludCAiRm9y d2FyZGluZyAlcyBzeW1ib2xzIGZyb20gc3RhdGljIGxpYnJhcnkgJXMiICUgKGxlbihzeW1ib2xz KSwgc3lzLmFyZ3ZbMV0pCitwcmludCAiRm9yd2FyZGluZyAlcyBzeW1ib2xzIGZyb20gJXMiICUg KGxlbihzeW1ib2xzKSwgIiAiLmpvaW4obGlicmFyaWVzKSkKIAotZXhwb3J0RmlsZSA9IG9wZW4o c3lzLmFyZ3ZbMl0sICJ3IikKK2V4cG9ydEZpbGUgPSBvcGVuKG91dHB1dEZpbGVOYW1lLCAidyIp CiBmb3Igc3ltYm9sIGluIHN5bWJvbHM6CiAgICAgZXhwb3J0RmlsZS53cml0ZSgiI3ByYWdtYSBj b21tZW50KGxpbmtlciwgXCIlc1wiKVxuIiAlIHN5bWJvbCk7CiBleHBvcnRGaWxlLmNsb3NlKCkK ZGlmZiAtLWdpdCBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvd2luMzIvZGVmYXVsdF9w b3N0LnByZiBiL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvd2luMzIvZGVmYXVsdF9wb3N0 LnByZgppbmRleCBkNDVkMDQ1NWVkMTI5NzNiMDBiZDA2NTg3MWM1NjVhMDMwZmZhZTVkLi4xMTY1 NTY3MDFhOGVkZGNlYzY2MTVlZGZhMGQzN2NkMjhhZWRlNGI4IDEwMDY0NAotLS0gYS9Ub29scy9x bWFrZS9ta3NwZWNzL2ZlYXR1cmVzL3dpbjMyL2RlZmF1bHRfcG9zdC5wcmYKKysrIGIvVG9vbHMv cW1ha2UvbWtzcGVjcy9mZWF0dXJlcy93aW4zMi9kZWZhdWx0X3Bvc3QucHJmCkBAIC0yNSwxNiAr MjUsMjEgQEAgbG9hZChkZWZhdWx0X3Bvc3QpCiBzaGFyZWQ6Y29udGFpbnMoVEVNUExBVEUsIGxp YikgewogICAgIGZvcih0YXJnZXQsIFBPU1RfVEFSR0VUREVQUykgewogICAgICAgICBsaWJkZXAg PSAkJGZpbmQodGFyZ2V0LCAuKlxcLmxpYikKLSAgICAgICAgZXhpc3RzKCQkbGliZGVwKTogTElC U1dJVEhFWFBPUlRTICs9ICQkbGliZGVwCisgICAgICAgICFpc0VtcHR5KGxpYmRlcCk6IExJQlNX SVRIRVhQT1JUUyArPSAkJGxpYmRlcAogICAgIH0KIH0KIAogIWlzRW1wdHkoTElCU1dJVEhFWFBP UlRTKSB7Ci0gICAgZXhwb3J0Z2VuLmlucHV0ID0gTElCU1dJVEhFWFBPUlRTCi0gICAgZXhwb3J0 Z2VuLm91dHB1dCA9IGV4cG9ydHNfJHtRTUFLRV9GSUxFX0JBU0V9LmNwcAotICAgIGV4cG9ydGdl bi5jb21tYW5kcyA9IHB5dGhvbiAkJHtST09UX1dFQktJVF9ESVJ9JCR7UU1BS0VfRElSX1NFUH1U b29scyQke1FNQUtFX0RJUl9TRVB9U2NyaXB0cyQke1FNQUtFX0RJUl9TRVB9Z2VuZXJhdGUtd2lu MzItZXhwb3J0LWZvcndhcmRzICR7UU1BS0VfRklMRV9JTn0gJHtRTUFLRV9GSUxFX09VVH0KLSAg ICBleHBvcnRnZW4udmFyaWFibGVfb3V0ID0gU09VUkNFUwotICAgIFFNQUtFX0VYVFJBX0NPTVBJ TEVSUyArPSBleHBvcnRnZW4KKyAgICBzdWZmaXggPQorICAgIENPTkZJRyhkZWJ1ZywgZGVidWd8 cmVsZWFzZSkgeworICAgICAgICB3aW4zMjogc3VmZml4ID0gZAorICAgICAgICBtYWM6IHN1ZmZp eCA9IF9kZWJ1ZworICAgIH0KKyAgICBmb3J3YXJkZWRfZXhwb3J0cy50YXJnZXQgPSBmb3J3YXJk ZWQtZXhwb3J0cyQke3N1ZmZpeH0uY3BwCisgICAgZm9yd2FyZGVkX2V4cG9ydHMuY29tbWFuZHMg PSBweXRob24gJCR7Uk9PVF9XRUJLSVRfRElSfSQke1FNQUtFX0RJUl9TRVB9VG9vbHMkJHtRTUFL RV9ESVJfU0VQfVNjcmlwdHMkJHtRTUFLRV9ESVJfU0VQfWdlbmVyYXRlLXdpbjMyLWV4cG9ydC1m b3J3YXJkcyAkJExJQlNXSVRIRVhQT1JUUyAkJGZvcndhcmRlZF9leHBvcnRzLnRhcmdldAorICAg IGZvcndhcmRlZF9leHBvcnRzLmRlcGVuZHMgPSAkJExJQlNXSVRIRVhQT1JUUworICAgIFFNQUtF X0VYVFJBX1RBUkdFVFMgKz0gZm9yd2FyZGVkX2V4cG9ydHMKKyAgICBHRU5FUkFURURfU09VUkNF UyArPSAkJGZvcndhcmRlZF9leHBvcnRzLnRhcmdldAogfQogCiAjIFRvIGVuc3VyZSB0aGUgUXQg ZXhwb3J0IG1hY3JvcyBhcmUgc2V0IHRvIGRsbGV4cG9ydAo= 152530 2012-07-16 07:26:45 -0700 2012-07-24 05:58:18 -0700 Patch bug-91229-20120716162654.patch text/plain 5214 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNzIxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTM3YWE5MDg0MzY3Zjc2YzU1ODIxM2U4NjE2OTA2ODE3 NTE3NGM3Yi4uOGExMGI3NzZmMDJmMGRkOGYyYWU2YjIxMWYzZjQ0NDJkMDZhNDc4NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDEyLTA3LTE2ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNv bT4KKworICAgICAgICBbUXRdIE1TVkM6IHVucmVzb2x2ZWQgZXh0ZXJuYWwgc3ltYm9sIF9fRGxs TWFpbkNSVFN0YXJ0dXBAMTIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkxMjI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW4gb3JkZXIgdG8gc3VjY2Vzc2Z1bGx5IGxpbmsgYSBETEwgb24gV2luZG93cyB3 ZSBuZWVkIHRvIGhhdmUgYXQgbGVhc3QKKyAgICAgICAgb25lIG9iamVjdCBmaWxlIChvciBjb21w aWxhdGlvbiB1bml0KS4gVGhlIGZvcndhcmQgZXhwb3J0IGhlYWRlciBmaWxlcyB3ZXJlCisgICAg ICAgIHN1cHBvc2VkIHRvIGJlIHRoYXQsIGJ1dCB1bmZvcnR1bmF0ZWx5IHRoZSBydWxlIGluIHdp bjMyL2RlZmF1bHRfcG9zdC5wcmYgZm9yCisgICAgICAgIGNyZWF0aW5nIHRoZSBoZWFkZXIgZmls ZXMgaGFkIHNvbWUgYnVncywgYW1vbmcgb3RoZXJzIHRoYXQgaXQgZGlkIGFuIGV4aXN0cygpCisg ICAgICAgIGNoZWNrIG9uIHRoZSBkZXBlbmRpbmcgc3RhdGljIGxpYnJhcnkuIEF0IHRoZSB0aW1l IHFtYWtlIGlzIHJhbiB0aG9zZSBsaWJyYXJpZXMKKyAgICAgICAgZG8gbm90IGV4aXN0IHlldCBh bmQgdGhlcmVmb3JlIHRoZSBjb3JyZXNwb25kaW5nIGV4dHJhIGNvbXBpbGVyIHJ1bGVzIHdlcmUg bmV2ZXIKKyAgICAgICAgY3JlYXRlZCwgcmVzdWx0aW5nIGluIGVtcHR5IE9CSkVDVFMvU09VUkNF Uy4KKworICAgICAgICBFdmVuIHdpdGhvdXQgc3VjaCBhbiBleGlzdHMoKSBjaGVjaywgcW1ha2Ug ZXh0cmEgY29tcGlsZXJzIHJlcXVpcmUgdGhlIGZpbGVzCisgICAgICAgIHJlZmVycmVkIHRvIGlu IHRoZSAuaW5wdXQgdmFyaWFibGUgdG8gZXhpc3QgYXQgcW1ha2UgdGltZS4gSW4gdGhpcyBjYXNl IHRoZSBpbnB1dAorICAgICAgICBmaWxlcyB3ZXJlIHRoZSBzdGF0aWMgbGlicmFyaWVzLCB3aGlj aCBkbyBub3QgZXhpc3QgeWV0LgorCisgICAgICAgIFRoaXMgcGF0Y2ggc29sdmVzIHRoaXMgYnkg dXNpbmcgYSBxbWFrZSBleHRyYSB0YXJnZXQgaW5zdGVhZCBvZiBleHRyYQorICAgICAgICBjb21w aWxlciwgd2hpY2ggZG9lcyBub3QgaGF2ZSB0aGlzIGxpbWl0YXRpb24uIFRoZSB0YXJnZXQgaXMg cmVmZXJlbmNlZAorICAgICAgICB0aHJvdWdoIHRoZSBleHRlbnNpb24gb2YgR0VORVJBVEVEX1NP VVJDRVMuCisKKyAgICAgICAgVGhlIHBhdGNoIGFsc28gYWRkcyBhIGQvX2RlYnVnIHN1ZmZpeCBm b3IgZGVidWcgYnVpbGRzLCBkbyBhbGxvdyBmb3Igc2VwYXJhdGUKKyAgICAgICAgc3ltYm9sIGV4 cG9ydHMgaWYgbmVjZXNzYXJ5LgorCisgICAgICAgICogU2NyaXB0cy9nZW5lcmF0ZS13aW4zMi1l eHBvcnQtZm9yd2FyZHM6IFN1cHBvcnQgbXVsdGlwbGUgaW5wdXQgZmlsZXMsIGkuZS4KKyAgICAg ICAgY29uc2lkZXIgdGhlIGxhc3QgYXJndW1lbnQgdG8gYmUgdGhlIG91dHB1dCBmaWxlIGFuZCBl dmVyeXRoaW5nIGVsc2UgaW5wdXQuCisgICAgICAgICogcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy93 aW4zMi9kZWZhdWx0X3Bvc3QucHJmOgorCiAyMDEyLTA3LTE1ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggbWFrZSBk aXN0Y2hlY2suCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2dlbmVyYXRlLXdpbjMyLWV4cG9y dC1mb3J3YXJkcyBiL1Rvb2xzL1NjcmlwdHMvZ2VuZXJhdGUtd2luMzItZXhwb3J0LWZvcndhcmRz CmluZGV4IGU3NWI0MzBmNGU4NmVlZjgxMzkwMWU3NDI1MTc1MjAyMmY0ZjYzMTUuLmU3NmM2YTVh ZGJkODk2NmRkYWIxNGY2Mzg0M2FkYjNmOWJjZTJmYWEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvZ2VuZXJhdGUtd2luMzItZXhwb3J0LWZvcndhcmRzCisrKyBiL1Rvb2xzL1NjcmlwdHMvZ2Vu ZXJhdGUtd2luMzItZXhwb3J0LWZvcndhcmRzCkBAIC0yNywyMiArMjcsMjcgQEAgaW1wb3J0IHN1 YnByb2Nlc3MKIGltcG9ydCBzeXMKIGltcG9ydCByZQogCi1kdW1wQmluID0gc3VicHJvY2Vzcy5Q b3BlbigiZHVtcGJpbiAvZGlyZWN0aXZlcyAiICsgc3lzLmFyZ3ZbMV0sIHN0ZG91dD1zdWJwcm9j ZXNzLlBJUEUsIHVuaXZlcnNhbF9uZXdsaW5lcz1UcnVlKTsKK2RlZiBleHBvcnRGb3J3YXJkc0Zv ckxpYnJhcnkobGlicmFyeSk6CisgICAgZHVtcEJpbiA9IHN1YnByb2Nlc3MuUG9wZW4oImR1bXBi aW4gL2RpcmVjdGl2ZXMgIiArIGxpYnJhcnksIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHVuaXZl cnNhbF9uZXdsaW5lcz1UcnVlKQogCi1vdXRwdXQsIGVycm9ycyA9IGR1bXBCaW4uY29tbXVuaWNh dGUoKTsKKyAgICBvdXRwdXQgPSBkdW1wQmluLmNvbW11bmljYXRlKClbMF0KKyAgICByZXR1cm4g b3V0cHV0CiAKLWV4cG9ydGVkU3ltYm9sUmVnZXhwID0gcmUuY29tcGlsZSgiXHMqKD9QPHN5bWJv bD4vRVhQT1JUOi4rKSIpOworbGlicmFyaWVzID0gc3lzLmFyZ3ZbMSA6IGxlbihzeXMuYXJndikg LSAxXQorb3V0cHV0RmlsZU5hbWUgPSBzeXMuYXJndltsZW4oc3lzLmFyZ3YpIC0gMV0KIAorZXhw b3J0ZWRTeW1ib2xSZWdleHAgPSByZS5jb21waWxlKCJccyooP1A8c3ltYm9sPi9FWFBPUlQ6Lisp IikKIHN5bWJvbHMgPSBzZXQoKQogCi1mb3IgbGluZSBpbiBvdXRwdXQuc3BsaXRsaW5lcygpOgot ICAgIG1hdGNoID0gZXhwb3J0ZWRTeW1ib2xSZWdleHAubWF0Y2gobGluZSkKLSAgICBpZiBtYXRj aCAhPSBOb25lOgotICAgICAgICBzeW1ib2xzLmFkZChtYXRjaC5ncm91cCgic3ltYm9sIikpCitm b3IgbGliIGluIGxpYnJhcmllczoKKyAgICBmb3IgbGluZSBpbiBleHBvcnRGb3J3YXJkc0Zvckxp YnJhcnkobGliKS5zcGxpdGxpbmVzKCk6CisgICAgICAgIG1hdGNoID0gZXhwb3J0ZWRTeW1ib2xS ZWdleHAubWF0Y2gobGluZSkKKyAgICAgICAgaWYgbWF0Y2ggIT0gTm9uZToKKyAgICAgICAgICAg IHN5bWJvbHMuYWRkKG1hdGNoLmdyb3VwKCJzeW1ib2wiKSkKIAotcHJpbnQgIkZvcndhcmRpbmcg JXMgc3ltYm9scyBmcm9tIHN0YXRpYyBsaWJyYXJ5ICVzIiAlIChsZW4oc3ltYm9scyksIHN5cy5h cmd2WzFdKQorcHJpbnQgIkZvcndhcmRpbmcgJXMgc3ltYm9scyBmcm9tICVzIiAlIChsZW4oc3lt Ym9scyksICIgIi5qb2luKGxpYnJhcmllcykpCiAKLWV4cG9ydEZpbGUgPSBvcGVuKHN5cy5hcmd2 WzJdLCAidyIpCitleHBvcnRGaWxlID0gb3BlbihvdXRwdXRGaWxlTmFtZSwgInciKQogZm9yIHN5 bWJvbCBpbiBzeW1ib2xzOgogICAgIGV4cG9ydEZpbGUud3JpdGUoIiNwcmFnbWEgY29tbWVudChs aW5rZXIsIFwiJXNcIilcbiIgJSBzeW1ib2wpOwogZXhwb3J0RmlsZS5jbG9zZSgpCmRpZmYgLS1n aXQgYS9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL3dpbjMyL2RlZmF1bHRfcG9zdC5wcmYg Yi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL3dpbjMyL2RlZmF1bHRfcG9zdC5wcmYKaW5k ZXggZDQ1ZDA0NTVlZDEyOTczYjAwYmQwNjU4NzFjNTY1YTAzMGZmYWU1ZC4uMTE2NTU2NzAxYThl ZGRjZWM2NjE1ZWRmYTBkMzdjZDI4YWVkZTRiOCAxMDA2NDQKLS0tIGEvVG9vbHMvcW1ha2UvbWtz cGVjcy9mZWF0dXJlcy93aW4zMi9kZWZhdWx0X3Bvc3QucHJmCisrKyBiL1Rvb2xzL3FtYWtlL21r c3BlY3MvZmVhdHVyZXMvd2luMzIvZGVmYXVsdF9wb3N0LnByZgpAQCAtMjUsMTYgKzI1LDIxIEBA IGxvYWQoZGVmYXVsdF9wb3N0KQogc2hhcmVkOmNvbnRhaW5zKFRFTVBMQVRFLCBsaWIpIHsKICAg ICBmb3IodGFyZ2V0LCBQT1NUX1RBUkdFVERFUFMpIHsKICAgICAgICAgbGliZGVwID0gJCRmaW5k KHRhcmdldCwgLipcXC5saWIpCi0gICAgICAgIGV4aXN0cygkJGxpYmRlcCk6IExJQlNXSVRIRVhQ T1JUUyArPSAkJGxpYmRlcAorICAgICAgICAhaXNFbXB0eShsaWJkZXApOiBMSUJTV0lUSEVYUE9S VFMgKz0gJCRsaWJkZXAKICAgICB9CiB9CiAKICFpc0VtcHR5KExJQlNXSVRIRVhQT1JUUykgewot ICAgIGV4cG9ydGdlbi5pbnB1dCA9IExJQlNXSVRIRVhQT1JUUwotICAgIGV4cG9ydGdlbi5vdXRw dXQgPSBleHBvcnRzXyR7UU1BS0VfRklMRV9CQVNFfS5jcHAKLSAgICBleHBvcnRnZW4uY29tbWFu ZHMgPSBweXRob24gJCR7Uk9PVF9XRUJLSVRfRElSfSQke1FNQUtFX0RJUl9TRVB9VG9vbHMkJHtR TUFLRV9ESVJfU0VQfVNjcmlwdHMkJHtRTUFLRV9ESVJfU0VQfWdlbmVyYXRlLXdpbjMyLWV4cG9y dC1mb3J3YXJkcyAke1FNQUtFX0ZJTEVfSU59ICR7UU1BS0VfRklMRV9PVVR9Ci0gICAgZXhwb3J0 Z2VuLnZhcmlhYmxlX291dCA9IFNPVVJDRVMKLSAgICBRTUFLRV9FWFRSQV9DT01QSUxFUlMgKz0g ZXhwb3J0Z2VuCisgICAgc3VmZml4ID0KKyAgICBDT05GSUcoZGVidWcsIGRlYnVnfHJlbGVhc2Up IHsKKyAgICAgICAgd2luMzI6IHN1ZmZpeCA9IGQKKyAgICAgICAgbWFjOiBzdWZmaXggPSBfZGVi dWcKKyAgICB9CisgICAgZm9yd2FyZGVkX2V4cG9ydHMudGFyZ2V0ID0gZm9yd2FyZGVkLWV4cG9y dHMkJHtzdWZmaXh9LmNwcAorICAgIGZvcndhcmRlZF9leHBvcnRzLmNvbW1hbmRzID0gcHl0aG9u ICQke1JPT1RfV0VCS0lUX0RJUn0kJHtRTUFLRV9ESVJfU0VQfVRvb2xzJCR7UU1BS0VfRElSX1NF UH1TY3JpcHRzJCR7UU1BS0VfRElSX1NFUH1nZW5lcmF0ZS13aW4zMi1leHBvcnQtZm9yd2FyZHMg JCRMSUJTV0lUSEVYUE9SVFMgJCRmb3J3YXJkZWRfZXhwb3J0cy50YXJnZXQKKyAgICBmb3J3YXJk ZWRfZXhwb3J0cy5kZXBlbmRzID0gJCRMSUJTV0lUSEVYUE9SVFMKKyAgICBRTUFLRV9FWFRSQV9U QVJHRVRTICs9IGZvcndhcmRlZF9leHBvcnRzCisgICAgR0VORVJBVEVEX1NPVVJDRVMgKz0gJCRm b3J3YXJkZWRfZXhwb3J0cy50YXJnZXQKIH0KIAogIyBUbyBlbnN1cmUgdGhlIFF0IGV4cG9ydCBt YWNyb3MgYXJlIHNldCB0byBkbGxleHBvcnQK