Title: [168345] tags/Safari-538.30.4/WebKitLibraries
Diff
Modified: tags/Safari-538.30.4/WebKitLibraries/ChangeLog (168344 => 168345)
--- tags/Safari-538.30.4/WebKitLibraries/ChangeLog 2014-05-06 02:35:44 UTC (rev 168344)
+++ tags/Safari-538.30.4/WebKitLibraries/ChangeLog 2014-05-06 02:42:55 UTC (rev 168345)
@@ -1,3 +1,18 @@
+2014-05-05 Babak Shafiei <[email protected]>
+
+ Merge r168321.
+
+ 2014-05-05 Brent Fulgham <[email protected]>
+
+ [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: Fall back to all-caps version
+ of environment variable if mixed-case version is not present.
+
2014-05-01 Babak Shafiei <[email protected]>
Merge r168143.
Modified: tags/Safari-538.30.4/WebKitLibraries/win/tools/scripts/auto-version.sh (168344 => 168345)
--- tags/Safari-538.30.4/WebKitLibraries/win/tools/scripts/auto-version.sh 2014-05-06 02:35:44 UTC (rev 168344)
+++ tags/Safari-538.30.4/WebKitLibraries/win/tools/scripts/auto-version.sh 2014-05-06 02:42:55 UTC (rev 168345)
@@ -46,7 +46,8 @@
# 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:-$RC_PROJECTSOURCEVERSION};
+
PROPOSED_VERSION=${ENVIRONMENT_VERSION:-$FALLBACK_VERSION}
chomp PROPOSED_VERSION
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
