JavaScriptCore: Revise CFLite Debug build to emit DLL's with _debug label.

https://bugs.webkit.org/show_bug.cgi?id=28695.

Reviewed by Steve Falkenburg.

* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Modify
  Cairo debug build to inherit from new debug_cairo property sheet.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops:
  Modify to look for debug CFLite when in debug build.

WebKit/win: Revise CFLite Debug build to emit DLL's with _debug label.
https://bugs.webkit.org/show_bug.cgi?id=28695.

Reviewed by Steve Falkenburg.

* WebKit.vcproj/WebKit.vcproj: Modify Debug_Cairo target to
  inherit from new debug_wincairo property sheet, instead of
  the current debug sheet.

WebKitLibraries: Revise CFLite Debug build to emit DLL's with _debug label.
https://bugs.webkit.org/show_bug.cgi?id=28695.

Reviewed by Steve Falkenburg.

* win/tools/vsprops/debug_wincairo.vsprops: Added.

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f6e1870e9d88f0c8a99f7c334d270fef6a68797f..62a62e056ab1bd4a6eab62a56a814dfbb5d5737b 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-08-24  Brent Fulgham  <bfulgham@webkit.org>
+
+        Reviewed by Steve Falkenburg.
+
+        Revise CFLite Debug build to emit DLL's with _debug label.
+        https://bugs.webkit.org/show_bug.cgi?id=28695.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Modify
+          Cairo debug build to inherit from new debug_cairo property sheet.
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops:
+          Modify to look for debug CFLite when in debug build.
+
 2009-08-24  Geoffrey Garen  <ggaren@apple.com>
 
         Build fix: start out with a 32-bit value to avoid a shortening warning.

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index 3eb9c9daa98abfc2fe142c80eaa2ca256f07631f..3142e75c6a89ae9b8e184c41aadcc20c0c607afd 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -328,7 +328,7 @@
                <Configuration\r
                        Name="Debug_CFLite|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCFLite.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\debug_wincairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCFLite.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
@@ -888,11 +888,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\runtime\MarkStack.h"\r
+                               RelativePath="..\..\runtime\MarkStack.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\runtime\MarkStack.cpp"\r
+                               RelativePath="..\..\runtime\MarkStack.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1640,15 +1640,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\assembler\LinkBuffer.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\assembler\RepatchBuffer.h"\r
+                               RelativePath="..\..\assembler\AssemblerBuffer.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\assembler\AssemblerBuffer.h"\r
+                               RelativePath="..\..\assembler\LinkBuffer.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1663,6 +1659,10 @@
                                RelativePath="..\..\assembler\MacroAssemblerX86Common.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\assembler\RepatchBuffer.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\assembler\X86Assembler.h"\r
                                >\r

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops
index 02f213bdc000be6c59a9b68253480389a66f0936..8c9e31f47f1a8933cedc1f22abf501d3dd2dc8d0 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops
@@ -6,6 +6,6 @@
        >\r
        <Tool\r
                Name="VCLinkerTool"\r
-               AdditionalDependencies="CFLite$(LibraryConfigSuffix).lib"\r
+               AdditionalDependencies="CFLite$(WebKitConfigSuffix).lib"\r
        />\r
 </VisualStudioPropertySheet>\r

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 6c52f9f6cba12d86ec41365b90045490d6b2d490..d69bd613db97a60aa3747a1e84cfa2a6e8613236 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2009-08-24  Brent Fulgham  <bfulgham@webkit.org>
+
+        Reviewed by Steve Falkenburg.
+
+        Revise CFLite Debug build to emit DLL's with _debug label.
+        https://bugs.webkit.org/show_bug.cgi?id=28695.
+
+        * WebKit.vcproj/WebKit.vcproj: Modify Debug_Cairo target to
+          inherit from new debug_wincairo property sheet, instead of
+          the current debug sheet. 
+
 2009-08-22  Adam Barth  <abarth@webkit.org>
 
         Revert 47684.  We're going to do this later once clients have had a

diff --git a/WebKit/win/WebKit.vcproj/WebKit.vcproj b/WebKit/win/WebKit.vcproj/WebKit.vcproj
index 3e9971bf6a94f978705a375d7c73ddbadd1ecdf1..dace1932c5d4f4ae81f842f3a5f555aa11a8a76e 100644 (file)
--- a/WebKit/win/WebKit.vcproj/WebKit.vcproj
+++ b/WebKit/win/WebKit.vcproj/WebKit.vcproj
@@ -250,7 +250,7 @@
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\cURL.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_wincairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\cURL.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index f217b265943ec5ac587fe0045800c60f0ca3df3b..eb080db47cda42061ebd4c60e353e6a758d66f1c 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-24  Brent Fulgham  <bfulgham@webkit.org>
+
+        Reviewed by Steve Falkenburg.
+
+        Revise CFLite Debug build to emit DLL's with _debug label.
+        https://bugs.webkit.org/show_bug.cgi?id=28695.
+
+        * win/tools/vsprops/debug_wincairo.vsprops: Added.
+
 2009-08-12  Peter Kasting  <pkasting@google.com>
 
         Reviewed by Darin Adler.

diff --git a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops
new file mode 100644 (file)
index 0000000..568b19b
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="debug_wincairo"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               Optimization="0"\r
+               MinimalRebuild="true"\r
+               BasicRuntimeChecks="3"\r
+               RuntimeLibrary="3"\r
+       />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               LinkIncremental="2"\r
+       />\r
+       <UserMacro\r
+               Name="WebKitConfigSuffix"\r
+               Value="_debug"\r
+               PerformEnvironmentSet="true"\r
+       />\r
+       <UserMacro\r
+               Name="LibraryConfigSuffix"\r
+               Value=""\r
+               PerformEnvironmentSet="true"\r
+       />\r
+       <UserMacro\r
+               Name="WebKitDLLConfigSuffix"\r
+               Value="_debug"\r
+       />\r
+</VisualStudioPropertySheet>\r