[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[sfalken at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 7feb3610e3837c875c25c11fd351825fdeb58556
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 18 00:24:41 2010 +0000

    2010-11-17  Steve Falkenburg  <sfalken at apple.com>
    
            Reviewed by Adam Roben.
    
            WebKitLauncherWin should use vsprops for shared build settings
            https://bugs.webkit.org/show_bug.cgi?id=49696
    
            * WebKitLauncherWin/WebKitLauncherWin.vcproj:
            * WebKitLauncherWin/WebKitLauncherWinCommon.vsprops: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72261 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ae9dfd0..a2c829e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Adam Roben.
 
+        WebKitLauncherWin should use vsprops for shared build settings
+        https://bugs.webkit.org/show_bug.cgi?id=49696
+
+        * WebKitLauncherWin/WebKitLauncherWin.vcproj:
+        * WebKitLauncherWin/WebKitLauncherWinCommon.vsprops: Added.
+
+2010-11-17  Steve Falkenburg  <sfalken at apple.com>
+
+        Reviewed by Adam Roben.
+
         WinLauncher should use vsprops for shared build settings
         https://bugs.webkit.org/show_bug.cgi?id=49695
 
diff --git a/WebKitTools/WebKitLauncherWin/WebKitLauncherWin.vcproj b/WebKitTools/WebKitLauncherWin/WebKitLauncherWin.vcproj
index b552ac8..792bfb3 100644
--- a/WebKitTools/WebKitLauncherWin/WebKitLauncherWin.vcproj
+++ b/WebKitTools/WebKitLauncherWin/WebKitLauncherWin.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"
+			InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;.\WebKitLauncherWinCommon.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -50,8 +50,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="shlwapi.lib"
-				OutputFile="$(OutDir)\WebKit$(WebKitConfigSuffix).exe"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -81,7 +79,7 @@
 		<Configuration
 			Name="Release_LTCG|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"
+			InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;.\WebKitLauncherWinCommon.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -114,8 +112,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="shlwapi.lib"
-				OutputFile="$(OutDir)\WebKit$(WebKitConfigSuffix).exe"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/WebKitTools/WebKitLauncherWin/WebKitLauncherWinCommon.vsprops b/WebKitTools/WebKitLauncherWin/WebKitLauncherWinCommon.vsprops
new file mode 100644
index 0000000..b597d20
--- /dev/null
+++ b/WebKitTools/WebKitLauncherWin/WebKitLauncherWinCommon.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitLauncherWinCommon"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="shlwapi.lib"
+		OutputFile="$(OutDir)\WebKit$(WebKitConfigSuffix).exe"
+	/>
+</VisualStudioPropertySheet>

-- 
WebKit Debian packaging