mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-26 00:19:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Place build & build_external commands into separate files

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-01-12 17:03:21 -08:00
parent 9072f51d74
commit 6a4ec92a90
7 changed files with 178 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolsrc/include/vcpkg_Commands.h
View File

@ -5,6 +5,12 @@
namespace vcpkg
{
//
namespace Commands::details
{
void build_internal(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir);
}
extern const char*const INTEGRATE_COMMAND_HELPSTRING;
void print_usage();

130
toolsrc/src/commands_build.cpp Normal file
View File

@ -0,0 +1,130 @@
#include "vcpkg_Commands.h"
#include "StatusParagraphs.h"
#include "vcpkg.h"
#include "vcpkg_Input.h"
#include "post_build_lint.h"
#include "vcpkg_Dependencies.h"
#include "vcpkg_System.h"
#include "vcpkg_Environment.h"
#include "metrics.h"
#include "vcpkg_info.h"
#include <fstream>
namespace vcpkg
{
using Dependencies::package_spec_with_install_plan;
using Dependencies::install_plan_type;
static const std::string OPTION_CHECKS_ONLY = "--checks-only";
static void create_binary_control_file(const vcpkg_paths& paths, const SourceParagraph& source_paragraph, const triplet& target_triplet)
{
const BinaryParagraph bpgh = BinaryParagraph(source_paragraph, target_triplet);
const fs::path binary_control_file = paths.packages / bpgh.dir() / "CONTROL";
std::ofstream(binary_control_file) << bpgh;
}
namespace Commands::details
{
void build_internal(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir)
{
Checks::check_exit(spec.name() == source_paragraph.name, "inconsistent arguments to build_internal()");
const triplet& target_triplet = spec.target_triplet();
const fs::path ports_cmake_script_path = paths.ports_cmake;
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")",
Strings::utf8_to_utf16(target_triplet.architecture()),
Strings::utf8_to_utf16(source_paragraph.name),
Strings::utf8_to_utf16(target_triplet.canonical_name()),
port_dir.generic_wstring(),
ports_cmake_script_path.generic_wstring());
System::Stopwatch2 timer;
timer.start();
int return_code = System::cmd_execute(command);
timer.stop();
TrackMetric("buildtimeus-" + to_string(spec), timer.microseconds());
if (return_code != 0)
{
System::println(System::color::error, "Error: building package %s failed", to_string(spec));
System::println("Please ensure sure you're using the latest portfiles with `vcpkg update`, then\n"
"submit an issue at https://github.com/Microsoft/vcpkg/issues including:\n"
" Package: %s\n"
" Vcpkg version: %s\n"
"\n"
"Additionally, attach any relevant sections from the log files above."
, to_string(spec), Info::version());
TrackProperty("error", "build failed");
TrackProperty("build_error", to_string(spec));
exit(EXIT_FAILURE);
}
PostBuildLint::perform_all_checks(spec, paths);
create_binary_control_file(paths, source_paragraph, target_triplet);
// const fs::path port_buildtrees_dir = paths.buildtrees / spec.name;
// delete_directory(port_buildtrees_dir);
}
}
void build_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet)
{
static const std::string example = create_example_string("build zlib:x64-windows");
// Installing multiple packages leads to unintuitive behavior if one of them depends on another.
// Allowing only 1 package for now.
args.check_exact_arg_count(1, example);
StatusParagraphs status_db = database_load_check(paths);
const package_spec spec = Input::check_and_get_package_spec(args.command_arguments.at(0), default_target_triplet, example);
Input::check_triplet(spec.target_triplet(), paths);
const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({OPTION_CHECKS_ONLY});
if (options.find(OPTION_CHECKS_ONLY) != options.end())
{
PostBuildLint::perform_all_checks(spec, paths);
exit(EXIT_SUCCESS);
}
// Explicitly load and use the portfile's build dependencies when resolving the build command (instead of a cached package's dependencies).
const expected<SourceParagraph> maybe_spgh = try_load_port(paths, spec.name());
Checks::check_exit(!maybe_spgh.error_code(), "Could not find package named %s: %s", spec, maybe_spgh.error_code().message());
const SourceParagraph& spgh = *maybe_spgh.get();
const std::vector<std::string> first_level_deps = filter_dependencies(spgh.depends, spec.target_triplet());
std::vector<package_spec> first_level_deps_specs;
for (const std::string& dep : first_level_deps)
{
first_level_deps_specs.push_back(package_spec::from_name_and_triplet(dep, spec.target_triplet()).get_or_throw());
}
std::vector<package_spec_with_install_plan> unmet_dependencies = Dependencies::create_install_plan(paths, first_level_deps_specs, status_db);
unmet_dependencies.erase(
std::remove_if(unmet_dependencies.begin(), unmet_dependencies.end(), [](const package_spec_with_install_plan& p)
{
return p.plan.type == install_plan_type::ALREADY_INSTALLED;
}),
unmet_dependencies.end());
if (!unmet_dependencies.empty())
{
System::println(System::color::error, "The build command requires all dependencies to be already installed.");
System::println("The following dependencies are missing:");
System::println("");
for (const package_spec_with_install_plan& p : unmet_dependencies)
{
System::println(" %s", to_string(p.spec));
}
System::println("");
exit(EXIT_FAILURE);
}
Environment::ensure_utilities_on_path(paths);
Commands::details::build_internal(spgh, spec, paths, paths.port_dir(spec));
exit(EXIT_SUCCESS);
}
}

