JavaScriptCore:
authorsfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Jan 2008 06:05:38 +0000 (06:05 +0000)
committersfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Jan 2008 06:05:38 +0000 (06:05 +0000)
        Share common files across projects.

        Unify vsprops files
        Debug:          common.vsprops, debug.vsprops
        Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops
        Release:        common.vsprops, release.vsprops

        Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops.
        debug_internal.vsprops will be mostly empty except for file path prefix modifiers.

        Reviewed by Adam Roben.

        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
        * JavaScriptCore.vcproj/debug.vsprops: Removed.
        * JavaScriptCore.vcproj/debug_internal.vsprops: Removed.
        * JavaScriptCore.vcproj/release.vsprops: Removed.
        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:

WebCore:

        Share common files across projects.

        Unify vsprops files
        Debug:          common.vsprops, debug.vsprops
        Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops
        Release:        common.vsprops, release.vsprops

        Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops.
        debug_internal.vsprops will be mostly empty except for file path prefix modifiers.

        Pull auto-version.sh, VERSION, and PRODUCTVERSION from tools.

        Reviewed by Adam Roben.

        * WebCore.vcproj/PRODUCTVERSION: Removed.
        * WebCore.vcproj/QTMovieWin.vcproj:
        * WebCore.vcproj/VERSION: Removed.
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.vcproj/auto-version.sh: Removed.
        * WebCore.vcproj/debug.vsprops: Removed.
        * WebCore.vcproj/debug_internal.vsprops: Removed.
        * WebCore.vcproj/release.vsprops: Removed.

WebKit/win:

        Share common files across projects.

        Unify vsprops files
        Debug:          common.vsprops, debug.vsprops
        Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops
        Release:        common.vsprops, release.vsprops

        Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops.
        debug_internal.vsprops will be mostly empty except for file path prefix modifiers.

        Pull auto-version.sh, VERSION, and PRODUCTVERSION from tools.

        Reviewed by Adam Roben.

        * WebKit.vcproj/Interfaces.vcproj:
        * WebKit.vcproj/PRODUCTVERSION: Removed.
        * WebKit.vcproj/VERSION: Removed.
        * WebKit.vcproj/WebKit.vcproj:
        * WebKit.vcproj/WebKitGUID.vcproj:
        * WebKit.vcproj/auto-version.sh: Removed.
        * WebKit.vcproj/debug.vsprops: Removed.
        * WebKit.vcproj/debug_internal.vsprops: Removed.
        * WebKit.vcproj/release.vsprops: Removed.

WebKitLibraries:

        Share common files across projects.

        Unify vsprops files
        Debug:          common.vsprops, debug.vsprops
        Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops
        Release:        common.vsprops, release.vsprops

        Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops.
        debug_internal.vsprops will be mostly empty except for file path prefix modifiers.

        Moved auto-version.sh, VERSION, PRODUCTVERSION to tools.

        Reviewed by Adam Roben.

        * win/tools/WinTools.make:
        * win/tools/scripts: Added.
        * win/tools/scripts/PRODUCTVERSION: Added.
        * win/tools/scripts/VERSION: Added.
        * win/tools/scripts/auto-version.sh: Copied from WebCore/WebCore.vcproj/auto-version.sh.
        * win/tools/vsprops/debug.vsprops:
        * win/tools/vsprops/debug_internal.vsprops: Added.
        * win/tools/vsprops/release.vsprops:

WebKitTools:

        Share common files across projects.

        Unify vsprops files
        Debug:          common.vsprops, debug.vsprops
        Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops
        Release:        common.vsprops, release.vsprops

        Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops.
        debug_internal.vsprops will be mostly empty except for file path prefix modifiers.

        Pull auto-version.sh, VERSION, and PRODUCTVERSION from tools.

        Reviewed by Adam Roben.

        * Drosera/win/Drosera.vcproj/Drosera.vcproj:
        * Drosera/win/Drosera.vcproj/PRODUCTVERSION: Removed.
        * Drosera/win/Drosera.vcproj/VERSION: Removed.
        * Drosera/win/Drosera.vcproj/auto-version.sh: Removed.
        * Drosera/win/Drosera.vcproj/debug.vsprops: Removed.
        * Drosera/win/Drosera.vcproj/debug_internal.vsprops: Removed.
        * Drosera/win/Drosera.vcproj/release.vsprops: Removed.
        * DumpRenderTree/win/DumpRenderTree.vcproj:
        * DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj:
        * DumpRenderTree/win/debug.vsprops: Removed.
        * DumpRenderTree/win/debug_internal.vsprops: Removed.
        * DumpRenderTree/win/release.vsprops: Removed.

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

