From 191c864927ea9e9e8788408adda4eff35d3edaf1 Mon Sep 17 00:00:00 2001
From: martin-s <webmaster@macside.net>
Date: Fri, 13 Sep 2019 06:52:52 +0000
Subject: Fix bug in `.vcpkg-root` detection that breaks `--overlay-triplets`
 (#7954)

* - Added scripts variable to ports file.
- Added check if triplet file is not available (NPE).

* - Fixed line endings.

* Provide location of .vcpkg-root to ports.cmake

* vcpkg sets VCPKG_ROOT_PATH in ports.cmake

* [vcpkg] Fail if VCPKG_ROOT_PATH is not passed from vcpkg.exe

* [vcpkg] Fix vcpkg rooth path

* [vcpkg] Make --x-scripts-root an experimental command
---
 toolsrc/VERSION.txt                     | 2 +-
 toolsrc/src/vcpkg-test/arguments.cpp    | 4 ++--
 toolsrc/src/vcpkg/build.cpp             | 1 +
 toolsrc/src/vcpkg/help.cpp              | 2 +-
 toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 8 ++++----
 toolsrc/src/vcpkg/vcpkgpaths.cpp        | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'toolsrc')

diff --git a/toolsrc/VERSION.txt b/toolsrc/VERSION.txt
index 2dc424b6c..4d402b96c 100644
--- a/toolsrc/VERSION.txt
+++ b/toolsrc/VERSION.txt
@@ -1 +1 @@
-"2019.08.27"
+"2019.09.12"
diff --git a/toolsrc/src/vcpkg-test/arguments.cpp b/toolsrc/src/vcpkg-test/arguments.cpp
index 326b07579..c63a31396 100644
--- a/toolsrc/src/vcpkg-test/arguments.cpp
+++ b/toolsrc/src/vcpkg-test/arguments.cpp
@@ -13,7 +13,7 @@ TEST_CASE ("VcpkgCmdArguments from lowercase argument sequence", "[arguments]")
 {
     std::vector<std::string> t = {"--vcpkg-root",
                                   "C:\\vcpkg",
-                                  "--scripts-root=C:\\scripts",
+                                  "--x-scripts-root=C:\\scripts",
                                   "--debug",
                                   "--sendmetrics",
                                   "--printmetrics",
@@ -45,7 +45,7 @@ TEST_CASE ("VcpkgCmdArguments from uppercase argument sequence", "[arguments]")
 {
     std::vector<std::string> t = {"--VCPKG-ROOT",
                                   "C:\\vcpkg",
-                                  "--SCRIPTS-ROOT=C:\\scripts",
+                                  "--X-SCRIPTS-ROOT=C:\\scripts",
                                   "--DEBUG",
                                   "--SENDMETRICS",
                                   "--PRINTMETRICS",
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index e5c00b929..618e4126b 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -396,6 +396,7 @@ namespace vcpkg::Build
             {"CMD", "BUILD"},
             {"PORT", config.scf.core_paragraph->name},
             {"CURRENT_PORT_DIR", config.port_dir},
+            {"VCPKG_ROOT_PATH", paths.root},
             {"TARGET_TRIPLET", triplet.canonical_name()},
             {"TARGET_TRIPLET_FILE", paths.get_triplet_file_path(triplet).u8string()},
             {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},
diff --git a/toolsrc/src/vcpkg/help.cpp b/toolsrc/src/vcpkg/help.cpp
index 48c836e63..0c53536fb 100644
--- a/toolsrc/src/vcpkg/help.cpp
+++ b/toolsrc/src/vcpkg/help.cpp
@@ -125,7 +125,7 @@ namespace vcpkg::Help
                        "                                  (default: " ENVVAR(VCPKG_ROOT) //
                        ")\n"
                        "\n"
-                       "  --scripts-root=<path>             Specify the scripts root directory\n"
+                       "  --x-scripts-root=<path>             (Experimental) Specify the scripts root directory\n"
                        "\n"
                        "  @response_file                  Specify a "
                        "response file to provide additional parameters\n"
diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
index e48340df7..5f99b85e5 100644
--- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
+++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
@@ -146,10 +146,10 @@ namespace vcpkg
                     parse_value(arg_begin, arg_end, "--vcpkg-root", args.vcpkg_root_dir);
                     continue;
                 }
-                if (Strings::starts_with(arg, "--scripts-root="))
+                if (Strings::starts_with(arg, "--x-scripts-root="))
                 {
                     parse_cojoined_value(
-                        arg.substr(sizeof("--scripts-root=") - 1), "--scripts-root", args.scripts_root_dir);
+                        arg.substr(sizeof("--x-scripts-root=") - 1), "--x-scripts-root", args.scripts_root_dir);
                     continue;
                 }
                 if (arg == "--triplet")
@@ -430,7 +430,7 @@ namespace vcpkg
                        "--vcpkg-root <path>",
                        "Specify the vcpkg directory to use instead of current directory or tool directory");
         System::printf("    %-40s %s\n",
-                       "--scripts-root=<path>",
-                       "Specify the scripts directory to use instead of default vcpkg scripts directory");
+                       "--x-scripts-root=<path>",
+                       "(Experimental) Specify the scripts directory to use instead of default vcpkg scripts directory");
     }
 }
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp
index 4f01ed03b..078121fcc 100644
--- a/toolsrc/src/vcpkg/vcpkgpaths.cpp
+++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp
@@ -76,7 +76,7 @@ namespace vcpkg
                 Checks::exit_with_message(
                     VCPKG_LINE_INFO,
                     "Invalid scripts override directory: %s; "
-                    "create that directory or unset --scripts-root to use the default scripts location.",
+                    "create that directory or unset --x-scripts-root to use the default scripts location.",
                     scripts_dir->u8string());
             }
 
-- 
cgit v1.2.3