Title: [168149] tags/Safari-538.30.3/WebKitLibraries
- Revision
- 168149
- Author
- bshaf...@apple.com
- Date
- 2014-05-01 21:28:36 -0700 (Thu, 01 May 2014)
Log Message
Merged r168143.
Modified Paths
Diff
Modified: tags/Safari-538.30.3/WebKitLibraries/ChangeLog (168148 => 168149)
--- tags/Safari-538.30.3/WebKitLibraries/ChangeLog 2014-05-02 04:23:34 UTC (rev 168148)
+++ tags/Safari-538.30.3/WebKitLibraries/ChangeLog 2014-05-02 04:28:36 UTC (rev 168149)
@@ -1,3 +1,22 @@
+2014-05-01 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r168143.
+
+ 2014-05-01 Brent Fulgham <bfulg...@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-15 Filip Pizlo <fpi...@apple.com>
Update LLVM binary drops for Mountain Lion to LLVM r206312.
Modified: tags/Safari-538.30.3/WebKitLibraries/win/tools/scripts/auto-version.sh (168148 => 168149)
--- tags/Safari-538.30.3/WebKitLibraries/win/tools/scripts/auto-version.sh 2014-05-02 04:23:34 UTC (rev 168148)
+++ tags/Safari-538.30.3/WebKitLibraries/win/tools/scripts/auto-version.sh 2014-05-02 04:28:36 UTC (rev 168149)
@@ -44,9 +44,9 @@
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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
