Better build scripts for VS2017 and VS2015 support

diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 86907e1..ec7067c 100644 (file)
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -20,7 +20,8 @@ declare_args() {
     }
   }
 
-  msvc = 2015
+  msvc = 2017
+  run_vcvars = true
 
   extra_asmflags = []
   extra_cflags = []
@@ -37,11 +38,10 @@ declare_args() {
   }
 }
 declare_args() {
-  if (msvc == 2015) {
-    windk = "C:/Program Files (x86)/Microsoft Visual Studio 14.0"
-  } else {
-    windk = "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional"
-  }
+  windk = exec_script("find_windk.py", [ "$msvc" ], "trim string")
+}
+declare_args() {
+  msvc_root = exec_script("find_msvc_root.py", [ "$msvc", windk ], "trim string")
 }
 
 if (host_os == "win") {
@@ -99,51 +99,35 @@ config("default") {
       "WIN32_LEAN_AND_MEAN",
       "NOMINMAX",
     ]
-    if (is_winrt) {
-      include_dirs = [
-        "$windk/VC/include",
 
-        "$windk/../Windows Kits/10/Include/10.0.10240.0/ucrt",
-        "$windk/../Windows Kits/10/Include/10.0.10240.0/um",
-        "$windk/../Windows Kits/10/Include/10.0.10240.0/shared",
-        "$windk/../Windows Kits/10/Include/10.0.10240.0/winrt",
-      ]
-      lib_dirs = [
-        "$windk/../Windows Kits\10\lib\10.0.10240.0\ucrt\$target_cpu",
-        "$windk/../Windows Kits\10\lib\10.0.10240.0\um\$target_cpu",
-      ]
-    } else {
-      include_dirs = [
-        "$windk/VC/include",
-    
-        # For local builds.
-        "$windk/../Windows Kits/10/Include/10.0.10150.0/ucrt",
-        "$windk/../Windows Kits/8.1/Include/shared",
-        "$windk/../Windows Kits/8.1/Include/um",
-        "$windk/../Windows Kits/8.1/Include/winrt",
-    
-        # For builds using win_toolchain asset.
-        "$windk/win_sdk/Include/10.0.14393.0/shared",
-        "$windk/win_sdk/Include/10.0.14393.0/ucrt",
-        "$windk/win_sdk/Include/10.0.14393.0/um",
-        "$windk/win_sdk/Include/10.0.14393.0/winrt",
-      ]
-      lib_dirs = [
-        # For local builds.
-        "$windk/../Windows Kits/10/Lib/10.0.10150.0/ucrt/$target_cpu",
-        "$windk/../Windows Kits/8.1/Lib/winv6.3/um/$target_cpu",
-    
-        # For builds using win_toolchain asset.
-        "$windk/win_sdk/Lib/10.0.14393.0/ucrt/$target_cpu",
-        "$windk/win_sdk/Lib/10.0.14393.0/um/$target_cpu",
-      ]
+    include_dirs = [ ]
+    lib_dirs = [ ]
+    if (msvc == 2015) {
+      win_kits = "$windk/../Windows Kits"
+    } else if (msvc == 2017) {
+      win_kits = "$windk/../../../Windows Kits"
     }
-    if (target_cpu == "x86") {
-      lib_dirs += [ "$windk/VC/lib" ]
-    } else if (target_cpu == "arm") {
-      lib_dirs += [ "$windk/VC/lib/arm" ]
-    } else {
-      lib_dirs += [ "$windk/VC/lib/amd64" ]
+    include_dirs += [
+      "$msvc_root/include",
+      "$win_kits/10/Include/10.0.10240.0/ucrt",
+      "$win_kits/10/Include/10.0.10240.0/um",
+      "$win_kits/10/Include/10.0.10240.0/shared",
+      "$win_kits/10/Include/10.0.10240.0/winrt",
+    ]
+    lib_dirs += [
+      "$win_kits/10/lib/10.0.10240.0/ucrt/$target_cpu",
+      "$win_kits/10/lib/10.0.10240.0/um/$target_cpu",
+    ]
+    if (msvc == 2015) {
+      if (target_cpu == "x86") {
+        lib_dirs += [ "$msvc_root/lib" ]
+      } else if (target_cpu == "arm") {
+        lib_dirs += [ "$msvc_root/lib/arm" ]
+      } else {
+        lib_dirs += [ "$msvc_root/lib/amd64" ]
+      }
+    } else  if (msvc == 2017) {
+      lib_dirs += [ "$msvc_root/lib/$target_cpu" ]
     }
   } else {
     cflags += [
@@ -489,19 +473,31 @@ config("executable") {
 toolchain("msvc") {
   lib_dir_switch = "/LIBPATH:"
 
-  _target = "amd64"
   env_setup = ""
   env_setup_end = ""
   if (target_cpu != "x64") {
-    if (target_cpu == "x86") {
-      _target += "_x86"
-    } else if (target_cpu == "arm") {
-      _target += "_arm"
+    _target = "amd64_" + target_cpu
+    if (msvc == 2015) {
+      _vcvarsall = "$msvc_root/vcvarsall.bat"
+    } else if (msvc == 2017) {
+      _vcvarsall = "$msvc_root/../../../Auxiliary/Build/vcvarsall.bat"
     }
-    env_setup = "cmd /c \"\"$windk/VC/vcvarsall.bat\" $_target && "
-    env_setup_end = "\""
+    if (run_vcvars) {
+      env_setup = "cmd /c \"\"$_vcvarsall\" $_target && "
+      env_setup_end = "\""
+    } else {
+      print("Be sure to run")
+      print("\"$_vcvarsall\" $_target")
+      print("to set up your environment before running ninja.")
+    }
+  } else if (msvc == 2015) {
+    _target = "amd64"
+  }
+  if (msvc == 2015) {
+    bin = "$msvc_root/bin/$_target"
+  } else if (msvc == 2017) {
+    bin = "$msvc_root/bin/HostX64/$target_cpu"
   }
-  bin = "$windk/VC/bin/$_target"
 
   tool("asm") {
     _ml = "ml"

diff --git a/gn/find_msvc_root.py b/gn/find_msvc_root.py
new file mode 100644 (file)
index 0000000..aebb7a3
--- /dev/null
+++ b/gn/find_msvc_root.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import subprocess
+import sys
+
+msvc = int(sys.argv[1])
+windk = sys.argv[2]
+
+# for now, just assume
+vc_version = '14.11.25503'
+
+if msvc == 2015:
+  print windk + '/VC'
+else:
+  print windk + '/VC/Tools/MSVC/' + vc_version

diff --git a/gn/find_windk.py b/gn/find_windk.py
new file mode 100644 (file)
index 0000000..d90a613
--- /dev/null
+++ b/gn/find_windk.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+import sys
+
+msvc = int(sys.argv[1])
+
+editions = [
+  'Community',
+  'Professional',
+  'Enterprise',
+]
+
+if msvc == 2015:
+  # just assume it is installed to the default location
+  print 'C:/Program Files (x86)/Microsoft Visual Studio 14.0'
+else:
+  # try each of the editions
+  root = 'C:/Program Files (x86)/Microsoft Visual Studio/2017/'
+  for edition in editions:
+    if os.path.exists(root + edition):
+      print root + edition
+      sys.exit(0)
+  # fall back to the "default"
+  print 'C:/Program Files (x86)/Microsoft Visual Studio/2017/' + editions[0]