137886 2014-10-20 11:13:30 -0700 Fix placement of a few items in vcxproj ItemGroups 2014-10-20 11:30:30 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam bfulgham commit-queue oldest_to_newest 1042888 0 mark.lam 2014-10-20 11:13:30 -0700 https://bugs.webkit.org/show_bug.cgi?id=137873 is likely a cut-and-paste error that manifested because we had ClCompile and ClInclude entries mixed up in the wrong ItemGroups. We should fix these so that ClCompile entries are in the ClCompile ItemGroup, and ClInclude entries in the ClInclude ItemGroup. This will help reduce the change of future cut-and-paste errors of this nature. 1042890 1 bfulgham 2014-10-20 11:19:11 -0700 (In reply to comment #0) > https://bugs.webkit.org/show_bug.cgi?id=137873 is likely a cut-and-paste > error that manifested because we had ClCompile and ClInclude entries mixed > up in the wrong ItemGroups. We should fix these so that ClCompile entries > are in the ClCompile ItemGroup, and ClInclude entries in the ClInclude > ItemGroup. This will help reduce the change of future cut-and-paste errors > of this nature. This is a great idea. We should also extend the style checker to look for these kinds of things. 1042891 2 240130 mark.lam 2014-10-20 11:20:38 -0700 Created attachment 240130 The patch. Here's the patch, but I'm still need to test this with an actual build before committing. 1042892 3 240130 ggaren 2014-10-20 11:24:24 -0700 Comment on attachment 240130 The patch. r=me if it builds 1042896 4 mark.lam 2014-10-20 11:27:38 -0700 It builds. I'll land manually. 1042898 5 mark.lam 2014-10-20 11:30:30 -0700 Thanks for the review. Landed in r174895: <http://trac.webkit.org/r174895>. 240130 2014-10-20 11:20:38 -0700 2014-10-20 11:27:17 -0700 The patch. bug-137886.patch text/plain 4700 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTc0ODk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDE0LTEwLTIwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggcGxhY2VtZW50IG9mIGEgZmV3IGl0ZW1zIGluIHZjeHByb2ogSXRlbUdyb3Vwcy4KKyAgICAg ICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEzNzg4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL3dlYmtpdC5vcmcvYi8xMzc4NzMgaXMg bGlrZWx5IGEgY3V0LWFuZC1wYXN0ZSBlcnJvciB0aGF0IG1hbmlmZXN0ZWQKKyAgICAgICAgYmVj YXVzZSB3ZSBoYWQgQ2xDb21waWxlIGFuZCBDbEluY2x1ZGUgZW50cmllcyBtaXhlZCB1cCBpbiB0 aGUgd3JvbmcgSXRlbUdyb3Vwcy4KKyAgICAgICAgV2Ugc2hvdWxkIGZpeCB0aGVzZSBzbyB0aGF0 IENsQ29tcGlsZSBlbnRyaWVzIGFyZSBpbiB0aGUgQ2xDb21waWxlIEl0ZW1Hcm91cCwKKyAgICAg ICAgYW5kIENsSW5jbHVkZSBlbnRyaWVzIGluIHRoZSBDbEluY2x1ZGUgSXRlbUdyb3VwLiAgVGhp cyB3aWxsIGhlbHAgcmVkdWNlIHRoZQorICAgICAgICBjaGFuY2Ugb2YgZnV0dXJlIGN1dC1hbmQt cGFzdGUgZXJyb3JzIG9mIHRoaXMgbmF0dXJlLgorCisgICAgICAgICogSmF2YVNjcmlwdENvcmUu dmN4cHJvai9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qOgorICAgICAgICAqIEphdmFTY3JpcHRDb3Jl LnZjeHByb2ovSmF2YVNjcmlwdENvcmUudmN4cHJvai5maWx0ZXJzOgorCiAyMDE0LTEwLTIwICBK b3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCBXaW5kb3dzIEJ1aWxkIEZpeCBhZnRlciByMTc0ODkyLgpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL0phdmFTY3JpcHRDb3JlLnZjeHByb2ovSmF2YVNjcmlwdENvcmUudmN4cHJvago9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUudmN4cHJvai9K YXZhU2NyaXB0Q29yZS52Y3hwcm9qCShyZXZpc2lvbiAxNzQ4OTApCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvSmF2YVNjcmlwdENvcmUudmN4cHJvai9KYXZhU2NyaXB0Q29yZS52Y3hwcm9qCSh3 b3JraW5nIGNvcHkpCkBAIC0zMDQsNyArMzA0LDYgQEAKICAgICA8Q2xDb21waWxlIEluY2x1ZGU9 Ii4uXEFQSVxPcGFxdWVKU1N0cmluZy5jcHAiIC8+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIu Llxhc3NlbWJsZXJcTGlua0J1ZmZlci5jcHAiIC8+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIu Llxhc3NlbWJsZXJcTWFjcm9Bc3NlbWJsZXIuY3BwIiAvPgotICAgIDxDbEluY2x1ZGUgSW5jbHVk ZT0iLi5cQVBJXEpTQ1Rlc3RSdW5uZXJVdGlscy5oIiAvPgogICAgIDxDbENvbXBpbGUgSW5jbHVk ZT0iLi5cYXNzZW1ibGVyXE1hY3JvQXNzZW1ibGVyWDg2Q29tbW9uLmNwcCIgLz4KICAgICA8Q2xD b21waWxlIEluY2x1ZGU9Ii4uXGJpbmRpbmdzXFNjcmlwdEZ1bmN0aW9uQ2FsbC5jcHAiIC8+CiAg ICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlxiaW5kaW5nc1xTY3JpcHRPYmplY3QuY3BwIiAvPgpA QCAtNjIzLDggKzYyMiwxMCBAQAogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5caml0XEpJVFRv REZHRGVmZXJyZWRDb21waWxhdGlvbkNhbGxiYWNrLmNwcCIgLz4KICAgICA8Q2xDb21waWxlIElu Y2x1ZGU9Ii4uXGppdFxSZWcuY3BwIiAvPgogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5caml0 XFJlZ2lzdGVyUHJlc2VydmF0aW9uV3JhcHBlckdlbmVyYXRvci5jcHAiIC8+CisgICAgPENsQ29t cGlsZSBJbmNsdWRlPSIuLlxqaXRcUmVnaXN0ZXJTZXQuY3BwIiAvPgogICAgIDxDbENvbXBpbGUg SW5jbHVkZT0iLi5caml0XFJlcGF0Y2guY3BwIiAvPgogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0i Li5caml0XFNjcmF0Y2hSZWdpc3RlckFsbG9jYXRvci5jcHAiIC8+CisgICAgPENsQ29tcGlsZSBJ bmNsdWRlPSIuLlxqaXRcVGVtcFJlZ2lzdGVyU2V0LmNwcCIgLz4KICAgICA8Q2xDb21waWxlIElu Y2x1ZGU9Ii4uXGppdFxUaHVua0dlbmVyYXRvcnMuY3BwIiAvPgogICAgIDxDbENvbXBpbGUgSW5j bHVkZT0iLi5cbGxpbnRcTExJbnRDTG9vcC5jcHAiIC8+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRl PSIuLlxsbGludFxMTEludERhdGEuY3BwIiAvPgpAQCAtODc2LDYgKzg3Nyw3IEBACiAgICAgPENs SW5jbHVkZSBJbmNsdWRlPSIuLlxBUElcSlNBUElXcmFwcGVyT2JqZWN0LmgiIC8+CiAgICAgPENs SW5jbHVkZSBJbmNsdWRlPSIuLlxBUElcSlNCYXNlLmgiIC8+CiAgICAgPENsSW5jbHVkZSBJbmNs dWRlPSIuLlxBUElcSlNCYXNlUHJpdmF0ZS5oIiAvPgorICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0i Li5cQVBJXEpTQ1Rlc3RSdW5uZXJVdGlscy5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0i Li5cQVBJXEpTQ2FsbGJhY2tDb25zdHJ1Y3Rvci5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVk ZT0iLi5cQVBJXEpTQ2FsbGJhY2tGdW5jdGlvbi5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVk ZT0iLi5cQVBJXEpTQ2FsbGJhY2tPYmplY3QuaCIgLz4KQEAgLTEzNDksMTQgKzEzNTEsMTIgQEAK ICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGppdFxKSVRUb0RGR0RlZmVycmVkQ29tcGlsYXRp b25DYWxsYmFjay5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caml0XEpJVFdyaXRl QmFycmllci5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caml0XEpTSW50ZXJmYWNl SklULmgiIC8+Ci0gICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlxqaXRcUmVnaXN0ZXJTZXQuY3Bw IiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caml0XFJlZy5oIiAvPgogICAgIDxDbElu Y2x1ZGUgSW5jbHVkZT0iLi5caml0XFJlZ2lzdGVyUHJlc2VydmF0aW9uV3JhcHBlckdlbmVyYXRv ci5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caml0XFJlZ2lzdGVyU2V0LmgiIC8+ CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxqaXRcUmVwYXRjaC5oIiAvPgogICAgIDxDbElu Y2x1ZGUgSW5jbHVkZT0iLi5caml0XFNjcmF0Y2hSZWdpc3RlckFsbG9jYXRvci5oIiAvPgogICAg IDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caml0XFNwZWNpYWxpemVkVGh1bmtKSVQuaCIgLz4KLSAg ICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXGppdFxUZW1wUmVnaXN0ZXJTZXQuY3BwIiAvPgogICAg IDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caml0XFRlbXBSZWdpc3RlclNldC5oIiAvPgogICAgIDxD bEluY2x1ZGUgSW5jbHVkZT0iLi5caml0XFRodW5rR2VuZXJhdG9yLmgiIC8+CiAgICAgPENsSW5j bHVkZSBJbmNsdWRlPSIuLlxqaXRcVGh1bmtHZW5lcmF0b3JzLmgiIC8+CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUudmN4cHJvai9KYXZhU2NyaXB0Q29yZS52Y3hw cm9qLmZpbHRlcnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3Jp cHRDb3JlLnZjeHByb2ovSmF2YVNjcmlwdENvcmUudmN4cHJvai5maWx0ZXJzCShyZXZpc2lvbiAx NzQ4OTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUudmN4cHJvai9K YXZhU2NyaXB0Q29yZS52Y3hwcm9qLmZpbHRlcnMJKHdvcmtpbmcgY29weSkKQEAgLTEyOSw2ICsx MjksOSBAQAogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5cYXNzZW1ibGVyXE1hY3JvQXNzZW1i bGVyLmNwcCI+CiAgICAgICA8RmlsdGVyPmFzc2VtYmxlcjwvRmlsdGVyPgogICAgIDwvQ2xDb21w aWxlPgorICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5cYXNzZW1ibGVyXE1hY3JvQXNzZW1ibGVy WDg2Q29tbW9uLmNwcCI+CisgICAgICA8RmlsdGVyPmFzc2VtYmxlcjwvRmlsdGVyPgorICAgIDwv Q2xDb21waWxlPgogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5cYnVpbHRpbnNcQnVpbHRpbkV4 ZWN1dGFibGVzLmNwcCI+CiAgICAgICA8RmlsdGVyPmJ1aWx0aW5zPC9GaWx0ZXI+CiAgICAgPC9D bENvbXBpbGU+CkBAIC0zMDMzLDkgKzMwMzYsNiBAQAogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0i Li5ccnVudGltZVxWTUVudHJ5U2NvcGUuaCI+CiAgICAgICA8RmlsdGVyPnJ1bnRpbWU8L0ZpbHRl cj4KICAgICA8L0NsSW5jbHVkZT4KLSAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXGFzc2VtYmxl clxNYWNyb0Fzc2VtYmxlclg4NkNvbW1vbi5jcHAiPgotICAgICAgPEZpbHRlcj5hc3NlbWJsZXI8 L0ZpbHRlcj4KLSAgICA8L0NsQ29tcGlsZT4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHJ1 bnRpbWVcSW50ZW5kZWRTdHJ1Y3R1cmVDaGFpbi5oIj4KICAgICAgIDxGaWx0ZXI+cnVudGltZTwv RmlsdGVyPgogICAgIDwvQ2xJbmNsdWRlPgo=