Update build files to use PSDK 6.1 (platformsdk_win2008_6_1). This is necessary for

dynamic font support.

This is a re-run of http://codereview.chromium.org/14908/show (except that chrome_dll.deps file which needs to be updated along with the actual code change)

This will be followed by http://codereview.chromium.org/16494 (actual webkit code change) and changes in webkit/build

BUG=1303


Review URL: http://codereview.chromium.org/16496

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7520 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 10 insertions, 12 deletions

diff --git a/build/SConscript.main b/build/SConscript.main
index 1b70f11..5e4be8a 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -269,16 +269,16 @@ else:
 visual_studio_path = msvs_drive + ':/Program Files/Microsoft Visual Studio 8'
 
 # If side-by-side platform sdk is not available try local copy.
-platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0/files'
+platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_win2008_6_1/files'
 if (root_env['PLATFORM'] in ['win32', 'cygwin'] and
     not os.path.exists(windows_env.subst(platform_sdk_path))):
   platform_sdk_path = (
-      msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.0')
+      msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.1')
 
 windows_env.Replace(
     CSCRIPT = 'c:\\Windows\\System32\\cscript',
 
-    PLATFORMSDK_VISTA = platform_sdk_path,
+    PLATFORMSDK_6_1 = platform_sdk_path,
     VISUAL_STUDIO = visual_studio_path,
 
     CYGWIN_DIR = windows_env.Dir('$CHROME_SRC_DIR/third_party/cygwin'),
diff --git a/build/internal/essential.scons b/build/internal/essential.scons
index 547f73a..389ae35 100644
--- a/build/internal/essential.scons
+++ b/build/internal/essential.scons
@@ -46,8 +46,7 @@ if env.Bit('windows'):
           ('_HAS_TR1', 0),
       ],
       CPPPATH = [
-          '$PLATFORMSDK_VISTA/Include',
-          '$PLATFORMSDK_VISTA/VC/INCLUDE',
+          '$PLATFORMSDK_6_1/Include',
           '$VISUAL_STUDIO/VC/atlmfc/include',
       ],
       CCFLAGS = [
@@ -76,8 +75,7 @@ if env.Bit('windows'):
           '/wd4819',
       ],
       LIBPATH = [
-          '$PLATFORMSDK_VISTA/Lib',
-          '$PLATFORMSDK_VISTA/VC/LIB',
+          '$PLATFORMSDK_6_1/Lib',
           '$VISUAL_STUDIO/VC/atlmfc/lib',
       ],
       LIBS = [
diff --git a/build/internal/essential.vsprops b/build/internal/essential.vsprops
index 0537f85..2fcc472 100644
--- a/build/internal/essential.vsprops
+++ b/build/internal/essential.vsprops
@@ -56,7 +56,7 @@
 	/>
 	<UserMacro
 		Name="SDK"
-		Value="$(SolutionDir)..\third_party\platformsdk_vista_6_0\files"
+		Value="$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files"
 	/>
 	<UserMacro
 		Name="SDKIncludes"
diff --git a/sandbox/wow_helper/wow_helper.vcproj b/sandbox/wow_helper/wow_helper.vcproj
index 7a2d8c6..5482fbd 100644
--- a/sandbox/wow_helper/wow_helper.vcproj
+++ b/sandbox/wow_helper/wow_helper.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\Include;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\VC\INCLUDE;$(VSInstallDir)\VC\atlmfc\include"
+				AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include"
 				PreprocessorDefinitions="_WIN32_WINNT=0x0501;WINVER=0x0501;WIN32;_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
@@ -120,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\Include;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\VC\INCLUDE;$(VSInstallDir)\VC\atlmfc\include"
+				AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include"
 				PreprocessorDefinitions="_WIN32_WINNT=0x0501;WINVER=0x0501;WIN32;NDEBUG"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
diff --git a/tools/memory_watcher/scripts/memtrace.pl b/tools/memory_watcher/scripts/memtrace.pl
index 64ad966..3c014d0 100644
--- a/tools/memory_watcher/scripts/memtrace.pl
+++ b/tools/memory_watcher/scripts/memtrace.pl
@@ -101,7 +101,7 @@ sub process_raw($) {
       if ($filename =~ m/microsoft visual studio 8/) {
         next;
       }
-      if ($filename =~ m/platformsdk_vista_6_0/) {
+      if ($filename =~ m/platformsdk_win2008_6_1/) {
         next;
       }
       if ($location_blame eq "") {
diff --git a/tools/purify/purify_message.py b/tools/purify/purify_message.py
index be1b58d..9ff107f 100644
--- a/tools/purify/purify_message.py
+++ b/tools/purify/purify_message.py
@@ -117,7 +117,7 @@ class Stack:
   # if functions match the following, elide them from the stack
   pat_func_elide = (re.compile('^std::'), re.compile('^new\('))
   # if files match the following, elide them from the stack
-  pat_file_elide = (re.compile('.*platformsdk_vista.*'), 
+  pat_file_elide = (re.compile('.*platformsdk_win2008.*'), 
                     re.compile('.*.(dll|DLL)$'),
                     # bug 1069902
                     re.compile('webkit/pending/wtf/fastmalloc\.h'),