[WIN] Enhance auto-version.sh to handle all-caps or mixed-case build environment...

https://bugs.webkit.org/show_bug.cgi?id=132580
<rdar://problem/16811179>

Reviewed by Dean Jackson.

* win/tools/scripts/auto-version.sh: Incorporate Mark's revised syntax.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168321 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 81b8b54bbd250c2df85cef7fc9f6dc1de84888da..941607e1305831ff39395d2a6a4d0d00e5c362ac 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+2014-05-05  Brent Fulgham  <bfulgham@apple.com>
+
+        [WIN] Enhance auto-version.sh to handle all-caps or mixed-case build environment variable
+        https://bugs.webkit.org/show_bug.cgi?id=132580
+        <rdar://problem/16811179>
+
+        Reviewed by Dean Jackson.
+
+        * win/tools/scripts/auto-version.sh: Incorporate Mark's revised syntax.
+
 2014-05-05  Brent Fulgham  <bfulgham@apple.com>
 
         [WIN] Enhance auto-version.sh to handle all-caps or mixed-case build environment variable

diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh
index 9397b28721ee44acb6c3f36247a24e9051a313a4..3f1af37f5713e95e45915491ed2949686fcd6e5d 100755 (executable)
--- a/WebKitLibraries/win/tools/scripts/auto-version.sh
+++ b/WebKitLibraries/win/tools/scripts/auto-version.sh
@@ -46,11 +46,7 @@ mkdir -p "$(dirname "$OUTPUT_FILE")"
 
 # Take the initial version number from RC_ProjectSourceVersion if it
 # exists, otherwise fall back to the version number stored in the source.
-ENVIRONMENT_VERSION="$RC_ProjectSourceVersion";
-if [[ -z "$ENVIRONMENT_VERSION" ]]; then
-    # Try the original all-caps version of the environment variable
-    ENVIRONMENT_VERSION="$RC_PROJECTSOURCEVERSION";
-fi
+ENVIRONMENT_VERSION=${RC_ProjectSourceVersion:-$RC_PROJECTSOURCEVERSION};
 
 PROPOSED_VERSION=${ENVIRONMENT_VERSION:-$FALLBACK_VERSION}
 chomp PROPOSED_VERSION