157997 2016-05-23 14:26:05 -0700 [cmake] Deduplicate make-js-file-arrays usage and make it work on Windows. 2016-05-25 22:30:38 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 annulen webkit-unassigned achristensen adam.bergkvist calvaris commit-queue lforschler mcatanzaro ossy oldest_to_newest 1195576 0 annulen 2016-05-23 14:26:05 -0700 On Windows setting PYTHONPATH variable requires separate command. 1195577 1 279584 annulen 2016-05-23 14:28:48 -0700 Created attachment 279584 Patch 1195605 2 279584 achristensen 2016-05-23 15:28:40 -0700 Comment on attachment 279584 Patch WebCore_USER_AGENT_SCRIPTS and WebCore_SDP_PROCESSOR_SCRIPTS aren't used on Windows. What does this enable? 1195606 3 279584 achristensen 2016-05-23 15:29:56 -0700 Comment on attachment 279584 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279584&action=review > Source/cmake/WebKitMacros.cmake:354 > +macro(MAKE_JS_FILE_ARRAYS _output_cpp _output_h _scripts _scripts_dependencies) This macro is only used in WebCore/CMakeLists.txt, so there's no reason to share it with other CMakeLists.txt here. 1195779 4 annulen 2016-05-24 01:13:01 -0700 (In reply to comment #2) > Comment on attachment 279584 [details] > Patch > > WebCore_USER_AGENT_SCRIPTS and WebCore_SDP_PROCESSOR_SCRIPTS aren't used on > Windows. What does this enable? I'm using them in downstream port, and I think this is need for sake of completeness. Similar stuff like WebCore_USER_AGENT_STYLE_SHEETS works anywhere because perl supports -I arguments and python doesn't. It will also be useful if someone decides to restore Windows support in WebKitGTK, or if you later decide to embed user scripts in Windows port instead of loading them from external file. 1196641 5 279584 achristensen 2016-05-25 22:09:27 -0700 Comment on attachment 279584 Patch All right. I guess this doesn't hurt anything. 1196645 6 279584 commit-queue 2016-05-25 22:30:34 -0700 Comment on attachment 279584 Patch Clearing flags on attachment: 279584 Committed r201413: <http://trac.webkit.org/changeset/201413> 1196646 7 commit-queue 2016-05-25 22:30:38 -0700 All reviewed patches have been landed. Closing bug. 279584 2016-05-23 14:28:48 -0700 2016-05-25 22:30:34 -0700 Patch bug-157997-20160524002953.patch text/plain 5460 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMjYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDUyMzk0OTNkMTk3MDIw YmE4ZDYwNTdhNDhhN2VkMzgzZGNiMGJjMC4uODJhMzZmNjY5MmFlNjhkYTA5MWYxOTJiNWU1NTcx ZmVkYzk4Yjk1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE2LTA1LTIzICBLb25z dGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KKworICAgICAgICBbY21ha2VdIERl ZHVwbGljYXRlIG1ha2UtanMtZmlsZS1hcnJheXMgdXNhZ2UgYW5kIG1ha2UgaXQgd29yayBvbiBX aW5kb3dzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTU3OTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzIG5lZWRlZC4KKworICAgICAgICAqIENNYWtlTGlzdHMudHh0OiBVc2UgbmV3 IE1BS0VfSlNfRklMRV9BUlJBWVMgbWFjcm8uCisKIDIwMTYtMDUtMjIgIEJyYWR5IEVpZHNvbiAg PGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgdG8gQysrMTQuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dCBiL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlz dHMudHh0CmluZGV4IGI1NzE3Mzc0M2RkNWM1MGJkNDFiMzEyMmI0ZTdhMjkyZGNmZDYzZWMuLjVl NzBhM2I4MGJkYjE5MmNhZTVhMTMzYjBiMzk3NjU3MTRlNzk4ODUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMu dHh0CkBAIC0zNTkyLDE0ICszNTkyLDEyIEBAIGlmIChXZWJDb3JlX1VTRVJfQUdFTlRfU0NSSVBU UykKICAgICAjIFdlYkNvcmVfVVNFUl9BR0VOVF9TQ1JJUFRTX0RFUEVOREVOQ0lFUyBjb250YWlu aW5nIHRoZSBzb3VyY2UgZmlsZSB0aGF0IHdpbGwgbG9hZCB0aGUgc2NyaXB0cyB0byBhZGQgdGhl IHByb3BlcgogICAgICMgICBkZXBlbmRlbmN5IGFuZCBoYXZpbmcgdGhlbSBidWlsdCBhdCB0aGUg cmlnaHQgbW9tZW50CiAKLSAgICBhZGRfY3VzdG9tX2NvbW1hbmQoCi0gICAgICAgIE9VVFBVVCAk e0RFUklWRURfU09VUkNFU19XRUJDT1JFX0RJUn0vVXNlckFnZW50U2NyaXB0c0RhdGEuY3BwICR7 REVSSVZFRF9TT1VSQ0VTX1dFQkNPUkVfRElSfS9Vc2VyQWdlbnRTY3JpcHRzLmgKLSAgICAgICAg TUFJTl9ERVBFTkRFTkNZICR7V0VCQ09SRV9ESVJ9L1NjcmlwdHMvbWFrZS1qcy1maWxlLWFycmF5 cy5weQotICAgICAgICBERVBFTkRTICR7V2ViQ29yZV9VU0VSX0FHRU5UX1NDUklQVFN9Ci0gICAg ICAgIENPTU1BTkQgIlBZVEhPTlBBVEg9JHtKYXZhU2NyaXB0Q29yZV9TQ1JJUFRTX0RJUn0iICR7 UFlUSE9OX0VYRUNVVEFCTEV9ICR7V0VCQ09SRV9ESVJ9L1NjcmlwdHMvbWFrZS1qcy1maWxlLWFy cmF5cy5weSAke0RFUklWRURfU09VUkNFU19XRUJDT1JFX0RJUn0vVXNlckFnZW50U2NyaXB0cy5o ICR7REVSSVZFRF9TT1VSQ0VTX1dFQkNPUkVfRElSfS9Vc2VyQWdlbnRTY3JpcHRzRGF0YS5jcHAg JHtXZWJDb3JlX1VTRVJfQUdFTlRfU0NSSVBUU30KLSAgICAgICAgVkVSQkFUSU0pCi0gICAgbGlz dChBUFBFTkQgV2ViQ29yZV9ERVJJVkVEX1NPVVJDRVMgJHtERVJJVkVEX1NPVVJDRVNfV0VCQ09S RV9ESVJ9L1VzZXJBZ2VudFNjcmlwdHNEYXRhLmNwcCkKLSAgICBBRERfU09VUkNFX1dFQkNPUkVf REVSSVZFRF9ERVBFTkRFTkNJRVMoJHtXZWJDb3JlX1VTRVJfQUdFTlRfU0NSSVBUU19ERVBFTkRF TkNJRVN9IFVzZXJBZ2VudFNjcmlwdHNEYXRhLmNwcCBVc2VyQWdlbnRTY3JpcHRzLmgpCisgICAg TUFLRV9KU19GSUxFX0FSUkFZUygKKyAgICAgICAgJHtERVJJVkVEX1NPVVJDRVNfV0VCQ09SRV9E SVJ9L1VzZXJBZ2VudFNjcmlwdHNEYXRhLmNwcAorICAgICAgICAke0RFUklWRURfU09VUkNFU19X RUJDT1JFX0RJUn0vVXNlckFnZW50U2NyaXB0cy5oCisgICAgICAgIFdlYkNvcmVfVVNFUl9BR0VO VF9TQ1JJUFRTCisgICAgICAgIFdlYkNvcmVfVVNFUl9BR0VOVF9TQ1JJUFRTX0RFUEVOREVOQ0lF UworICAgICkKIGVuZGlmICgpCiAKIGlmIChXZWJDb3JlX1NEUF9QUk9DRVNTT1JfU0NSSVBUUykK QEAgLTM2MDgsMTQgKzM2MDYsMTIgQEAgaWYgKFdlYkNvcmVfU0RQX1BST0NFU1NPUl9TQ1JJUFRT KQogICAgICMgV2ViQ29yZV9TRFBfUFJPQ0VTU09SX1NDUklQVFNfREVQRU5ERU5DSUVTIGNvbnRh aW5pbmcgdGhlIHNvdXJjZSBmaWxlIHRoYXQgd2lsbCBsb2FkIHRoZSBzY3JpcHRzIHRvIGFkZCB0 aGUgcHJvcGVyCiAgICAgIyAgIGRlcGVuZGVuY3kgYW5kIGhhdmluZyB0aGVtIGJ1aWx0IGF0IHRo ZSByaWdodCBtb21lbnQKIAotICAgIGFkZF9jdXN0b21fY29tbWFuZCgKLSAgICAgICAgT1VUUFVU ICR7REVSSVZFRF9TT1VSQ0VTX1dFQkNPUkVfRElSfS9TRFBQcm9jZXNzb3JTY3JpcHRzRGF0YS5j cHAgJHtERVJJVkVEX1NPVVJDRVNfV0VCQ09SRV9ESVJ9L1NEUFByb2Nlc3NvclNjcmlwdHMuaAot ICAgICAgICBNQUlOX0RFUEVOREVOQ1kgJHtXRUJDT1JFX0RJUn0vU2NyaXB0cy9tYWtlLWpzLWZp bGUtYXJyYXlzLnB5Ci0gICAgICAgIERFUEVORFMgJHtXZWJDb3JlX1NEUF9QUk9DRVNTT1JfU0NS SVBUU30KLSAgICAgICAgQ09NTUFORCAiUFlUSE9OUEFUSD0ke0phdmFTY3JpcHRDb3JlX1NDUklQ VFNfRElSfSIgJHtQWVRIT05fRVhFQ1VUQUJMRX0gJHtXRUJDT1JFX0RJUn0vU2NyaXB0cy9tYWtl LWpzLWZpbGUtYXJyYXlzLnB5ICR7REVSSVZFRF9TT1VSQ0VTX1dFQkNPUkVfRElSfS9TRFBQcm9j ZXNzb3JTY3JpcHRzLmggJHtERVJJVkVEX1NPVVJDRVNfV0VCQ09SRV9ESVJ9L1NEUFByb2Nlc3Nv clNjcmlwdHNEYXRhLmNwcCAke1dlYkNvcmVfU0RQX1BST0NFU1NPUl9TQ1JJUFRTfQotICAgICAg ICBWRVJCQVRJTSkKLSAgICBsaXN0KEFQUEVORCBXZWJDb3JlX0RFUklWRURfU09VUkNFUyAke0RF UklWRURfU09VUkNFU19XRUJDT1JFX0RJUn0vU0RQUHJvY2Vzc29yU2NyaXB0c0RhdGEuY3BwKQot ICAgIEFERF9TT1VSQ0VfV0VCQ09SRV9ERVJJVkVEX0RFUEVOREVOQ0lFUygke1dlYkNvcmVfU0RQ X1BST0NFU1NPUl9TQ1JJUFRTX0RFUEVOREVOQ0lFU30gU0RQUHJvY2Vzc29yU2NyaXB0c0RhdGEu Y3BwIFNEUFByb2Nlc3NvclNjcmlwdHMuaCkKKyAgICBNQUtFX0pTX0ZJTEVfQVJSQVlTKAorICAg ICAgICAke0RFUklWRURfU09VUkNFU19XRUJDT1JFX0RJUn0vU0RQUHJvY2Vzc29yU2NyaXB0c0Rh dGEuY3BwCisgICAgICAgICR7REVSSVZFRF9TT1VSQ0VTX1dFQkNPUkVfRElSfS9TRFBQcm9jZXNz b3JTY3JpcHRzLmgKKyAgICAgICAgV2ViQ29yZV9TRFBfUFJPQ0VTU09SX1NDUklQVFMKKyAgICAg ICAgV2ViQ29yZV9TRFBfUFJPQ0VTU09SX1NDUklQVFNfREVQRU5ERU5DSUVTCisgICAgKQogZW5k aWYgKCkKIAogIyBHZW5lcmF0ZSBwbHVnLWluIHJlc291cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNl L2NtYWtlL1dlYktpdE1hY3Jvcy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9XZWJLaXRNYWNyb3MuY21h a2UKaW5kZXggY2E2MWMyYzc1ZjhjOWQ3YjM1MWE5ZWExNTUwYjVmMDk4YjJmOGIyMy4uMDA3Yzhj ZmY0YjUxZDg2ODIyZjY4MWQwZDQ3MTBhMTY4ZWMwM2QxMyAxMDA2NDQKLS0tIGEvU291cmNlL2Nt YWtlL1dlYktpdE1hY3Jvcy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvV2ViS2l0TWFjcm9zLmNt YWtlCkBAIC0zNTEsNiArMzUxLDIzIEBAIG1hY3JvKEdFTkVSQVRFX1dFQktJVDJfTUVTU0FHRV9T T1VSQ0VTIF9vdXRwdXRfc291cmNlIF9pbnB1dF9maWxlcykKICAgICBlbmRmb3JlYWNoICgpCiBl bmRtYWNybygpCiAKK21hY3JvKE1BS0VfSlNfRklMRV9BUlJBWVMgX291dHB1dF9jcHAgX291dHB1 dF9oIF9zY3JpcHRzIF9zY3JpcHRzX2RlcGVuZGVuY2llcykKKyAgICBpZiAoV0lOMzIpCisgICAg ICAgIHNldChfcHl0aG9uX3BhdGggc2V0ICJQWVRIT05QQVRIPSR7SmF2YVNjcmlwdENvcmVfU0NS SVBUU19ESVJ9IiBDT01NQU5EKQorICAgIGVsc2UgKCkKKyAgICAgICAgc2V0KF9weXRob25fcGF0 aCAiUFlUSE9OUEFUSD0ke0phdmFTY3JpcHRDb3JlX1NDUklQVFNfRElSfSIpCisgICAgZW5kaWYg KCkKKworICAgIGFkZF9jdXN0b21fY29tbWFuZCgKKyAgICAgICAgT1VUUFVUICR7X291dHB1dF9o fSAke19vdXRwdXRfY3BwfQorICAgICAgICBNQUlOX0RFUEVOREVOQ1kgJHtXRUJDT1JFX0RJUn0v U2NyaXB0cy9tYWtlLWpzLWZpbGUtYXJyYXlzLnB5CisgICAgICAgIERFUEVORFMgJHske19zY3Jp cHRzfX0KKyAgICAgICAgQ09NTUFORCAke19weXRob25fcGF0aH0gJHtQWVRIT05fRVhFQ1VUQUJM RX0gJHtXRUJDT1JFX0RJUn0vU2NyaXB0cy9tYWtlLWpzLWZpbGUtYXJyYXlzLnB5ICR7X291dHB1 dF9ofSAke19vdXRwdXRfY3BwfSAkeyR7X3NjcmlwdHN9fQorICAgICAgICBWRVJCQVRJTSkKKyAg ICBsaXN0KEFQUEVORCBXZWJDb3JlX0RFUklWRURfU09VUkNFUyAke19vdXRwdXRfY3BwfSkKKyAg ICBBRERfU09VUkNFX0RFUEVOREVOQ0lFUygkeyR7X3NjcmlwdHNfZGVwZW5kZW5jaWVzfX0gJHtf b3V0cHV0X2h9ICR7X291dHB1dF9jcHB9KQorZW5kbWFjcm8oKQorCiAjIEhlbHBlciBtYWNybyBm b3IgdXNpbmcgYWxsLWluLW9uZSBidWlsZHMKICMgVGhpcyBtYWNybyByZW1vdmVzIHRoZSBzb3Vy Y2VzIGluY2x1ZGVkIGluIHRoZSBfYWxsX2luX29uZV9maWxlIGZyb20gdGhlIGlucHV0IF9maWxl X2xpc3QuCiAjIF9maWxlX2xpc3QgaXMgYSBsaXN0IG9mIHNvdXJjZSBmaWxlcwpkaWZmIC0tZ2l0 IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDMyOGY5ODY1ZDY5YzAyYjM4YWEwMTdhZDk5 MjU3MWI4YzZjN2JlZDIuLjVlNzM2OGQxNjUwYTQ5ZDUzNjQyNDYzNjgyYmEwOTFiNDQ2MWRjMDYg MTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAxNi0wNS0yMyAgS29uc3RhbnRpbiBUb2thcmV2ICA8YW5udWxlbkB5YW5kZXgucnU+CisKKyAg ICAgICAgW2NtYWtlXSBEZWR1cGxpY2F0ZSBtYWtlLWpzLWZpbGUtYXJyYXlzIHVzYWdlIGFuZCBt YWtlIGl0IHdvcmsgb24gV2luZG93cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE1Nzk5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogU291cmNlL2NtYWtlL1dlYktpdE1hY3Jvcy5jbWFrZTogQWRkZWQg TUFLRV9KU19GSUxFX0FSUkFZUyBtYWNyby4KKwogMjAxNi0wNS0yMiAgQnJhZHkgRWlkc29uICA8 YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSB0byBDKysxNC4K