don't use VS subdir for 2013 toolchain builder

tools/win/toolchain/toolchain2013.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Extracts a Windows VS2013 toolchain from various downloadable pieces.
 
 
 from toolchain import *
 
 
@@ skipping 57 matching lines @@
       ('Windows_SDK\\'
        r'Windows Software Development Kit for Metro style Apps-x86_en-us.msi',
           False),
     ])
   return results
 
 
 def CopyToFinalLocation(extracted_dirs, target_dir):
   sys.stdout.write('Copying to final location...\n')
   mappings = {
-      'Program Files\\Microsoft Visual Studio 12.0\\': 'vs\\',
+      'Program Files\\Microsoft Visual Studio 12.0\\': '.\\',
       'Windows Kits\\8.0\\': 'win8sdk\\',
       'System64\\': 'sys64\\',
       'System\\': 'sys32\\',
   }
   matches = []
   for extracted_dir in extracted_dirs:
     for root, dirnames, filenames in os.walk(extracted_dir):
       for filename in filenames:
         matches.append((extracted_dir, os.path.join(root, filename)))
 
@@ skipping 16 matching lines @@
 
 def GenerateSetEnvCmd(target_dir, pro):
   """Generate a batch file that gyp expects to exist to set up the compiler
   environment. This is normally generated by a full install of the SDK, but we
   do it here manually since we do not do a full install."""
   with open(os.path.join(
         target_dir, r'win8sdk\bin\SetEnv.cmd'), 'w') as file:
     file.write('@echo off\n')
     file.write(':: Generated by tools\\win\\toolchain\\toolchain2013.py.\n')
     # Common to x86 and x64
-    file.write('set PATH=%~dp0..\\..\\vs\\Common7\\IDE;%PATH%\n')
+    file.write('set PATH=%~dp0..\\..\\Common7\\IDE;%PATH%\n')
     file.write('set INCLUDE=%~dp0..\\..\\win8sdk\\Include\\um;'
                '%~dp0..\\..\\win8sdk\\Include\\shared;'
-               '%~dp0..\\..\\vs\\VC\\include;'
-               '%~dp0..\\..\\vs\\VC\\atlmfc\\include\n')
+               '%~dp0..\\..\\VC\\include;'
+               '%~dp0..\\..\\VC\\atlmfc\\include\n')
     file.write('if "%1"=="/x64" goto x64\n')
 
     # x86. If we're Pro, then use the amd64_x86 cross (we don't support x86
     # host at all).
     if pro:
       file.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x86;'
-                '%~dp0..\\..\\vs\\VC\\bin\\amd64_x86;'
-                '%~dp0..\\..\\vs\\VC\\bin\\amd64;'  # Needed for mspdb120.dll.
+                '%~dp0..\\..\\VC\\bin\\amd64_x86;'
+                '%~dp0..\\..\\VC\\bin\\amd64;'  # Needed for mspdb120.dll.
                 '%PATH%\n')
     else:
       file.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x86;'
-                '%~dp0..\\..\\vs\\VC\\bin;%PATH%\n')
-    file.write('set LIB=%~dp0..\\..\\vs\\VC\\lib;'
+                '%~dp0..\\..\\VC\\bin;%PATH%\n')
+    file.write('set LIB=%~dp0..\\..\\VC\\lib;'
                '%~dp0..\\..\\win8sdk\\Lib\\win8\\um\\x86;'
-               '%~dp0..\\..\\vs\\VC\\atlmfc\\lib\n')
+               '%~dp0..\\..\\VC\\atlmfc\\lib\n')
     file.write('goto done\n')
 
     # Express does not include a native 64 bit compiler, so we have to use
     # the x86->x64 cross.
     if not pro:
       # x86->x64 cross.
       file.write(':x64\n')
       file.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x64;'
-                 '%~dp0..\\..\\vs\\VC\\bin\\x86_amd64;'
+                 '%~dp0..\\..\\VC\\bin\\x86_amd64;'
                  '%PATH%\n')
     else:
       # x64 native.
       file.write(':x64\n')
       file.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x64;'
-                 '%~dp0..\\..\\vs\\VC\\bin\\amd64;'
+                 '%~dp0..\\..\\VC\\bin\\amd64;'
                  '%PATH%\n')
-    file.write('set LIB=%~dp0..\\..\\vs\\VC\\lib\\amd64;'
+    file.write('set LIB=%~dp0..\\..\\VC\\lib\\amd64;'
                '%~dp0..\\..\\win8sdk\\Lib\\win8\\um\\x64;'
-               '%~dp0..\\..\\vs\\VC\\atlmfc\\lib\\amd64\n')
+               '%~dp0..\\..\\VC\\atlmfc\\lib\\amd64\n')
     file.write(':done\n')
 
 
 def GenerateTopLevelEnv(target_dir, pro):
   """Generate a batch file that sets up various environment variables that let
   the Chromium build files and gyp find SDKs and tools."""
   with open(os.path.join(target_dir, r'env.bat'), 'w') as file:
     file.write('@echo off\n')
     file.write(':: Generated by tools\\win\\toolchain\\toolchain2013.py.\n')
     file.write('set GYP_DEFINES=windows_sdk_path="%~dp0win8sdk" '
@@ skipping 56 matching lines @@
       "  gclient runhooks (or gclient sync if you haven't pulled deps yet)\n"
       '  ninja -C out\Debug chrome\n\n'
       'Note that this script intentionally does not modify any global\n'
       'settings like the registry, or system environment variables, so you\n'
       'will need to run the above env.bat whenever you start a new\n'
       'shell.\n\n' % target_dir)
 
 
 if __name__ == '__main__':
   main()