44 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
JavaScriptCore/JavaScriptCore.vcproj/debug.vsprops [deleted file]
JavaScriptCore/JavaScriptCore.vcproj/debug_internal.vsprops [deleted file]
JavaScriptCore/JavaScriptCore.vcproj/release.vsprops [deleted file]
JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
WebCore/ChangeLog
WebCore/WebCore.vcproj/PRODUCTVERSION [deleted file]
WebCore/WebCore.vcproj/QTMovieWin.vcproj
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.vcproj/debug.vsprops [deleted file]
WebCore/WebCore.vcproj/debug_internal.vsprops [deleted file]
WebCore/WebCore.vcproj/release.vsprops [deleted file]
WebKit/win/ChangeLog
WebKit/win/WebKit.vcproj/Interfaces.vcproj
WebKit/win/WebKit.vcproj/PRODUCTVERSION [deleted file]
WebKit/win/WebKit.vcproj/VERSION [deleted file]
WebKit/win/WebKit.vcproj/WebKit.vcproj
WebKit/win/WebKit.vcproj/WebKitGUID.vcproj
WebKit/win/WebKit.vcproj/auto-version.sh [deleted file]
WebKit/win/WebKit.vcproj/debug.vsprops [deleted file]
WebKit/win/WebKit.vcproj/release.vsprops [deleted file]
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/WinTools.make
WebKitLibraries/win/tools/scripts/PRODUCTVERSION [new file with mode: 0644]
WebKitLibraries/win/tools/scripts/VERSION [moved from WebCore/WebCore.vcproj/VERSION with 100% similarity]
WebKitLibraries/win/tools/scripts/auto-version.sh [moved from WebCore/WebCore.vcproj/auto-version.sh with 97% similarity]
WebKitLibraries/win/tools/vsprops/debug.vsprops
WebKitLibraries/win/tools/vsprops/debug_internal.vsprops [moved from WebKit/win/WebKit.vcproj/debug_internal.vsprops with 90% similarity]
WebKitLibraries/win/tools/vsprops/release.vsprops
WebKitTools/ChangeLog
WebKitTools/Drosera/win/Drosera.vcproj/Drosera.vcproj
WebKitTools/Drosera/win/Drosera.vcproj/PRODUCTVERSION [deleted file]
WebKitTools/Drosera/win/Drosera.vcproj/VERSION [deleted file]
WebKitTools/Drosera/win/Drosera.vcproj/auto-version.sh [deleted file]
WebKitTools/Drosera/win/Drosera.vcproj/debug.vsprops [deleted file]
WebKitTools/Drosera/win/Drosera.vcproj/debug_internal.vsprops [deleted file]
WebKitTools/Drosera/win/Drosera.vcproj/release.vsprops [deleted file]
WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj
WebKitTools/DumpRenderTree/win/debug.vsprops [deleted file]
WebKitTools/DumpRenderTree/win/debug_internal.vsprops [deleted file]
WebKitTools/DumpRenderTree/win/release.vsprops [deleted file]

index f4219c3..733e566 100644 (file)
@@ -1,3 +1,24 @@
+2008-01-13  Steve Falkenburg  <sfalken@apple.com>
+
+        Share common files across projects.
+        
+        Unify vsprops files
+        Debug:          common.vsprops, debug.vsprops
+        Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops
+        Release:        common.vsprops, release.vsprops
+        
+        Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops.
+        debug_internal.vsprops will be mostly empty except for file path prefix modifiers.
+
+        Reviewed by Adam Roben.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
+        * JavaScriptCore.vcproj/debug.vsprops: Removed.
+        * JavaScriptCore.vcproj/debug_internal.vsprops: Removed.
+        * JavaScriptCore.vcproj/release.vsprops: Removed.
+        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
+
 2008-01-13  Marius Bugge Monsen  <mbm@trolltech.com>
 
         Contributions and review by Adriaan de Groot,
index b09f2f6..fa63bc3 100644 (file)
@@ -20,7 +20,7 @@
                        OutputDirectory="$(WebKitOutputDir)\lib"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="..\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
                        >\r
@@ -96,7 +96,7 @@
                        OutputDirectory="$(WebKitOutputDir)\lib"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="..\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
                        WholeProgramOptimization="1"\r
index efe2c72..9c80c29 100644 (file)
@@ -20,7 +20,7 @@
                        OutputDirectory="$(WebKitOutputDir)\lib"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="..\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
                        >\r
@@ -93,7 +93,7 @@
                        OutputDirectory="$(WebKitOutputDir)\lib"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="..\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
                        WholeProgramOptimization="1"\r
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/debug.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/debug.vsprops
deleted file mode 100644 (file)
index f249d8a..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="debug"
-       >
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value="_debug"
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value=""
-       />
-       <UserMacro
-               Name="WebKitDLLConfigSuffix"
-               Value=""
-       />
-</VisualStudioPropertySheet>
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/debug_internal.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/debug_internal.vsprops
deleted file mode 100644 (file)
index ac9d18a..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="debug_internal"
-       >
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value="_debug"
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value=""
-       />
-       <UserMacro
-               Name="WebKitDLLConfigSuffix"
-               Value="_debug"
-       />
-</VisualStudioPropertySheet>
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/release.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/release.vsprops
deleted file mode 100644 (file)
index 3916464..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="release"
-       >
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value=""
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value=""
-       />
-       <UserMacro
-               Name="WebKitDLLConfigSuffix"
-               Value=""
-       />
-</VisualStudioPropertySheet>
index 733e146..3876574 100644 (file)
@@ -20,7 +20,7 @@
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\JavaScriptCore\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\debug_internal.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="if not &quot;$(PRODUCTION)&quot;==&quot;&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt36.dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt36.dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt36$(ConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).pdb&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;"\r
+                               CommandLine="if not &quot;$(PRODUCTION)&quot;==&quot;&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt36.dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt36.dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt36$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt36$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuuc36$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuuc36$(LibraryConfigSuffix).pdb&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
index 511757d..fd11fd5 100644 (file)
@@ -1,3 +1,28 @@
+2008-01-13  Steve Falkenburg  <sfalken@apple.com>
+
+        Share common files across projects.
+        
+        Unify vsprops files
+        Debug:          common.vsprops, debug.vsprops
+        Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops
+        Release:        common.vsprops, release.vsprops
+        
+        Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops.
+        debug_internal.vsprops will be mostly empty except for file path prefix modifiers.
+
+        Pull auto-version.sh, VERSION, and PRODUCTVERSION from tools.
+
+        Reviewed by Adam Roben.
+
+        * WebCore.vcproj/PRODUCTVERSION: Removed.
+        * WebCore.vcproj/QTMovieWin.vcproj:
+        * WebCore.vcproj/VERSION: Removed.
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.vcproj/auto-version.sh: Removed.
+        * WebCore.vcproj/debug.vsprops: Removed.
+        * WebCore.vcproj/debug_internal.vsprops: Removed.
+        * WebCore.vcproj/release.vsprops: Removed.
+
 2008-01-13  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.vcproj/PRODUCTVERSION b/WebCore/WebCore.vcproj/PRODUCTVERSION
