22347 2008-11-18 16:24:48 -0800 Chromium Scons build does not work on Windows 2008-11-26 17:40:06 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric oldest_to_newest 99243 0 eric 2008-11-18 16:24:48 -0800 I knew this when I wrote it. I didn't have any idea how hard it would be to fix the build to work on Windows though. :( Scons + CYGWIN + MSVC do not get along, at all. I've got most of it building now. I'll attach my first pass patch shortly. It is *not possible* to build using a cygwin shell. Sadly Scons requires Windows Python in order to handle MSVC. This is superbly lame, but do to needing to grab at the registry to find out where MSVC is installed. The scons folks know about the issue, and will likely fix it at some point, but for now, we have to install Windows Python, + the win32 python additions, (not to mention scons itself) in order to build. 99257 1 25255 eric 2008-11-18 17:35:58 -0800 Created attachment 25255 first attempt at making the scons build work on Windows Not for review yet. Still at least one error: cl /Fowtf\ThreadingWin.obj /c wtf\ThreadingWin.cpp /nologo /TP /nologo /DBUILDING_CHROMIUM__ /I. /IC:\Projects\WebK it /IForwardingHeaders /Iicu /Ipcre /Idebugger /Iwrec /Iwtf\unicode /Iparser /Ibytecompiler /Iprofiler /IAPI /Iwtf /IDerivedSources\JavaScriptCore /IVM /Iruntime /Iwtf\win /Iwtf\unicode\icu /IC:\Projects\WebKit\WebKitLibraries\win \include /IC:\Projects\WebKit\WebKitLibraries\win\include\pthreads ThreadingWin.cpp wtf\ThreadingWin.cpp(280) : error C2039: 'TryEnterCriticalSection' : is not a member of '`global namespace'' wtf\ThreadingWin.cpp(280) : error C3861: 'TryEnterCriticalSection': identifier not found scons: *** [wtf\ThreadingWin.obj] Error 2 scons: building terminated because of errors. 99260 2 eric 2008-11-18 17:42:36 -0800 I tried adding a WIN32_LEAN_AND_MEAN define before the windows.h include in ThreadingWin.cpp, but that didn't solve the problem. I think I'll try defining LEAN_AND_MEAN globally (Since a google search seems to suggest that will help.) 99563 3 25325 eric 2008-11-20 16:40:00 -0800 Created attachment 25325 Fix the JSC/Chromium build for Windows 99568 4 25325 darin 2008-11-20 16:52:00 -0800 Comment on attachment 25325 Fix the JSC/Chromium build for Windows > ASSERT(m_sourceElements); > - functionBodyNode->adoptData(auto_ptr<ScopeNodeData>(new ScopeNodeData(m_sourceElements.get(), > + functionBodyNode->adoptData(std::auto_ptr<ScopeNodeData>(new ScopeNodeData(m_sourceElements.get(), > m_varDeclarations ? &m_varDeclarations->data : 0, > m_funcDeclarations ? &m_funcDeclarations->data : 0, > m_numConstants))); What's this change about? It's not mentioned in the ChangeLog. The right fix would be to add a "using namespace std" or "using std::auto_ptr" to this source file, not add an explicit std:: qualification. rs=me on the scons changes 99569 5 eric 2008-11-20 16:56:40 -0800 (In reply to comment #4) > What's this change about? It's not mentioned in the ChangeLog. The right fix > would be to add a "using namespace std" or "using std::auto_ptr" to this source > file, not add an explicit std:: qualification. Yeah, sorry. I'll fix it to be using std::auto_ptr. Not sure why no other platform fails... I'll also fix it to mention in the ChangeLog. Thanks! 100494 6 eric 2008-11-26 17:40:06 -0800 http://trac.webkit.org/changeset/38647 25255 2008-11-18 17:35:58 -0800 2008-11-20 16:33:09 -0800 first attempt at making the scons build work on Windows scons-try.patch text/plain 3320 eric Y29tbWl0IDRjZDU4YzZlMzllNGVhNWEzYjU4NGM5MTVhNmZmZjBmMGJlNTM2ZDAKQXV0aG9yOiBl c2VpZGVsIDxlc2VpZGVsQGVzZWlkZWwtY29ycC5jb3JwLmdvb2dsZS5jb20+CkRhdGU6ICAgVHVl IE5vdiAxOCAxNzowNDo1MCAyMDA4IC0wODAwCgogICAgRmlyc3QtcGFzcyBhdCBmaXhpbmcgdGhl IFNjb25zIGJ1aWxkIHRvIHdvcmsgdW5kZXIgV2luZG93cwoKZGlmZiAtLWdpdCBhL0phdmFTY3Jp cHRDb3JlL0phdmFTY3JpcHRDb3JlLnNjb25zIGIvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENv cmUuc2NvbnMKaW5kZXggMDZlNGE1YS4uODNkMGMyMSAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENv cmUvSmF2YVNjcmlwdENvcmUuc2NvbnMKKysrIGIvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENv cmUuc2NvbnMKQEAgLTEsNyArMSwzIEBACi1pbXBvcnQgb3MKLWltcG9ydCBzeXMKLWZyb20gc3Vi cHJvY2VzcyBpbXBvcnQgUG9wZW4sIFBJUEUKLQogIyBUaGUga2V5cyBpbiBzb3VyY2VzIGFyZSB0 aGUgcGF0aHMgdG8gdGhlIGRpcmVjdG9yaWVzCiAjIHRoZSB2YWx1ZXMgYXJlIGFuIGFycmF5IG9m IHNvdXJjZSBmaWxlcyBpbiB0aG9zZSBkaXJlY3RvcmllcyB0byBjb21waWxlCiBzb3VyY2VzID0g e30KQEAgLTE1MCwxMiArMTQ2LDIzIEBAIHNvdXJjZXNbJ3d0Zi91bmljb2RlL2ljdSddID0gWwog CiBlbnYgPSBFbnZpcm9ubWVudCgpCiAKKyMgU2NvbnMgdXNlcyBnY2Mgd2hlbiBidWlsZGluZyB1 bmRlciBjeWd3aW4gYnkgZGVmYXVsdAoraWYgZW52WydQTEFURk9STSddID09ICdjeWd3aW4nOgor ICAgIGVudi5Ub29sKCdtc3ZjJykKKyAgICBlbnYuVG9vbCgnbXNsaW5rJykKKyAgICBlbnYuVG9v bCgnbXNsaWInKQorCisjIFNjb25zIGlzIGZhaWxpbmcgdG8gY2FycnkgdGhlICVQQVRIJSB2YWx1 ZSB0aHJvdWdoIGNvcnJlY3RseQorIyBIYWNrIEluY3JlZGlCdWlsZCBpbnRvIG91ciBwYXRoIHNv IGNsLmV4ZSBkb2Vzbid0IGNyYXNoCitpZiBlbnZbJ1BMQVRGT1JNJ10gPT0gJ3dpbjMyJzoKKyAg ICBlbnYuQXBwZW5kRU5WUGF0aCgnUEFUSCcsICdjOi9Qcm9ncmFtIEZpbGVzL1hvcmVheC9JbmNy ZWRpQnVpbGQnKQorCiBpZiBlbnZbJ1BMQVRGT1JNJ10gPT0gJ2Rhcndpbic6CiAgICAgc291cmNl c1snQVBJJ10uYXBwZW5kKCdBUEkvSlNTdHJpbmdSZWZDRi5jcHAnKQogICAgIHNvdXJjZXNbJ3By b2ZpbGVyJ10uYXBwZW5kKCdwcm9maWxlci9Qcm9maWxlclNlcnZlci5tbScpCiAgICAgc291cmNl c1snd3RmJ10uYXBwZW5kKCd3dGYvVGhyZWFkaW5nUHRocmVhZHMuY3BwJykKICAgICBzb3VyY2Vz Wyd3dGYvbWFjJ10gPSBbJ3d0Zi9tYWMvTWFpblRocmVhZE1hYy5tbSddCi1lbGlmIGVudlsnUExB VEZPUk0nXSA9PSAnd2luMzInOgorZWxpZiBlbnZbJ1BMQVRGT1JNJ10gPT0gJ3dpbjMyJyBvciBl bnZbJ1BMQVRGT1JNJ10gPT0gJ2N5Z3dpbic6CiAgICAgc291cmNlc1snQVBJJ10uYXBwZW5kKCdB UEkvSlNTdHJpbmdSZWZCU1RSLmNwcCcpCiAgICAgc291cmNlc1snd3RmJ10uYXBwZW5kKCd3dGYv VGhyZWFkaW5nV2luLmNwcCcpCiAgICAgc291cmNlc1snd3RmL3dpbiddID0gWyd3dGYvd2luL01h aW5UaHJlYWRXaW4uY3BwJ10KQEAgLTE5MiwxMSArMTk5LDE1IEBAIGRlcml2ZWRfc291cmNlc19z b3VyY2VzID0gWwogXQogCiAjIEdlbmVyYXRlIERlcml2ZWRTb3VyY2VzCi1lbnYuQ29tbWFuZChk ZXJpdmVkX3NvdXJjZXNfcmVzdWx0cywgZGVyaXZlZF9zb3VyY2VzX3NvdXJjZXMsICcuL21ha2Ut Z2VuZXJhdGVkLXNvdXJjZXMuc2gnKQotc291cmNlc1tkZXJpdmVkX3NvdXJjZXNfcGF0aF0gPSBb RGVyaXZlZFNvdXJjZXMoJ2dyYW1tYXIuY3BwJyldCisjIE1ha2Ugc3VyZSBXaW5kb3dzIGtub3dz IHdoZXJlIGJhc2ggKGFuZCBhbGwgdGhlIG90aGVyIGN5Z3dpbiBjb21tYW5kcykgbGl2ZQoraWYg ZW52WydQTEFURk9STSddID09ICd3aW4zMic6CisgICAgZW52LkFwcGVuZEVOVlBhdGgoJ1BBVEgn LCAnQzovY3lnd2luL2JpbicpCitlbnYuQ29tbWFuZChkZXJpdmVkX3NvdXJjZXNfcmVzdWx0cywg ZGVyaXZlZF9zb3VyY2VzX3NvdXJjZXMsICdiYXNoIG1ha2UtZ2VuZXJhdGVkLXNvdXJjZXMuc2gn KQorc291cmNlc1tkZXJpdmVkX3NvdXJjZXNfcGF0aF0gPSBbRGVyaXZlZFNvdXJjZXMoJ0dyYW1t YXIuY3BwJyldCiAKICMgSGFuZGxlIG9zLXZlcnNpb24gc3BlY2lmaWMgYnVpbGQgc2V0dGluZ3MK IGlmIGVudlsnUExBVEZPUk0nXSA9PSAnZGFyd2luJzoKKyAgICBmcm9tIHN1YnByb2Nlc3MgaW1w b3J0IFBvcGVuLCBQSVBFCiAgICAgdmVyc2lvbl9waWVjZXMgPSBQb3BlbihbInN3X3ZlcnMiLCAi LXByb2R1Y3RWZXJzaW9uIl0sIHN0ZG91dCA9IFBJUEUpLmNvbW11bmljYXRlKClbMF0uc3BsaXQo Jy4nKQogICAgIGlmIG1hcChpbnQsIHZlcnNpb25fcGllY2VzKVs6Ml0gPiAoMTAsIDUpOgogICAg ICAgICAjIER0cmFjZSBkb2Vzbid0IGV4aXN0IGluIFRpZ2VyLCBhbmQgd2FzIGJyb2tlbiBpbiBM ZW9wYXJkCkBAIC0yMTAsMTQgKzIyMSwxNyBAQCBlbnZbJ0NQUERFRklORVMnXSA9ICdCVUlMRElO R19DSFJPTUlVTV9fJwogIyByZW1vdmUgdGhpcyB3aGVuIHdlIGZpeCBTY29ucyB0byB1bmRlcnN0 YW5kIEdDQyBwcmVjb21waWxlZCBoZWFkZXJzCiBpZiBlbnZbJ0NDJ10gPT0gJ2djYyc6CiAgICAg ZW52WydDQ0ZMQUdTJ10gPSAnLWluY2x1ZGUgSmF2YVNjcmlwdENvcmVQcmVmaXguaCcKLWVudlsn UENIJ10gPSAnSmF2YVNjcmlwdENvcmVQcmVmaXguaCcKKyMgZW52WydQQ0gnXSA9ICdKYXZhU2Ny aXB0Q29yZVByZWZpeC5oJworIyBlbnZbJ1BDSFNUT1AnXSA9ICdKYXZhU2NyaXB0Q29yZVByZWZp eC5oJwogCiBpZiBlbnZbJ1BMQVRGT1JNJ10gPT0gJ2Rhcndpbic6CiAgICAgZW52WydGUkFNRVdP UktTJ10gPSBbJ0NvcmVGb3VuZGF0aW9uJywgJ0ZvdW5kYXRpb24nXQogICAgIGVudlsnTElCUydd ID0gWydpY3Vjb3JlJ10KIAogaW5jbHVkZV9wYXRocyA9IFsnLicsICcuLicsICdGb3J3YXJkaW5n SGVhZGVycycsICdpY3UnXSArIHNvdXJjZXMua2V5cygpCi1lbnZbJ0NQUFBBVEgnXSA9IGluY2x1 ZGVfcGF0aHMKK2Vudi5BcHBlbmQoQ1BQUEFUSCA9IGluY2x1ZGVfcGF0aHMpCitpZiBlbnZbJ1BM QVRGT1JNJ10gPT0gJ3dpbjMyJzoKKyAgICBlbnYuQXBwZW5kKENQUFBBVEggPSBbJy4uL1dlYktp dExpYnJhcmllcy93aW4vaW5jbHVkZScsICcuLi9XZWJLaXRMaWJyYXJpZXMvd2luL2luY2x1ZGUv cHRocmVhZHMnXSkKIGVudi5TaGFyZWRMaWJyYXJ5KCJKYXZhU2NyaXB0Q29yZSIsIHNvdXJjZXMu dmFsdWVzKCkpCiAKIAo= 25325 2008-11-20 16:40:00 -0800 2008-11-20 16:52:00 -0800 Fix the JSC/Chromium build for Windows fix-build.patch text/plain 8486 eric ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBjZmIwZjAxLi4wNzUwNzJjIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMDgtMTEtMjAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgSmF2YVNjcmlwdENv cmUgQ2hyb21pdW0gYnVpbGQgdW5kZXIgV2luZG93cyAoY21kIG9ubHksIGN5Z3dpbiBhbG1vc3Qg d29ya3MpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjM0NworCisgICAgICAgICogSmF2YVNjcmlwdENvcmUuc2NvbnM6CisgICAgICAgICogcGFyc2Vy L1BhcnNlci5jcHA6CisgICAgICAgIChKU0M6OlBhcnNlcjo6cmVwYXJzZSk6CisKIDIwMDgtMTEt MjAgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggbm9uLW1hYyBi dWlsZHMuCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5zY29ucyBi L0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnNjb25zCmluZGV4IGQxYTM5MDYuLjRiN2Q1 YTggMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnNjb25zCisrKyBi L0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnNjb25zCkBAIC0xLDcgKzEsMyBAQAotaW1w b3J0IG9zCi1pbXBvcnQgc3lzCi1mcm9tIHN1YnByb2Nlc3MgaW1wb3J0IFBvcGVuLCBQSVBFCi0K ICMgVGhlIGtleXMgaW4gc291cmNlcyBhcmUgdGhlIHBhdGhzIHRvIHRoZSBkaXJlY3Rvcmllcwog IyB0aGUgdmFsdWVzIGFyZSBhbiBhcnJheSBvZiBzb3VyY2UgZmlsZXMgaW4gdGhvc2UgZGlyZWN0 b3JpZXMgdG8gY29tcGlsZQogc291cmNlcyA9IHt9CkBAIC01NSw2ICs1MSw3IEBAIHNvdXJjZXNb J3J1bnRpbWUnXSA9IFsKICAgICAncnVudGltZS9Cb29sZWFuUHJvdG90eXBlLmNwcCcsCiAgICAg J3J1bnRpbWUvQ2FsbERhdGEuY3BwJywKICAgICAncnVudGltZS9Db2xsZWN0b3IuY3BwJywKKyAg ICAncnVudGltZS9Db21wbGV0aW9uLmNwcCcsCiAgICAgJ3J1bnRpbWUvQ29tbW9uSWRlbnRpZmll cnMuY3BwJywKICAgICAncnVudGltZS9Db25zdHJ1Y3REYXRhLmNwcCcsCiAgICAgJ3J1bnRpbWUv RGF0ZUNvbnN0cnVjdG9yLmNwcCcsCkBAIC0xMzEsMjUgKzEyOCwxOCBAQCBzb3VyY2VzWydqaXQn XSA9IFsKICAgICAnaml0L0pJVC5jcHAnLAogXQogc291cmNlc1snd3JlYyddID0gWwotICAgICd3 cmVjL0NoYXJhY3RlckNsYXNzLmNwcCcKLSAgICAnd3JlYy9DaGFyYWN0ZXJDbGFzcy5oJworICAg ICd3cmVjL0NoYXJhY3RlckNsYXNzLmNwcCcsCiAgICAgJ3dyZWMvQ2hhcmFjdGVyQ2xhc3NDb25z dHJ1Y3Rvci5jcHAnLAotICAgICd3cmVjL1F1YW50aWZpZXIuaCcKLSAgICAnd3JlYy9XUkVDLmNw cCcKLSAgICAnd3JlYy9XUkVDRnVuY3RvcnMuY3BwJwotICAgICd3cmVjL1dSRUNGdW5jdG9ycy5o JwotICAgICd3cmVjL1dSRUNHZW5lcmF0b3IuY3BwJwotICAgICd3cmVjL1dSRUNHZW5lcmF0b3Iu aCcKLSAgICAnd3JlYy9XUkVDUGFyc2VyLmNwcCcKLSAgICAnd3JlYy9XUkVDUGFyc2VyLmgnCisg ICAgJ3dyZWMvV1JFQy5jcHAnLAorICAgICd3cmVjL1dSRUNGdW5jdG9ycy5jcHAnLAorICAgICd3 cmVjL1dSRUNHZW5lcmF0b3IuY3BwJywKKyAgICAnd3JlYy9XUkVDUGFyc2VyLmNwcCcsCiBdCiBz b3VyY2VzWyd3dGYnXSA9IFsKICAgICAnd3RmL0Fzc2VydGlvbnMuY3BwJywKICAgICAnd3RmL0Zh c3RNYWxsb2MuY3BwJywKICAgICAnd3RmL0hhc2hUYWJsZS5jcHAnLAotICAgICd3dGYvTWFpblRo cmVhZC5jcHAnLAogICAgICd3dGYvUmVmQ291bnRlZExlYWtDb3VudGVyLmNwcCcsCi0gICAgJ3d0 Zi9UQ1N5c3RlbUFsbG9jLmNwcCcsCiAgICAgJ3d0Zi9kdG9hLmNwcCcsCiBdCiBzb3VyY2VzWyd3 dGYvdW5pY29kZSddID0gWwpAQCAtMTYyLDE2ICsxNTIsMzkgQEAgc291cmNlc1snd3RmL3VuaWNv ZGUvaWN1J10gPSBbCiAKIGVudiA9IEVudmlyb25tZW50KCkKIAorYnVpbGRpbmdfb25fd2luMzIg PSBlbnZbJ1BMQVRGT1JNJ10gPT0gJ3dpbjMyJyBvciBlbnZbJ1BMQVRGT1JNJ10gPT0gJ2N5Z3dp bicKKworIyBTY29ucyB1c2VzIGdjYyB3aGVuIGJ1aWxkaW5nIHVuZGVyIGN5Z3dpbiBieSBkZWZh dWx0CisjIFdlIGFsc28gaGF2ZSB0byBtYW51YWxseSBmb3JjZSA4LjAgb3IgU2NvbnMgd2lsbCB0 cnkgYW5kCisjIGxvb2sgdXAgd2hhdCB2ZXJzaW9uIHRvIHVzZSB1c2luZyB0aGUgcmVnaXN0cnkg YW5kIGZhaWwKKyMgZHVlIHRvIGxhY2sgb2YgY3lnd2luLXB5dGhvbiByZWdpc3RyeSBzdXBwb3J0 CitpZiBlbnZbJ1BMQVRGT1JNJ10gPT0gJ2N5Z3dpbic6CisgICAgZW52WydNU1ZTX1ZFUlNJT04n XSA9ICc4LjAnCisgICAgIyBTb21lIHN5c3RlbXMgaGF2ZSBQUk9HUkFNRklMRVMsIHNvbWUgaGF2 ZSBQcm9ncmFtRmlsZXMKKyAgICAjIFNjb25zIG1zdmMgdG9vbCBvbmx5IGV4cGVjdHMgJ1Byb2dy YW1GaWxlcycKKyAgICBpbXBvcnQgb3MKKyAgICBpZiBvcy5nZXRlbnYoJ1BST0dSQU1GSUxFUycp IGFuZCBub3Qgb3MuZ2V0ZW52KCdQcm9ncmFtRmlsZXMnKToKKyAgICAgICAgb3MuZW52aXJvblsn UHJvZ3JhbUZpbGVzJ10gPSBvcy5nZXRlbnYoJ1BST0dSQU1GSUxFUycpCisKKyAgICBlbnYuVG9v bCgnbXN2YycpCisgICAgZW52LlRvb2woJ21zbGluaycpCisgICAgZW52LlRvb2woJ21zbGliJykK KworIyBTY29ucyBpcyBmYWlsaW5nIHRvIGNhcnJ5IHRoZSAlUEFUSCUgdmFsdWUgdGhyb3VnaCBj b3JyZWN0bHkKKyMgSGFjayBJbmNyZWRpQnVpbGQgaW50byBvdXIgcGF0aCBzbyBjbC5leGUgZG9l c24ndCBjcmFzaAoraWYgZW52WydQTEFURk9STSddID09ICd3aW4zMic6CisgICAgZW52LkFwcGVu ZEVOVlBhdGgoJ1BBVEgnLCAnYzovUHJvZ3JhbSBGaWxlcy9Yb3JlYXgvSW5jcmVkaUJ1aWxkJykK KwogaWYgZW52WydQTEFURk9STSddID09ICdkYXJ3aW4nOgogICAgIHNvdXJjZXNbJ0FQSSddLmFw cGVuZCgnQVBJL0pTU3RyaW5nUmVmQ0YuY3BwJykKICAgICBzb3VyY2VzWydwcm9maWxlciddLmFw cGVuZCgncHJvZmlsZXIvUHJvZmlsZXJTZXJ2ZXIubW0nKQogICAgIHNvdXJjZXNbJ3d0ZiddLmFw cGVuZCgnd3RmL1RocmVhZGluZ1B0aHJlYWRzLmNwcCcpCisgICAgc291cmNlc1snd3RmJ10uYXBw ZW5kKCd3dGYvTWFpblRocmVhZC5jcHAnKQogICAgIHNvdXJjZXNbJ3d0Zi9tYWMnXSA9IFsnd3Rm L21hYy9NYWluVGhyZWFkTWFjLm1tJ10KLWVsaWYgZW52WydQTEFURk9STSddID09ICd3aW4zMic6 Ci0gICAgc291cmNlc1snQVBJJ10uYXBwZW5kKCdBUEkvSlNTdHJpbmdSZWZCU1RSLmNwcCcpCi0g ICAgc291cmNlc1snd3RmJ10uYXBwZW5kKCd3dGYvVGhyZWFkaW5nV2luLmNwcCcpCi0gICAgc291 cmNlc1snd3RmL3dpbiddID0gWyd3dGYvd2luL01haW5UaHJlYWRXaW4uY3BwJ10KLQorICAgIHNv dXJjZXNbJ3d0ZiddLmFwcGVuZCgnd3RmL1RDU3lzdGVtQWxsb2MuY3BwJykKK2VsaWYgYnVpbGRp bmdfb25fd2luMzI6CisgICAgc291cmNlc1snd3RmJ10uYXBwZW5kKCd3dGYvVGhyZWFkaW5nTm9u ZS5jcHAnKQorICAgIGVudi5BcHBlbmQoQ1BQREVGSU5FUyA9IFsnRU5BQkxFX0pTQ19NVUxUSVBM RV9USFJFQURTPTAnXSkKIAogZGVyaXZlZF9zb3VyY2VzX3BhdGggPSAnRGVyaXZlZFNvdXJjZXMv SmF2YVNjcmlwdENvcmUvJwogZGVmIERlcml2ZWRTb3VyY2VzKHBhdGgpOgpAQCAtMjA0LDExICsy MTcsMTUgQEAgZGVyaXZlZF9zb3VyY2VzX3NvdXJjZXMgPSBbCiBdCiAKICMgR2VuZXJhdGUgRGVy aXZlZFNvdXJjZXMKLWVudi5Db21tYW5kKGRlcml2ZWRfc291cmNlc19yZXN1bHRzLCBkZXJpdmVk X3NvdXJjZXNfc291cmNlcywgJy4vbWFrZS1nZW5lcmF0ZWQtc291cmNlcy5zaCcpCi1zb3VyY2Vz W2Rlcml2ZWRfc291cmNlc19wYXRoXSA9IFtEZXJpdmVkU291cmNlcygnZ3JhbW1hci5jcHAnKV0K KyMgTWFrZSBzdXJlIFdpbmRvd3Mga25vd3Mgd2hlcmUgYmFzaCAoYW5kIGFsbCB0aGUgb3RoZXIg Y3lnd2luIGNvbW1hbmRzKSBsaXZlCitpZiBlbnZbJ1BMQVRGT1JNJ10gPT0gJ3dpbjMyJzoKKyAg ICBlbnYuQXBwZW5kRU5WUGF0aCgnUEFUSCcsICdDOi9jeWd3aW4vYmluJykKK2Vudi5Db21tYW5k KGRlcml2ZWRfc291cmNlc19yZXN1bHRzLCBkZXJpdmVkX3NvdXJjZXNfc291cmNlcywgJ2Jhc2gg bWFrZS1nZW5lcmF0ZWQtc291cmNlcy5zaCcpCitzb3VyY2VzW2Rlcml2ZWRfc291cmNlc19wYXRo XSA9IFtEZXJpdmVkU291cmNlcygnR3JhbW1hci5jcHAnKV0KIAogIyBIYW5kbGUgb3MtdmVyc2lv biBzcGVjaWZpYyBidWlsZCBzZXR0aW5ncwogaWYgZW52WydQTEFURk9STSddID09ICdkYXJ3aW4n OgorICAgIGZyb20gc3VicHJvY2VzcyBpbXBvcnQgUG9wZW4sIFBJUEUKICAgICB2ZXJzaW9uX3Bp ZWNlcyA9IFBvcGVuKFsic3dfdmVycyIsICItcHJvZHVjdFZlcnNpb24iXSwgc3Rkb3V0ID0gUElQ RSkuY29tbXVuaWNhdGUoKVswXS5zcGxpdCgnLicpCiAgICAgaWYgbWFwKGludCwgdmVyc2lvbl9w aWVjZXMpWzoyXSA+ICgxMCwgNSk6CiAgICAgICAgICMgRHRyYWNlIGRvZXNuJ3QgZXhpc3QgaW4g VGlnZXIsIGFuZCB3YXMgYnJva2VuIGluIExlb3BhcmQKQEAgLTIxNiwyNiArMjMzLDYzIEBAIGlm IGVudlsnUExBVEZPUk0nXSA9PSAnZGFyd2luJzoKIAogIyBUaGlzIGJ1aWxkIGZpbGUgYnVpbGRz IHRoZSBDaHJvbWl1bSBwb3J0IGZvciBub3csIHN1cHBvcnQgZm9yCiAjIG90aGVycyBjb3VsZCBi ZSBhZGRlZCBsYXRlci4KLWVudlsnQ1BQREVGSU5FUyddID0gJ0JVSUxESU5HX0NIUk9NSVVNX18n CitlbnYuQXBwZW5kKENQUERFRklORVMgPSBbJ0JVSUxESU5HX0NIUk9NSVVNX18nXSkKKworIyBJ J20gbm90IGNlcnRhaW4gaG93IG1hbnkgb2YgdGhlc2Ugd2luZG93cyBkZWZpbmVzIGFyZSBhY3R1 YWxseSByZXF1aXJlZC4KK2lmIGJ1aWxkaW5nX29uX3dpbjMyOgorICAgIGVudi5BcHBlbmQoQ1BQ REVGSU5FUyA9IFsnX1dJTjMyX1dJTk5UPTB4MDYwMCcsICdXSU5WRVI9MHgwNjAwJywgJ1dJTjMy JywgJ19XSU5ET1dTJywgJ05PTUlOTUFYJywgJ1VOSUNPREUnLCAnX1VOSUNPREUnLCAnX19TVERf QycsICdfSEFTX0VYQ0VQVElPTlM9MCddKQogCiAjIFNjb25zIG91dC1vZi10aGUtYm94IG9ubHkg c3VwcG9ydHMgcHJlY29tcGlsZWQgaGVhZGVycyBmb3IgTVNWQwogIyByZW1vdmUgdGhpcyB3aGVu IHdlIGZpeCBTY29ucyB0byB1bmRlcnN0YW5kIEdDQyBwcmVjb21waWxlZCBoZWFkZXJzCiBpZiBl bnZbJ0NDJ10gPT0gJ2djYyc6CiAgICAgZW52WydDQ0ZMQUdTJ10gPSAnLWluY2x1ZGUgSmF2YVNj cmlwdENvcmVQcmVmaXguaCcKLWVudlsnUENIJ10gPSAnSmF2YVNjcmlwdENvcmVQcmVmaXguaCcK KyMgVHVybnMgb3V0IHRoZSBNU1ZDIFBDSCBzdXBwb3J0IGlzIGJhZGx5IGJyb2tlbgorIyBlbnZb J1BDSCddID0gJ0phdmFTY3JpcHRDb3JlUHJlZml4LmgnCisjIGVudlsnUENIU1RPUCddID0gJ0ph dmFTY3JpcHRDb3JlUHJlZml4LmgnCiAKIGlmIGVudlsnUExBVEZPUk0nXSA9PSAnZGFyd2luJzoK ICAgICBlbnZbJ0ZSQU1FV09SS1MnXSA9IFsnQ29yZUZvdW5kYXRpb24nLCAnRm91bmRhdGlvbidd CiAgICAgZW52WydMSUJTJ10gPSBbJ2ljdWNvcmUnXQorICAgICMgQXBwbGUgZG9lcyBub3Qgc2hp cCB0aGUgSUNVIGhlYWRlcnMgd2l0aCBNYWMgT1MgWCwgc28gV2ViS2l0IGluY2x1ZGVzIGEgY29w eSBvZiAzLjIgaGVhZGVycworICAgIGVudi5BcHBlbmQoQ1BQUEFUSCA9ICdpY3UnKQogCi1pbmNs dWRlX3BhdGhzID0gWycuJywgJy4uJywgJ0ZvcndhcmRpbmdIZWFkZXJzJywgJ2ljdSddICsgc291 cmNlcy5rZXlzKCkKLWVudlsnQ1BQUEFUSCddID0gaW5jbHVkZV9wYXRocwotZW52LlNoYXJlZExp YnJhcnkoIkphdmFTY3JpcHRDb3JlIiwgc291cmNlcy52YWx1ZXMoKSkKK3dlYmtpdF9saWJyYXJp ZXNfcGF0aCA9ICIuLi9XZWJLaXRMaWJyYXJpZXMvd2luLyIKK2RlZiBXZWJLaXRMaWJyYXJpZXMo cGF0aCk6CisgICAgcmV0dXJuIHdlYmtpdF9saWJyYXJpZXNfcGF0aCArIHBhdGgKIAoraW5jbHVk ZV9wYXRocyA9IFsnLicsICcuLicsICdGb3J3YXJkaW5nSGVhZGVycyddICsgc291cmNlcy5rZXlz KCkKK2Vudi5BcHBlbmQoQ1BQUEFUSCA9IGluY2x1ZGVfcGF0aHMpCitpZiBidWlsZGluZ19vbl93 aW4zMjoKKyAgICBlbnYuQXBwZW5kKENQUFBBVEggPSBbV2ViS2l0TGlicmFyaWVzKCdpbmNsdWRl JyldKQorICAgIGVudi5QcmVwZW5kKExJQlBBVEggPSBbV2ViS2l0TGlicmFyaWVzKCdsaWInKV0p CisgICAgZW52LkFwcGVuZChMSUJTID0gWydpY3VpbicsICdpY3V1YycsICd1c2VyMzInLCAnd2lu bW0nXSkKKworIyBTYXZlIG9mZiBhIGNvcHkgb2YgdGhlIGVudmlyb25tZW50IGZvciB1c2Ugd2l0 aCBqc2MKK2pzY19lbnYgPSBlbnYuQ2xvbmUoKQorCitpZiBidWlsZGluZ19vbl93aW4zMjoKKyAg ICBlbnYuU3RhdGljTGlicmFyeSgiSmF2YVNjcmlwdENvcmUiLCBzb3VyY2VzLnZhbHVlcygpKQor ZWxzZToKKyAgICBlbnYuU2hhcmVkTGlicmFyeSgiSmF2YVNjcmlwdENvcmUiLCBzb3VyY2VzLnZh bHVlcygpKQorCisKK2VudiA9IGpzY19lbnYKIAogIyBCdWlsZCB0aGUganNjIHRlc3Rpbmcgc2hl bGwKIHNoZWxsX3NvdXJjZXMgPSBbJ2pzYy5jcHAnXQogYnVpbGRfZGlyZWN0b3J5ID0gJy4nICMg VGhpcyBzaG91bGQgYmUgY2hhbmdlZCB0byBwb2ludCB0byB3aGVyZXZlciBKYXZhU2NyaXB0Q29y ZSBnZXRzIGJ1aWx0IHRvCiAKLWVudiA9IEVudmlyb25tZW50KENQUFBBVEggPSBpbmNsdWRlX3Bh dGhzLCBMSUJTID0gWydKYXZhU2NyaXB0Q29yZScsICdlZGl0J10sIExJQlBBVEggPSBbYnVpbGRf ZGlyZWN0b3J5XSkKKyMgSXQncyBoYWNreSB0byByZS11c2UgdGhlIHNhbWUgZW52aXJvbm1lbnQg ZnJvbSBKYXZhU2NyaXB0Q29yZQorIyBidXQgaXQgbWFrZXMgYnVpbGRpbmcgb24gd2luZG93cyBl YXNpZXIgZm9yIG5vdworZW52WydDUFBQQVRIJ10gPSBpbmNsdWRlX3BhdGhzCitlbnZbJ0xJQlMn XSA9IFsnSmF2YVNjcmlwdENvcmUnXQorZW52WydMSUJQQVRIJ10gPSBbYnVpbGRfZGlyZWN0b3J5 XQorCitpZiBlbnZbJ1BMQVRGT1JNJ10gPT0gJ2Rhcndpbic6CisgICAgZW52LkFwcGVuZChMSUJT ID0gWydlZGl0J10pCitlbGlmIGJ1aWxkaW5nX29uX3dpbjMyOgorICAgIGVudi5BcHBlbmQoQ1BQ UEFUSCA9IFtXZWJLaXRMaWJyYXJpZXMoJ2luY2x1ZGUnKV0pCisgICAgZW52LlByZXBlbmQoTElC UEFUSCA9IFtXZWJLaXRMaWJyYXJpZXMoJ2xpYicpXSkKKyAgICBlbnYuQXBwZW5kKExJQlMgPSBb J2ljdWluJywgJ2ljdXVjJywgJ3VzZXIzMicsICd3aW5tbSddKQorCiBlbnYuUHJvZ3JhbSgnanNj Jywgc2hlbGxfc291cmNlcykKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJz ZXIuY3BwIGIvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKaW5kZXggZGU5ZjI5Yy4u NjBkN2M3ZSAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKKysr IGIvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKQEAgLTcxLDcgKzcxLDcgQEAgdm9p ZCBQYXJzZXI6OnJlcGFyc2UoSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhLCBGdW5jdGlvbkJvZHlO b2RlKiBmdW5jdGlvbkJvZHlOb2QKICAgICBtX3NvdXJjZSA9ICZmdW5jdGlvbkJvZHlOb2RlLT5z b3VyY2UoKTsKICAgICBwYXJzZShnbG9iYWxEYXRhLCAwLCAwKTsKICAgICBBU1NFUlQobV9zb3Vy Y2VFbGVtZW50cyk7Ci0gICAgZnVuY3Rpb25Cb2R5Tm9kZS0+YWRvcHREYXRhKGF1dG9fcHRyPFNj b3BlTm9kZURhdGE+KG5ldyBTY29wZU5vZGVEYXRhKG1fc291cmNlRWxlbWVudHMuZ2V0KCksCisg ICAgZnVuY3Rpb25Cb2R5Tm9kZS0+YWRvcHREYXRhKHN0ZDo6YXV0b19wdHI8U2NvcGVOb2RlRGF0 YT4obmV3IFNjb3BlTm9kZURhdGEobV9zb3VyY2VFbGVtZW50cy5nZXQoKSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbV92YXJEZWNsYXJhdGlvbnMgPyAmbV92YXJEZWNsYXJhdGlvbnMtPmRhdGEgOiAwLCAK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbV9mdW5jRGVjbGFyYXRpb25zID8gJm1fZnVuY0RlY2xhcmF0aW9u cy0+ZGF0YSA6IDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fbnVtQ29uc3RhbnRzKSkpOwo=