32
toolsrc/src/commands_build_external.cpp Normal file
View File

@ -0,0 +1,32 @@
#include "vcpkg_Commands.h"
#include "vcpkg_System.h"
#include "vcpkg_Environment.h"
#include "vcpkg_Input.h"
#include "vcpkg.h"
namespace vcpkg
{
void build_external_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet)
{
static const std::string example = create_example_string(R"(build_external zlib2 C:\path\to\dir\with\controlfile\)");
args.check_exact_arg_count(2, example);
expected<package_spec> maybe_current_spec = package_spec::from_string(args.command_arguments[0], default_target_triplet);
if (auto spec = maybe_current_spec.get())
{
Input::check_triplet(spec->target_triplet(), paths);
Environment::ensure_utilities_on_path(paths);
const fs::path port_dir = args.command_arguments.at(1);
const expected<SourceParagraph> maybe_spgh = try_load_port(port_dir);
if (auto spgh = maybe_spgh.get())
{
Commands::details::build_internal(*spgh, *spec, paths, port_dir);
exit(EXIT_SUCCESS);
}
}
System::println(System::color::error, "Error: %s: %s", maybe_current_spec.error_code().message(), args.command_arguments[0]);
print_example(Strings::format("%s zlib:x64-windows", args.command));
exit(EXIT_FAILURE);
}
}

2
toolsrc/src/commands_edit.cpp
View File

@ -27,7 +27,7 @@ namespace vcpkg
}
}
std::wstring cmdLine = Strings::wformat(LR"("%s" "%s" "%s")", env_EDITOR, portpath.native(), (portpath / "portfile.cmake").native());
std::wstring cmdLine = Strings::wformat(LR"("%s" "%s" "%s" -n)", env_EDITOR, portpath.native(), (portpath / "portfile.cmake").native());
exit(System::cmd_execute(cmdLine));
}
}

141
toolsrc/src/commands_installation.cpp
View File

