Correct case of environment variables in auto-version.sh scripts

https://bugs.webkit.org/show_bug.cgi?id=132455

Reviewed by Dean Jackson.

Although we have historically used RC_PROJECTSOURCEVERSION in our scripts,
the actual environment variable is RC_ProjectSourceVersion. Old versions of
Cygwin converted this to all-caps by default, but this is no longer the case.
We need to use the proper case to avoid build failures.

* win/tools/scripts/auto-version.sh: Although we have historically coded
this as 'RC_PROJECTSOURCEVERSION', it is actually 'RC_ProjectSourceVersion'.

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

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 3de9f677f9d3e930f3d4315d72003646eb59a7ca..652bad867e30687a7c1b9ff71d389a1d8a1eff27 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,18 @@
+2014-05-01  Brent Fulgham  <bfulgham@apple.com>
+
+        Correct case of environment variables in auto-version.sh scripts
+        https://bugs.webkit.org/show_bug.cgi?id=132455
+
+        Reviewed by Dean Jackson.
+
+        Although we have historically used RC_PROJECTSOURCEVERSION in our scripts,
+        the actual environment variable is RC_ProjectSourceVersion. Old versions of
+        Cygwin converted this to all-caps by default, but this is no longer the case.
+        We need to use the proper case to avoid build failures.
+
+        * win/tools/scripts/auto-version.sh: Although we have historically coded
+        this as 'RC_PROJECTSOURCEVERSION', it is actually 'RC_ProjectSourceVersion'.
+
 2014-04-25  Dean Jackson  <dino@apple.com>
 
         Update WKSI for https://webkit.org/b/132195

diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh
index e75cdb69627cdf4fcfd34f1fdacf9b6784fa0429..ea695e49d0f8fbdf6dfcfa8156519d0718e5311c 100755 (executable)
--- a/WebKitLibraries/win/tools/scripts/auto-version.sh
+++ b/WebKitLibraries/win/tools/scripts/auto-version.sh
@@ -44,9 +44,9 @@ fi
 OUTPUT_FILE=$(cygpath -u "$1")/include/autoversion.h
 mkdir -p "$(dirname "$OUTPUT_FILE")"
 
-# Take the initial version number from RC_PROJECTSOURCEVERSION if it
+# 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";
+ENVIRONMENT_VERSION="$RC_ProjectSourceVersion";
 PROPOSED_VERSION=${ENVIRONMENT_VERSION:-$FALLBACK_VERSION}
 chomp PROPOSED_VERSION