132580 2014-05-05 13:29:06 -0700 [WIN] Enhance auto-version.sh to handle all-caps or mixed-case build environment variable 2014-05-05 15:12:29 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED InRadar P2 Normal --- 132455 1 bfulgham bfulgham oldest_to_newest 1006718 0 bfulgham 2014-05-05 13:29:06 -0700 In Bug 132455, I modified our build scripts to support mixed-case environment variables. However, we should still support older build machines running old versions of Cygwin where these variables will be set to all caps. This patch assumes we will be using the new mixed-case variable style. If that variable is not present, it falls back to the original use of all capitals. 1006719 1 230853 bfulgham 2014-05-05 13:31:02 -0700 Created attachment 230853 Patch 1006720 2 bfulgham 2014-05-05 13:31:26 -0700 <rdar://problem/16811179> 1006741 3 230853 mrowe 2014-05-05 14:41:48 -0700 Comment on attachment 230853 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230853&action=review > WebKitLibraries/win/tools/scripts/auto-version.sh:53 > ENVIRONMENT_VERSION="$RC_ProjectSourceVersion"; > +if [[ -z "$ENVIRONMENT_VERSION" ]]; then > + # Try the original all-caps version of the environment variable > + ENVIRONMENT_VERSION="$RC_PROJECTSOURCEVERSION"; > +fi You can avoid the if by doing something like: ENVIRONMENT_VERSION=${RC_ProjectSourceVersion:-$RC_PROJECTSOURCEVERSION}; 1006749 4 230853 dino 2014-05-05 15:08:27 -0700 Comment on attachment 230853 Patch Listen to Mark :) 1006753 5 bfulgham 2014-05-05 15:12:29 -0700 Committed r168321: <http://trac.webkit.org/changeset/168321> 230853 2014-05-05 13:31:02 -0700 2014-05-05 15:08:27 -0700 Patch bug-132580-20140505133039.patch text/plain 1539 bfulgham SW5kZXg6IFdlYktpdExpYnJhcmllcy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0TGli cmFyaWVzL0NoYW5nZUxvZwkocmV2aXNpb24gMTY4MzEyKQorKysgV2ViS2l0TGlicmFyaWVzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE0LTA1LTA1ICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXSU5dIEVuaGFuY2Ug YXV0by12ZXJzaW9uLnNoIHRvIGhhbmRsZSBhbGwtY2FwcyBvciBtaXhlZC1jYXNlIGJ1aWxkIGVu dmlyb25tZW50IHZhcmlhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzI1ODAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2ODExMTc5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2luL3Rvb2xz L3NjcmlwdHMvYXV0by12ZXJzaW9uLnNoOiBGYWxsIGJhY2sgdG8gYWxsLWNhcHMgdmVyc2lvbgor ICAgICAgICBvZiBlbnZpcm9ubWVudCB2YXJpYWJsZSBpZiBtaXhlZC1jYXNlIHZlcnNpb24gaXMg bm90IHByZXNlbnQuCisKIDIwMTQtMDUtMDEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgQ29ycmVjdCBjYXNlIG9mIGVudmlyb25tZW50IHZhcmlhYmxlcyBp biBhdXRvLXZlcnNpb24uc2ggc2NyaXB0cwpJbmRleDogV2ViS2l0TGlicmFyaWVzL3dpbi90b29s cy9zY3JpcHRzL2F1dG8tdmVyc2lvbi5zaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRMaWJyYXJpZXMv d2luL3Rvb2xzL3NjcmlwdHMvYXV0by12ZXJzaW9uLnNoCShyZXZpc2lvbiAxNjgyODkpCisrKyBX ZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xzL3NjcmlwdHMvYXV0by12ZXJzaW9uLnNoCSh3b3JraW5n IGNvcHkpCkBAIC00Nyw2ICs0NywxMSBAQCBta2RpciAtcCAiJChkaXJuYW1lICIkT1VUUFVUX0ZJ TEUiKSIKICMgVGFrZSB0aGUgaW5pdGlhbCB2ZXJzaW9uIG51bWJlciBmcm9tIFJDX1Byb2plY3RT b3VyY2VWZXJzaW9uIGlmIGl0CiAjIGV4aXN0cywgb3RoZXJ3aXNlIGZhbGwgYmFjayB0byB0aGUg dmVyc2lvbiBudW1iZXIgc3RvcmVkIGluIHRoZSBzb3VyY2UuCiBFTlZJUk9OTUVOVF9WRVJTSU9O PSIkUkNfUHJvamVjdFNvdXJjZVZlcnNpb24iOworaWYgW1sgLXogIiRFTlZJUk9OTUVOVF9WRVJT SU9OIiBdXTsgdGhlbgorICAgICMgVHJ5IHRoZSBvcmlnaW5hbCBhbGwtY2FwcyB2ZXJzaW9uIG9m IHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZQorICAgIEVOVklST05NRU5UX1ZFUlNJT049IiRSQ19Q Uk9KRUNUU09VUkNFVkVSU0lPTiI7CitmaQorCiBQUk9QT1NFRF9WRVJTSU9OPSR7RU5WSVJPTk1F TlRfVkVSU0lPTjotJEZBTExCQUNLX1ZFUlNJT059CiBjaG9tcCBQUk9QT1NFRF9WRVJTSU9OCiAK