[Win] Correct DebugSuffix builds under MSBuild
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Dec 2014 18:26:51 +0000 (18:26 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Dec 2014 18:26:51 +0000 (18:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=139733
<rdar://problem/19276880>

Reviewed by Simon Fraser.

../JavaScriptCore:

* JavaScriptCore.vcxproj/JavaScriptCore.proj: Make sure to use the
'_debug' suffix when building the DebugSuffix target.

../WebKit:

* WebKit.vcxproj/WebKit.proj: Make sure to use the '_debug' suffix
when building the DebugSuffix target.

../WTF:

* WTF.vcxproj/WTF.proj: Make sure to use the '_debug' suffix
when building the DebugSuffix target.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177448 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
Source/WTF/ChangeLog
Source/WTF/WTF.vcxproj/WTF.proj
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKit.proj

index ba3e4dc..9a2b716 100644 (file)
@@ -1,3 +1,14 @@
+2014-12-17  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Correct DebugSuffix builds under MSBuild
+        https://bugs.webkit.org/show_bug.cgi?id=139733
+        <rdar://problem/19276880>
+
+        Reviewed by Simon Fraser.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.proj: Make sure to use the
+        '_debug' suffix when building the DebugSuffix target.
+
 2014-12-16  Enrica Casucci  <enrica@apple.com>
 
         Fix iOS builders for 8.0
index 677e427..b89bac4 100644 (file)
@@ -4,9 +4,11 @@
   <!-- normalize configuration case -->\r
   <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">\r
        <CONFIG>Production</CONFIG>\r
+    <DebugSuffix></DebugSuffix>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">\r
        <CONFIG>DebugSuffix</CONFIG>\r
+    <DebugSuffix>_debug</DebugSuffix>\r
   </PropertyGroup>\r
 \r
   <!-- Wrapper to build JavaScriptCore for both win32 and x64. -->\r
     <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">\r
       <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin32\JavaScriptCore.dll">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\JavaScriptCore$(DebugSuffix).dll">\r
       <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin64\JavaScriptCore.dll">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\JavaScriptCore$(DebugSuffix).dll">\r
       <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />\r
     </CreateItem>\r
     <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">\r
index be193f4..fa8c4cb 100644 (file)
@@ -1,3 +1,14 @@
+2014-12-17  Brent Fulgham  <bfulgham@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-17  Anders Carlsson  <andersca@apple.com>
 
         Make Ref::copyRef const and ref-qualified
index e96a708..504820b 100644 (file)
@@ -4,9 +4,11 @@
   <!-- normalize configuration case -->\r
   <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">\r
        <CONFIG>Production</CONFIG>\r
+    <DebugSuffix></DebugSuffix>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">\r
        <CONFIG>DebugSuffix</CONFIG>\r
+    <DebugSuffix>_debug</DebugSuffix>\r
   </PropertyGroup>\r
 \r
   <!-- Wrapper to build WTF for both win32 and x64. -->\r
     <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">\r
        <Output TaskParameter="Include" ItemName="Bin64Files" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin32\WTF.dll">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\WTF$(DebugSuffix).dll">\r
       <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin64\WTF.dll">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\WTF$(DebugSuffix).dll">\r
       <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />\r
     </CreateItem>\r
     <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.pdb">\r
index f64911a..6a4db69 100644 (file)
@@ -1,3 +1,14 @@
+2014-12-17  Brent Fulgham  <bfulgham@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-17  peavo@outlook.com  <peavo@outlook.com>
 
         [Win] Link errors.
index 30b3056..e830f80 100644 (file)
@@ -4,9 +4,11 @@
   <!-- normalize configuration case -->\r
   <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">\r
        <CONFIG>Production</CONFIG>\r
+    <DebugSuffix></DebugSuffix>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">\r
        <CONFIG>DebugSuffix</CONFIG>\r
+    <DebugSuffix>_debug</DebugSuffix>\r
   </PropertyGroup>\r
 \r
   <!-- Wrapper to build WebKit for both win32 and x64. -->\r
     <CreateItem Include="$(ConfigurationBuildDir)\bin64\*">\r
       <Output TaskParameter="Include" ItemName="Bin64Files" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit.dll">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\WebKit$(DebugSuffix).dll">\r
       <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />\r
     </CreateItem>\r
-    <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit.dll">\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\WebKit$(DebugSuffix).dll">\r
       <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />\r
     </CreateItem>\r
     <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">\r