191713 2018-11-15 14:14:22 -0800 [CMake][AppleWin] Use DEBUG_SUFFIX only where needed 2021-11-01 12:45:58 -0700 1 1 1 Unclassified WebKit CMake WebKit Nightly Build Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 don.olmstead don.olmstead achristensen annulen bfulgham ews-watchlist fujii mcatanzaro pvollan oldest_to_newest 1479109 0 don.olmstead 2018-11-15 14:14:22 -0800 MSVC builds executable code into the same directory structure regardless of configuration. For full debug builds of internal AppleWin builds DEBUG_SUFFIX is set to separate release and debug build artifacts. CMake files were modified to support this but it appears that ${DEBUG_SUFFIX} is used in places where it isn't needed. # Correct usage we're just setting the output name set(WTF_OUTPUT_NAME WTF${DEBUG_SUFFIX}) # Correct usage this library is built outside of the WebKit tree target_link_libraries(WebKitQuartzCoreAdditions CoreFoundation${DEBUG_SUFFIX}) # Incorrect usage since CMake builds the library and will know the output name set(test_wtf_LIBRARIES WTF${DEBUG_SUFFIX}) All incorrect usages should be removed assuming CMake is functioning as I suspect it will. 1479118 1 354987 don.olmstead 2018-11-15 14:22:02 -0800 Created attachment 354987 WIP Patch This fixes all incorrect usages of ${DEBUG_SUFFIX} within CMake files. To test the build I ran the following command to pretend I had an internal AppleWin build. perl Tools\Scripts\build-webkit --wincairo --64-bit --debug --cmakeargs="-DDEBUG_SUFFIX=_debug" I had to do some build fixes so I suspect that the internal Apple Windows build might be having issues but I can't verify since I don't have access. Also the adding of ${DEBUG_SUFFIX} is not consistent. There are a number of places where produced executables and libraries do not have a debug suffix. All the WEBKIT_FRAMEWORKS have _debug.lib, e.g. WTF_debug.lib/dll. Some executables have them, e.g. jsc_debug.exe, but not others, MiniBrowser.exe. Anyways this builds now so we can go from here in terms of fixing it all. 1479122 2 ews-watchlist 2018-11-15 14:25:01 -0800 Attachment 354987 did not pass style-queue: ERROR: Source/WebKitLegacy/PlatformWin.cmake:450: Alphabetical sorting problem. "PRIVATE WebKitLegacyGUID" should be before "PRIVATE Winmm". [list/order] [5] ERROR: Source/WebKitLegacy/CMakeLists.txt:33: Alphabetical sorting problem. "PRIVATE PAL" should be before "PRIVATE WebCore". [list/order] [5] Total errors found: 2 in 20 files If any of these errors are false positives, please file a bug against check-webkit-style. 1479125 3 354987 don.olmstead 2018-11-15 14:29:22 -0800 Comment on attachment 354987 WIP Patch View in context: https://bugs.webkit.org/attachment.cgi?id=354987&action=review Made some comments so the changes make sense. ${DEBUG_SUFFIX} is just removed from anything that will end up in a linked library. Just turning on the review flag to see what might be required next. > Source/ThirdParty/ANGLE/PlatformWin.cmake:38 > +if (DEBUG_SUFFIX) > + list(APPEND ANGLEGLESv2_LIBRARIES dxguid) > +endif () If there's no DEBUG_SUFFIX _DEBUG is removed from the compiler flags. Compiling with DEBUG_SUFFIX revealed that dxguid is needed when compiling ANGLE due to missing symbols that are used when _DEBUG is present. This is why I suspect that the build might not actually be working. > Source/WebKitLegacy/PlatformWin.cmake:450 > - PRIVATE WebKitGUID${DEBUG_SUFFIX} > + PRIVATE WebKitLegacyGUID The original code might actually be a bug. I know we've had issues with IDL not regenerating without a clean build. > Source/WebKitLegacy/PlatformWin.cmake:458 > + libANGLE > + libEGL > + libGLESv2 ANGLE stuff does not actually contain a suffix. Its including a .exp file which doesn't match the library name if I set things. 1479131 4 bfulgham 2018-11-15 14:37:31 -0800 I'm not sure if we have this totally right. I believe we need to support the following states: (1) Production build, full optimizations, LTO, stripping, etc. (2) Local release build, not linked against any debug stuff. (3) Local debug build, built with debug symbols and -0 optimization, but linked against release libraries (e.g., CRT, CoreGraphics, etc.) (4) Debug_Suffix debug build, build with debug symbols and linked against debug libraries. We only append the "_debug" suffix to WebKit binaries that are built for (4). I'm not sure the current patch is totally right, because I think it will give us "debug suffix" builds without the suffix on the WebKit bits. 1479136 5 don.olmstead 2018-11-15 14:42:07 -0800 (In reply to Brent Fulgham from comment #4) > I'm not sure if we have this totally right. I believe we need to support the > following states: > > (1) Production build, full optimizations, LTO, stripping, etc. > (2) Local release build, not linked against any debug stuff. > (3) Local debug build, built with debug symbols and -0 optimization, but > linked against release libraries (e.g., CRT, CoreGraphics, etc.) > (4) Debug_Suffix debug build, build with debug symbols and linked against > debug libraries. > > We only append the "_debug" suffix to WebKit binaries that are built for (4). > > I'm not sure the current patch is totally right, because I think it will > give us "debug suffix" builds without the suffix on the WebKit bits. $ find WebKitBuild/Debug/lib64 -name *.lib WebKitBuild/Debug/lib64/DumpRenderTreeLib.lib WebKitBuild/Debug/lib64/gtest.lib WebKitBuild/Debug/lib64/ImageDiffLib.lib WebKitBuild/Debug/lib64/JavaScriptCore_debug.lib WebKitBuild/Debug/lib64/jscLib.lib WebKitBuild/Debug/lib64/libANGLE.lib WebKitBuild/Debug/lib64/libEGL.lib WebKitBuild/Debug/lib64/libGLESv2.lib WebKitBuild/Debug/lib64/MiniBrowserLib.lib WebKitBuild/Debug/lib64/PAL_debug.lib WebKitBuild/Debug/lib64/testapiLib.lib WebKitBuild/Debug/lib64/testmasmLib.lib WebKitBuild/Debug/lib64/testRegExpLib.lib WebKitBuild/Debug/lib64/TestRunnerInjectedBundle.lib WebKitBuild/Debug/lib64/TestWebCoreLib.lib WebKitBuild/Debug/lib64/TestWebKitAPIBase.lib WebKitBuild/Debug/lib64/TestWebKitAPIInjectedBundle.lib WebKitBuild/Debug/lib64/TestWebKitLegacyLib.lib WebKitBuild/Debug/lib64/TestWebKitLib.lib WebKitBuild/Debug/lib64/TestWTFLib.lib WebKitBuild/Debug/lib64/WebCoreTestSupport.lib WebKitBuild/Debug/lib64/WebCore_debug.lib WebKitBuild/Debug/lib64/WebKit2.lib WebKitBuild/Debug/lib64/WebKitGUID_debug.lib WebKitBuild/Debug/lib64/WebKitTestRunnerLib.lib WebKitBuild/Debug/lib64/WebKit_debug.lib WebKitBuild/Debug/lib64/WTF_debug.lib As you can see WTF, JavaScriptCore, WebCore, PAL, WebKit (WebKitLegacy technically) all have the _debug suffix in there. Its just the things around it like ANGLE and the testing libraries don't have a suffix. 1479182 6 achristensen 2018-11-15 17:10:14 -0800 I don't think we can just remove these like you have without messing up our internal build. What is the motivation for wanting to do this? 1479194 7 don.olmstead 2018-11-15 17:29:09 -0800 (In reply to Alex Christensen from comment #6) > I don't think we can just remove these like you have without messing up our > internal build. What is the motivation for wanting to do this? It was brought up in my patch for https://bugs.webkit.org/show_bug.cgi?id=191662 and I wanted to test my theory on this. I tried it with setting the DEBUG_SUFFIX manually on WinCairo so I think this is correct. AppleWin build is currently red in trunk so that's why its not coming back. Could someone in Apple give this patch a go on a build? I'm pretty confident that it will work for the reasons stated above. 1479414 8 354987 bfulgham 2018-11-16 08:35:29 -0800 Comment on attachment 354987 WIP Patch I actually think this looks good, but we need to confirm that our weird DebugSuffix build still does what we expect. We'll run a test today and confirm. 1479696 9 pvollan 2018-11-16 15:53:58 -0800 I am seeing some link errors when applying this patch. It seems JavaScript_Debug is trying to link with WTF.lib, not WTF_debug.lib. 1481617 10 don.olmstead 2018-11-26 12:02:37 -0800 CMake is invoked in each individual .vcxproj so this won't work. It makes the case for using CMake's external project but that's significantly more involved. 1810780 11 354987 achristensen 2021-11-01 12:45:58 -0700 Comment on attachment 354987 WIP Patch This has been requesting review for more than one year. If this is still needed, please rebase and re-request review. 354987 2018-11-15 14:22:02 -0800 2021-11-01 12:45:58 -0700 WIP Patch bug-191713.diff text/plain 11985 don.olmstead ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBjZjQ4ZDdlNmJkMy4uNTNi YTE0MzFlNjIgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMiBAQAorMjAxOC0xMS0xNSAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29t PgorCisgICAgICAgIFtDTWFrZV1bQXBwbGVXaW5dIFVzZSBERUJVR19TVUZGSVggb25seSB3aGVy ZSBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MTcxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogU291cmNlL2NtYWtlL09wdGlvbnNNU1ZDLmNtYWtlOgorCiAyMDE4LTExLTEyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBIVFRQUyBnaXQgcmVtb3Rl IHRvIFJlYWRNZS5tZApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlz dHMudHh0IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NNYWtlTGlzdHMudHh0CmluZGV4IGFiODcy NTQwMmUxLi5mYjcyOGFlNjZmZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NN YWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DTWFrZUxpc3RzLnR4dApA QCAtMTE2LDcgKzExNiw3IEBAIHNldChKYXZhU2NyaXB0Q29yZV9PQkpFQ1RfTFVUX1NPVVJDRVMK ICkKIAogc2V0KEphdmFTY3JpcHRDb3JlX0xJQlJBUklFUwotICAgIFdURiR7REVCVUdfU1VGRklY fQorICAgIFdURgogICAgICR7SUNVX0kxOE5fTElCUkFSSUVTfQogKQogCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBjODk4MjRlYjViZi4uNzJmMTAzNTdkNjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE4LTExLTE1ICBEb24gT2xtc3RlYWQgIDxkb24u b2xtc3RlYWRAc29ueS5jb20+CisKKyAgICAgICAgW0NNYWtlXVtBcHBsZVdpbl0gVXNlIERFQlVH X1NVRkZJWCBvbmx5IHdoZXJlIG5lZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTkxNzEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBDTWFrZUxpc3RzLnR4dDoKKyAgICAgICAgKiBzaGVsbC9DTWFr ZUxpc3RzLnR4dDoKKwogMjAxOC0xMS0xNCAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5j b20+CiAKICAgICAgICAgTW92ZSBzY3JpcHRzIGZvciBEZXJpdmVkIGFuZCBVbmlmaWVkIFNvdXJj ZXMgdG8gZXh0ZXJuYWwgZmlsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9z aGVsbC9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9zaGVsbC9DTWFrZUxp c3RzLnR4dAppbmRleCA4NzE1M2UzNTFiMC4uNDhhNTA0NjkwNTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9zaGVsbC9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvc2hlbGwvQ01ha2VMaXN0cy50eHQKQEAgLTQsOCArNCw4IEBAIHNldChKU0NfU09V UkNFUwogCiBzZXQoSlNDX0xJQlJBUklFUwogICAgICR7Q01BS0VfRExfTElCU30KLSAgICBKYXZh U2NyaXB0Q29yZSR7REVCVUdfU1VGRklYfQotICAgIFdURiR7REVCVUdfU1VGRklYfQorICAgIEph dmFTY3JpcHRDb3JlCisgICAgV1RGCiApCiAKIGlmIChXVEZfT1NfTUFDX09TX1gpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cKaW5kZXggNWI4NTZlMzhlMDYuLmQ5ZTJkZWI0MDc4IDEwMDY0NAot LS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTgtMTEtMTUgIERvbiBP bG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KKworICAgICAgICBbQ01ha2VdW0FwcGxl V2luXSBVc2UgREVCVUdfU1VGRklYIG9ubHkgd2hlcmUgbmVlZGVkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTE3MTMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRmb3JtV2luLmNtYWtlOgorCiAy MDE4LTEwLTAzICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgQU5H TEUgcGFydCBvZiBbWGNvZGVdIFVwZGF0ZSBzb21lIGJ1aWxkIHNldHRpbmdzIGFzIHJlY29tbWVu ZGVkIGJ5IFhjb2RlIDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9QbGF0 Zm9ybVdpbi5jbWFrZSBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL1BsYXRmb3JtV2luLmNtYWtl CmluZGV4IDNkY2JmNmZlMzAzLi41OWQ2ZTA0M2M1NyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvUGxhdGZvcm1XaW4uY21ha2UKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5H TEUvUGxhdGZvcm1XaW4uY21ha2UKQEAgLTMxLDkgKzMxLDExIEBAIGxpc3QoQVBQRU5EIEFOR0xF R0xFU3YyX0NPTVBJTEVfREVGSU5JVElPTlMKICAgICBfX1NURENfTElNSVRfTUFDUk9TCiApCiAK LWxpc3QoQVBQRU5EIEFOR0xFR0xFU3YyX0xJQlJBUklFUwotICAgIEQzZDkKLSkKK2xpc3QoQVBQ RU5EIEFOR0xFR0xFU3YyX0xJQlJBUklFUyBEM2Q5KQorCitpZiAoREVCVUdfU1VGRklYKQorICAg IGxpc3QoQVBQRU5EIEFOR0xFR0xFU3YyX0xJQlJBUklFUyBkeGd1aWQpCitlbmRpZiAoKQogCiBs aXN0KEFQUEVORCBBTkdMRV9TT1VSQ0VTCiAgICAgc3JjL2NvbW1vbi9zeXN0ZW1fdXRpbHNfd2lu LmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQgYi9Tb3VyY2Uv V2ViQ29yZS9DTWFrZUxpc3RzLnR4dAppbmRleCA4M2NhZWY4OWVmMC4uMDZmMjc3N2QxOWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9XZWJD b3JlL0NNYWtlTGlzdHMudHh0CkBAIC0xMTYzLDcgKzExNjMsNyBAQCBzZXQoV2ViQ29yZV9MSUJS QVJJRVMKICAgICAke0xJQlhTTFRfTElCUkFSSUVTfQogICAgICR7U1FMSVRFX0xJQlJBUklFU30K ICAgICAke1pMSUJfTElCUkFSSUVTfQotICAgIFBBTCR7REVCVUdfU1VGRklYfQorICAgIFBBTAog KQogCiBpZiAoRU5BQkxFX0xFR0FDWV9FTkNSWVBURURfTUVESUEpCkBAIC0xNjg0LDcgKzE2ODQs NyBAQCBsaXN0KEFQUEVORCBXZWJDb3JlVGVzdFN1cHBvcnRfU09VUkNFUwogKQogCiBzZXQoV2Vi Q29yZVRlc3RTdXBwb3J0X0xJQlJBUklFUwotICAgIFBSSVZBVEUgSmF2YVNjcmlwdENvcmUke0RF QlVHX1NVRkZJWH0KKyAgICBQUklWQVRFIEphdmFTY3JpcHRDb3JlCiApCiAKICMgTW9kdWxlcyB0 aGF0IHRoZSBiaW5kaW5ncyBnZW5lcmF0b3Igc2NyaXB0cyBtYXkgdXNlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWFhNGQ3ZGU1ZmIuLmEzMGYwNGIxM2VhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTgtMTEtMTUgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KKworICAgICAg ICBbQ01ha2VdW0FwcGxlV2luXSBVc2UgREVCVUdfU1VGRklYIG9ubHkgd2hlcmUgbmVlZGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTE3MTMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIENNYWtlTGlz dHMudHh0OgorICAgICAgICAqIFBsYXRmb3JtV2luLmNtYWtlOgorCiAyMDE4LTExLTE1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgUlRDUGVlckNv bm5lY3Rpb24gSlMgYnVpbHQtaW5zIHRvIGJlIGNsb3NlciB0byBzcGVjV2UKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCmluZGV4IGE3OTRmMjEyMTM1Li5jYzY0ZTZmNTE5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvUEFML0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTgtMTEtMTUgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBz b255LmNvbT4KKworICAgICAgICBbQ01ha2VdW0FwcGxlV2luXSBVc2UgREVCVUdfU1VGRklYIG9u bHkgd2hlcmUgbmVlZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTE3MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBhbC9DTWFrZUxpc3RzLnR4dDoKKwogMjAxOC0xMS0xMSAgRGFuaWVsIEJhdGVz ICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gRHJhdyBjYXBzIGxvY2sgaW5k aWNhdG9yIGluIHBhc3N3b3JkIGZpZWxkcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFM L3BhbC9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvQ01ha2VMaXN0cy50 eHQKaW5kZXggMmY2ZThmMjA3MDMuLmZlYmYwMmNkNzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL0NNYWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwv Q01ha2VMaXN0cy50eHQKQEAgLTQwLDcgKzQwLDcgQEAgc2V0KFBBTF9TWVNURU1fSU5DTFVERV9E SVJFQ1RPUklFUwogKQogCiBzZXQoUEFMX0xJQlJBUklFUwotICAgIEphdmFTY3JpcHRDb3JlJHtE RUJVR19TVUZGSVh9CisgICAgSmF2YVNjcmlwdENvcmUKICkKIAogV0VCS0lUX0ZSQU1FV09SS19E RUNMQVJFKFBBTCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtV2luLmNtYWtl IGIvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1XaW4uY21ha2UKaW5kZXggMTkzMGViYzM5YWYuLmYw MmJkNTAzOWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybVdpbi5jbWFrZQor KysgYi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybVdpbi5jbWFrZQpAQCAtMzE5LDEyICszMTksOSBA QCBXRUJLSVRfTUFLRV9GT1JXQVJESU5HX0hFQURFUlMoV2ViQ29yZQogICAgIEZMQVRURU5FRAog KQogCi1zZXQoV2ViQ29yZV9PVVRQVVRfTkFNRQotICAgIFdlYkNvcmUke0RFQlVHX1NVRkZJWH0K LSkKLQotbGlzdChBUFBFTkQgV2ViQ29yZV9MSUJSQVJJRVMgV1RGJHtERUJVR19TVUZGSVh9KQor c2V0KFdlYkNvcmVfT1VUUFVUX05BTUUgV2ViQ29yZSR7REVCVUdfU1VGRklYfSkKK2xpc3QoQVBQ RU5EIFdlYkNvcmVfTElCUkFSSUVTIFdURikKIGlmIChUQVJHRVQgbGliRUdMKQogICAgIGxpc3Qo QVBQRU5EIFdlYkNvcmVfTElCUkFSSUVTIGxpYkVHTCkKIGVuZGlmICgpCi1saXN0KEFQUEVORCBX ZWJDb3JlVGVzdFN1cHBvcnRfTElCUkFSSUVTIFdURiR7REVCVUdfU1VGRklYfSkKK2xpc3QoQVBQ RU5EIFdlYkNvcmVUZXN0U3VwcG9ydF9MSUJSQVJJRVMgV1RGKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdExlZ2FjeS9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvQ01ha2VM aXN0cy50eHQKaW5kZXggMDQwNzZmY2U0OWYuLmU3ZmMyMmQzMTU4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0TGVnYWN5L0NNYWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kv Q01ha2VMaXN0cy50eHQKQEAgLTI4LDkgKzI4LDkgQEAgc2V0KFdlYktpdExlZ2FjeV9TWVNURU1f SU5DTFVERV9ESVJFQ1RPUklFUwogKQogCiBzZXQoV2ViS2l0TGVnYWN5X0xJQlJBUklFUwotICAg IFBSSVZBVEUgSmF2YVNjcmlwdENvcmUke0RFQlVHX1NVRkZJWH0KLSAgICBQUklWQVRFIFdlYkNv cmUke0RFQlVHX1NVRkZJWH0KLSAgICBQUklWQVRFIFBBTCR7REVCVUdfU1VGRklYfQorICAgIFBS SVZBVEUgSmF2YVNjcmlwdENvcmUKKyAgICBQUklWQVRFIFdlYkNvcmUKKyAgICBQUklWQVRFIFBB TAogKQogCiBXRUJLSVRfRlJBTUVXT1JLX0RFQ0xBUkUoV2ViS2l0TGVnYWN5KQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdExlZ2FjeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L0No YW5nZUxvZwppbmRleCBiNDE1ZjNhZDBjMi4uMjBjYTBlMWJmMjIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXRMZWdhY3kvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTgtMTEtMTUgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1z dGVhZEBzb255LmNvbT4KKworICAgICAgICBbQ01ha2VdW0FwcGxlV2luXSBVc2UgREVCVUdfU1VG RklYIG9ubHkgd2hlcmUgbmVlZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTE3MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIENNYWtlTGlzdHMudHh0OgorICAgICAgICAqIFBsYXRmb3JtV2luLmNt YWtlOgorCiAyMDE4LTExLTA5ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlbW92ZSBsZWdhY3kgc3RvcmFnZSB0cmFja2VyIGRhdGFiYXNlIGZpbGUgYWZ0ZXIg cjIzNzMzMApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9QbGF0Zm9ybVdpbi5jbWFr ZSBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvUGxhdGZvcm1XaW4uY21ha2UKaW5kZXggYWE3NzhmMWJl N2YuLmNhODI2ZmViNWNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L1BsYXRmb3Jt V2luLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvUGxhdGZvcm1XaW4uY21ha2UKQEAg LTM1LDcgKzM1LDcgQEAgZWxzZSAoKQogICAgICkKIGVuZGlmICgpCiAKLWxpc3QoQVBQRU5EIFdl YktpdExlZ2FjeV9MSUJSQVJJRVMgUFJJVkFURSBXVEYke0RFQlVHX1NVRkZJWH0pCitsaXN0KEFQ UEVORCBXZWJLaXRMZWdhY3lfTElCUkFSSUVTIFBSSVZBVEUgV1RGKQogCiBhZGRfY3VzdG9tX2Nv bW1hbmQoCiAgICAgT1VUUFVUICR7REVSSVZFRF9TT1VSQ0VTX1dFQktJVExFR0FDWV9ESVJ9L1dl YktpdFZlcnNpb24uaApAQCAtNDQ3LDE1ICs0NDcsMTUgQEAgbGlzdChBUFBFTkQgV2ViS2l0TGVn YWN5X0xJQlJBUklFUwogICAgIFBSSVZBVEUgVXNwMTAKICAgICBQUklWQVRFIFZlcnNpb24KICAg ICBQUklWQVRFIFdpbm1tCi0gICAgUFJJVkFURSBXZWJLaXRHVUlEJHtERUJVR19TVUZGSVh9Cisg ICAgUFJJVkFURSBXZWJLaXRMZWdhY3lHVUlECiAgICAgUFJJVkFURSBXaW5kb3dzQ29kZWNzCiAp CiAKIGlmIChFTkFCTEVfR1JBUEhJQ1NfQ09OVEVYVF8zRCkKICAgICBsaXN0KEFQUEVORCBXZWJL aXRMZWdhY3lfTElCUkFSSUVTCi0gICAgICAgIGxpYkFOR0xFJHtERUJVR19TVUZGSVh9Ci0gICAg ICAgIGxpYkVHTCR7REVCVUdfU1VGRklYfQotICAgICAgICBsaWJHTEVTdjIke0RFQlVHX1NVRkZJ WH0KKyAgICAgICAgbGliQU5HTEUKKyAgICAgICAgbGliRUdMCisgICAgICAgIGxpYkdMRVN2Mgog ICAgICkKIGVuZGlmICgpCiAKQEAgLTQ4Miw2ICs0ODIsNCBAQCBXRUJLSVRfTUFLRV9GT1JXQVJE SU5HX0hFQURFUlMoV2ViS2l0TGVnYWN5R1VJRAogICAgIEZMQVRURU5FRAogKQogCi1zZXQoV2Vi S2l0TGVnYWN5X09VVFBVVF9OQU1FCi0gICAgV2ViS2l0JHtERUJVR19TVUZGSVh9Ci0pCitzZXQo V2ViS2l0TGVnYWN5X09VVFBVVF9OQU1FIFdlYktpdCR7REVCVUdfU1VGRklYfSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdh Y3kvd2luL0NoYW5nZUxvZwppbmRleCAxMTU4ZmJiM2YyOC4uNTA2YTdmNTllMTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 TGVnYWN5L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxOC0xMS0xNSAgRG9uIE9s bXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgorCisgICAgICAgIFtDTWFrZV1bQXBwbGVX aW5dIFVzZSBERUJVR19TVUZGSVggb25seSB3aGVyZSBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTcxMworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0UXVhcnR6Q29yZUFkZGl0aW9u cy9DTWFrZUxpc3RzLnR4dDoKKwogMjAxOC0xMS0xNCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3Ro eUBhcHBsZS5jb20+CiAKICAgICAgICAgRGVmYXVsdCB0aGUgdmlldyBiYWNrZ3JvdW5kIGNvbG9y IGFuZCB0ZXh0IGNvbG9yIHRvIGRpZmZlcmVudCB2YWx1ZXMgd2hlbiBpbiBkYXJrIG1vZGUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJLaXRRdWFydHpDb3JlQWRkaXRp b25zL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViS2l0UXVhcnR6 Q29yZUFkZGl0aW9ucy9DTWFrZUxpc3RzLnR4dAppbmRleCBlZDhmYWM1MjEyZS4uNDhhNDZhZWVm M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYktpdFF1YXJ0ekNvcmVB ZGRpdGlvbnMvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2Vi S2l0UXVhcnR6Q29yZUFkZGl0aW9ucy9DTWFrZUxpc3RzLnR4dApAQCAtNTksNyArNTksNyBAQCBh ZGRfbGlicmFyeShXZWJLaXRRdWFydHpDb3JlQWRkaXRpb25zIFNIQVJFRCAke1dlYktpdFF1YXJ0 ekNvcmVBZGRpdGlvbnNfU09VUkNFUwogc2V0X3RhcmdldF9wcm9wZXJ0aWVzKFdlYktpdFF1YXJ0 ekNvcmVBZGRpdGlvbnMgUFJPUEVSVElFUyBPVVRQVVRfTkFNRSBXZWJLaXRRdWFydHpDb3JlQWRk aXRpb25zJHtERUJVR19TVUZGSVh9KQogdGFyZ2V0X2xpbmtfbGlicmFyaWVzKFdlYktpdFF1YXJ0 ekNvcmVBZGRpdGlvbnMKICAgICBEM2Q5Ci0gICAgV1RGJHtERUJVR19TVUZGSVh9CisgICAgV1RG CiAgICAgQ29yZUZvdW5kYXRpb24ke0RFQlVHX1NVRkZJWH0KICAgICBDb3JlR3JhcGhpY3Mke0RF QlVHX1NVRkZJWH0KICAgICBRdWFydHpDb3JlJHtERUJVR19TVUZGSVh9CmRpZmYgLS1naXQgYS9T b3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc01TVkMu Y21ha2UKaW5kZXggODNkMWUyMmI0YjQuLmE0NzRlODM1OGRiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv Y21ha2UvT3B0aW9uc01TVkMuY21ha2UKKysrIGIvU291cmNlL2NtYWtlL09wdGlvbnNNU1ZDLmNt YWtlCkBAIC03Nyw3ICs3Nyw3IEBAIGZvcmVhY2ggKGZsYWdfdmFyCiAgICAgIyBVc2UgdGhlIG11 bHRpdGhyZWFkZWQgc3RhdGljIHJ1bnRpbWUgbGlicmFyeSBpbnN0ZWFkIG9mIHRoZSBkZWZhdWx0 IERMTCBydW50aW1lLgogICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIvTUQiICIke01TVkNfUlVO VElNRV9DT01QSUxFX0ZMQUd9IiAke2ZsYWdfdmFyfSAiJHske2ZsYWdfdmFyfX0iKQogCi0gICAg IyBObyBkZWJ1ZyBydW50aW1lLCBldmVuIGluIGRlYnVnIGJ1aWxkcy4KKyAgICAjIE5vIGRlYnVn IHJ1bnRpbWUsIGV2ZW4gaW4gZGVidWcgYnVpbGRzLCBleGNlcHQgZm9yIEFwcGxlIEludGVybmFs IFdpbmRvd3MgYnVpbGRzCiAgICAgaWYgKE5PVCBERUJVR19TVUZGSVgpCiAgICAgICAgIHN0cmlu ZyhSRUdFWCBSRVBMQUNFICIke01TVkNfUlVOVElNRV9DT01QSUxFX0ZMQUd9ZCIgIiR7TVNWQ19S VU5USU1FX0NPTVBJTEVfRkxBR30iICR7ZmxhZ192YXJ9ICIkeyR7ZmxhZ192YXJ9fSIpCiAgICAg ICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIvRF9ERUJVRyIgIiIgJHtmbGFnX3Zhcn0gIiR7JHtm bGFnX3Zhcn19IikKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCAzMTEyYzUzZDkwYS4uMDg0M2QxZTg5NDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOC0xMS0xNSAg RG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgorCisgICAgICAgIFtDTWFrZV1b QXBwbGVXaW5dIFVzZSBERUJVR19TVUZGSVggb25seSB3aGVyZSBuZWVkZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTcxMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9DTWFr ZUxpc3RzLnR4dDoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1BsYXRmb3JtV2luLmNtYWtlOgor CiAyMDE4LTExLTE0ICBaYWxhbiBCdXRqYXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg W0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3IgaW4tZmxvdyBwb3NpdGlvbmVkIGlubGluZSBib3hl cy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ01ha2VMaXN0cy50eHQgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMudHh0CmluZGV4IDQ5ZjBhOGM0Y2M0Li5hZmQ3MmMz NTYyMyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9DTWFrZUxpc3RzLnR4dAorKysg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL0NNYWtlTGlzdHMudHh0CkBAIC0xLDE3ICsxLDE3IEBACiBz ZXQoVEVTVFdFQktJVEFQSV9ESVIgIiR7VE9PTFNfRElSfS9UZXN0V2ViS2l0QVBJIikKIHNldCh0 ZXN0X3d0Zl9MSUJSQVJJRVMKLSAgICBXVEYke0RFQlVHX1NVRkZJWH0KKyAgICBXVEYKICAgICBn dGVzdAogKQogCiBzZXQodGVzdF93ZWJjb3JlX0xJQlJBUklFUwotICAgIFdURiR7REVCVUdfU1VG RklYfQotICAgIFdlYkNvcmUke0RFQlVHX1NVRkZJWH0KKyAgICBXVEYKKyAgICBXZWJDb3JlCiAg ICAgZ3Rlc3QKICkKIAogc2V0KFRlc3RXZWJLaXRBUElfTElCUkFSSUVTCi0gICAgV1RGJHtERUJV R19TVUZGSVh9CisgICAgV1RGCiApCiAKIHNldChUZXN0V2ViS2l0QVBJX0RFUEVOREVOQ0lFUwpA QCAtMTAzLDcgKzEwMyw3IEBAIGlmIChFTkFCTEVfV0VCS0lUKQogICAgICkKIGVsc2UgKCkKICAg ICBsaXN0KEFQUEVORCBUZXN0V2ViS2l0QVBJX0xJQlJBUklFUwotICAgICAgICBXZWJLaXRMZWdh Y3kke0RFQlVHX1NVRkZJWH0KKyAgICAgICAgV2ViS2l0TGVnYWN5CiAgICAgKQogZW5kaWYgKCkK IApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVdpbi5jbWFrZSBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1XaW4uY21ha2UKaW5kZXggMzY1MGU0MDY0NWEuLjlh MzcxYmNhMDdhIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtV2luLmNt YWtlCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1XaW4uY21ha2UKQEAgLTI5LDcg KzI5LDcgQEAgc2V0KHRlc3Rfd2ViY29yZV9MSUJSQVJJRVMKICAgICBQc2FwaQogICAgIFNobHdh cGkKICAgICBVc3AxMAotICAgIFdlYkNvcmUke0RFQlVHX1NVRkZJWH0KKyAgICBXZWJDb3JlCiAg ICAgV2luZG93c0NvZGVjcwogICAgIGd0ZXN0CiApCkBAIC0xNDksNyArMTQ5LDcgQEAgZW5kaWYg KCkKIAogc2V0KHRlc3Rfd2Via2l0bGVnYWN5X0xJQlJBUklFUwogICAgIFdlYkNvcmVUZXN0U3Vw cG9ydAotICAgIFdlYktpdExlZ2FjeSR7REVCVUdfU1VGRklYfQorICAgIFdlYktpdExlZ2FjeQog ICAgIGd0ZXN0CiApCiAK