deleted file mode 100644 (file)
index 7da3c16..0000000
+++ /dev/null
@@ -1 +0,0 @@
-3.0.5
\ No newline at end of file
index 6c087a0..88dc780 100644 (file)
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets=".\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets=".\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets=".\debug_internal.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
index d70c73e..4b2447b 100644 (file)
@@ -20,7 +20,7 @@
                        OutputDirectory="$(WebKitOutputDir)\lib"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets=".\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
                        >\r
@@ -94,7 +94,7 @@
                        OutputDirectory="$(WebKitOutputDir)\lib"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets=".\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
                        WholeProgramOptimization="1"\r
                        OutputDirectory="$(WebKitOutputDir)\lib"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets=".\debug_internal.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
                        CharacterSet="1"\r
                        DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
                        >\r
diff --git a/WebCore/WebCore.vcproj/debug.vsprops b/WebCore/WebCore.vcproj/debug.vsprops
deleted file mode 100644 (file)
index 3e58669..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="debug"
-       >
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value="_debug"
-               PerformEnvironmentSet="true"
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
-</VisualStudioPropertySheet>
diff --git a/WebCore/WebCore.vcproj/debug_internal.vsprops b/WebCore/WebCore.vcproj/debug_internal.vsprops
deleted file mode 100644 (file)
index f7af24e..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="debug_internal"
-       >
-       <Tool
-               Name="VCCLCompilerTool"
-               PreprocessorDefinitions="USE_DEBUG_SAFARI_THEME"
-       />
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value="_debug"
-               PerformEnvironmentSet="true"
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value="_debug"
-               PerformEnvironmentSet="true"
-       />
-</VisualStudioPropertySheet>
diff --git a/WebCore/WebCore.vcproj/release.vsprops b/WebCore/WebCore.vcproj/release.vsprops
deleted file mode 100644 (file)
index ee9cdba..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="release"
-       >
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
-</VisualStudioPropertySheet>
index 391150a..c3bbd62 100644 (file)
@@ -1,3 +1,29 @@
+2008-01-11  Steve Falkenburg  <sfalken@apple.com>
+
+        Share common files across projects.
+        
+        Unify vsprops files
+        Debug:          common.vsprops, debug.vsprops
+        Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops
+        Release:        common.vsprops, release.vsprops
+        
+        Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops.
+        debug_internal.vsprops will be mostly empty except for file path prefix modifiers.
+
+        Pull auto-version.sh, VERSION, and PRODUCTVERSION from tools.
+
+        Reviewed by Adam Roben.
+
+        * WebKit.vcproj/Interfaces.vcproj:
+        * WebKit.vcproj/PRODUCTVERSION: Removed.
+        * WebKit.vcproj/VERSION: Removed.
+        * WebKit.vcproj/WebKit.vcproj:
+        * WebKit.vcproj/WebKitGUID.vcproj:
+        * WebKit.vcproj/auto-version.sh: Removed.
+        * WebKit.vcproj/debug.vsprops: Removed.
+        * WebKit.vcproj/debug_internal.vsprops: Removed.
+        * WebKit.vcproj/release.vsprops: Removed.
+
 2008-01-11  Adam Roben  <aroben@apple.com>
 
         Fix Bug 16828: WebView never paints if first page load is canceled after being committed but before layout
