From e0e3f6ac21d074b0c043e9d6a2aff769930f07a7 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Mon, 23 Jan 2017 16:15:30 -0800
Subject: [VS2017] Add function to get vcvarsall.bat

---
 toolsrc/include/vcpkg_Environment.h |  2 ++
 toolsrc/src/vcpkg_Environment.cpp   | 39 +++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/toolsrc/include/vcpkg_Environment.h b/toolsrc/include/vcpkg_Environment.h
index 64b2315b9..9161f7ce5 100644
--- a/toolsrc/include/vcpkg_Environment.h
+++ b/toolsrc/include/vcpkg_Environment.h
@@ -16,4 +16,6 @@ namespace vcpkg::Environment
     }
 
     const fs::path& get_dumpbin_exe(const vcpkg_paths& paths);
+
+    const fs::path& get_vcvarsall_bat(const vcpkg_paths& paths);
 }
diff --git a/toolsrc/src/vcpkg_Environment.cpp b/toolsrc/src/vcpkg_Environment.cpp
index 3efcfb872..54541bd45 100644
--- a/toolsrc/src/vcpkg_Environment.cpp
+++ b/toolsrc/src/vcpkg_Environment.cpp
@@ -158,4 +158,43 @@ namespace vcpkg::Environment
         static const fs::path dumpbin_exe = find_dumpbin_exe(paths);
         return dumpbin_exe;
     }
+
+    static fs::path find_vcvarsall_bat(const vcpkg_paths& paths)
+    {
+        const std::vector<std::string> vs2017_installation_instances = get_VS2017_installation_instances(paths);
+        std::vector<fs::path> paths_examined;
+
+        // VS2017
+        for (const fs::path& instance : vs2017_installation_instances)
+        {
+            const fs::path vcvarsall_bat = instance / "VC" / "Auxiliary" / "Build" / "vcvarsall.bat";
+            paths_examined.push_back(vcvarsall_bat);
+            if (fs::exists(vcvarsall_bat))
+            {
+                return vcvarsall_bat;
+            }
+        }
+
+        // VS2015
+        const fs::path vs2015_vcvarsall_bat = get_VS2015_installation_instance() / "VC" / "vcvarsall.bat";
+        paths_examined.push_back(vs2015_vcvarsall_bat);
+        if (fs::exists(vs2015_vcvarsall_bat))
+        {
+            return vs2015_vcvarsall_bat;
+        }
+
+        System::println(System::color::error, "Could not detect vccarsall.bat.");
+        System::println("The following paths were examined:");
+        for (const fs::path& path : paths_examined)
+        {
+            System::println(path.generic_string());
+        }
+        exit(EXIT_FAILURE);
+    }
+
+    const fs::path& get_vcvarsall_bat(const vcpkg_paths& paths)
+    {
+        static const fs::path vcvarsall_bat = find_vcvarsall_bat(paths);
+        return vcvarsall_bat;
+    }
 }
-- 
cgit v1.2.3