Title: [158603] branches/safari-537.60-branch/Source
- Revision
- 158603
- Author
- [email protected]
- Date
- 2013-11-04 15:37:55 -0800 (Mon, 04 Nov 2013)
Log Message
Merged r158602. <rdar://problem/15373550>
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WTF/ChangeLog (158602 => 158603)
--- branches/safari-537.60-branch/Source/WTF/ChangeLog 2013-11-04 23:26:17 UTC (rev 158602)
+++ branches/safari-537.60-branch/Source/WTF/ChangeLog 2013-11-04 23:37:55 UTC (rev 158603)
@@ -1,3 +1,16 @@
+2013-11-04 Lucas Forschler <[email protected]>
+
+ Merge r158602
+
+ 2013-11-04 Brent Fulgham <[email protected]>
+
+ [Win] User VersionStamper for official builds
+ https://bugs.webkit.org/show_bug.cgi?id=123758
+
+ Reviewed by Tim Horton.
+
+ * WTF.vcxproj/WTFPostBuild.cmd: Add missing command to run VersionStamper.exe.
+
2013-10-28 Lucas Forschler <[email protected]>
Merge r156302
Modified: branches/safari-537.60-branch/Source/WTF/WTF.vcxproj/WTFPostBuild.cmd (158602 => 158603)
--- branches/safari-537.60-branch/Source/WTF/WTF.vcxproj/WTFPostBuild.cmd 2013-11-04 23:26:17 UTC (rev 158602)
+++ branches/safari-537.60-branch/Source/WTF/WTF.vcxproj/WTFPostBuild.cmd 2013-11-04 23:37:55 UTC (rev 158603)
@@ -1 +1,2 @@
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
\ No newline at end of file
Modified: branches/safari-537.60-branch/Source/WebKit/ChangeLog (158602 => 158603)
--- branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-11-04 23:26:17 UTC (rev 158602)
+++ branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-11-04 23:37:55 UTC (rev 158603)
@@ -1,3 +1,17 @@
+2013-11-04 Lucas Forschler <[email protected]>
+
+ Merge r158602
+
+ 2013-11-04 Brent Fulgham <[email protected]>
+
+ [Win] Use VersionStamper for official builds
+ https://bugs.webkit.org/show_bug.cgi?id=123758
+
+ Reviewed by Tim Horton.
+
+ * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd: Restore command to
+ call VersionStamper on final stage of build.
+
2013-08-28 Lucas Forschler <[email protected]>
Merge r154642
Modified: branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd (158602 => 158603)
--- branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2013-11-04 23:26:17 UTC (rev 158602)
+++ branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2013-11-04 23:37:55 UTC (rev 158603)
@@ -13,5 +13,6 @@
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources"
xcopy /y /d "%PROJECTDIR%..\..\WebKit.resources\*" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources"
+if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
