135478 2014-07-31 15:22:46 -0700 [Win] Use RC_PROJECTBUILDVERSION as build portion of version 2014-07-31 18:16:16 -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 1026087 0 bfulgham 2014-07-31 15:22:46 -0700 We want to make sure that the environment variable 'RC_PROJECTBUILDVERSION' is used (when available) to populate the FILE version of the version resource. 1026092 1 235854 bfulgham 2014-07-31 15:28:47 -0700 Created attachment 235854 Patch 1026103 2 webkit-bug-importer 2014-07-31 16:12:43 -0700 <rdar://problem/17877481> 1026115 3 235854 ddkilzer 2014-07-31 16:42:30 -0700 Comment on attachment 235854 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235854&action=review r=me either way Also, can we write a test for SAFE_BUILD_VERSION being defined in the environment to test the override? > WebKitLibraries/win/tools/scripts/version-stamp.pl:103 > +my $SAFE_BUILD_VERSION = $ENV{RC_PROJECTBUILDVERSION}; > +if (!defined($SAFE_BUILD_VERSION)) { > + $SAFE_BUILD_VERSION = $components{'__VERSION_BUILD__'}; > +} I would prefer to write this code thusly: my $SAFE_BUILD_VERSION = $ENV{RC_PROJECTBUILDVERSION} || $components{'__VERSION_BUILD__'}; I think it's a lot easier to read that way. :) 1026126 4 235854 bfulgham 2014-07-31 17:18:38 -0700 Comment on attachment 235854 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235854&action=review >> WebKitLibraries/win/tools/scripts/version-stamp.pl:103 >> +} > > I would prefer to write this code thusly: > > my $SAFE_BUILD_VERSION = $ENV{RC_PROJECTBUILDVERSION} || $components{'__VERSION_BUILD__'}; > > I think it's a lot easier to read that way. :) Will do. 1026146 5 bfulgham 2014-07-31 18:16:16 -0700 Committed r171903: <http://trac.webkit.org/changeset/171903> 235854 2014-07-31 15:28:47 -0700 2014-07-31 17:18:38 -0700 Patch bug-135478-20140731152913.patch text/plain 2157 bfulgham SW5kZXg6IFdlYktpdExpYnJhcmllcy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0TGli cmFyaWVzL0NoYW5nZUxvZwkocmV2aXNpb24gMTcxODkwKQorKysgV2ViS2l0TGlicmFyaWVzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA3LTMxICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIFVzZSBSQ19Q Uk9KRUNUQlVJTERWRVJTSU9OIGFzIGJ1aWxkIHBvcnRpb24gb2YgdmVyc2lvbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1NDc4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3aW4vdG9vbHMvc2NyaXB0 cy92ZXJzaW9uLXN0YW1wLnBsOiBDaGVjayBlbnZpcm9ubWVudCBmb3IKKyAgICAgICAgUkNfUFJP SkVDVEJVSUxEVkVSU0lPTiwgYW5kIHVzZSBpdCBmb3IgdGhlIGJ1aWxkIHBvcnRpb24gb2YKKyAg ICAgICAgdGhlIGZpbGUgdmVyc2lvbiByZXNvdXJjZS4gT3RoZXJ3aXNlLCB1c2UgdGhlIF9fVkVS U0lPTl9CVUlMRF9fCisgICAgICAgIHZhbHVlIHdlIGNhbGN1bGF0ZWQgZnJvbSB0aGUgdmVyc2lv biBzdHJpbmcuCisKIDIwMTQtMDctMzEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5j b20+CiAKICAgICAgICAgW1dpbl0gRml4IGJ1aWxkIGZhaWx1cmUgd2hlbiB1c2luZyA1LXR1cGxl IGJ1aWxkIHZlcnNpb25zLgpJbmRleDogV2ViS2l0TGlicmFyaWVzL3dpbi90b29scy9zY3JpcHRz L3ZlcnNpb24tc3RhbXAucGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0TGlicmFyaWVzL3dpbi90b29s cy9zY3JpcHRzL3ZlcnNpb24tc3RhbXAucGwJKHJldmlzaW9uIDE3MTg3MCkKKysrIFdlYktpdExp YnJhcmllcy93aW4vdG9vbHMvc2NyaXB0cy92ZXJzaW9uLXN0YW1wLnBsCSh3b3JraW5nIGNvcHkp CkBAIC05NiwxMSArOTYsMTUgQEAgcHJpbnQgIlVzaW5nIFJDX1BST0pFQ1RTT1VSQ0VWRVJTSU9O PSRTQQogIyBOb3RlOiBUaGVzZSBlbnZpcm9ubWVudCBzZXR0aW5ncyBvbmx5IGFmZmVjdCB0aGlz IHNjcmlwdCBhbmQgaXRzIGNoaWxkIHByb2Nlc3NlczoKICRFTlZ7UkNfUFJPSkVDVFNPVVJDRVZF UlNJT059ID0gJFNBRkVfUFJPSkVDVF9WRVJTSU9OOwogJEVOVntSQ19Qcm9qZWN0U291cmNlVmVy c2lvbn0gPSAkU0FGRV9QUk9KRUNUX1ZFUlNJT047Ci0kRU5We1JDX1BST0pFQ1RCVUlMRFZFUlNJ T059ID0gJGNvbXBvbmVudHN7J19fVkVSU0lPTl9CVUlMRF9fJ307CisKK215ICRTQUZFX0JVSUxE X1ZFUlNJT04gPSAkRU5We1JDX1BST0pFQ1RCVUlMRFZFUlNJT059OworaWYgKCFkZWZpbmVkKCRT QUZFX0JVSUxEX1ZFUlNJT04pKSB7CisgICAgJFNBRkVfQlVJTERfVkVSU0lPTiA9ICRjb21wb25l bnRzeydfX1ZFUlNJT05fQlVJTERfXyd9OworfQogCiBteSAkcmMgPSBzeXN0ZW0oJFZFUlNJT05f U1RBTVBFUiwgJy0tdmVyYm9zZScsICRUQVJHRVRfUEFUSCwgJy0tZmlsZU1ham9yJywgJGNvbXBv bmVudHN7J19fVkVSU0lPTl9NQUpPUl9fJ30sCiAgICAgJy0tZmlsZU1pbm9yJywgJGNvbXBvbmVu dHN7J19fVkVSU0lPTl9NSU5PUl9fJ30sICctLWZpbGVSZXZpc2lvbicsICRjb21wb25lbnRzeydf X1ZFUlNJT05fVElOWV9fJ30sCi0gICAgJy0tZmlsZUJ1aWxkJywgJGNvbXBvbmVudHN7J19fVkVS U0lPTl9CVUlMRF9fJ30sICctLXByb2R1Y3RNYWpvcicsICRjb21wb25lbnRzeydfX1ZFUlNJT05f TUFKT1JfXyd9LAorICAgICctLWZpbGVCdWlsZCcsICRTQUZFX0JVSUxEX1ZFUlNJT04sICctLXBy b2R1Y3RNYWpvcicsICRjb21wb25lbnRzeydfX1ZFUlNJT05fTUFKT1JfXyd9LAogICAgICctLXBy b2R1Y3RNaW5vcicsICRjb21wb25lbnRzeydfX1ZFUlNJT05fTUlOT1JfXyd9LCAnLS1wcm9kdWN0 UmV2aXNpb24nLCAkY29tcG9uZW50c3snX19WRVJTSU9OX1RJTllfXyd9LAogICAgICctLXByb2R1 Y3RCdWlsZCcsICRjb21wb25lbnRzeydfX1ZFUlNJT05fQlVJTERfXyd9KTsgCiAK