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

aroben at apple.com aroben at apple.com
Wed Dec 22 16:02:47 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 101738573c2ed8080550050ba2ac01e78e0eaf14
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 18 01:30:05 2010 +0000

    Move FindSafari's settings into a vsprops file
    
    Fixes <http://webkit.org/b/49699> FindSafari should use a vsprops file
    
    Reviewed by Steve Falkenburg.
    
    * FindSafari/FindSafari.vcproj:
    * FindSafari/FindSafariCommon.vsprops: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72265 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 86ccd65..65d3591 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,16 @@
 2010-11-17  Adam Roben  <aroben at apple.com>
 
+        Move FindSafari's settings into a vsprops file
+
+        Fixes <http://webkit.org/b/49699> FindSafari should use a vsprops file
+
+        Reviewed by Steve Falkenburg.
+
+        * FindSafari/FindSafari.vcproj:
+        * FindSafari/FindSafariCommon.vsprops: Added.
+
+2010-11-17  Adam Roben  <aroben at apple.com>
+
         Use a minimum font size of 0 in DRT on Windows
 
         This is the Windows equivalent of r72164.
diff --git a/WebKitTools/FindSafari/FindSafari.vcproj b/WebKitTools/FindSafari/FindSafari.vcproj
index 083fa4d..66f1454 100644
--- a/WebKitTools/FindSafari/FindSafari.vcproj
+++ b/WebKitTools/FindSafari/FindSafari.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="all|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;.\FindSafariCommon.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -49,9 +49,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="shlwapi.lib advapi32.lib ole32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				SubSystem="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/WebKitTools/FindSafari/FindSafariCommon.vsprops b/WebKitTools/FindSafari/FindSafariCommon.vsprops
new file mode 100644
index 0000000..738b109
--- /dev/null
+++ b/WebKitTools/FindSafari/FindSafariCommon.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="FindSafariCommon"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="shlwapi.lib advapi32.lib ole32.lib"
+		OutputFile="$(OutDir)\$(ProjectName).exe"
+		SubSystem="1"
+	/>
+</VisualStudioPropertySheet>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list