Title: [172810] branches/safari-600.1-branch/Source/_javascript_Core
- Revision
- 172810
- Author
- [email protected]
- Date
- 2014-08-20 14:04:34 -0700 (Wed, 20 Aug 2014)
Log Message
Merged r172805. <rdar://problem/18075852>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog (172809 => 172810)
--- branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-08-20 21:02:24 UTC (rev 172809)
+++ branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-08-20 21:04:34 UTC (rev 172810)
@@ -1,3 +1,18 @@
+2014-08-20 Lucas Forschler <[email protected]>
+
+ Merge r172805
+
+ 2014-08-20 Brent Fulgham <[email protected]>
+
+ [Win] _javascript_Core.dll is missing version information.
+ https://bugs.webkit.org/show_bug.cgi?id=136105
+ <rdar://problem/18075852>
+
+ Reviewed by Dean Jackson.
+
+ * _javascript_Core.vcxproj/_javascript_CorePreBuild.cmd: Add missing step to generate
+ version information for intermediary build path.
+
2014-08-19 Dana Burkart <[email protected]>
Merge r172727. <rdar://problem/18051847>
Modified: branches/safari-600.1-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CorePreBuild.cmd (172809 => 172810)
--- branches/safari-600.1-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CorePreBuild.cmd 2014-08-20 21:02:24 UTC (rev 172809)
+++ branches/safari-600.1-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CorePreBuild.cmd 2014-08-20 21:04:34 UTC (rev 172810)
@@ -4,3 +4,5 @@
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
+
+perl "%WEBKIT_LIBRARIES%\tools\scripts\auto-version.pl" "%INTDIR%"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
