From fa1867f391ba5ec83cfbdda103b5770564bd1ce6 Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@8873c55e-713a-0410-88f8-23d9c3d90b1b>
Date: Fri, 18 Sep 2009 12:10:33 +0000
Subject: [PATCH] Fix googleurl to use icu version-agnostic directory.

Adds text files as item in the projects.
Review URL: http://codereview.chromium.org/214013

git-svn-id: http://google-url.googlecode.com/svn/trunk@117 8873c55e-713a-0410-88f8-23d9c3d90b1b
---
 build/README.txt                                   | 2 ++
 build/base.vcproj                                  | 8 ++++++--
 build/googleurl.sln                                | 6 ++++++
 build/googleurl.vcproj                             | 8 ++++++--
 third_party/{icu38 => icu}/build/using_icu.vsprops | 2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)
 rename third_party/{icu38 => icu}/build/using_icu.vsprops (73%)

diff --git a/build/README.txt b/build/README.txt
index 81a47dc..eab011a 100644
--- a/build/README.txt
+++ b/build/README.txt
@@ -1,2 +1,4 @@
 This directory includes solution and project files for compiling with
 Visual Studio 2005 on Windows.
+
+The base checkout directory must be named 'googleurl'.
diff --git a/build/base.vcproj b/build/base.vcproj
index 80a89dc..0e923cf 100644
--- a/build/base.vcproj
+++ b/build/base.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)../third_party/icu38/build/using_icu.vsprops"
+			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)../third_party/icu/build/using_icu.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -69,7 +69,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)../third_party/icu38/build/using_icu.vsprops"
+			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)../third_party/icu/build/using_icu.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -134,6 +134,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\base\README.txt"
+			>
+		</File>
+		<File
 			RelativePath="..\base\scoped_ptr.h"
 			>
 		</File>
diff --git a/build/googleurl.sln b/build/googleurl.sln
index 80db0e8..347810d 100644
--- a/build/googleurl.sln
+++ b/build/googleurl.sln
@@ -5,6 +5,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googleurl", "googleurl.vcpr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "base.vcproj", "{ACAC8E18-F003-4881-9BA0-C7718AC5FFD5}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D8E84C85-89D3-4B8D-9A3A-C44B63C3383A}"
+	ProjectSection(SolutionItems) = preProject
+		..\LICENSE.txt = ..\LICENSE.txt
+		..\README.txt = ..\README.txt
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
diff --git a/build/googleurl.vcproj b/build/googleurl.vcproj
index b5773cf..71b3123 100644
--- a/build/googleurl.vcproj
+++ b/build/googleurl.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)../third_party/icu38/build/using_icu.vsprops"
+			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)../third_party/icu/build/using_icu.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -69,7 +69,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)../third_party/icu38/build/using_icu.vsprops"
+			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)../third_party/icu/build/using_icu.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -130,6 +130,10 @@
 			>
 		</File>
 		<File
+			RelativePath=".\README.txt"
+			>
+		</File>
+		<File
 			RelativePath="..\src\url_canon.h"
 			>
 		</File>
diff --git a/third_party/icu38/build/using_icu.vsprops b/third_party/icu/build/using_icu.vsprops
similarity index 73%
rename from third_party/icu38/build/using_icu.vsprops
rename to third_party/icu/build/using_icu.vsprops
index 266d990..a3989ef 100644
--- a/third_party/icu38/build/using_icu.vsprops
+++ b/third_party/icu/build/using_icu.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\third_party\icu38\public\common&quot;;&quot;$(SolutionDir)..\..\third_party\icu38\public\i18n&quot;"
+		AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\third_party\icu\public\common&quot;;&quot;$(SolutionDir)..\..\third_party\icu\public\i18n&quot;"
 	/>
 </VisualStudioPropertySheet>
-- 
2.11.4.GIT