@ -1,72 +1,17 @@
#include "vcpkg_Commands.h"
#include "vcpkg.h"
#include <fstream>
#include "vcpkg_Environment.h"
#include "metrics.h"
#include "vcpkg_Files.h"
#include "post_build_lint.h"
#include "vcpkg_System.h"
#include "vcpkg_Dependencies.h"
#include "vcpkg_Input.h"
#include "vcpkg_Maps.h"
#include "vcpkg_info.h"
namespace vcpkg
{
using Dependencies::package_spec_with_install_plan;
using Dependencies::install_plan_type;
static const std::string OPTION_CHECKS_ONLY = "--checks-only";
static void create_binary_control_file(const vcpkg_paths& paths, const SourceParagraph& source_paragraph, const triplet& target_triplet)
{
const BinaryParagraph 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 SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir)
{
Checks::check_exit(spec.name() == source_paragraph.name, "inconsistent arguments to build_internal()");
const triplet& target_triplet = spec.target_triplet();
const fs::path ports_cmake_script_path = paths.ports_cmake;
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")",
Strings::utf8_to_utf16(target_triplet.architecture()),
Strings::utf8_to_utf16(source_paragraph.name),
Strings::utf8_to_utf16(target_triplet.canonical_name()),
port_dir.generic_wstring(),
ports_cmake_script_path.generic_wstring());
System::Stopwatch2 timer;
timer.start();
int return_code = System::cmd_execute(command);
timer.stop();
TrackMetric("buildtimeus-" + to_string(spec), timer.microseconds());
if (return_code != 0)
{
System::println(System::color::error, "Error: building package %s failed", to_string(spec));
System::println("Please ensure sure you're using the latest portfiles with `vcpkg update`, then\n"
"submit an issue at https://github.com/Microsoft/vcpkg/issues including:\n"
" Package: %s\n"
" Vcpkg version: %s\n"
"\n"
"Additionally, attach any relevant sections from the log files above."
, to_string(spec), Info::version());
TrackProperty("error", "build failed");
TrackProperty("build_error", to_string(spec));
exit(EXIT_FAILURE);
}
PostBuildLint::perform_all_checks(spec, paths);
create_binary_control_file(paths, source_paragraph, target_triplet);
// const fs::path port_buildtrees_dir = paths.buildtrees / spec.name;
// delete_directory(port_buildtrees_dir);
}
static void install_and_write_listfile(const vcpkg_paths& paths, const BinaryParagraph& bpgh)
{
std::vector<std::string> output;
@ -271,7 +216,7 @@ namespace vcpkg
}
else if (action.plan.type == install_plan_type::BUILD_AND_INSTALL)
{
build_internal(*action.plan.spgh, action.spec, paths, paths.port_dir(action.spec));
Commands::details::build_internal(*action.plan.spgh, action.spec, paths, paths.port_dir(action.spec));
const BinaryParagraph bpgh = try_load_cached_package(paths, action.spec).get_or_throw();
install_package(paths, bpgh, status_db);
System::println(System::color::success, "Package %s is installed", action.spec);
@ -293,88 +238,4 @@ namespace vcpkg
exit(EXIT_SUCCESS);
}
void build_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet)
{
static const std::string example = create_example_string("build zlib:x64-windows");
// Installing multiple packages leads to unintuitive behavior if one of them depends on another.
// Allowing only 1 package for now.
args.check_exact_arg_count(1, example);
StatusParagraphs status_db = database_load_check(paths);
const package_spec spec = Input::check_and_get_package_spec(args.command_arguments.at(0), default_target_triplet, example);
Input::check_triplet(spec.target_triplet(), paths);
const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({OPTION_CHECKS_ONLY});
if (options.find(OPTION_CHECKS_ONLY) != options.end())
{
PostBuildLint::perform_all_checks(spec, paths);
exit(EXIT_SUCCESS);
}
// Explicitly load and use the portfile's build dependencies when resolving the build command (instead of a cached package's dependencies).
const expected<SourceParagraph> maybe_spgh = try_load_port(paths, spec.name());
Checks::check_exit(!maybe_spgh.error_code(), "Could not find package named %s: %s", spec, maybe_spgh.error_code().message());
const SourceParagraph& spgh = *maybe_spgh.get();
const std::vector<std::string> first_level_deps = filter_dependencies(spgh.depends, spec.target_triplet());
std::vector<package_spec> first_level_deps_specs;
for (const std::string& dep : first_level_deps)
{
first_level_deps_specs.push_back(package_spec::from_name_and_triplet(dep, spec.target_triplet()).get_or_throw());
}
std::vector<package_spec_with_install_plan> unmet_dependencies = Dependencies::create_install_plan(paths, first_level_deps_specs, status_db);
unmet_dependencies.erase(
std::remove_if(unmet_dependencies.begin(), unmet_dependencies.end(), [](const package_spec_with_install_plan& p)
{
return p.plan.type == install_plan_type::ALREADY_INSTALLED;
}),
unmet_dependencies.end());
if (!unmet_dependencies.empty())
{
System::println(System::color::error, "The build command requires all dependencies to be already installed.");
System::println("The following dependencies are missing:");
System::println("");
for (const package_spec_with_install_plan& p : unmet_dependencies)
{
System::println(" %s", to_string(p.spec));
}
System::println("");
exit(EXIT_FAILURE);
}
Environment::ensure_utilities_on_path(paths);
build_internal(spgh, spec, paths, paths.port_dir(spec));
exit(EXIT_SUCCESS);
}
void build_external_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet)
{
static const std::string example = create_example_string(R"(build_external zlib2 C:\path\to\dir\with\controlfile\)");
args.check_exact_arg_count(2, example);
expected<package_spec> maybe_current_spec = package_spec::from_string(args.command_arguments[0], default_target_triplet);
if (auto spec = maybe_current_spec.get())
{
Input::check_triplet(spec->target_triplet(), paths);
Environment::ensure_utilities_on_path(paths);
const fs::path port_dir = args.command_arguments.at(1);
const expected<SourceParagraph> maybe_spgh = try_load_port(port_dir);
if (auto spgh = maybe_spgh.get())
{
build_internal(*spgh, *spec, paths, port_dir);
exit(EXIT_SUCCESS);
}
}
System::println(System::color::error, "Error: %s: %s", maybe_current_spec.error_code().message(), args.command_arguments[0]);
print_example(Strings::format("%s zlib:x64-windows", args.command));
exit(EXIT_FAILURE);
}
}

2
toolsrc/vcpkg/vcpkg.vcxproj
View File

@ -130,6 +130,8 @@
<ItemGroup>
<ClCompile Include="..\MachineType.cpp" />
<ClCompile Include="..\src\coff_file_reader.cpp" />
<ClCompile Include="..\src\commands_build.cpp" />
<ClCompile Include="..\src\commands_build_external.cpp" />
<ClCompile Include="..\src\commands_cache.cpp" />
<ClCompile Include="..\src\commands_create.cpp" />
<ClCompile Include="..\src\commands_edit.cpp" />

6
toolsrc/vcpkg/vcpkg.vcxproj.filters
View File

@ -84,6 +84,12 @@
<ClCompile Include="..\src\commands_portsdiff.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\commands_build_external.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\commands_build.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\post_build_lint.h">