135948 2014-08-14 12:34:27 -0700 [Win] Extend auto-version.pl and version-stamp.pl to account for RC_ProjectBuildVersion 2014-08-14 14:09:39 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham webkit-bug-importer oldest_to_newest 1029167 0 bfulgham 2014-08-14 12:34:27 -0700 Update these two build utilities to handle the RC_ProjectBuildVersion environment variable, and to recognize both possible capitalization styles. 1029168 1 webkit-bug-importer 2014-08-14 12:34:56 -0700 <rdar://problem/18022221> 1029173 2 236609 bfulgham 2014-08-14 12:46:48 -0700 Created attachment 236609 Patch 1029183 3 236609 ddkilzer 2014-08-14 13:03:15 -0700 Comment on attachment 236609 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236609&action=review r=me, but please add tests for the override behavior. > WebKitLibraries/win/tools/scripts/auto-version.pl:152 > + my $RETURN_NANO_VERSION = $ENV{RC_ProjectBuildVersion} || $ENV{RC_PROJECTBUILDVERSION} || $BUILD_MICRO_VERSION; Nit: Should be consistent here and use '' quotes around the hash key like the code above. 1029199 4 bfulgham 2014-08-14 14:02:57 -0700 (In reply to comment #3) > (From update of attachment 236609 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=236609&action=review > > r=me, but please add tests for the override behavior. Done! I actually had them, but did my `webkit-patch upload` from the WebKitLibraries directory. > > WebKitLibraries/win/tools/scripts/auto-version.pl:152 > > + my $RETURN_NANO_VERSION = $ENV{RC_ProjectBuildVersion} || $ENV{RC_PROJECTBUILDVERSION} || $BUILD_MICRO_VERSION; > > Nit: Should be consistent here and use '' quotes around the hash key like the code above. Will do! 1029204 5 bfulgham 2014-08-14 14:09:39 -0700 Committed r172604: <http://trac.webkit.org/changeset/172604> 236609 2014-08-14 12:46:48 -0700 2014-08-14 13:03:15 -0700 Patch bug-135948-20140814124747.patch text/plain 3655 bfulgham SW5kZXg6IFdlYktpdExpYnJhcmllcy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0TGli cmFyaWVzL0NoYW5nZUxvZwkocmV2aXNpb24gMTcyNTk5KQorKysgV2ViS2l0TGlicmFyaWVzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA4LTE0ICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEV4dGVuZCBh dXRvLXZlcnNpb24gYW5kIHZlcnNpb24tc3RhbXAgZm9yIFJDX1Byb2plY3RCdWlsZFZlcnNpb24K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTk0OAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTgwMjIyMjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3aW4vdG9vbHMvc2NyaXB0cy9hdXRvLXZlcnNp b24ucGw6CisgICAgICAgIChzcGxpdFZlcnNpb24pOiBVc2UgUkNfUHJvamVjdEJ1aWxkVmVyc2lv biAob3IgUkNfUFJPSkVDVEJVSUxEVkVSU0lPTikgaWYgc2V0CisgICAgICAgIGluIHRoZSBlbnZp cm9ubWVudCBhcyB0aGUgJ0J1aWxkIFZlcnNpb24nLCB1bmxlc3MgdGhlIG11bHRpLXR1cGxlIHZl cnNpb24KKyAgICAgICAgc3VwcGxpZWQgYnkgUkNfUHJvamVjdFNvdXJjZVZlcnNpb24gYWxyZWFk eSBoYXMgYSBmb3VydGggY29tcG9uZW50LgorICAgICAgICAqIHdpbi90b29scy9zY3JpcHRzL3Zl cnNpb24tc3RhbXAucGw6IENoZWNrIGZvciBSQ19Qcm9qZWN0QnVpbGRWZXJzaW9uIGFuZAorICAg ICAgICB1c2UgaXQgaW4gcHJlZmVyZW5jZSB0byBSQ19QUk9KRUNUQlVJTERWRVJTSU9OLgorCiAy MDE0LTA4LTA4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAg ICAgbWFrZSBjbGVhbiBkb2VzIG5vdCB3b3JrIGluIE9wZW5Tb3VyY2UsIGZhaWxzIGluIFdlYktp dExpYnJhcmllcwpJbmRleDogV2ViS2l0TGlicmFyaWVzL3dpbi90b29scy9zY3JpcHRzL2F1dG8t dmVyc2lvbi5wbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xzL3Njcmlw dHMvYXV0by12ZXJzaW9uLnBsCShyZXZpc2lvbiAxNzI1NDYpCisrKyBXZWJLaXRMaWJyYXJpZXMv d2luL3Rvb2xzL3NjcmlwdHMvYXV0by12ZXJzaW9uLnBsCSh3b3JraW5nIGNvcHkpCkBAIC02Miwx MiArNjIsOCBAQCBteSAkT1VUUFVUX0ZJTEUgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRPCiAKICMg VGFrZSB0aGUgaW5pdGlhbCB2ZXJzaW9uIG51bWJlciBmcm9tIFJDX1Byb2plY3RTb3VyY2VWZXJz aW9uIGlmIGl0CiAjIGV4aXN0cywgb3RoZXJ3aXNlIGZhbGwgYmFjayB0byB0aGUgdmVyc2lvbiBu dW1iZXIgc3RvcmVkIGluIHRoZSBzb3VyY2UuCi1teSAkRU5WSVJPTk1FTlRfVkVSU0lPTiA9ICRF TlZ7J1JDX1Byb2plY3RTb3VyY2VWZXJzaW9uJ307Ci1pZiAoIWRlZmluZWQgJEVOVklST05NRU5U X1ZFUlNJT04pIHsKLSAgICAkRU5WSVJPTk1FTlRfVkVSU0lPTiA9ICRFTlZ7J1JDX1BST0pFQ1RT T1VSQ0VWRVJTSU9OJ307Ci19Ci0KLW15ICRQUk9QT1NFRF9WRVJTSU9OID0gKGRlZmluZWQgJEVO VklST05NRU5UX1ZFUlNJT04pID8gJEVOVklST05NRU5UX1ZFUlNJT04gOiAkRkFMTEJBQ0tfVkVS U0lPTjsKK215ICRFTlZJUk9OTUVOVF9WRVJTSU9OID0gJEVOVnsnUkNfUHJvamVjdFNvdXJjZVZl cnNpb24nfSB8fCAkRU5WeydSQ19QUk9KRUNUU09VUkNFVkVSU0lPTid9OworbXkgJFBST1BPU0VE X1ZFUlNJT04gPSAkRU5WSVJPTk1FTlRfVkVSU0lPTiB8fCAkRkFMTEJBQ0tfVkVSU0lPTjsKIGNo b21wKCRQUk9QT1NFRF9WRVJTSU9OKTsKIAogbXkgKCRCVUlMRF9NQUpPUl9WRVJTSU9OLCAkQlVJ TERfTUlOT1JfVkVSU0lPTiwgJEJVSUxEX1RJTllfVkVSU0lPTiwgJEJVSUxEX1ZBUklBTlRfVkVS U0lPTiwgJEFESlVTVEVEX1BST1BPU0VEX1ZFUlNJT04pID0gc3BsaXRWZXJzaW9uKCRQUk9QT1NF RF9WRVJTSU9OKTsKQEAgLTE1Myw3ICsxNDksNyBAQCBzdWIgc3BsaXRWZXJzaW9uKCQpCiAgICAg ICAgICRCVUlMRF9NSUNST19WRVJTSU9OID0gJGNvbXBvbmVudHNbM107CiAgICAgfQogCi0gICAg bXkgJFJFVFVSTl9OQU5PX1ZFUlNJT04gPSAkQlVJTERfTUlDUk9fVkVSU0lPTjsKKyAgICBteSAk UkVUVVJOX05BTk9fVkVSU0lPTiA9ICRFTlZ7UkNfUHJvamVjdEJ1aWxkVmVyc2lvbn0gfHwgJEVO VntSQ19QUk9KRUNUQlVJTERWRVJTSU9OfSB8fCAkQlVJTERfTUlDUk9fVkVSU0lPTjsKICAgICBp ZiAoJGNvbXBvbmVudENvdW50ID4gNCkgewogICAgICAgICAkQlVJTERfTkFOT19WRVJTSU9OID0g JGNvbXBvbmVudHNbNF07CiAgICAgICAgICRSRVRVUk5fTkFOT19WRVJTSU9OID0gJEJVSUxEX05B Tk9fVkVSU0lPTjsKQEAgLTE3MSw0ICsxNjcsMyBAQCBzdWIgc3BsaXRWZXJzaW9uKCQpCiAKICAg ICByZXR1cm4gKCRCVUlMRF9NQUpPUl9WRVJTSU9OLCBwYWNrVHdvVmFsdWVzKCRCVUlMRF9NSU5P Ul9WRVJTSU9OLCAkQlVJTERfVElOWV9WRVJTSU9OKSwgcGFja1R3b1ZhbHVlcygkQlVJTERfTUlD Uk9fVkVSU0lPTiwgJEJVSUxEX05BTk9fVkVSU0lPTiksICRSRVRVUk5fTkFOT19WRVJTSU9OLCAk UFJPUE9TRURfVkVSU0lPTik7CiB9Ci0KSW5kZXg6IFdlYktpdExpYnJhcmllcy93aW4vdG9vbHMv c2NyaXB0cy92ZXJzaW9uLXN0YW1wLnBsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdExpYnJhcmllcy93 aW4vdG9vbHMvc2NyaXB0cy92ZXJzaW9uLXN0YW1wLnBsCShyZXZpc2lvbiAxNzI1NDYpCisrKyBX ZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xzL3NjcmlwdHMvdmVyc2lvbi1zdGFtcC5wbAkod29ya2lu ZyBjb3B5KQpAQCAtOTEsNyArOTEsNyBAQCBteSAkVEFSR0VUX1BBVEggPSBGaWxlOjpTcGVjLT5j YW5vbnBhdGgoCiBwcmludCAiQWRqdXN0aW5nIFJDX1BST0pFQ1RTT1VSQ0VWRVJTSU9OIGFuZCBS Q19Qcm9qZWN0U291cmNlVmVyc2lvbiB0byBiZSBzYWZlIGZvciBWZXJzaW9uU3RhbXBlci5cbiI7 CiAKIG15ICRTQUZFX1BST0pFQ1RfVkVSU0lPTiA9ICIkY29tcG9uZW50c3snX19WRVJTSU9OX01B Sk9SX18nfS4kY29tcG9uZW50c3snX19WRVJTSU9OX01JTk9SX18nfS4kY29tcG9uZW50c3snX19W RVJTSU9OX1RJTllfXyd9IjsKLW15ICRTQUZFX0JVSUxEX1ZFUlNJT04gPSAkRU5We1JDX1BST0pF Q1RCVUlMRFZFUlNJT059IHx8ICRjb21wb25lbnRzeydfX1ZFUlNJT05fQlVJTERfXyd9OworbXkg JFNBRkVfQlVJTERfVkVSU0lPTiA9ICRFTlZ7UkNfUHJvamVjdEJ1aWxkVmVyc2lvbn0gfHwgJEVO VntSQ19QUk9KRUNUQlVJTERWRVJTSU9OfSB8fCAkY29tcG9uZW50c3snX19WRVJTSU9OX0JVSUxE X18nfTsKIAogcHJpbnQgIlVzaW5nIFJDX1BST0pFQ1RTT1VSQ0VWRVJTSU9OPSRTQUZFX1BST0pF Q1RfVkVSU0lPTiBhbmQgUkNfUFJPSkVDVEJVSUxEVkVSU0lPTj0kU0FGRV9CVUlMRF9WRVJTSU9O XG4iOwogCg==