55599 2011-03-02 12:01:22 -0800 r80079 caused incremental Windows builds to fail 2011-03-02 12:49:40 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 aroben aroben dcheng sfalken oldest_to_newest 360955 0 aroben 2011-03-02 12:01:22 -0800 r80079 caused incremental Windows builds to fail 360959 1 aroben 2011-03-02 12:02:19 -0800 Here's the build that failed: http://build.webkit.org/builders/Windows%20Debug%20%28Build%29/builds/31688 The errors were: 10>WebKit2WebProcess.res : fatal error LNK1241: resource file WebKit2WebProcess.res already specified 11>FindSafari.res : fatal error LNK1241: resource file FindSafari.res already specified 360960 2 84445 aroben 2011-03-02 12:02:48 -0800 Created attachment 84445 Patch 360994 3 84445 tony 2011-03-02 12:43:38 -0800 Comment on attachment 84445 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=84445&action=review > Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:24 > + for extension in ['manifest', 'pch', 'res']: Nit: Using a tuple instead of a list is a bit more efficient. 360996 4 aroben 2011-03-02 12:49:40 -0800 Committed r80158: <http://trac.webkit.org/changeset/80158> 84445 2011-03-02 12:02:48 -0800 2011-03-02 12:43:38 -0800 Patch bug-55599-20110302150253.patch text/plain 2974 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogODAxNTIKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDk0 MzcyOWJjOTI1NjIxZWFhN2U2ZWEyYTY4ZjA5MWYxMzFlNGE0MDIuLjc1ZmE5YWRmOTA1OTZlYmU2 ZDc4ZjNhZWU5OGI3ODk3MzhjZDg3Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDExLTAzLTAyICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KKwor ICAgICAgICBEZWxldGUgb2xkIC5yZXMgZmlsZXMgd2hlbmV2ZXIgYW55IC52c3Byb3BzIGZpbGUg Y2hhbmdlcworCisgICAgICAgIFByb3NwZWN0aXZlIGZpeCBmb3IgPGh0dHA6Ly93ZWJraXQub3Jn L2IvNTU1OTk+IHI4MDA3OSBjYXVzZWQgaW5jcmVtZW50YWwgV2luZG93cyBidWlsZHMgdG8KKyAg ICAgICAgZmFpbAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogSmF2YVNjcmlwdENvcmUudmNwcm9qL0phdmFTY3JpcHRDb3JlL3JlYWN0LXRvLXZzcHJv cHMtY2hhbmdlcy5weToKKyAgICAgICAgKG1haW4pOiBSZXN0cnVjdHVyZWQgY29kZSB0byBsb29w IG92ZXIgYSBzZXQgb2YgZmlsZSBleHRlbnNpb25zLCBkZWxldGluZyBhbnkgb2xkIGZpbGVzIHRo YXQKKyAgICAgICAgaGF2ZSB0aGF0IGV4dGVuc2lvbi4gTm93IGRlbGV0ZXMgLnJlcyBmaWxlcywg dG9vLiAoV2UgcHJldmlvdXNseSBkZWxldGVkIGFueSBmaWxlIG1hdGNoaW5nCisgICAgICAgICou bWFuaWZlc3QqLCBidXQgdGhhdCB0dXJuZWQgb3V0IHRvIGp1c3QgYmUgdGhlIHVuaW9uIG9mICou bWFuaWZlc3QgYW5kICoucmVzLikKKwogMjAxMS0wMy0wMiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3 ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3Byb2ovSmF2YVNj cmlwdENvcmUvcmVhY3QtdG8tdnNwcm9wcy1jaGFuZ2VzLnB5IGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0phdmFTY3JpcHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29yZS9yZWFjdC10by12c3Byb3Bz LWNoYW5nZXMucHkKaW5kZXggZTEyODQwZjI3YzFjNmYwMWQ3MTA1NzRmNDkyZjEzM2I1YmVhMDBm Ny4uZDY0ZmYyMTBjYTIwZDI5ZDE4ZWNjZmZiYTY4NTk2NzIzZmY2NmEyYyAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29y ZS9yZWFjdC10by12c3Byb3BzLWNoYW5nZXMucHkKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L0phdmFTY3JpcHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29yZS9yZWFjdC10by12c3Byb3BzLWNo YW5nZXMucHkKQEAgLTE2LDE3ICsxNiwxNCBAQCBkZWYgbWFpbigpOgogICAgIGFzc2VydCBsZW4o dnNwcm9wc19maWxlcyksICJDb3VsZG4ndCBmaW5kIGFueSAudnNwcm9wcyBmaWxlcyBpbiAlcyIg JSB2c3Byb3BzX2RpcmVjdG9yeQogICAgIG5ld2VzdF92c3Byb3BzX3RpbWUgPSBtYXgobWFwKG9z LnBhdGguZ2V0bXRpbWUsIHZzcHJvcHNfZmlsZXMpKQogCi0gICAgIyBEZWxldGUgYW55IG1hbmlm ZXN0LXJlbGF0ZWQgZmlsZXMgYmVjYXVzZSBWaXN1YWwgU3R1ZGlvIGlzbid0IHNtYXJ0Ci0gICAg IyBlbm91Z2ggdG8gZmlndXJlIG91dCB0aGF0IGl0IG1pZ2h0IG5lZWQgdG8gcmVidWlsZCB0aGVt LgogICAgIG9ial9kaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4ob3MuZW52aXJvblsnQ09ORklHVVJB VElPTkJVSUxERElSJ10sICdvYmonKQotICAgIGZvciBtYW5pZmVzdF9maWxlIGluIGdsb2IuaWds b2Iob3MucGF0aC5qb2luKG9ial9kaXJlY3RvcnksICcqJywgJyoubWFuaWZlc3QqJykpOgotICAg ICAgICBkZWxldGVfaWZfb2xkZXJfdGhhbihtYW5pZmVzdF9maWxlLCBuZXdlc3RfdnNwcm9wc190 aW1lKQotCi0gICAgIyBEZWxldGUgYW55IHByZWNvbXBpbGVkIGhlYWRlcnMgYmVjYXVzZSBWaXN1 YWwgU3R1ZGlvIGlzbid0IHNtYXJ0IGVub3VnaAotICAgICMgdG8gZmlndXJlIG91dCB0aGF0IGl0 IG1pZ2h0IG5lZWQgdG8gcmVidWlsZCB0aGVtLCBldmVuIGlmIHdlIHRvdWNoCi0gICAgIyB3dGYv UGxhdGZvcm0uaCBiZWxvdy4KLSAgICBmb3IgcHJlY29tcGlsZWRfaGVhZGVyIGluIGdsb2IuaWds b2Iob3MucGF0aC5qb2luKG9ial9kaXJlY3RvcnksICcqJywgJyoucGNoJykpOgotICAgICAgICBk ZWxldGVfaWZfb2xkZXJfdGhhbihwcmVjb21waWxlZF9oZWFkZXIsIG5ld2VzdF92c3Byb3BzX3Rp bWUpCisKKyAgICAjIFZpc3VhbCBTdHVkaW8gaXNuJ3Qgc21hcnQgZW5vdWdoIHRvIGZpZ3VyZSBv dXQgaXQgbmVlZHMgdG8gcmVidWlsZCB0aGVzZSBmaWxlIHR5cGVzIHdoZW4KKyAgICAjIC52c3By b3BzIGZpbGVzIGNoYW5nZSAoZXZlbiBpZiB3ZSB0b3VjaCB3dGYvUGxhdGZvcm0uaCBiZWxvdyks IHNvIHdlIGRlbGV0ZSB0aGVtIHRvIGZvcmNlIHRoZW0KKyAgICAjIHRvIGJlIHJlYnVpbHQuCisg ICAgZm9yIGV4dGVuc2lvbiBpbiBbJ21hbmlmZXN0JywgJ3BjaCcsICdyZXMnXToKKyAgICAgICAg Zm9yIGZpbGVwYXRoIGluIGdsb2IuaWdsb2Iob3MucGF0aC5qb2luKG9ial9kaXJlY3RvcnksICcq JywgJyouJXMnICUgZXh0ZW5zaW9uKSk6CisgICAgICAgICAgICBkZWxldGVfaWZfb2xkZXJfdGhh bihmaWxlcGF0aCwgbmV3ZXN0X3ZzcHJvcHNfdGltZSkKIAogICAgICMgVG91Y2ggd3RmL1BsYXRm b3JtLmggc28gYWxsIGZpbGVzIHdpbGwgYmUgcmVjb21waWxlZC4gVGhpcyBpcyBuZWNlc3NhcnkK ICAgICAjIHRvIHBpY2sgdXAgY2hhbmdlcyB0byBwcmVwcm9jZXNzb3IgbWFjcm9zIChlLmcuLCBF TkFCTEVfKikuCg==