3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-29 03:34:26 +08:00
Code Issues Projects Releases Wiki Activity

[building] Parse SourceParagraph at the start of the build

Browse Source
This commit is contained in:
Alexander Karatarakis 2016-11-02 19:30:53 -07:00
parent ce890f9799
commit 1fa0555695
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolsrc/src/commands_installation.cpp
View File

@ -11,17 +11,19 @@
namespace vcpkg
{
static void create_binary_control_file(const vcpkg_paths& paths, const fs::path& port_dir, const triplet& target_triplet)
static void create_binary_control_file(const vcpkg_paths& paths, const SourceParagraph& source_paragraph, const triplet& target_triplet)
{
auto pghs = get_paragraphs(port_dir / "CONTROL");
Checks::check_exit(pghs.size() == 1, "Error: invalid control file");
auto bpgh = BinaryParagraph(SourceParagraph(pghs[0]), target_triplet);
auto bpgh = BinaryParagraph(source_paragraph, target_triplet);
const fs::path binary_control_file = paths.packages / bpgh.dir() / "CONTROL";
std::ofstream(binary_control_file) << bpgh;
}
static void build_internal(const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir)
{
auto pghs = get_paragraphs(port_dir / "CONTROL");
Checks::check_exit(pghs.size() == 1, "Error: invalid control file");
SourceParagraph source_paragraph(pghs[0]);
const fs::path ports_cmake_script_path = paths.ports_cmake;
auto&& target_triplet = spec.target_triplet();
const std::wstring command = Strings::wformat(LR"("%%VS140COMNTOOLS%%..\..\VC\vcvarsall.bat" %s && cmake -DCMD=BUILD -DPORT=%s -DTARGET_TRIPLET=%s "-DCURRENT_PORT_DIR=%s/." -P "%s")",
@ -54,7 +56,7 @@ namespace vcpkg
perform_all_checks(spec, paths);
create_binary_control_file(paths, port_dir, target_triplet);
create_binary_control_file(paths, source_paragraph, target_triplet);
// const fs::path port_buildtrees_dir = paths.buildtrees / spec.name;
// delete_directory(port_buildtrees_dir);