aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg-test/binarycaching.cpp28
-rw-r--r--toolsrc/src/vcpkg-test/manifests.cpp1
-rw-r--r--toolsrc/src/vcpkg.cpp1
-rw-r--r--toolsrc/src/vcpkg/vcpkgcmdarguments.cpp77
4 files changed, 50 insertions, 57 deletions
diff --git a/toolsrc/src/vcpkg-test/binarycaching.cpp b/toolsrc/src/vcpkg-test/binarycaching.cpp
index 3cede064c..8a1a28d23 100644
--- a/toolsrc/src/vcpkg-test/binarycaching.cpp
+++ b/toolsrc/src/vcpkg-test/binarycaching.cpp
@@ -58,7 +58,11 @@ TEST_CASE ("generate_nuspec", "[generate_nuspec]")
{
auto& fsWrapper = Files::get_real_filesystem();
VcpkgCmdArguments args = VcpkgCmdArguments::create_from_arg_sequence(nullptr, nullptr);
+ args.imbue_from_environment();
args.packages_root_dir = std::make_unique<std::string>("/");
+ auto pkgPath = fsWrapper.absolute(VCPKG_LINE_INFO, fs::u8path("/zlib2_x64-windows")) / fs::u8path("**");
+ pkgPath.make_preferred();
+ const auto pkgPathStr = fs::u8string(pkgPath);
VcpkgPaths paths(fsWrapper, args);
auto pghs = Paragraphs::parse_paragraphs(R"(
@@ -101,11 +105,6 @@ Build-Depends: bzip
{
auto nuspec = generate_nuspec(paths, ipa, ref, {});
-#ifdef _WIN32
-#define PKGPATH "C:\\zlib2_x64-windows\\**"
-#else
-#define PKGPATH "/zlib2_x64-windows/**"
-#endif
std::string expected = R"(<package>
<metadata>
<id>zlib2_x64-windows</id>
@@ -125,7 +124,8 @@ Dependencies:
</description>
<packageTypes><packageType name="vcpkg"/></packageTypes>
</metadata>
- <files><file src=")" PKGPATH R"(" target=""/></files>
+ <files><file src=")" + pkgPathStr +
+ R"(" target=""/></files>
</package>
)";
REQUIRE_EQUAL_TEXT(nuspec, expected);
@@ -133,11 +133,6 @@ Dependencies:
{
auto nuspec = generate_nuspec(paths, ipa, ref, {"urlvalue"});
-#ifdef _WIN32
-#define PKGPATH "C:\\zlib2_x64-windows\\**"
-#else
-#define PKGPATH "/zlib2_x64-windows/**"
-#endif
std::string expected = R"(<package>
<metadata>
<id>zlib2_x64-windows</id>
@@ -158,18 +153,14 @@ Dependencies:
<packageTypes><packageType name="vcpkg"/></packageTypes>
<repository type="git" url="urlvalue"/>
</metadata>
- <files><file src=")" PKGPATH R"(" target=""/></files>
+ <files><file src=")" + pkgPathStr +
+ R"(" target=""/></files>
</package>
)";
REQUIRE_EQUAL_TEXT(nuspec, expected);
}
{
auto nuspec = generate_nuspec(paths, ipa, ref, {"urlvalue", "branchvalue", "commitvalue"});
-#ifdef _WIN32
-#define PKGPATH "C:\\zlib2_x64-windows\\**"
-#else
-#define PKGPATH "/zlib2_x64-windows/**"
-#endif
std::string expected = R"(<package>
<metadata>
<id>zlib2_x64-windows</id>
@@ -190,7 +181,8 @@ Dependencies:
<packageTypes><packageType name="vcpkg"/></packageTypes>
<repository type="git" url="urlvalue" branch="branchvalue" commit="commitvalue"/>
</metadata>
- <files><file src=")" PKGPATH R"(" target=""/></files>
+ <files><file src=")" + pkgPathStr +
+ R"(" target=""/></files>
</package>
)";
REQUIRE_EQUAL_TEXT(nuspec, expected);
diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp
index 7cf92818e..bbbe0c96c 100644
--- a/toolsrc/src/vcpkg-test/manifests.cpp
+++ b/toolsrc/src/vcpkg-test/manifests.cpp
@@ -681,6 +681,7 @@ TEST_CASE ("Serialize all the ports", "[manifests]")
std::vector<std::string> args_list = {"format-manifest"};
auto& fs = Files::get_real_filesystem();
auto args = VcpkgCmdArguments::create_from_arg_sequence(args_list.data(), args_list.data() + args_list.size());
+ args.imbue_from_environment();
VcpkgPaths paths{fs, args};
std::vector<SourceControlFile> scfs;
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index ccc951f10..f25a0c3b6 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -226,6 +226,7 @@ int main(const int argc, const char* const* const argv)
VcpkgCmdArguments args = VcpkgCmdArguments::create_from_command_line(fs, argc, argv);
if (const auto p = args.debug.get()) Debug::g_debugging = *p;
args.imbue_from_environment();
+ VcpkgCmdArguments::imbue_or_apply_process_recursion(args);
args.check_feature_flag_consistency();
{
diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
index e5e8e5aad..6ac05e538 100644
--- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
+++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
@@ -648,13 +648,6 @@ namespace vcpkg
void VcpkgCmdArguments::imbue_from_environment()
{
- static bool s_reentrancy_guard = false;
- Checks::check_exit(VCPKG_LINE_INFO,
- !s_reentrancy_guard,
- "VcpkgCmdArguments::imbue_from_environment() modifies global state and thus may only be "
- "called once per process.");
- s_reentrancy_guard = true;
-
if (!disable_metrics)
{
const auto vcpkg_disable_metrics_env = System::get_environment_variable(DISABLE_METRICS_ENV);
@@ -701,46 +694,52 @@ namespace vcpkg
parse_feature_flags(flags, *this);
}
}
+ }
- {
- auto maybe_vcpkg_recursive_data = System::get_environment_variable(RECURSIVE_DATA_ENV);
- if (auto vcpkg_recursive_data = maybe_vcpkg_recursive_data.get())
- {
- m_is_recursive_invocation = true;
-
- auto rec_doc = Json::parse(*vcpkg_recursive_data).value_or_exit(VCPKG_LINE_INFO).first;
- const auto& obj = rec_doc.object();
-
- if (auto entry = obj.get(DOWNLOADS_ROOT_DIR_ENV))
- {
- downloads_root_dir = std::make_unique<std::string>(entry->string().to_string());
- }
+ void VcpkgCmdArguments::imbue_or_apply_process_recursion(VcpkgCmdArguments& args)
+ {
+ static bool s_reentrancy_guard = false;
+ Checks::check_exit(
+ VCPKG_LINE_INFO,
+ !s_reentrancy_guard,
+ "VcpkgCmdArguments::imbue_or_apply_process_recursion() modifies global state and thus may only be "
+ "called once per process.");
+ s_reentrancy_guard = true;
- if (obj.get(DISABLE_METRICS_ENV))
- {
- disable_metrics = true;
- }
+ auto maybe_vcpkg_recursive_data = System::get_environment_variable(RECURSIVE_DATA_ENV);
+ if (auto vcpkg_recursive_data = maybe_vcpkg_recursive_data.get())
+ {
+ auto rec_doc = Json::parse(*vcpkg_recursive_data).value_or_exit(VCPKG_LINE_INFO).first;
+ const auto& obj = rec_doc.object();
- // Setting the recursive data to 'poison' prevents more than one level of recursion because
- // Json::parse() will fail.
- System::set_environment_variable(RECURSIVE_DATA_ENV, "poison");
+ if (auto entry = obj.get(DOWNLOADS_ROOT_DIR_ENV))
+ {
+ args.downloads_root_dir = std::make_unique<std::string>(entry->string().to_string());
}
- else
+
+ if (obj.get(DISABLE_METRICS_ENV))
{
- Json::Object obj;
- if (downloads_root_dir)
- {
- obj.insert(DOWNLOADS_ROOT_DIR_ENV, Json::Value::string(*downloads_root_dir.get()));
- }
+ args.disable_metrics = true;
+ }
- if (disable_metrics)
- {
- obj.insert(DISABLE_METRICS_ENV, Json::Value::boolean(true));
- }
+ // Setting the recursive data to 'poison' prevents more than one level of recursion because
+ // Json::parse() will fail.
+ System::set_environment_variable(RECURSIVE_DATA_ENV, "poison");
+ }
+ else
+ {
+ Json::Object obj;
+ if (args.downloads_root_dir)
+ {
+ obj.insert(DOWNLOADS_ROOT_DIR_ENV, Json::Value::string(*args.downloads_root_dir.get()));
+ }
- System::set_environment_variable(RECURSIVE_DATA_ENV,
- Json::stringify(obj, Json::JsonStyle::with_spaces(0)));
+ if (args.disable_metrics)
+ {
+ obj.insert(DISABLE_METRICS_ENV, Json::Value::boolean(true));
}
+
+ System::set_environment_variable(RECURSIVE_DATA_ENV, Json::stringify(obj, Json::JsonStyle::with_spaces(0)));
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-08 04:15:58 +0000