index 2fe212d..dad51c5 100644 (file)
@@ -20,7 +20,7 @@
                        OutputDirectory="$(WebKitOutputDir)\include\WebKit"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\WebKit\$(ConfigurationName)\$(ProjectName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets=".\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
@@ -93,7 +93,7 @@
                        OutputDirectory="$(WebKitOutputDir)\include\WebKit"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\WebKit\$(ConfigurationName)\$(ProjectName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets=".\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
diff --git a/WebKit/win/WebKit.vcproj/PRODUCTVERSION b/WebKit/win/WebKit.vcproj/PRODUCTVERSION
deleted file mode 100644 (file)
index 7da3c16..0000000
+++ /dev/null
@@ -1 +0,0 @@
-3.0.5
\ No newline at end of file
diff --git a/WebKit/win/WebKit.vcproj/VERSION b/WebKit/win/WebKit.vcproj/VERSION
deleted file mode 100644 (file)
index 642ea6f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-525
index d71228b..f128f31 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="windows-1251"?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8,00"\r
+       Version="8.00"\r
        Name="WebKit"\r
        ProjectGUID="{0662A8A9-82A3-4638-97D8-EC425D8D87C9}"\r
        RootNamespace="WebKit"\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets=".\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;touch &quot;$(WebKitOutputDir)\tmp.cpp&quot;&#x0D;&#x0A;cl /analyze /nologo /c &quot;$(WebKitOutputDir)\tmp.cpp&quot; 2&gt;&amp;1 | findstr D9040&#x0D;&#x0A;if ERRORLEVEL 0 set EnablePREfast=&quot;false&quot; else set EnablePREfast=&quot;true&quot;&#x0D;&#x0A;if ERRORLEVEL 0 set AnalyzeWithLargeStack=&quot;&quot; AnalyzeWithLargeStack=&quot;/analyze:65536&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\include\JavaScriptCore\JavaScriptCore\*&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;touch &quot;$(WebKitOutputDir)\tmp.cpp&quot;&#x0D;&#x0A;cl /analyze /nologo /c &quot;$(WebKitOutputDir)\tmp.cpp&quot; 2&gt;&amp;1 | findstr D9040&#x0D;&#x0A;if ERRORLEVEL 0 set EnablePREfast=&quot;false&quot; else set EnablePREfast=&quot;true&quot;&#x0D;&#x0A;if ERRORLEVEL 0 set AnalyzeWithLargeStack=&quot;&quot; AnalyzeWithLargeStack=&quot;/analyze:65536&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\include\JavaScriptCore\JavaScriptCore\*&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets=".\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;touch &quot;$(WebKitOutputDir)\tmp.cpp&quot;&#x0D;&#x0A;cl /analyze /nologo /c &quot;$(WebKitOutputDir)\tmp.cpp&quot; 2&gt;&amp;1 | findstr D9040&#x0D;&#x0A;if ERRORLEVEL 0 set EnablePREfast=&quot;false&quot; else set EnablePREfast=&quot;true&quot;&#x0D;&#x0A;if ERRORLEVEL 0 set AnalyzeWithLargeStack=&quot;&quot; AnalyzeWithLargeStack=&quot;/analyze:65536&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\include\JavaScriptCore\JavaScriptCore\*&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;touch &quot;$(WebKitOutputDir)\tmp.cpp&quot;&#x0D;&#x0A;cl /analyze /nologo /c &quot;$(WebKitOutputDir)\tmp.cpp&quot; 2&gt;&amp;1 | findstr D9040&#x0D;&#x0A;if ERRORLEVEL 0 set EnablePREfast=&quot;false&quot; else set EnablePREfast=&quot;true&quot;&#x0D;&#x0A;if ERRORLEVEL 0 set AnalyzeWithLargeStack=&quot;&quot; AnalyzeWithLargeStack=&quot;/analyze:65536&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\include\JavaScriptCore\JavaScriptCore\*&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets=".\debug_internal.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;touch &quot;$(WebKitOutputDir)\tmp.cpp&quot;&#x0D;&#x0A;cl /analyze /nologo /c &quot;$(WebKitOutputDir)\tmp.cpp&quot; 2&gt;&amp;1 | findstr D9040&#x0D;&#x0A;if ERRORLEVEL 0 set EnablePREfast=&quot;false&quot; else set EnablePREfast=&quot;true&quot;&#x0D;&#x0A;if ERRORLEVEL 0 set AnalyzeWithLargeStack=&quot;&quot; AnalyzeWithLargeStack=&quot;/analyze:65536&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\include\JavaScriptCore\JavaScriptCore\*&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;touch &quot;$(WebKitOutputDir)\tmp.cpp&quot;&#x0D;&#x0A;cl /analyze /nologo /c &quot;$(WebKitOutputDir)\tmp.cpp&quot; 2&gt;&amp;1 | findstr D9040&#x0D;&#x0A;if ERRORLEVEL 0 set EnablePREfast=&quot;false&quot; else set EnablePREfast=&quot;true&quot;&#x0D;&#x0A;if ERRORLEVEL 0 set AnalyzeWithLargeStack=&quot;&quot; AnalyzeWithLargeStack=&quot;/analyze:65536&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\include\JavaScriptCore\JavaScriptCore\*&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
index fe6806c..be4a3f3 100644 (file)
@@ -20,7 +20,7 @@
                        OutputDirectory="$(WebKitOutputDir)\lib"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\WebKit\$(ConfigurationName)\$(ProjectName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets=".\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
@@ -92,7 +92,7 @@
                        OutputDirectory="$(WebKitOutputDir)\lib"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\WebKit\$(ConfigurationName)\$(ProjectName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets=".\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
diff --git a/WebKit/win/WebKit.vcproj/auto-version.sh b/WebKit/win/WebKit.vcproj/auto-version.sh
deleted file mode 100755 (executable)
index a2c6d2c..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/bash
-
-# Copyright (C) 2007 Apple Inc.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-SRCPATH=`cygpath -u "$1"`
-VERSIONPATH=`cygpath -u "$2"`
-VERSIONPATH=$VERSIONPATH/include
-VERSIONFILE=$VERSIONPATH/autoversion.h
-mkdir -p "$VERSIONPATH"
-
-PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"`
-MAJORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/' "$SRCPATH/PRODUCTVERSION"`
-MINORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/' "$SRCPATH/PRODUCTVERSION"`
-TINYVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/' "$SRCPATH/PRODUCTVERSION"`
-if [ "$TINYVERSION" == "" ]; then
-    TINYVERSION=0
-fi
-
-if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
-    echo -n `cat "$SRCPATH/VERSION"` > "$VERSIONFILE"
-else
-    echo -n $RC_PROJECTSOURCEVERSION > "$VERSIONFILE"
-fi
-
-if [ `grep -c -E "4\.|4$" "$VERSIONFILE"` -ne 0 ]; then
-    echo "Can't set WebKit's version to something that ends in a 4!"
-    echo "If we do, someone's going to think it's Netscape 4."
-    echo "Radar bug 3787996 has some details."
-    exit 1
-fi
-
-BLDMAJORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/' "$VERSIONFILE"`
-BLDMINORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/' "$VERSIONFILE"`
-BLDVARIANTVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/' "$VERSIONFILE"`
-if [ "$BLDMINORVERSION" == "" ]; then
-    BLDMINORVERSION=0
-fi
-if [ "$BLDVARIANTVERSION" == "" ]; then
-    BLDVARIANTVERSION=0
-fi
-SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'`
-
-BLDNMBR=`cat "$VERSIONFILE"`
-BLDNMBRSHORT=`cat "$VERSIONFILE"`
-BUILDER=""
-
-if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
-    echo -n "+" >> "$VERSIONFILE"
-    BLDNMBRSHORT=`cat "$VERSIONFILE"`
-    echo -n " " >> "$VERSIONFILE"
-    echo -n `whoami` >> "$VERSIONFILE"
-    echo -n " - " >> "$VERSIONFILE"
-    echo -n `date` >> "$VERSIONFILE"
-    echo -n " - r$SVNOPENSOURCEREVISION" >> "$VERSIONFILE"
-    BLDNMBR=`cat "$VERSIONFILE"`
-fi
-
-echo -n '#define __VERSION_TEXT__ "' > "$VERSIONFILE"
-echo -n $PRODUCTVERSION >> "$VERSIONFILE"
-echo -n " (" >> "$VERSIONFILE"
-echo -n $BLDNMBR >> "$VERSIONFILE"
-echo ')"' >> "$VERSIONFILE"
-echo -n '#define __BUILD_NUMBER_SHORT__ "' >> "$VERSIONFILE"
-echo -n $BLDNMBRSHORT >> "$VERSIONFILE"
-echo '"' >> "$VERSIONFILE"
-
-echo -n '#define __VERSION_MAJOR__ ' >> "$VERSIONFILE"
-echo $MAJORVERSION >> "$VERSIONFILE"
-echo -n '#define __VERSION_MINOR__ ' >> "$VERSIONFILE"
-echo $MINORVERSION >> "$VERSIONFILE"
-echo -n '#define __VERSION_TINY__ ' >> "$VERSIONFILE"
-echo $TINYVERSION >> "$VERSIONFILE"
-
-echo -n '#define __BUILD_NUMBER_MAJOR__ ' >> "$VERSIONFILE"
-echo $BLDMAJORVERSION >> "$VERSIONFILE"
-echo -n '#define __BUILD_NUMBER_MINOR__ ' >> "$VERSIONFILE"
-echo $BLDMINORVERSION >> "$VERSIONFILE"
-echo -n '#define __BUILD_NUMBER_VARIANT__ ' >> "$VERSIONFILE"
-echo $BLDVARIANTVERSION >> "$VERSIONFILE"
-
-echo -n '#define __SVN_REVISION__ ' >> "$VERSIONFILE"
-echo $SVNREVISION >> "$VERSIONFILE"
diff --git a/WebKit/win/WebKit.vcproj/debug.vsprops b/WebKit/win/WebKit.vcproj/debug.vsprops
deleted file mode 100644 (file)
index 30e46dd..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="debug"
-       >
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value="_debug"
-               PerformEnvironmentSet="true"
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
-       <UserMacro
-               Name="WebKitDLLConfigSuffix"
-               Value=""
-       />
-</VisualStudioPropertySheet>
diff --git a/WebKit/win/WebKit.vcproj/release.vsprops b/WebKit/win/WebKit.vcproj/release.vsprops
deleted file mode 100644 (file)
index 3156603..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="release"
-       >
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
-       <UserMacro
-               Name="WebKitDLLConfigSuffix"
-               Value=""
-       />
-</VisualStudioPropertySheet>
index 5c4b490..9828c30 100644 (file)
@@ -1,5 +1,30 @@
 2008-01-11  Steve Falkenburg  <sfalken@apple.com>
 
+        Share common files across projects.
+        
+        Unify vsprops files
+        Debug:          common.vsprops, debug.vsprops
+        Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops
+        Release:        common.vsprops, release.vsprops
+        
+        Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops.
+        debug_internal.vsprops will be mostly empty except for file path prefix modifiers.
+
+        Moved auto-version.sh, VERSION, PRODUCTVERSION to tools.
+
+        Reviewed by Adam Roben.
+
+        * win/tools/WinTools.make:
+        * win/tools/scripts: Added.
+        * win/tools/scripts/PRODUCTVERSION: Added.
+        * win/tools/scripts/VERSION: Added.
+        * win/tools/scripts/auto-version.sh: Copied from WebCore/WebCore.vcproj/auto-version.sh.
+        * win/tools/vsprops/debug.vsprops:
+        * win/tools/vsprops/debug_internal.vsprops: Added.
+        * win/tools/vsprops/release.vsprops:
+
+2008-01-11  Steve Falkenburg  <sfalken@apple.com>
+
         Add shared vsprops to help unify our Windows tools settings.
 
         Reviewed by Hyatt.
index 2fd78fb..a4c9f2c 100755 (executable)
@@ -1,2 +1,3 @@
 install:\r
     xcopy "$(SRCROOT)\vsprops\*.vsprops" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y\r
+    xcopy "$(SRCROOT)\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y\r
diff --git a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION b/WebKitLibraries/win/tools/scripts/PRODUCTVERSION
new file mode 100644 (file)
index 0000000..06a4457
--- /dev/null
@@ -0,0 +1 @@
+3.1
\ No newline at end of file
similarity index 97%
rename from WebCore/WebCore.vcproj/auto-version.sh
rename to WebKitLibraries/win/tools/scripts/auto-version.sh
index a2c6d2c..a93f4af 100755 (executable)
@@ -23,8 +23,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-SRCPATH=`cygpath -u "$1"`
-VERSIONPATH=`cygpath -u "$2"`
+SRCPATH=`cygpath -u "$WEBKITLIBRARIESDIR\Tools\Scripts"`
+VERSIONPATH=`cygpath -u "$1"`
 VERSIONPATH=$VERSIONPATH/include
 VERSIONFILE=$VERSIONPATH/autoversion.h
 mkdir -p "$VERSIONPATH"
index 5f5b67f..b2cf563 100644 (file)
@@ -4,9 +4,18 @@
        Version="8.00"
        Name="debug"
        >
-       <UserMacro
-               Name="ConfigSuffix"
+  <UserMacro
+               Name="WebKitConfigSuffix"
                Value="_debug"
                PerformEnvironmentSet="true"
        />
+  <UserMacro
+               Name="LibraryConfigSuffix"
+               Value=""
+               PerformEnvironmentSet="true"
+       />
+  <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value=""
+       />
 </VisualStudioPropertySheet>
@@ -4,21 +4,21 @@
        Version="8.00"
        Name="debug_internal"
        >
-       <Tool
+  <Tool
                Name="VCCLCompilerTool"
                PreprocessorDefinitions="USE_DEBUG_SAFARI_THEME"
        />
-       <UserMacro
+  <UserMacro
                Name="WebKitConfigSuffix"
                Value="_debug"
                PerformEnvironmentSet="true"
        />
-       <UserMacro
+  <UserMacro
                Name="LibraryConfigSuffix"
                Value="_debug"
                PerformEnvironmentSet="true"
        />
-       <UserMacro
+  <UserMacro
                Name="WebKitDLLConfigSuffix"
                Value="_debug"
        />
index 3890863..eebc367 100644 (file)
@@ -4,9 +4,18 @@
        Version="8.00"
        Name="release"
        >
-       <UserMacro
-               Name="ConfigSuffix"
+  <UserMacro
+               Name="WebKitConfigSuffix"
                Value=""
                PerformEnvironmentSet="true"
        />
+  <UserMacro
+               Name="LibraryConfigSuffix"
+               Value=""
+               PerformEnvironmentSet="true"
+       />
+  <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value=""
+       />
 </VisualStudioPropertySheet>
index 444aaee..5662b75 100644 (file)
@@ -1,3 +1,32 @@
+2008-01-13  Steve Falkenburg  <sfalken@apple.com>
+
+        Share common files across projects.
+        
+        Unify vsprops files
+        Debug:          common.vsprops, debug.vsprops
+        Debug_Internal: common.vsprops, debug.vsprops, debug_internal.vsprops
+        Release:        common.vsprops, release.vsprops
+        
+        Shared properties can go into common.vsprops, shared debug settings can go into debug.vsprops.
+        debug_internal.vsprops will be mostly empty except for file path prefix modifiers.
+
+        Pull auto-version.sh, VERSION, and PRODUCTVERSION from tools.
+
+        Reviewed by Adam Roben.
+
+        * Drosera/win/Drosera.vcproj/Drosera.vcproj:
+        * Drosera/win/Drosera.vcproj/PRODUCTVERSION: Removed.
+        * Drosera/win/Drosera.vcproj/VERSION: Removed.
+        * Drosera/win/Drosera.vcproj/auto-version.sh: Removed.
+        * Drosera/win/Drosera.vcproj/debug.vsprops: Removed.
+        * Drosera/win/Drosera.vcproj/debug_internal.vsprops: Removed.
+        * Drosera/win/Drosera.vcproj/release.vsprops: Removed.
+        * DumpRenderTree/win/DumpRenderTree.vcproj:
+        * DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj:
+        * DumpRenderTree/win/debug.vsprops: Removed.
+        * DumpRenderTree/win/debug_internal.vsprops: Removed.
+        * DumpRenderTree/win/release.vsprops: Removed.
+
 2008-01-13  Brent Fulgham  <bfulgham@gmail.com>
 
         Reviewed by Maciej.
index 8ef2dc5..62ca478 100755 (executable)
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets=".\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -75,7 +75,7 @@
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\r
                                AdditionalDependencies="CoreFoundation$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)$(ConfigSuffix).exe"\r
+                               OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;"\r
                                IgnoreAllDefaultLibraries="false"\r
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxml2$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxslt$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\Info.plist&quot; &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.css&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.html&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.js&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\Images\*&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxml2$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxslt$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\Info.plist&quot; &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.css&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.html&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.js&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\Images\*&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets=".\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\r
                                AdditionalDependencies="CoreFoundation$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)$(ConfigSuffix).exe"\r
+                               OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;"\r
                                DelayLoadDLLs=""\r
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxml2$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxslt$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\Info.plist&quot; &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.css&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.html&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.js&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\Images\*&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxml2$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxslt$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\Info.plist&quot; &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.css&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.html&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.js&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\Images\*&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets=".\debug_internal.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\r
                                AdditionalDependencies="CoreFoundation$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)$(ConfigSuffix).exe"\r
+                               OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;"\r
                                IgnoreAllDefaultLibraries="false"\r
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxml2$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxslt$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\Info.plist&quot; &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.css&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.html&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.js&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\Images\*&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;"\r
+                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CFNetwork$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreGraphics$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin36$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxml2$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libxslt$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\SQLite3$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\zlib1$(LibraryConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\Info.plist&quot; &quot;$(OutDir)\$(ProjectName).resources&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.css&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.html&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\*.js&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)..\..\Images\*&quot; &quot;$(OutDir)\$(ProjectName).resources\$(ProjectName)&quot;&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
        </Configurations>\r
diff --git a/WebKitTools/Drosera/win/Drosera.vcproj/PRODUCTVERSION b/WebKitTools/Drosera/win/Drosera.vcproj/PRODUCTVERSION
deleted file mode 100644 (file)
index 7da3c16..0000000
+++ /dev/null
@@ -1 +0,0 @@
-3.0.5
\ No newline at end of file
diff --git a/WebKitTools/Drosera/win/Drosera.vcproj/VERSION b/WebKitTools/Drosera/win/Drosera.vcproj/VERSION
deleted file mode 100644 (file)
index 642ea6f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-525
diff --git a/WebKitTools/Drosera/win/Drosera.vcproj/auto-version.sh b/WebKitTools/Drosera/win/Drosera.vcproj/auto-version.sh
deleted file mode 100644 (file)
index a2c6d2c..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/bash
-
-# Copyright (C) 2007 Apple Inc.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-SRCPATH=`cygpath -u "$1"`
-VERSIONPATH=`cygpath -u "$2"`
-VERSIONPATH=$VERSIONPATH/include
-VERSIONFILE=$VERSIONPATH/autoversion.h
-mkdir -p "$VERSIONPATH"
-
-PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"`
-MAJORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/' "$SRCPATH/PRODUCTVERSION"`
-MINORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/' "$SRCPATH/PRODUCTVERSION"`
-TINYVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/' "$SRCPATH/PRODUCTVERSION"`
-if [ "$TINYVERSION" == "" ]; then
-    TINYVERSION=0
-fi
-
-if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
-    echo -n `cat "$SRCPATH/VERSION"` > "$VERSIONFILE"
-else
-    echo -n $RC_PROJECTSOURCEVERSION > "$VERSIONFILE"
-fi
-
-if [ `grep -c -E "4\.|4$" "$VERSIONFILE"` -ne 0 ]; then
-    echo "Can't set WebKit's version to something that ends in a 4!"
-    echo "If we do, someone's going to think it's Netscape 4."
-    echo "Radar bug 3787996 has some details."
-    exit 1
-fi
-
-BLDMAJORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/' "$VERSIONFILE"`
-BLDMINORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/' "$VERSIONFILE"`
-BLDVARIANTVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/' "$VERSIONFILE"`
-if [ "$BLDMINORVERSION" == "" ]; then
-    BLDMINORVERSION=0
-fi
-if [ "$BLDVARIANTVERSION" == "" ]; then
-    BLDVARIANTVERSION=0
-fi
-SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'`
-
-BLDNMBR=`cat "$VERSIONFILE"`
-BLDNMBRSHORT=`cat "$VERSIONFILE"`
-BUILDER=""
-
-if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
-    echo -n "+" >> "$VERSIONFILE"
-    BLDNMBRSHORT=`cat "$VERSIONFILE"`
-    echo -n " " >> "$VERSIONFILE"
-    echo -n `whoami` >> "$VERSIONFILE"
-    echo -n " - " >> "$VERSIONFILE"
-    echo -n `date` >> "$VERSIONFILE"
-    echo -n " - r$SVNOPENSOURCEREVISION" >> "$VERSIONFILE"
-    BLDNMBR=`cat "$VERSIONFILE"`
-fi
-
-echo -n '#define __VERSION_TEXT__ "' > "$VERSIONFILE"
-echo -n $PRODUCTVERSION >> "$VERSIONFILE"
-echo -n " (" >> "$VERSIONFILE"
-echo -n $BLDNMBR >> "$VERSIONFILE"
-echo ')"' >> "$VERSIONFILE"
-echo -n '#define __BUILD_NUMBER_SHORT__ "' >> "$VERSIONFILE"
-echo -n $BLDNMBRSHORT >> "$VERSIONFILE"
-echo '"' >> "$VERSIONFILE"
-
-echo -n '#define __VERSION_MAJOR__ ' >> "$VERSIONFILE"
-echo $MAJORVERSION >> "$VERSIONFILE"
-echo -n '#define __VERSION_MINOR__ ' >> "$VERSIONFILE"
-echo $MINORVERSION >> "$VERSIONFILE"
-echo -n '#define __VERSION_TINY__ ' >> "$VERSIONFILE"
-echo $TINYVERSION >> "$VERSIONFILE"
-
-echo -n '#define __BUILD_NUMBER_MAJOR__ ' >> "$VERSIONFILE"
-echo $BLDMAJORVERSION >> "$VERSIONFILE"
-echo -n '#define __BUILD_NUMBER_MINOR__ ' >> "$VERSIONFILE"
-echo $BLDMINORVERSION >> "$VERSIONFILE"
-echo -n '#define __BUILD_NUMBER_VARIANT__ ' >> "$VERSIONFILE"
-echo $BLDVARIANTVERSION >> "$VERSIONFILE"
-
-echo -n '#define __SVN_REVISION__ ' >> "$VERSIONFILE"
-echo $SVNREVISION >> "$VERSIONFILE"
diff --git a/WebKitTools/Drosera/win/Drosera.vcproj/debug.vsprops b/WebKitTools/Drosera/win/Drosera.vcproj/debug.vsprops
deleted file mode 100644 (file)
index 301c1eb..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioPropertySheet\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="debug"\r
-       >\r
-       <UserMacro\r
-               Name="WebKitConfigSuffix"\r
-               Value="_debug"\r
-       />\r
-       <UserMacro\r
-               Name="LibraryConfigSuffix"\r
-               Value=""\r
-       />\r
-       <UserMacro\r
-               Name="WebKitDLLConfigSuffix"\r
-               Value=""\r
-       />\r
-</VisualStudioPropertySheet>\r
diff --git a/WebKitTools/Drosera/win/Drosera.vcproj/debug_internal.vsprops b/WebKitTools/Drosera/win/Drosera.vcproj/debug_internal.vsprops
deleted file mode 100644 (file)
index 5fb3e51..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioPropertySheet\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="debug_internal"\r
-       >\r
-       <UserMacro\r
-               Name="WebKitConfigSuffix"\r
-               Value="_debug"\r
-       />\r
-       <UserMacro\r
-               Name="LibraryConfigSuffix"\r
-               Value="_debug"\r
-       />\r
-       <UserMacro\r
-               Name="WebKitDLLConfigSuffix"\r
-               Value="_debug"\r
-       />\r
-</VisualStudioPropertySheet>\r
diff --git a/WebKitTools/Drosera/win/Drosera.vcproj/release.vsprops b/WebKitTools/Drosera/win/Drosera.vcproj/release.vsprops
deleted file mode 100644 (file)
index eb0f463..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioPropertySheet\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="release"\r
-       >\r
-       <UserMacro\r
-               Name="WebKitConfigSuffix"\r
-               Value=""\r
-       />\r
-       <UserMacro\r
-               Name="LibraryConfigSuffix"\r
-               Value=""\r
-       />\r
-       <UserMacro\r
-               Name="WebKitDLLConfigSuffix"\r
-               Value=""\r
-       />\r
-</VisualStudioPropertySheet>\r
index e10eed7..7982356 100644 (file)
@@ -20,7 +20,7 @@
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets=".\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets=".\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets=".\debug_internal.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
index 613b285..254f68d 100644 (file)
@@ -20,7 +20,7 @@
                        OutputDirectory="$(WebKitOutputDir)\bin\TestNetscapePlugin$(WebKitConfigSuffix)"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\debug.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                        OutputDirectory="$(WebKitOutputDir)\bin\TestNetscapePlugin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\release.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
diff --git a/WebKitTools/DumpRenderTree/win/debug.vsprops b/WebKitTools/DumpRenderTree/win/debug.vsprops
deleted file mode 100644 (file)
index f249d8a..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="debug"
-       >
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value="_debug"
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value=""
-       />
-       <UserMacro
-               Name="WebKitDLLConfigSuffix"
-               Value=""
-       />
-</VisualStudioPropertySheet>
diff --git a/WebKitTools/DumpRenderTree/win/debug_internal.vsprops b/WebKitTools/DumpRenderTree/win/debug_internal.vsprops
deleted file mode 100644 (file)
index 9517fdb..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="debug_internal"
-       >
-       <Tool
-               Name="VCCLCompilerTool"
-               PreprocessorDefinitions="DEBUG_WEBKIT_HAS_SUFFIX"
-       />
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value="_debug"
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value="_debug"
-       />
-       <UserMacro
-               Name="WebKitDLLConfigSuffix"
-               Value="_debug"
-       />
-</VisualStudioPropertySheet>
diff --git a/WebKitTools/DumpRenderTree/win/release.vsprops b/WebKitTools/DumpRenderTree/win/release.vsprops
deleted file mode 100644 (file)
index 3916464..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="release"
-       >
-       <UserMacro
-               Name="WebKitConfigSuffix"
-               Value=""
-       />
-       <UserMacro
-               Name="LibraryConfigSuffix"
-               Value=""
-       />
-       <UserMacro
-               Name="WebKitDLLConfigSuffix"
-               Value=""
-       />
-</VisualStudioPropertySheet>