132619 2014-05-06 11:58:45 -0700 Add Makefile targets for copying static libraries (LLVM and WKSI) 2015-09-08 09:30:05 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer ayao bburg commit-queue ddkilzer dfarler fpizlo ggaren mhahnenberg mitz mrowe oldest_to_newest 1007030 0 ddkilzer 2014-05-06 11:58:45 -0700 For developers that use "make" to build WebKit, it would be useful to have targets to copy the static libraries so that one could run: make libs debug Or even more abbreviated: make l d 1007047 1 mrowe 2014-05-06 12:41:26 -0700 Why not just include WebKitLibraries in the top level Makefile's list of projects, and give it a Makefile that does the right thing? Then the obvious "make debug" will Just Work. 1007058 2 230926 ddkilzer 2014-05-06 13:13:16 -0700 Created attachment 230926 Patch v1 1007059 3 ddkilzer 2014-05-06 13:14:49 -0700 (In reply to comment #1) > Why not just include WebKitLibraries in the top level Makefile's list of projects, and give it a Makefile that does the right thing? Then the obvious "make debug" will Just Work. I had assumed for internal developers who build WKSI that this wouldn't be desirable, but I now realize the default action for copy-webkitlibraries-to-product-directory is not to overwrite newer copies of WKSI (and LLVM) static libraries, so this would be fine. New patch forthcoming. 1007060 4 230927 ddkilzer 2014-05-06 13:19:20 -0700 Created attachment 230927 Patch v2 1007064 5 230927 mrowe 2014-05-06 13:22:21 -0700 Comment on attachment 230927 Patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=230927&action=review > WebKitLibraries/Makefile:10 > +libs l: > + perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi --llvm > + > +llvm: > + perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --llvm > + > +wksi: > + perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi The llvm, wksi and l targets seem unnecessary. How does copy-webkitlibraries-to-product-directory know which configuration's build directory to copy to? 1007069 6 ddkilzer 2014-05-06 13:46:21 -0700 (In reply to comment #5) > (From update of attachment 230927 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230927&action=review > > > WebKitLibraries/Makefile:10 > > +libs l: > > + perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi --llvm > > + > > +llvm: > > + perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --llvm > > + > > +wksi: > > + perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi > > The llvm, wksi and l targets seem unnecessary. The are convenience targets in case someone wants to "build" only one or the other (instead of typing out the whole command). > How does copy-webkitlibraries-to-product-directory know which configuration's build directory to copy to? It ends up calling productDir() in webkitdirs.pm, which uses the current set-webkit-configuration (which is set by Makefile.shared, which WebKitLibraries/Makefile includes) because we don't pass a product directory on the command line, and we don't set BUILT_PRODUCTS_DIR in the environment when the script is run. In other words, the fallback for the product directory in copy-webkitlibraries-to-product-directory is the following: 1. command-line argument, else 2. $ENV{BUILT_PRODUCTS_DIR}, else 3. productDir() in webkitdirs.pm. 1007070 7 ddkilzer 2014-05-06 13:47:11 -0700 (In reply to comment #6) > (In reply to comment #5) > > The llvm, wksi and l targets seem unnecessary. > > The are convenience targets in case someone wants to "build" only one or the other (instead of typing out the whole command). I'm okay removing these as well. 1007075 8 mrowe 2014-05-06 13:58:37 -0700 (In reply to comment #6) > (In reply to comment #5) > > (From update of attachment 230927 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=230927&action=review > > > > > WebKitLibraries/Makefile:10 > > > +libs l: > > > + perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi --llvm > > > + > > > +llvm: > > > + perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --llvm > > > + > > > +wksi: > > > + perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi > > > > The llvm, wksi and l targets seem unnecessary. > > The are convenience targets in case someone wants to "build" only one or the other (instead of typing out the whole command). > > > How does copy-webkitlibraries-to-product-directory know which configuration's build directory to copy to? > > It ends up calling productDir() in webkitdirs.pm, which uses the current set-webkit-configuration (which is set by Makefile.shared, which WebKitLibraries/Makefile includes) because we don't pass a product directory on the command line, and we don't set BUILT_PRODUCTS_DIR in the environment when the script is run. > > In other words, the fallback for the product directory in copy-webkitlibraries-to-product-directory is the following: > > 1. command-line argument, else > 2. $ENV{BUILT_PRODUCTS_DIR}, else > 3. productDir() in webkitdirs.pm. Consider the following sequence of events: 1) set-webkit-configuration --release 2) make -C WebKitLibraries debug Based on your WebKitLibraries/Makefile, I expect this will copy the libraries in to the Release configuration's build directory rather than Debug's like the command implies. I think you'll also see warnings like so: Makefile:4: warning: overriding commands for target `debug' ../Makefile.shared:32: warning: ignoring old commands for target `debug' 1007151 9 230956 ddkilzer 2014-05-06 17:22:58 -0700 Created attachment 230956 Patch v3 1007219 10 230956 commit-queue 2014-05-06 22:18:36 -0700 Comment on attachment 230956 Patch v3 Clearing flags on attachment: 230956 Committed r168410: <http://trac.webkit.org/changeset/168410> 1007220 11 commit-queue 2014-05-06 22:18:40 -0700 All reviewed patches have been landed. Closing bug. 1124256 12 bburg 2015-09-08 09:30:05 -0700 *** Bug 129499 has been marked as a duplicate of this bug. *** 230926 2014-05-06 13:13:16 -0700 2014-05-06 13:14:58 -0700 Patch v1 bug-132619-20140506131254.patch text/plain 4078 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MzI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjYyYTFjMGI5YzJlZWEwYTc0MWNiYTEyZjAxZWMwNzg3 YjUyMjY0MC4uYWM4NzM5YzMyMDQ1ZDJjYWRjMDA3ZjM5MmRiZTQ0MDJlNGVjYmI1YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE0LTA1LTA2ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgQWRkIE1ha2VmaWxlIHRhcmdldHMgZm9yIGNvcHlpbmcgc3RhdGljIGxpYnJhcmllcyAo TExWTSBhbmQgV0tTSSkKKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTMyNjE5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9j b3B5LXdlYmtpdGxpYnJhcmllcy10by1wcm9kdWN0LWRpcmVjdG9yeTogU2V0IGEKKyAgICAgICAg c2Vuc2libGUgZGVmYXVsdCBmb3IgcHJvZHVjdCBkaXJlY3RvcnkgaWYgbm90IHNwZWNpZmllZCBv bgorICAgICAgICBlaXRoZXIgdGhlIGNvbW1hbmQtbGluZSBvciBpbiB0aGUgZW52aXJvbm1lbnQg KGJ5IFhjb2RlKSBieQorICAgICAgICBjYWxsaW5nIHByb2R1Y3REaXIoKSBpbiB3ZWJraXRkaXJz LnBtLgorCiAyMDE0LTA1LTA1ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBDbGVhbiB1cCBJbWFnZSBEb2N1bWVudCBhbmQgdHdlYWsgdGhlIGxheW91 dCBhbmQgdmlld3BvcnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY29weS13ZWJraXRsaWJy YXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkgYi9Ub29scy9TY3JpcHRzL2NvcHktd2Via2l0bGli cmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5CmluZGV4IDMzMjc2NjdmNjY3MGZhZThmYzhiNzYw MzllYmVmYjMxOWFiZGQxYzUuLmMwOWQ0ZjZhYTI4OGZjMmE5Y2I3Yzk2YjNlYTQ1NjUzZDI0ZTQ5 MzQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvY29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJv ZHVjdC1kaXJlY3RvcnkKKysrIGIvVG9vbHMvU2NyaXB0cy9jb3B5LXdlYmtpdGxpYnJhcmllcy10 by1wcm9kdWN0LWRpcmVjdG9yeQpAQCAtODQsNyArODQsNyBAQCBteSAkcHJvZHVjdERpciA9IHNo aWZ0IEBBUkdWOwogaWYgKCRwcm9kdWN0RGlyKSB7CiAgICAgJHByb2R1Y3REaXIgPSBGaWxlOjpT cGVjLT5yZWwyYWJzKCRwcm9kdWN0RGlyKTsKIH0gZWxzZSB7Ci0gICAgJHByb2R1Y3REaXIgPSAk RU5We0JVSUxUX1BST0RVQ1RTX0RJUn07CisgICAgJHByb2R1Y3REaXIgPSAkRU5We0JVSUxUX1BS T0RVQ1RTX0RJUn0gfHwgcHJvZHVjdERpcigpOwogfQogCiBpZiAoISRvc3hWZXJzaW9uKSB7CmRp ZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggMWVlNzAwOTRiYjkyZDUxMzc2 MjQxYjBjNjNkNzFhNzM0NTc5MTgzNi4uNmU1OGM1ZjFiYjM0Mjg0OWY3Yjk0YjU0NWFmYjIxZTBj NjAzOTAyMyAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE0IEBACisyMDE0LTA1LTA2ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkIE1ha2VmaWxlIHRhcmdldHMgZm9yIGNvcHlpbmcgc3RhdGljIGxpYnJhcmll cyAoTExWTSBhbmQgV0tTSSkKKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTMyNjE5Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWFrZWZp bGU6CisgICAgICAgIChsaWJzIGwpOiBBZGQgdGFyZ2V0cyB0aGF0IGludm9rZSB0aGUgc2FtZSB0 YXJnZXRzIG9uCisgICAgICAgIFdlYktpdExpYmFyaWVzL01ha2VmaWxlLgorCiAyMDE0LTA1LTA1 ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RL XVtDTWFrZV0gVW5hYmxlIHRvIGRvIG1ha2UgaW5zdGFsbApkaWZmIC0tZ2l0IGEvTWFrZWZpbGUg Yi9NYWtlZmlsZQppbmRleCAxNGUzMzE1NzAxMTE1Nzc5N2RhYzYyYzQ5NGJhYzBiZjI1NGQ3YzJm Li44MGMyZmEyMzY1ZjA3OTUyNDEyMjg0MTFjNmE2ZWUxYTM3NDNhMTUwIDEwMDY0NAotLS0gYS9N YWtlZmlsZQorKysgYi9NYWtlZmlsZQpAQCAtMTIsNiArMTIsMTAgQEAgcmVsZWFzZSByOgogCUBm b3IgZGlyIGluICQoTU9EVUxFUyk7IGRvICR7TUFLRX0gJEAgLUMgJCRkaXI7IGV4aXRfc3RhdHVz PSQkPzsgXAogCWlmIFsgJCRleGl0X3N0YXR1cyAtbmUgMCBdOyB0aGVuIGV4aXQgJCRleGl0X3N0 YXR1czsgZmk7IGRvbmUKIAorbGlicyBsOgorCUAke01BS0V9ICRAIC1DIFdlYktpdExpYnJhcmll czsgZXhpdF9zdGF0dXM9JCQ/OyBcCisJaWYgWyAkJGV4aXRfc3RhdHVzIC1uZSAwIF07IHRoZW4g ZXhpdCAkJGV4aXRfc3RhdHVzOyBmaQorCiBjbGVhbjoKIAlAZm9yIGRpciBpbiAkKE1PRFVMRVMp OyBkbyAke01BS0V9ICRAIC1DICQkZGlyOyBleGl0X3N0YXR1cz0kJD87IFwKIAlpZiBbICQkZXhp dF9zdGF0dXMgLW5lIDAgXTsgdGhlbiBleGl0ICQkZXhpdF9zdGF0dXM7IGZpOyBkb25lCmRpZmYg LS1naXQgYS9XZWJLaXRMaWJyYXJpZXMvQ2hhbmdlTG9nIGIvV2ViS2l0TGlicmFyaWVzL0NoYW5n ZUxvZwppbmRleCA5NDE2MDdlMTMwNTgzMWZmMzkzOTVkMmE2YTRkMGQwMGU1YzM2MmFjLi4wN2Qx OWJlMjMxNTAxNGRkZmZjYTkxNzcwYWJlYjFmZTc3MWQzYmNiIDEwMDY0NAotLS0gYS9XZWJLaXRM aWJyYXJpZXMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdExpYnJhcmllcy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxNC0wNS0wNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t PgorCisgICAgICAgIEFkZCBNYWtlZmlsZSB0YXJnZXRzIGZvciBjb3B5aW5nIHN0YXRpYyBsaWJy YXJpZXMgKExMVk0gYW5kIFdLU0kpCisgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzEzMjYx OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1h a2VmaWxlOiBBZGRlZC4KKyAgICAgICAgKGxpYnMgbCk6IEluc3RhbGwgYm90aCBMTFZNIGFuZCBX S1NJIHN0YXRpYyBsaWJyYXJpZXMuCisgICAgICAgIChsbHZtKTogSW5zdGFsbCBMTFZNIHN0YXRp YyBsaWJyYXJpZXMuCisgICAgICAgICh3a3NpKTogSW5zdGFsbCBXS1NJIHN0YXRpYyBsaWJyYXJp ZXMuCisgICAgICAgIChhbGwpOiBBZGQgZGVwZW5kZW5jeSBvbiAnbGlicycgdGFyZ2V0LgorICAg ICAgICAoZGVidWcgZCk6IERpdHRvLgorICAgICAgICAocmVsZWFzZSByKTogRGl0dG8uCisKIDIw MTQtMDUtMDUgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAg W1dJTl0gRW5oYW5jZSBhdXRvLXZlcnNpb24uc2ggdG8gaGFuZGxlIGFsbC1jYXBzIG9yIG1peGVk LWNhc2UgYnVpbGQgZW52aXJvbm1lbnQgdmFyaWFibGUKZGlmZiAtLWdpdCBhL1dlYktpdExpYnJh cmllcy9NYWtlZmlsZSBiL1dlYktpdExpYnJhcmllcy9NYWtlZmlsZQpuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40NWM1 ODZkMTA3ZDdmYmZjYTYwMGJkYzUxYzRkOTljNTQ0NjBiYjdjCi0tLSAvZGV2L251bGwKKysrIGIv V2ViS2l0TGlicmFyaWVzL01ha2VmaWxlCkBAIC0wLDAgKzEsMTcgQEAKK2luY2x1ZGUgLi4vTWFr ZWZpbGUuc2hhcmVkCisKK2xpYnMgbDoKKwlwZXJsICQoU0NSSVBUU19QQVRIKS9jb3B5LXdlYmtp dGxpYnJhcmllcy10by1wcm9kdWN0LWRpcmVjdG9yeSAtLXdrc2kgLS1sbHZtCisKK2xsdm06CisJ cGVybCAkKFNDUklQVFNfUEFUSCkvY29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJl Y3RvcnkgLS1sbHZtCisKK3drc2k6CisJcGVybCAkKFNDUklQVFNfUEFUSCkvY29weS13ZWJraXRs aWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkgLS13a3NpCisKK2FsbDogbGlicworCitkZWJ1 ZyBkOiBsaWJzCisKK3JlbGVhc2UgcjogbGlicworCg== 230927 2014-05-06 13:19:20 -0700 2014-05-06 17:22:54 -0700 Patch v2 bug-132619-20140506131857.patch text/plain 3751 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MzI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjYyYTFjMGI5YzJlZWEwYTc0MWNiYTEyZjAxZWMwNzg3 YjUyMjY0MC4uYWM4NzM5YzMyMDQ1ZDJjYWRjMDA3ZjM5MmRiZTQ0MDJlNGVjYmI1YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE0LTA1LTA2ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgQWRkIE1ha2VmaWxlIHRhcmdldHMgZm9yIGNvcHlpbmcgc3RhdGljIGxpYnJhcmllcyAo TExWTSBhbmQgV0tTSSkKKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTMyNjE5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9j b3B5LXdlYmtpdGxpYnJhcmllcy10by1wcm9kdWN0LWRpcmVjdG9yeTogU2V0IGEKKyAgICAgICAg c2Vuc2libGUgZGVmYXVsdCBmb3IgcHJvZHVjdCBkaXJlY3RvcnkgaWYgbm90IHNwZWNpZmllZCBv bgorICAgICAgICBlaXRoZXIgdGhlIGNvbW1hbmQtbGluZSBvciBpbiB0aGUgZW52aXJvbm1lbnQg KGJ5IFhjb2RlKSBieQorICAgICAgICBjYWxsaW5nIHByb2R1Y3REaXIoKSBpbiB3ZWJraXRkaXJz LnBtLgorCiAyMDE0LTA1LTA1ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBDbGVhbiB1cCBJbWFnZSBEb2N1bWVudCBhbmQgdHdlYWsgdGhlIGxheW91 dCBhbmQgdmlld3BvcnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY29weS13ZWJraXRsaWJy YXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkgYi9Ub29scy9TY3JpcHRzL2NvcHktd2Via2l0bGli cmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5CmluZGV4IDMzMjc2NjdmNjY3MGZhZThmYzhiNzYw MzllYmVmYjMxOWFiZGQxYzUuLmMwOWQ0ZjZhYTI4OGZjMmE5Y2I3Yzk2YjNlYTQ1NjUzZDI0ZTQ5 MzQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvY29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJv ZHVjdC1kaXJlY3RvcnkKKysrIGIvVG9vbHMvU2NyaXB0cy9jb3B5LXdlYmtpdGxpYnJhcmllcy10 by1wcm9kdWN0LWRpcmVjdG9yeQpAQCAtODQsNyArODQsNyBAQCBteSAkcHJvZHVjdERpciA9IHNo aWZ0IEBBUkdWOwogaWYgKCRwcm9kdWN0RGlyKSB7CiAgICAgJHByb2R1Y3REaXIgPSBGaWxlOjpT cGVjLT5yZWwyYWJzKCRwcm9kdWN0RGlyKTsKIH0gZWxzZSB7Ci0gICAgJHByb2R1Y3REaXIgPSAk RU5We0JVSUxUX1BST0RVQ1RTX0RJUn07CisgICAgJHByb2R1Y3REaXIgPSAkRU5We0JVSUxUX1BS T0RVQ1RTX0RJUn0gfHwgcHJvZHVjdERpcigpOwogfQogCiBpZiAoISRvc3hWZXJzaW9uKSB7CmRp ZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggMWVlNzAwOTRiYjkyZDUxMzc2 MjQxYjBjNjNkNzFhNzM0NTc5MTgzNi4uYTFjZjZmZjY2ZTA2MDNhYWY2Y2U3YTE3M2VlMmE0MzQx YTNkY2EwMCAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDE0LTA1LTA2ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkIE1ha2VmaWxlIHRhcmdldHMgZm9yIGNvcHlpbmcgc3RhdGljIGxpYnJhcmll cyAoTExWTSBhbmQgV0tTSSkKKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTMyNjE5Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWFrZWZp bGU6CisgICAgICAgIChNT0RVTEVTKTogQWRkIFdlYktpdExpYnJhcmllcy4KKwogMjAxNC0wNS0w NSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dU S11bQ01ha2VdIFVuYWJsZSB0byBkbyBtYWtlIGluc3RhbGwKZGlmZiAtLWdpdCBhL01ha2VmaWxl IGIvTWFrZWZpbGUKaW5kZXggMTRlMzMxNTcwMTExNTc3OTdkYWM2MmM0OTRiYWMwYmYyNTRkN2My Zi4uMzI2MzM2NDkxMzk1YWZmMTZkODgyOGU5MzEzMjk5NDU0MDNlZTgwOSAxMDA2NDQKLS0tIGEv TWFrZWZpbGUKKysrIGIvTWFrZWZpbGUKQEAgLTEsNCArMSw0IEBACi1NT0RVTEVTID0gU291cmNl IFRvb2xzCitNT0RVTEVTID0gV2ViS2l0TGlicmFyaWVzIFNvdXJjZSBUb29scwogCiBhbGw6CiAJ QGZvciBkaXIgaW4gJChNT0RVTEVTKTsgZG8gJHtNQUtFfSAkQCAtQyAkJGRpcjsgZXhpdF9zdGF0 dXM9JCQ/OyBcCmRpZmYgLS1naXQgYS9XZWJLaXRMaWJyYXJpZXMvQ2hhbmdlTG9nIGIvV2ViS2l0 TGlicmFyaWVzL0NoYW5nZUxvZwppbmRleCA5NDE2MDdlMTMwNTgzMWZmMzkzOTVkMmE2YTRkMGQw MGU1YzM2MmFjLi4wN2QxOWJlMjMxNTAxNGRkZmZjYTkxNzcwYWJlYjFmZTc3MWQzYmNiIDEwMDY0 NAotLS0gYS9XZWJLaXRMaWJyYXJpZXMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdExpYnJhcmllcy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNC0wNS0wNiAgRGF2aWQgS2lsemVyICA8ZGRr aWx6ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBNYWtlZmlsZSB0YXJnZXRzIGZvciBjb3B5 aW5nIHN0YXRpYyBsaWJyYXJpZXMgKExMVk0gYW5kIFdLU0kpCisgICAgICAgIDxodHRwOi8vd2Vi a2l0Lm9yZy9iLzEzMjYxOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIE1ha2VmaWxlOiBBZGRlZC4KKyAgICAgICAgKGxpYnMgbCk6IEluc3RhbGwg Ym90aCBMTFZNIGFuZCBXS1NJIHN0YXRpYyBsaWJyYXJpZXMuCisgICAgICAgIChsbHZtKTogSW5z dGFsbCBMTFZNIHN0YXRpYyBsaWJyYXJpZXMuCisgICAgICAgICh3a3NpKTogSW5zdGFsbCBXS1NJ IHN0YXRpYyBsaWJyYXJpZXMuCisgICAgICAgIChhbGwpOiBBZGQgZGVwZW5kZW5jeSBvbiAnbGli cycgdGFyZ2V0LgorICAgICAgICAoZGVidWcgZCk6IERpdHRvLgorICAgICAgICAocmVsZWFzZSBy KTogRGl0dG8uCisKIDIwMTQtMDUtMDUgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5j b20+CiAKICAgICAgICAgW1dJTl0gRW5oYW5jZSBhdXRvLXZlcnNpb24uc2ggdG8gaGFuZGxlIGFs bC1jYXBzIG9yIG1peGVkLWNhc2UgYnVpbGQgZW52aXJvbm1lbnQgdmFyaWFibGUKZGlmZiAtLWdp dCBhL1dlYktpdExpYnJhcmllcy9NYWtlZmlsZSBiL1dlYktpdExpYnJhcmllcy9NYWtlZmlsZQpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi40NWM1ODZkMTA3ZDdmYmZjYTYwMGJkYzUxYzRkOTljNTQ0NjBiYjdjCi0tLSAv ZGV2L251bGwKKysrIGIvV2ViS2l0TGlicmFyaWVzL01ha2VmaWxlCkBAIC0wLDAgKzEsMTcgQEAK K2luY2x1ZGUgLi4vTWFrZWZpbGUuc2hhcmVkCisKK2xpYnMgbDoKKwlwZXJsICQoU0NSSVBUU19Q QVRIKS9jb3B5LXdlYmtpdGxpYnJhcmllcy10by1wcm9kdWN0LWRpcmVjdG9yeSAtLXdrc2kgLS1s bHZtCisKK2xsdm06CisJcGVybCAkKFNDUklQVFNfUEFUSCkvY29weS13ZWJraXRsaWJyYXJpZXMt dG8tcHJvZHVjdC1kaXJlY3RvcnkgLS1sbHZtCisKK3drc2k6CisJcGVybCAkKFNDUklQVFNfUEFU SCkvY29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkgLS13a3NpCisKK2Fs bDogbGlicworCitkZWJ1ZyBkOiBsaWJzCisKK3JlbGVhc2UgcjogbGlicworCg== 230956 2014-05-06 17:22:58 -0700 2014-05-06 22:18:36 -0700 Patch v3 bug-132619-20140506172235.patch text/plain 3656 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MzI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjYyYTFjMGI5YzJlZWEwYTc0MWNiYTEyZjAxZWMwNzg3 YjUyMjY0MC4uYWM4NzM5YzMyMDQ1ZDJjYWRjMDA3ZjM5MmRiZTQ0MDJlNGVjYmI1YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE0LTA1LTA2ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgQWRkIE1ha2VmaWxlIHRhcmdldHMgZm9yIGNvcHlpbmcgc3RhdGljIGxpYnJhcmllcyAo TExWTSBhbmQgV0tTSSkKKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTMyNjE5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9j b3B5LXdlYmtpdGxpYnJhcmllcy10by1wcm9kdWN0LWRpcmVjdG9yeTogU2V0IGEKKyAgICAgICAg c2Vuc2libGUgZGVmYXVsdCBmb3IgcHJvZHVjdCBkaXJlY3RvcnkgaWYgbm90IHNwZWNpZmllZCBv bgorICAgICAgICBlaXRoZXIgdGhlIGNvbW1hbmQtbGluZSBvciBpbiB0aGUgZW52aXJvbm1lbnQg KGJ5IFhjb2RlKSBieQorICAgICAgICBjYWxsaW5nIHByb2R1Y3REaXIoKSBpbiB3ZWJraXRkaXJz LnBtLgorCiAyMDE0LTA1LTA1ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBDbGVhbiB1cCBJbWFnZSBEb2N1bWVudCBhbmQgdHdlYWsgdGhlIGxheW91 dCBhbmQgdmlld3BvcnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY29weS13ZWJraXRsaWJy YXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkgYi9Ub29scy9TY3JpcHRzL2NvcHktd2Via2l0bGli cmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5CmluZGV4IDMzMjc2NjdmNjY3MGZhZThmYzhiNzYw MzllYmVmYjMxOWFiZGQxYzUuLmMwOWQ0ZjZhYTI4OGZjMmE5Y2I3Yzk2YjNlYTQ1NjUzZDI0ZTQ5 MzQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvY29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJv ZHVjdC1kaXJlY3RvcnkKKysrIGIvVG9vbHMvU2NyaXB0cy9jb3B5LXdlYmtpdGxpYnJhcmllcy10 by1wcm9kdWN0LWRpcmVjdG9yeQpAQCAtODQsNyArODQsNyBAQCBteSAkcHJvZHVjdERpciA9IHNo aWZ0IEBBUkdWOwogaWYgKCRwcm9kdWN0RGlyKSB7CiAgICAgJHByb2R1Y3REaXIgPSBGaWxlOjpT cGVjLT5yZWwyYWJzKCRwcm9kdWN0RGlyKTsKIH0gZWxzZSB7Ci0gICAgJHByb2R1Y3REaXIgPSAk RU5We0JVSUxUX1BST0RVQ1RTX0RJUn07CisgICAgJHByb2R1Y3REaXIgPSAkRU5We0JVSUxUX1BS T0RVQ1RTX0RJUn0gfHwgcHJvZHVjdERpcigpOwogfQogCiBpZiAoISRvc3hWZXJzaW9uKSB7CmRp ZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggMWVlNzAwOTRiYjkyZDUxMzc2 MjQxYjBjNjNkNzFhNzM0NTc5MTgzNi4uYTFjZjZmZjY2ZTA2MDNhYWY2Y2U3YTE3M2VlMmE0MzQx YTNkY2EwMCAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDE0LTA1LTA2ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkIE1ha2VmaWxlIHRhcmdldHMgZm9yIGNvcHlpbmcgc3RhdGljIGxpYnJhcmll cyAoTExWTSBhbmQgV0tTSSkKKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTMyNjE5Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWFrZWZp bGU6CisgICAgICAgIChNT0RVTEVTKTogQWRkIFdlYktpdExpYnJhcmllcy4KKwogMjAxNC0wNS0w NSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dU S11bQ01ha2VdIFVuYWJsZSB0byBkbyBtYWtlIGluc3RhbGwKZGlmZiAtLWdpdCBhL01ha2VmaWxl IGIvTWFrZWZpbGUKaW5kZXggMTRlMzMxNTcwMTExNTc3OTdkYWM2MmM0OTRiYWMwYmYyNTRkN2My Zi4uMzI2MzM2NDkxMzk1YWZmMTZkODgyOGU5MzEzMjk5NDU0MDNlZTgwOSAxMDA2NDQKLS0tIGEv TWFrZWZpbGUKKysrIGIvTWFrZWZpbGUKQEAgLTEsNCArMSw0IEBACi1NT0RVTEVTID0gU291cmNl IFRvb2xzCitNT0RVTEVTID0gV2ViS2l0TGlicmFyaWVzIFNvdXJjZSBUb29scwogCiBhbGw6CiAJ QGZvciBkaXIgaW4gJChNT0RVTEVTKTsgZG8gJHtNQUtFfSAkQCAtQyAkJGRpcjsgZXhpdF9zdGF0 dXM9JCQ/OyBcCmRpZmYgLS1naXQgYS9XZWJLaXRMaWJyYXJpZXMvQ2hhbmdlTG9nIGIvV2ViS2l0 TGlicmFyaWVzL0NoYW5nZUxvZwppbmRleCA5NDE2MDdlMTMwNTgzMWZmMzkzOTVkMmE2YTRkMGQw MGU1YzM2MmFjLi4zMjg5NGQ4Yjc0MDZhNmJiMWU2NzBiYWNhNjcxZDE1MzE1ZDM0YzM5IDEwMDY0 NAotLS0gYS9XZWJLaXRMaWJyYXJpZXMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdExpYnJhcmllcy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNC0wNS0wNiAgRGF2aWQgS2lsemVyICA8ZGRr aWx6ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBNYWtlZmlsZSB0YXJnZXRzIGZvciBjb3B5 aW5nIHN0YXRpYyBsaWJyYXJpZXMgKExMVk0gYW5kIFdLU0kpCisgICAgICAgIDxodHRwOi8vd2Vi a2l0Lm9yZy9iLzEzMjYxOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIE1ha2VmaWxlOiBBZGRlZC4KKyAgICAgICAgKGxpYnMpOiBJbnN0YWxsIGJv dGggTExWTSBhbmQgV0tTSSBzdGF0aWMgbGlicmFyaWVzLgorICAgICAgICAoYWxsKTogQWRkIGRl cGVuZGVuY3kgb24gJ2xpYnMnIHRhcmdldC4KKyAgICAgICAgKGRlYnVnIGQpOiBTZXQgY29uZmln dXJhdGlvbiwgdGhlIGNhbGwgJ2xpYnMnIHRhcmdldC4KKyAgICAgICAgKHJlbGVhc2Ugcik6IERp dHRvLgorCiAyMDE0LTA1LTA1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgog CiAgICAgICAgIFtXSU5dIEVuaGFuY2UgYXV0by12ZXJzaW9uLnNoIHRvIGhhbmRsZSBhbGwtY2Fw cyBvciBtaXhlZC1jYXNlIGJ1aWxkIGVudmlyb25tZW50IHZhcmlhYmxlCmRpZmYgLS1naXQgYS9X ZWJLaXRMaWJyYXJpZXMvTWFrZWZpbGUgYi9XZWJLaXRMaWJyYXJpZXMvTWFrZWZpbGUKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYTg1ZTAzZDI1YmI3ZmFjODNhNjQyMmRhNGFlOTI3NDdmMjFhNWIxMAotLS0gL2Rldi9u dWxsCisrKyBiL1dlYktpdExpYnJhcmllcy9NYWtlZmlsZQpAQCAtMCwwICsxLDE1IEBACitTQ1JJ UFRTX1BBVEggPSAuLi9Ub29scy9TY3JpcHRzCisKK2xpYnM6CisJcGVybCAkKFNDUklQVFNfUEFU SCkvY29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkgLS13a3NpIC0tbGx2 bQorCithbGw6IGxpYnMKKworZGVidWcgZDoKKwkkKFNDUklQVFNfUEFUSCkvc2V0LXdlYmtpdC1j b25maWd1cmF0aW9uIC0tZGVidWcKKwlAJChNQUtFKSBsaWJzCisKK3JlbGVhc2UgcjoKKwkkKFND UklQVFNfUEFUSCkvc2V0LXdlYmtpdC1jb25maWd1cmF0aW9uIC0tcmVsZWFzZQorCUAkKE1BS0Up IGxpYnMKKwo=