Title: [171883] branches/safari-600.1-branch/WebKitLibraries
- Revision
- 171883
- Author
- [email protected]
- Date
- 2014-07-31 13:19:25 -0700 (Thu, 31 Jul 2014)
Log Message
Merge r171870. <rdar://problem/17872507>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/WebKitLibraries/ChangeLog (171882 => 171883)
--- branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-07-31 19:50:45 UTC (rev 171882)
+++ branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-07-31 20:19:25 UTC (rev 171883)
@@ -1,3 +1,18 @@
+2014-07-31 Lucas Forschler <[email protected]>
+
+ Merge r171870
+
+ 2014-07-31 Brent Fulgham <[email protected]>
+
+ [Win] Fix build failure when using 5-tuple build versions.
+ https://bugs.webkit.org/show_bug.cgi?id=135464
+ <rdar://problem/17872507>
+
+ Reviewed by David Kilzer.
+
+ * win/tools/scripts/version-stamp.pl: Modify the environment for
+ the VersionStamper sub-process to work around bug in that tool.
+
2014-07-30 Lucas Forschler <[email protected]>
Merge r171825
Modified: branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl (171882 => 171883)
--- branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-07-31 19:50:45 UTC (rev 171882)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-07-31 20:19:25 UTC (rev 171883)
@@ -87,6 +87,17 @@
my $TARGET_PATH = File::Spec->canonpath($target);
+print "Adjusting RC_PROJECTSOURCEVERSION and RC_ProjectSourceVersion to be safe for VersionStamper.\n";
+
+my $SAFE_PROJECT_VERSION = "$components{'__VERSION_MAJOR__'}.$components{'__VERSION_MINOR__'}.$components{'__VERSION_TINY__'}";
+
+print "Using RC_PROJECTSOURCEVERSION=$SAFE_PROJECT_VERSION and RC_PROJECTBUILDVERSION=$components{'__VERSION_BUILD__'}\n";
+
+# Note: These environment settings only affect this script and its child processes:
+$ENV{RC_PROJECTSOURCEVERSION} = $SAFE_PROJECT_VERSION;
+$ENV{RC_ProjectSourceVersion} = $SAFE_PROJECT_VERSION;
+$ENV{RC_PROJECTBUILDVERSION} = $components{'__VERSION_BUILD__'};
+
my $rc = system($VERSION_STAMPER, '--verbose', $TARGET_PATH, '--fileMajor', $components{'__VERSION_MAJOR__'},
'--fileMinor', $components{'__VERSION_MINOR__'}, '--fileRevision', $components{'__VERSION_TINY__'},
'--fileBuild', $components{'__VERSION_BUILD__'}, '--productMajor', $components{'__VERSION_MAJOR__'},
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
