Title: [177465] branches/safari-600.1.17-branch/Source
- Revision
- 177465
- Author
- matthew_han...@apple.com
- Date
- 2014-12-17 14:25:15 -0800 (Wed, 17 Dec 2014)
Log Message
Merged r177448. rdar://problems/19281928
Modified Paths
Diff
Modified: branches/safari-600.1.17-branch/Source/_javascript_Core/ChangeLog (177464 => 177465)
--- branches/safari-600.1.17-branch/Source/_javascript_Core/ChangeLog 2014-12-17 22:24:14 UTC (rev 177464)
+++ branches/safari-600.1.17-branch/Source/_javascript_Core/ChangeLog 2014-12-17 22:25:15 UTC (rev 177465)
@@ -1,3 +1,18 @@
+2014-12-17 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r177448. rdar://problem/19281928
+
+ 2014-12-17 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Correct DebugSuffix builds under MSBuild
+ https://bugs.webkit.org/show_bug.cgi?id=139733
+ <rdar://problem/19276880>
+
+ Reviewed by Simon Fraser.
+
+ * _javascript_Core.vcxproj/_javascript_Core.proj: Make sure to use the
+ '_debug' suffix when building the DebugSuffix target.
+
2014-12-16 Babak Shafiei <bshaf...@apple.com>
Merge r176896.
Modified: branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (177464 => 177465)
--- branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2014-12-17 22:24:14 UTC (rev 177464)
+++ branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2014-12-17 22:25:15 UTC (rev 177465)
@@ -4,9 +4,11 @@
<!-- normalize configuration case -->
<PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
<CONFIG>Production</CONFIG>
+ <DebugSuffix></DebugSuffix>
</PropertyGroup>
<PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
<CONFIG>DebugSuffix</CONFIG>
+ <DebugSuffix>_debug</DebugSuffix>
</PropertyGroup>
<!-- Wrapper to build _javascript_Core for both win32 and x64. -->
@@ -83,10 +85,10 @@
<CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">
<Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\_javascript_Core.dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\bin32\_javascript_Core$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\_javascript_Core.dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\bin64\_javascript_Core$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
</CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">
Modified: branches/safari-600.1.17-branch/Source/WTF/ChangeLog (177464 => 177465)
--- branches/safari-600.1.17-branch/Source/WTF/ChangeLog 2014-12-17 22:24:14 UTC (rev 177464)
+++ branches/safari-600.1.17-branch/Source/WTF/ChangeLog 2014-12-17 22:25:15 UTC (rev 177465)
@@ -1,3 +1,18 @@
+2014-12-17 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r177448. rdar://problem/19281928
+
+ 2014-12-17 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Correct DebugSuffix builds under MSBuild
+ https://bugs.webkit.org/show_bug.cgi?id=139733
+ <rdar://problem/19276880>
+
+ Reviewed by Simon Fraser.
+
+ * WTF.vcxproj/WTF.proj: Make sure to use the '_debug' suffix
+ when building the DebugSuffix target.
+
2014-12-16 Babak Shafiei <bshaf...@apple.com>
Merge r176896.
Modified: branches/safari-600.1.17-branch/Source/WTF/WTF.vcxproj/WTF.proj (177464 => 177465)
--- branches/safari-600.1.17-branch/Source/WTF/WTF.vcxproj/WTF.proj 2014-12-17 22:24:14 UTC (rev 177464)
+++ branches/safari-600.1.17-branch/Source/WTF/WTF.vcxproj/WTF.proj 2014-12-17 22:25:15 UTC (rev 177465)
@@ -4,9 +4,11 @@
<!-- normalize configuration case -->
<PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
<CONFIG>Production</CONFIG>
+ <DebugSuffix></DebugSuffix>
</PropertyGroup>
<PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
<CONFIG>DebugSuffix</CONFIG>
+ <DebugSuffix>_debug</DebugSuffix>
</PropertyGroup>
<!-- Wrapper to build WTF for both win32 and x64. -->
@@ -68,10 +70,10 @@
<CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
<Output TaskParameter="Include" ItemName="Bin64Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\WTF.dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\bin32\WTF$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\WTF.dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\bin64\WTF$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
</CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">
Modified: branches/safari-600.1.17-branch/Source/WebKit/ChangeLog (177464 => 177465)
--- branches/safari-600.1.17-branch/Source/WebKit/ChangeLog 2014-12-17 22:24:14 UTC (rev 177464)
+++ branches/safari-600.1.17-branch/Source/WebKit/ChangeLog 2014-12-17 22:25:15 UTC (rev 177465)
@@ -1,3 +1,18 @@
+2014-12-17 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r177448. rdar://problem/19281928
+
+ 2014-12-17 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Correct DebugSuffix builds under MSBuild
+ https://bugs.webkit.org/show_bug.cgi?id=139733
+ <rdar://problem/19276880>
+
+ Reviewed by Simon Fraser.
+
+ * WebKit.vcxproj/WebKit.proj: Make sure to use the '_debug' suffix
+ when building the DebugSuffix target.
+
2014-12-16 Babak Shafiei <bshaf...@apple.com>
Merge r176896.
Modified: branches/safari-600.1.17-branch/Source/WebKit/WebKit.vcxproj/WebKit.proj (177464 => 177465)
--- branches/safari-600.1.17-branch/Source/WebKit/WebKit.vcxproj/WebKit.proj 2014-12-17 22:24:14 UTC (rev 177464)
+++ branches/safari-600.1.17-branch/Source/WebKit/WebKit.vcxproj/WebKit.proj 2014-12-17 22:25:15 UTC (rev 177465)
@@ -4,9 +4,11 @@
<!-- normalize configuration case -->
<PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">
<CONFIG>Production</CONFIG>
+ <DebugSuffix></DebugSuffix>
</PropertyGroup>
<PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">
<CONFIG>DebugSuffix</CONFIG>
+ <DebugSuffix>_debug</DebugSuffix>
</PropertyGroup>
<!-- Wrapper to build WebKit for both win32 and x64. -->
@@ -77,10 +79,10 @@
<CreateItem Include="$(ConfigurationBuildDir)\bin64\*">
<Output TaskParameter="Include" ItemName="Bin64Files" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit.dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin32DLLFiles" />
</CreateItem>
- <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.dll">
+ <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit$(DebugSuffix).dll">
<Output TaskParameter="Include" ItemName="Bin64DLLFiles" />
</CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
