125569 2013-12-11 06:09:07 -0800 [GTK][CMake] Integrate GResource for inspector files (and others?) 2013-12-22 22:05:44 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 115966 1 gustavo mrobinson cdumez cgarcia commit-queue gyuyoung.kim mrobinson rakuco zan oldest_to_newest 958685 0 gustavo 2013-12-11 06:09:07 -0800 SSIA 962331 1 219875 mrobinson 2013-12-22 09:17:41 -0800 Created attachment 219875 Patch 962332 2 commit-queue 2013-12-22 09:19:05 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 962333 3 commit-queue 2013-12-22 09:19:13 -0800 Attachment 219875 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebInspectorUI/ChangeLog', u'Source/WebInspectorUI/GNUmakefile.am', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/GNUmakefile.am', u'Source/WebKit2/PlatformGTK.cmake', u'Source/WebKit2/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml', u'Tools/ChangeLog', u'Tools/gtk/generate-inspector-gresource-manifest.py', '--commit-queue']" exit_code: 1 ERROR: Source/WebKit2/PlatformGTK.cmake:363: Alphabetical sorting problem. "fake-installed-webextension-headers" should be before "soup-forwarding-headers". [list/order] [5] ERROR: Source/WebKit2/PlatformGTK.cmake:460: The item "unix/PluginMainUnix.cpp" should be added only once to the list. [list/duplicate] [5] ERROR: Source/WebKit2/PlatformGTK.cmake:466: Alphabetical sorting problem. "PluginProcess/PluginControllerProxy.messages.in" should be before "Shared/Plugins/NPObjectMessageReceiver.messages.in". [list/order] [5] Total errors found: 3 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 962335 4 mrobinson 2013-12-22 09:30:27 -0800 (In reply to comment #3) > If any of these errors are false positives, please file a bug against check-webkit-style. These style errors were not introduced by this patch. I'll fix them in another patch. 962357 5 219875 gustavo 2013-12-22 12:47:09 -0800 Comment on attachment 219875 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219875&action=review > Source/WebInspectorUI/GNUmakefile.am:11 > + $(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py $@ Nice =) maybe you should depend on the script as well. > Source/WebKit2/GNUmakefile.am:27 > $(AM_V_at)glib-compile-resources --generate --sourcedir=$(WebKit2)/UIProcess/InspectorServer/front-end \ > - --target=${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.c ${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.xml > - > -BUILT_SOURCES += \ > - DerivedSources/WebInspectorUI/WebKit2GResourceBundle.xml > + --target=${GENSOURCES_WEBINSPECTOR_UI}/WebKit2GResourceBundle.c $(WebKit2)/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml Makes so much more sense. Why did I add that many echo calls instead of shipping this file I know not. 962397 6 mrobinson 2013-12-22 22:05:20 -0800 Committed r160985: <http://trac.webkit.org/changeset/160985> 962398 7 219875 mrobinson 2013-12-22 22:05:30 -0800 Comment on attachment 219875 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219875&action=review >> Source/WebInspectorUI/GNUmakefile.am:11 >> + $(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py $@ > > Nice =) maybe you should depend on the script as well. Nice catch! Thanks for the review. 219875 2013-12-22 09:17:41 -0800 2013-12-22 22:05:44 -0800 Patch bug-125569-20131222091740.patch text/plain 11890 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwOTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA5 ZWViYWQ1MjY1ZDlkYzczMmUwODc4YjEzMzVhMzUyYzJjNmEyMTBiLi41MTI4OTNiMzZiOGYzNzg5 NmZiNDNiMWE2MGQ5MzEyNGRmNzQzY2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxMy0xMi0yMiAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxp YS5jb20+CisKKyAgICAgICAgW0dUS11bQ01ha2VdIEludGVncmF0ZSBHUmVzb3VyY2UgZm9yIGlu c3BlY3RvciBmaWxlcyAoYW5kIG90aGVycz8pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU1NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOiBVc2UgdGhlIG5ldyBnZW5lcmF0 aW9uIHNjcmlwdCBpbnN0ZWFkIG9mIGdlbmVyYXRpbmcgd2l0aAorICAgICAgICBzaGVsbCBzY3Jp cHRpbmcgaW4gdGhlIG1ha2VmaWxlLgorCiAyMDEzLTEyLTE5ICBKb3NlcGggUGVjb3Jhcm8gIDxw ZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRnJvbnRlbmQgRXJy b3Igd2hlbiBzZWxlY3RpbmcgRGF0YWJhc2UgZm9sZGVyIGluIFJlc291cmNlcyBTaWRlYmFyCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKaW5kZXggNmQyMTRjMzI3YjIwYjNiOTg0N2E1MDE5MTUzNjk4OWEwZjgxZmYyNy4uYzE5 MmE0OTc5ZjlkMTdiZWI5NThjODU2ZDRiZTMxYWRkMDM4YzhiYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE1IEBACisyMDEzLTEyLTIyICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXVtDTWFrZV0gSW50ZWdyYXRlIEdSZXNvdXJjZSBmb3IgaW5z cGVjdG9yIGZpbGVzIChhbmQgb3RoZXJzPykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyNTU2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogR05VbWFrZWZpbGUuYW06IFVzZSB0aGUgbmV3bHkgYWRkZWQg c3RhdGljIFdlYktpdDJJbnNwZWN0b3JHUmVzb3VyY2VCdW5kbGUueG1sCisgICAgICAgIGluc3Rl YWQgb2YgZ2VuZXJhdGluZyB0aGUgc2FtZSBmaWxlIGVhY2ggdGltZS4KKyAgICAgICAgKiBQbGF0 Zm9ybUdUSy5jbWFrZTogQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHRoZSBHUmVzb3VyY2UgYnVu ZGxlcyBpbnRvIFdlYktpdDIuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Mklu c3BlY3RvckdSZXNvdXJjZUJ1bmRsZS54bWw6IEFkZGVkLgorCiAyMDEzLTEyLTIwICBFbnJpcXVl IE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10g VGhlIGZ1bGxzY3JlZW4gQVBJIHNob3VsZCBiZSBlbmFibGVkIGJ5IGRlZmF1bHQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9HTlVtYWtlZmlsZS5hbSBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9HTlVtYWtlZmlsZS5hbQppbmRleCBkNmIyZGFmYmI5ZTYzMzQxN2ViOGE1YjM2YzI1 ODJhNzllYjljNTZkLi5lODIwY2ZkOGFlN2YyZmVlZTVhZDEyOTc4NGU5N2FkZGM5MTA3ODFiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvR05VbWFrZWZpbGUuYW0KKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL0dOVW1ha2VmaWxlLmFtCkBAIC04LDE4ICs4LDcgQEAgJHtHRU5T T1VSQ0VTX1dFQklOU1BFQ1RPUl9VSX0vR1Jlc291cmNlQnVuZGxlLnhtbDogR05VbWFrZWZpbGUg XAogCSQoV2ViSW5zcGVjdG9yVUkpL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qcwogCSQoQU1fVl9HRU4pCiAJJChBTV9WX2F0KW1rZGlyIC1wICR7R0VOU09VUkNFU19X RUJJTlNQRUNUT1JfVUl9Ci0JJChBTV9WX2F0KWVjaG8gJzw/eG1sIHZlcnNpb249IjEuMCIgZW5j b2Rpbmc9IlVURi04Ij8+JyA+ICR7R0VOU09VUkNFU19XRUJJTlNQRUNUT1JfVUl9L0dSZXNvdXJj ZUJ1bmRsZS54bWwKLQkkKEFNX1ZfYXQpZWNobyAnPGdyZXNvdXJjZXM+JyA+PiAke0dFTlNPVVJD RVNfV0VCSU5TUEVDVE9SX1VJfS9HUmVzb3VyY2VCdW5kbGUueG1sCi0JJChBTV9WX2F0KWVjaG8g JyAgPGdyZXNvdXJjZSBwcmVmaXg9Ii9vcmcvd2Via2l0Z3RrL2luc3BlY3RvciI+JyA+PiAke0dF TlNPVVJDRVNfV0VCSU5TUEVDVE9SX1VJfS9HUmVzb3VyY2VCdW5kbGUueG1sCi0JJChBTV9WX2F0 KVwKLQkJYmFzZXBhdGg9YGVjaG8gJChXZWJJbnNwZWN0b3JVSSkvIHwgc2VkICdzLF4uLywsZydg OyBcCi0JCWZvciBmaWxlIGluICReOyBkbyBcCi0JCQlpZiBbICIkJGZpbGUiID0gIkdOVW1ha2Vm aWxlIiBdOyB0aGVuIGNvbnRpbnVlOyBmaTsgXAotCQkJZmlsZT1gZWNobyAkJGZpbGUgfCBzZWQg InMsJCRiYXNlcGF0aCwsZyJgOyBcCi0JCQllY2hvICIgICAgPGZpbGU+JCRmaWxlPC9maWxlPiIg Pj4gJHtHRU5TT1VSQ0VTX1dFQklOU1BFQ1RPUl9VSX0vR1Jlc291cmNlQnVuZGxlLnhtbDsgXAot CQlkb25lCi0JJChBTV9WX2F0KWVjaG8gJyAgPC9ncmVzb3VyY2U+JyA+PiAke0dFTlNPVVJDRVNf V0VCSU5TUEVDVE9SX1VJfS9HUmVzb3VyY2VCdW5kbGUueG1sCi0JJChBTV9WX2F0KWVjaG8gJzwv Z3Jlc291cmNlcz4nID4+ICR7R0VOU09VUkNFU19XRUJJTlNQRUNUT1JfVUl9L0dSZXNvdXJjZUJ1 bmRsZS54bWwKKwkkKEFNX1ZfYXQpJChzcmNkaXIpL1Rvb2xzL2d0ay9nZW5lcmF0ZS1pbnNwZWN0 b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5ICRACiAKICR7R0VOU09VUkNFU19XRUJJTlNQRUNUT1Jf VUl9L0dSZXNvdXJjZUJ1bmRsZS5jOiBEZXJpdmVkU291cmNlcy9XZWJJbnNwZWN0b3JVSS9HUmVz b3VyY2VCdW5kbGUueG1sCiAJJChBTV9WX0dFTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0dOVW1ha2VmaWxlLmFtIGIvU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0KaW5kZXggZTNk NGE2MGM3NzQzNDFiMTgxMGFkNGMzNjhlMjZiYThjNmU3MzhkYi4uMjQ3YzJhZGFhZjE4ZDg2YTVl YWU3MzYxZTBiM2JiYjM2ZWE3YjkwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvR05VbWFr ZWZpbGUuYW0KKysrIGIvU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0KQEAgLTE5LDI0ICsx OSwxMiBAQCBsaWJleGVjX1BST0dSQU1TICs9IFwKIAlQcm9ncmFtcy9XZWJLaXRQbHVnaW5Qcm9j ZXNzCiBlbmRpZgogCi0ke0dFTlNPVVJDRVNfV0VCSU5TUEVDVE9SX1VJfS9XZWJLaXQyR1Jlc291 cmNlQnVuZGxlLnhtbDogR05VbWFrZWZpbGUgXAotCSQoV2ViS2l0MikvVUlQcm9jZXNzL0luc3Bl Y3RvclNlcnZlci9mcm9udC1lbmQvaW5zcGVjdG9yUGFnZUluZGV4Lmh0bWwKLQkkKEFNX1ZfR0VO KQotCSQoQU1fVl9hdClta2RpciAtcCAke0dFTlNPVVJDRVNfV0VCSU5TUEVDVE9SX1VJfQotCSQo QU1fVl9hdCllY2hvICc8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/PicgPiAk e0dFTlNPVVJDRVNfV0VCSU5TUEVDVE9SX1VJfS9XZWJLaXQyR1Jlc291cmNlQnVuZGxlLnhtbAot CSQoQU1fVl9hdCllY2hvICc8Z3Jlc291cmNlcz4nID4+ICR7R0VOU09VUkNFU19XRUJJTlNQRUNU T1JfVUl9L1dlYktpdDJHUmVzb3VyY2VCdW5kbGUueG1sCi0JJChBTV9WX2F0KWVjaG8gJyAgPGdy ZXNvdXJjZSBwcmVmaXg9Ii9vcmcvd2Via2l0Z3RrL2luc3BlY3Rvci9Vc2VySW50ZXJmYWNlIj4n ID4+ICR7R0VOU09VUkNFU19XRUJJTlNQRUNUT1JfVUl9L1dlYktpdDJHUmVzb3VyY2VCdW5kbGUu eG1sCi0JJChBTV9WX2F0KWVjaG8gIiAgICA8ZmlsZT5pbnNwZWN0b3JQYWdlSW5kZXguaHRtbDwv ZmlsZT4iID4+ICR7R0VOU09VUkNFU19XRUJJTlNQRUNUT1JfVUl9L1dlYktpdDJHUmVzb3VyY2VC dW5kbGUueG1sCi0JJChBTV9WX2F0KWVjaG8gJyAgPC9ncmVzb3VyY2U+JyA+PiAke0dFTlNPVVJD RVNfV0VCSU5TUEVDVE9SX1VJfS9XZWJLaXQyR1Jlc291cmNlQnVuZGxlLnhtbAotCSQoQU1fVl9h dCllY2hvICc8L2dyZXNvdXJjZXM+JyA+PiAke0dFTlNPVVJDRVNfV0VCSU5TUEVDVE9SX1VJfS9X ZWJLaXQyR1Jlc291cmNlQnVuZGxlLnhtbAotCi0ke0dFTlNPVVJDRVNfV0VCSU5TUEVDVE9SX1VJ fS9XZWJLaXQyR1Jlc291cmNlQnVuZGxlLmM6IERlcml2ZWRTb3VyY2VzL1dlYkluc3BlY3RvclVJ L1dlYktpdDJHUmVzb3VyY2VCdW5kbGUueG1sCiske0dFTlNPVVJDRVNfV0VCSU5TUEVDVE9SX1VJ fS9XZWJLaXQyR1Jlc291cmNlQnVuZGxlLmM6IFwKKwkJJChXZWJLaXQyKS9VSVByb2Nlc3MvSW5z cGVjdG9yU2VydmVyL2Zyb250LWVuZC9pbnNwZWN0b3JQYWdlSW5kZXguaHRtbCBcCisJCSQoV2Vi S2l0MikvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Mkluc3BlY3RvckdSZXNvdXJjZUJ1bmRsZS54 bWwKIAkkKEFNX1ZfR0VOKQogCSQoQU1fVl9hdClnbGliLWNvbXBpbGUtcmVzb3VyY2VzIC0tZ2Vu ZXJhdGUgLS1zb3VyY2VkaXI9JChXZWJLaXQyKS9VSVByb2Nlc3MvSW5zcGVjdG9yU2VydmVyL2Zy b250LWVuZCBcCi0JCS0tdGFyZ2V0PSR7R0VOU09VUkNFU19XRUJJTlNQRUNUT1JfVUl9L1dlYktp dDJHUmVzb3VyY2VCdW5kbGUuYyAke0dFTlNPVVJDRVNfV0VCSU5TUEVDVE9SX1VJfS9XZWJLaXQy R1Jlc291cmNlQnVuZGxlLnhtbAotCi1CVUlMVF9TT1VSQ0VTICs9IFwKLQlEZXJpdmVkU291cmNl cy9XZWJJbnNwZWN0b3JVSS9XZWJLaXQyR1Jlc291cmNlQnVuZGxlLnhtbAorCQktLXRhcmdldD0k e0dFTlNPVVJDRVNfV0VCSU5TUEVDVE9SX1VJfS9XZWJLaXQyR1Jlc291cmNlQnVuZGxlLmMgJChX ZWJLaXQyKS9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXQySW5zcGVjdG9yR1Jlc291cmNlQnVuZGxl LnhtbAogCiB3ZWJraXQyZ3RrX2J1aWx0X3NvdXJjZXMgKz0gXAogCURlcml2ZWRTb3VyY2VzL1dl Ykluc3BlY3RvclVJL1dlYktpdDJHUmVzb3VyY2VCdW5kbGUuYwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdUSy5j bWFrZQppbmRleCBlN2E5YTk0M2QwZmE5ODUwNWRlY2NhY2Y4MWUxNmQ5NjEwYjg0NWYzLi5jYTFk M2YyNTVkOTQ1NWNhOTZiNzAwZDk2MzA0YzQyZjY2MzM0N2RhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9QbGF0Zm9ybUdUSy5jbWFrZQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdU Sy5jbWFrZQpAQCAtMTUsNiArMTUsOSBAQCBhZGRfZGVmaW5pdGlvbnMoLURQQUNLQUdFX0xPQ0FM RV9ESVI9IiR7Q01BS0VfSU5TVEFMTF9GVUxMX0xPQ0FMRURJUn0iKQogYWRkX2RlZmluaXRpb25z KC1ETElCRElSPSIke0NNQUtFX0lOU1RBTExfRlVMTF9MSUJESVJ9IikKIAogbGlzdChBUFBFTkQg V2ViS2l0Ml9TT1VSQ0VTCisgICAgJHtERVJJVkVEX1NPVVJDRVNfV0VCS0lUMkdUS19ESVJ9L1dl YktpdDJJbnNwZWN0b3JHUmVzb3VyY2VCdW5kbGUuYworICAgICR7REVSSVZFRF9TT1VSQ0VTX1dF QktJVDJHVEtfRElSfS9JbnNwZWN0b3JHUmVzb3VyY2VCdW5kbGUuYworCiAgICAgJHtXRUJLSVQy X0JVSUxUX0FQSV9ESVJ9L1dlYktpdEVudW1UeXBlcy5jcHAKICAgICAke1dFQktJVDJfQlVJTFRf QVBJX0RJUn0vV2ViS2l0TWFyc2hhbC5jcHAKIApAQCAtMzUyLDcgKzM1NSwxNiBAQCBzZXQoV2Vi S2l0Ml9JTlNUQUxMRURfSEVBREVSUwogICAgICR7V0VCS0lUMl9ESVJ9L1dlYlByb2Nlc3MvSW5q ZWN0ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRXZWJQYWdlLmgKICAgICAke1dFQktJVDJfRElSfS9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViUGFnZVByaXZhdGUuaAog ICAgICR7V0VCS0lUMl9ESVJ9L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2d0ay93ZWJr aXQtd2ViLWV4dGVuc2lvbi5oCispCiAKK2ZpbGUoR0xPQiBJbnNwZWN0b3JGaWxlcworICAgICR7 Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4u bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworICAgICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvKi5jc3MKKyAgICAke0NNQUtFX1NPVVJDRV9E SVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0V4dGVybmFsL0NvZGVNaXJy b3IvKgorICAgICR7Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvKi5odG1sCisgICAgJHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvKi5wbmcKKyAgICAke0NNQUtFX1NPVVJDRV9ESVJ9 L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy8qLnN2ZworICAgICR7 Q01BS0VfU09VUkNFX0RJUn0vU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvKi5q cwogKQogCiBsaXN0KEFQUEVORCBXZWJLaXQyX01FU1NBR0VTX0lOX0ZJTEVTCkBAIC00NDUsNiAr NDU3LDMwIEBAIGFkZF9jdXN0b21fY29tbWFuZCgKICAgICBDT01NQU5EIGdsaWItbWtlbnVtcyAt LXRlbXBsYXRlICR7V0VCS0lUMl9ESVJ9L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEVudW1UeXBl cy5jcHAudGVtcGxhdGUgJHtXZWJLaXQyX0lOU1RBTExFRF9IRUFERVJTfSB8IHNlZCBzL3dlYl9r aXQvd2Via2l0LyA+ICR7V0VCS0lUMl9CVUlMVF9BUElfRElSfS9XZWJLaXRFbnVtVHlwZXMuY3Bw CiAgICAgVkVSQkFUSU0pCiAKK2FkZF9jdXN0b21fY29tbWFuZCgKKyAgICBPVVRQVVQgJHtERVJJ VkVEX1NPVVJDRVNfV0VCS0lUMkdUS19ESVJ9L0luc3BlY3RvckdSZXNvdXJjZUJ1bmRsZS54bWwK KyAgICBERVBFTkRTICR7SW5zcGVjdG9yRmlsZXN9CisgICAgICAgICAgICAke1RPT0xTX0RJUn0v Z3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2UtbWFuaWZlc3QucHkKKyAgICBDT01NQU5E ICR7VE9PTFNfRElSfS9ndGsvZ2VuZXJhdGUtaW5zcGVjdG9yLWdyZXNvdXJjZS1tYW5pZmVzdC5w eSAke0RFUklWRURfU09VUkNFU19XRUJLSVQyR1RLX0RJUn0vSW5zcGVjdG9yR1Jlc291cmNlQnVu ZGxlLnhtbAorICAgIFZFUkJBVElNCispCisKK2FkZF9jdXN0b21fY29tbWFuZCgKKyAgICBPVVRQ VVQgJHtERVJJVkVEX1NPVVJDRVNfV0VCS0lUMkdUS19ESVJ9L0luc3BlY3RvckdSZXNvdXJjZUJ1 bmRsZS5jCisgICAgREVQRU5EUyAke0RFUklWRURfU09VUkNFU19XRUJLSVQyR1RLX0RJUn0vSW5z cGVjdG9yR1Jlc291cmNlQnVuZGxlLnhtbAorICAgICAgICAgICAgJHtJbnNwZWN0b3JGaWxlc30K KyAgICBDT01NQU5EIGdsaWItY29tcGlsZS1yZXNvdXJjZXMgLS1nZW5lcmF0ZSAtLXNvdXJjZWRp cj0ke0NNQUtFX1NPVVJDRV9ESVJ9L1NvdXJjZS9XZWJJbnNwZWN0b3JVSSAtLXRhcmdldD0ke0RF UklWRURfU09VUkNFU19XRUJLSVQyR1RLX0RJUn0vSW5zcGVjdG9yR1Jlc291cmNlQnVuZGxlLmMg JHtERVJJVkVEX1NPVVJDRVNfV0VCS0lUMkdUS19ESVJ9L0luc3BlY3RvckdSZXNvdXJjZUJ1bmRs ZS54bWwKKyAgICBWRVJCQVRJTQorKQorCithZGRfY3VzdG9tX2NvbW1hbmQoCisgICAgT1VUUFVU ICR7REVSSVZFRF9TT1VSQ0VTX1dFQktJVDJHVEtfRElSfS9XZWJLaXQySW5zcGVjdG9yR1Jlc291 cmNlQnVuZGxlLmMKKyAgICBERVBFTkRTICR7V0VCS0lUMl9ESVJ9L1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdDJJbnNwZWN0b3JHUmVzb3VyY2VCdW5kbGUueG1sCisgICAgICAgICAgICAke1dFQktJ VDJfRElSfS9VSVByb2Nlc3MvSW5zcGVjdG9yU2VydmVyL2Zyb250LWVuZC9pbnNwZWN0b3JQYWdl SW5kZXguaHRtbAorICAgIENPTU1BTkQgZ2xpYi1jb21waWxlLXJlc291cmNlcyAtLWdlbmVyYXRl IC0tc291cmNlZGlyPSR7V0VCS0lUMl9ESVJ9L1VJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvZnJv bnQtZW5kIC0tdGFyZ2V0PSR7REVSSVZFRF9TT1VSQ0VTX1dFQktJVDJHVEtfRElSfS9XZWJLaXQy SW5zcGVjdG9yR1Jlc291cmNlQnVuZGxlLmMgJHtXRUJLSVQyX0RJUn0vVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0Mkluc3BlY3RvckdSZXNvdXJjZUJ1bmRsZS54bWwKKyAgICBWRVJCQVRJTQorKQor CiAjIFRoaXMgc3ltYm9saWMgbGluayBhbGxvd3MgaW5jbHVkZXMgbGlrZSAjaW5jbHVkZSA8d2Vi a2l0Mi9XZWJraXRXZWJWaWV3Lmg+IHdoaWNoIHNpbXVsYXRlcyBpbnN0YWxsZWQgaGVhZGVycy4K IGFkZF9jdXN0b21fdGFyZ2V0KGZha2UtaW5zdGFsbGVkLWhlYWRlcnMKICAgICBta2RpciAtcCAk e0RFUklWRURfU09VUkNFU19XRUJLSVQyX0RJUn0vd2Via2l0Mmd0ay9pbmNsdWRlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXQySW5zcGVjdG9yR1Jl c291cmNlQnVuZGxlLnhtbCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dDJJbnNwZWN0b3JHUmVzb3VyY2VCdW5kbGUueG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmUzODkzMmM4MGI4MDc1 M2MyOTk3MTZkYTEwOWM5ZDViMDE1NjI5MzMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXQySW5zcGVjdG9yR1Jlc291cmNlQnVuZGxlLnht bApAQCAtMCwwICsxLDYgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+ Cis8Z3Jlc291cmNlcz4KKyAgPGdyZXNvdXJjZSBwcmVmaXg9Ii9vcmcvd2Via2l0Z3RrL2luc3Bl Y3Rvci9Vc2VySW50ZXJmYWNlIj4KKyAgICA8ZmlsZT5pbnNwZWN0b3JQYWdlSW5kZXguaHRtbDwv ZmlsZT4KKyAgPC9ncmVzb3VyY2U+Cis8L2dyZXNvdXJjZXM+CmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTkyNmE3ZWEyMDJiNjQ4OTA3MDgwNzcz ZDg5OWUzNTM1MTk1YzdhNC4uNGJmMjQ4NmIzYzk1ZTg2ODMxMDRmZDQ5ODRlZjgyN2Q2MmM0MzI5 MSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEyIEBACisyMDEzLTEyLTIyICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdh bGlhLmNvbT4KKworICAgICAgICBbR1RLXVtDTWFrZV0gSW50ZWdyYXRlIEdSZXNvdXJjZSBmb3Ig aW5zcGVjdG9yIGZpbGVzIChhbmQgb3RoZXJzPykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTU2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogZ3RrL2dlbmVyYXRlLWluc3BlY3Rvci1ncmVzb3VyY2Ut bWFuaWZlc3QucHk6IEFkZGVkLgorCiAyMDEzLTEyLTIwICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9i aW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBbQ01ha2VdIEFkZCBzdXBwb3J0IGZv ciBidWlsZGluZyBJbWFnZURpZmYKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9nZW5lcmF0ZS1pbnNw ZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5IGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWluc3BlY3Rv ci1ncmVzb3VyY2UtbWFuaWZlc3QucHkKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNThhMWRmMTdmNWEwMzI2OWU0NzQw ZDQ0MjZhYTY5YTEyMDRmOWQ0MAotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2d0ay9nZW5lcmF0 ZS1pbnNwZWN0b3ItZ3Jlc291cmNlLW1hbmlmZXN0LnB5CkBAIC0wLDAgKzEsNDcgQEAKKyMhL3Vz ci9iaW4vZW52IHB5dGhvbgorIyBDb3B5cmlnaHQgKEMpIDIwMTMgSWdhbGlhIFMuTC4KKyMKKyMg VGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFu ZC9vcgorIyBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVy YWwgUHVibGljCisjIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZv dW5kYXRpb247IGVpdGhlcgorIyB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3Vy IG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisjCisjIFRoaXMgbGlicmFyeSBpcyBkaXN0cmli dXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorIyBidXQgV0lUSE9VVCBB TlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorIyBNRVJD SEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhl IEdOVQorIyBMZXNzZXIgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgor IworIyBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGVzc2VyIEdl bmVyYWwgUHVibGljCisjIExpY2Vuc2UgYWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7IGlmIG5vdCwg d3JpdGUgdG8gdGhlIEZyZWUgU29mdHdhcmUKKyMgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmts aW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwgQm9zdG9uLCBNQSAgMDIxMTAtMTMwMSAgVVNBCisKK2lt cG9ydCBjb21tb24KK2ltcG9ydCBnbG9iCitpbXBvcnQgb3MKK2ltcG9ydCBzeXMKKworcmVzb3Vy Y2VzX3BhdGggPSBjb21tb24udG9wX2xldmVsX3BhdGgoKSArICIvU291cmNlL1dlYkluc3BlY3Rv clVJLyIKK2luc3BlY3Rvcl9maWxlcyA9IFwKKyAgICBnbG9iLmdsb2IocmVzb3VyY2VzX3BhdGgg KyAnVXNlckludGVyZmFjZS8qLmh0bWwnKSArIFwKKyAgICBnbG9iLmdsb2IocmVzb3VyY2VzX3Bh dGggKyAnVXNlckludGVyZmFjZS8qLmpzJykgKyBcCisgICAgZ2xvYi5nbG9iKHJlc291cmNlc19w YXRoICsgJ1VzZXJJbnRlcmZhY2UvKi5jc3MnKSArIFwKKyAgICBnbG9iLmdsb2IocmVzb3VyY2Vz X3BhdGggKyAnVXNlckludGVyZmFjZS9JbWFnZXMvKi5wbmcnKSArIFwKKyAgICBnbG9iLmdsb2Io cmVzb3VyY2VzX3BhdGggKyAnVXNlckludGVyZmFjZS9JbWFnZXMvKi5zdmcnKSArIFwKKyAgICBn bG9iLmdsb2IocmVzb3VyY2VzX3BhdGggKyAnVXNlckludGVyZmFjZS9FeHRlcm5hbC9Db2RlTWly cm9yLyonKSArIFwKKyAgICBnbG9iLmdsb2IocmVzb3VyY2VzX3BhdGggKyAnTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzJykKKworZ3Jlc291cmNlc19maWxlX2NvbnRl bnQgPSBcCisiIiI8P3htbCB2ZXJzaW9uPTEuMCBlbmNvZGluZz1VVEYtOD8+Cis8Z3Jlc291cmNl cz4KKyAgICA8Z3Jlc291cmNlIHByZWZpeD0iL29yZy93ZWJraXRndGsvaW5zcGVjdG9yIj4KKyIi IgorCitmb3IgZmlsZSBpbiBpbnNwZWN0b3JfZmlsZXM6CisgICAgZ3Jlc291cmNlc19maWxlX2Nv bnRlbnQgKz0gIiAgICAgICAgPGZpbGU+IiArIGZpbGUucmVwbGFjZShyZXNvdXJjZXNfcGF0aCwg JycpICsgIjwvZmlsZT5cbiIKKworZ3Jlc291cmNlc19maWxlX2NvbnRlbnQgKz0gXAorIiIiICAg IDwvZ3Jlc291cmNlPgorPC9ncmVzb3VyY2VzPgorIiIiCisKK29wZW4oc3lzLmFyZ3ZbMV0sICd3 Jykud3JpdGUoZ3Jlc291cmNlc19maWxlX2NvbnRlbnQpCg==