The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 11:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

export: Place the nuget-specific redirect in buildsystems/tmp

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-04-26 17:22:11 -07:00
parent ddd549f0a2
commit d6d506d678
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
toolsrc/src/commands_export.cpp
View File

@ -15,7 +15,10 @@ namespace vcpkg::Commands::Export
using Dependencies::RequestType; using Dependencies::RequestType;
using Dependencies::ExportPlanType; using Dependencies::ExportPlanType;
static std::string create_nuspec_file_contents(const std::string& raw_exported_dir, const std::string& nuget_id, const std::string& nupkg_version) static std::string create_nuspec_file_contents(const std::string& raw_exported_dir,
const std::string& targets_redirect_path,
const std::string& nuget_id,
const std::string& nupkg_version)
{ {
static constexpr auto content_template = R"( static constexpr auto content_template = R"(
<package> <package>
@ -31,7 +34,7 @@ namespace vcpkg::Commands::Export
<file src="@RAW_EXPORTED_DIR@\installed\**" target="installed" /> <file src="@RAW_EXPORTED_DIR@\installed\**" target="installed" />
<file src="@RAW_EXPORTED_DIR@\scripts\**" target="scripts" /> <file src="@RAW_EXPORTED_DIR@\scripts\**" target="scripts" />
<file src="@RAW_EXPORTED_DIR@\.vcpkg-root" target="" /> <file src="@RAW_EXPORTED_DIR@\.vcpkg-root" target="" />
<file src="@RAW_EXPORTED_DIR@\vcpkg.targets" target="build\native\@NUGET_ID@.targets" /> <file src="@TARGETS_REDIRECT_PATH@" target="build\native\@NUGET_ID@.targets" />
</files> </files>
</package> </package>
)"; )";
@ -39,6 +42,7 @@ namespace vcpkg::Commands::Export
std::string nuspec_file_content = std::regex_replace(content_template, std::regex("@NUGET_ID@"), nuget_id); std::string nuspec_file_content = std::regex_replace(content_template, std::regex("@NUGET_ID@"), nuget_id);
nuspec_file_content = std::regex_replace(nuspec_file_content, std::regex("@VERSION@"), nupkg_version); nuspec_file_content = std::regex_replace(nuspec_file_content, std::regex("@VERSION@"), nupkg_version);
nuspec_file_content = std::regex_replace(nuspec_file_content, std::regex("@RAW_EXPORTED_DIR@"), raw_exported_dir); nuspec_file_content = std::regex_replace(nuspec_file_content, std::regex("@RAW_EXPORTED_DIR@"), raw_exported_dir);
nuspec_file_content = std::regex_replace(nuspec_file_content, std::regex("@TARGETS_REDIRECT_PATH@"), targets_redirect_path);
return nuspec_file_content; return nuspec_file_content;
} }
@ -104,8 +108,13 @@ namespace vcpkg::Commands::Export
Files::Filesystem& fs = paths.get_filesystem(); Files::Filesystem& fs = paths.get_filesystem();
const fs::path& nuget_exe = paths.get_nuget_exe(); const fs::path& nuget_exe = paths.get_nuget_exe();
// This file will be placed in "build\native" in the nuget package. Therefore, go up two dirs.
const std::string targets_redirect_content = create_targets_redirect("../../scripts/buildsystems/msbuild/vcpkg.targets");
const fs::path targets_redirect = paths.buildsystems / "tmp" / "vcpkg.export.nuget.targets";
fs.write_contents(targets_redirect, targets_redirect_content);
const std::string nuget_id = raw_exported_dir.filename().string(); const std::string nuget_id = raw_exported_dir.filename().string();
const std::string nuspec_file_content = create_nuspec_file_contents(raw_exported_dir.string(), nuget_id, NUPKG_VERSION); const std::string nuspec_file_content = create_nuspec_file_contents(raw_exported_dir.string(), targets_redirect.string(), nuget_id, NUPKG_VERSION);
const fs::path nuspec_file_path = paths.buildsystems / "tmp" / "vcpkg.export.nuspec"; const fs::path nuspec_file_path = paths.buildsystems / "tmp" / "vcpkg.export.nuspec";
fs.write_contents(nuspec_file_path, nuspec_file_content); fs.write_contents(nuspec_file_path, nuspec_file_content);
@ -298,12 +307,6 @@ namespace vcpkg::Commands::Export
Checks::check_exit(VCPKG_LINE_INFO, !ec); Checks::check_exit(VCPKG_LINE_INFO, !ec);
} }
// This file will be placed in "build\native" in the nuget package. Therefore, go up two dirs.
const std::string targets_redirect_content = create_targets_redirect("../../scripts/buildsystems/msbuild/vcpkg.targets");
const fs::path targets_redirect = raw_exported_dir_path / "vcpkg.targets";
fs.write_contents(targets_redirect, targets_redirect_content);
Checks::check_exit(VCPKG_LINE_INFO, !ec);
if (raw) if (raw)
{ {
System::println(System::Color::success, R"(Files exported at: "%s")", raw_exported_dir_path.generic_string()); System::println(System::Color::success, R"(Files exported at: "%s")", raw_exported_dir_path.generic_string());