summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/minicargo/build.cpp29
-rw-r--r--tools/minicargo/build.h14
-rw-r--r--tools/minicargo/main.cpp68
-rw-r--r--tools/minicargo/manifest.cpp4
4 files changed, 82 insertions, 33 deletions
diff --git a/tools/minicargo/build.cpp b/tools/minicargo/build.cpp
index b7be7607..ce7bc02f 100644
--- a/tools/minicargo/build.cpp
+++ b/tools/minicargo/build.cpp
@@ -220,11 +220,11 @@ struct Timestamp
}
};
-bool MiniCargo_Build(const PackageManifest& manifest, ::helpers::path override_path)
+bool MiniCargo_Build(const PackageManifest& manifest, BuildOptions opts)
{
BuildList list;
- list.add_dependencies(manifest, 0, !override_path.is_valid());
+ list.add_dependencies(manifest, 0, !opts.build_script_overrides.is_valid());
list.sort_list();
// dedup?
@@ -234,7 +234,7 @@ bool MiniCargo_Build(const PackageManifest& manifest, ::helpers::path override_p
}
// Build dependencies
- Builder builder { "output", override_path };
+ Builder builder { ::std::move(opts) };
for(const auto& p : list.iter())
{
if( ! builder.build_library(p) )
@@ -315,9 +315,8 @@ void BuildList::sort_list()
}
}
-Builder::Builder(::helpers::path output_dir, ::helpers::path override_dir):
- m_output_dir(output_dir),
- m_build_script_overrides(override_dir)
+Builder::Builder(BuildOptions opts):
+ m_opts(::std::move(opts))
{
#ifdef _WIN32
char buf[1024];
@@ -341,7 +340,7 @@ Builder::Builder(::helpers::path output_dir, ::helpers::path override_dir):
bool Builder::build_target(const PackageManifest& manifest, const PackageTarget& target) const
{
const char* crate_type;
- auto outfile = m_output_dir;
+ auto outfile = m_opts.output_dir;
switch(target.m_type)
{
case PackageTarget::Type::Lib:
@@ -400,7 +399,7 @@ bool Builder::build_target(const PackageManifest& manifest, const PackageTarget&
args.push_back("-O");
}
args.push_back("-o"); args.push_back(outfile);
- args.push_back("-L"); args.push_back(m_output_dir.str().c_str());
+ args.push_back("-L"); args.push_back(m_opts.output_dir.str().c_str());
for(const auto& dir : manifest.build_script_output().rustc_link_search) {
args.push_back("-L"); args.push_back(dir.second.c_str());
}
@@ -426,14 +425,14 @@ bool Builder::build_target(const PackageManifest& manifest, const PackageTarget&
}
::std::string Builder::build_build_script(const PackageManifest& manifest) const
{
- auto outfile = m_output_dir / manifest.name() + "_build" EXESUF;
+ auto outfile = m_opts.output_dir / manifest.name() + "_build" EXESUF;
StringList args;
args.push_back( ::helpers::path(manifest.manifest_path()).parent() / ::helpers::path(manifest.build_script()) );
args.push_back("--crate-name"); args.push_back("build");
args.push_back("--crate-type"); args.push_back("bin");
args.push_back("-o"); args.push_back(outfile);
- args.push_back("-L"); args.push_back(m_output_dir.str().c_str());
+ args.push_back("-L"); args.push_back(m_opts.output_dir.str().c_str());
StringListKV env;
env.push_back("CARGO_MANIFEST_DIR", manifest.directory().to_absolute());
@@ -449,17 +448,17 @@ bool Builder::build_library(const PackageManifest& manifest) const
if( manifest.build_script() != "" )
{
// Locate a build script override file
- if(this->m_build_script_overrides.is_valid())
+ if(this->m_opts.build_script_overrides.is_valid())
{
- auto override_file = this->m_build_script_overrides / "build_" + manifest.name().c_str() + ".txt";
+ auto override_file = this->m_opts.build_script_overrides / "build_" + manifest.name().c_str() + ".txt";
// TODO: Should this test if it exists? or just assume and let it error?
-
+
// > Note, override file can specify a list of commands to run.
const_cast<PackageManifest&>(manifest).load_build_script( override_file.str() );
}
else
{
- auto out_file = m_output_dir / "build_" + manifest.name().c_str() + ".txt";
+ auto out_file = m_opts.output_dir / "build_" + manifest.name().c_str() + ".txt";
// If the build script output doesn't exist (TODO: Or is older than ...)
bool run_build_script = true;
auto ts_result = this->get_timestamp(out_file);
@@ -485,7 +484,7 @@ bool Builder::build_library(const PackageManifest& manifest) const
return false;
auto script_exe_abs = ::helpers::path(script_exe).to_absolute();
- auto output_dir_abs = m_output_dir.to_absolute();
+ auto output_dir_abs = m_opts.output_dir.to_absolute();
// - Run the script and put output in the right dir
auto out_file = output_dir_abs / "build_" + manifest.name().c_str() + ".txt";
diff --git a/tools/minicargo/build.h b/tools/minicargo/build.h
index 45ce1679..4bbcd158 100644
--- a/tools/minicargo/build.h
+++ b/tools/minicargo/build.h
@@ -7,14 +7,20 @@ class StringList;
class StringListKV;
struct Timestamp;
+struct BuildOptions
+{
+ ::helpers::path output_dir;
+ ::helpers::path build_script_overrides;
+ ::std::vector<::helpers::path> lib_search_dirs;
+};
+
class Builder
{
- ::helpers::path m_output_dir;
- ::helpers::path m_build_script_overrides;
+ BuildOptions m_opts;
::helpers::path m_compiler_path;
public:
- Builder(::helpers::path output_dir, ::helpers::path override_dir);
+ Builder(BuildOptions opts);
bool build_target(const PackageManifest& manifest, const PackageTarget& target) const;
bool build_library(const PackageManifest& manifest) const;
@@ -28,4 +34,4 @@ private:
Timestamp get_timestamp(const ::helpers::path& path) const;
};
-extern bool MiniCargo_Build(const PackageManifest& manifest, ::helpers::path override_path);
+extern bool MiniCargo_Build(const PackageManifest& manifest, BuildOptions opts);
diff --git a/tools/minicargo/main.cpp b/tools/minicargo/main.cpp
index 04fe4fcf..cdd98aff 100644
--- a/tools/minicargo/main.cpp
+++ b/tools/minicargo/main.cpp
@@ -15,6 +15,7 @@
struct ProgramOptions
{
+ // Input (package) directory
const char* directory = nullptr;
// Directory containing build script outputs
@@ -23,8 +24,14 @@ struct ProgramOptions
// Directory containing "vendored" (packaged) copies of packages
const char* vendor_dir = nullptr;
+ // Output/build directory
const char* output_directory = nullptr;
+ // Library search directories
+ ::std::vector<const char*> lib_search_dirs;
+
+ bool pause_before_quit = false;
+
int parse(int argc, const char* argv[]);
void usage() const;
};
@@ -56,30 +63,36 @@ int main(int argc, const char* argv[])
m.load_dependencies(repo, !bs_override_dir.is_valid());
// 3. Build dependency tree and build program.
- if( !MiniCargo_Build(m, bs_override_dir ) )
+ BuildOptions build_opts;
+ build_opts.build_script_overrides = ::std::move(bs_override_dir);
+ build_opts.output_dir = opts.output_directory ? ::helpers::path(opts.output_directory) : ::helpers::path("output");
+ build_opts.lib_search_dirs.reserve(opts.lib_search_dirs.size());
+ for(const auto* d : opts.lib_search_dirs)
+ build_opts.lib_search_dirs.push_back( ::helpers::path(d) );
+ if( !MiniCargo_Build(m, ::std::move(build_opts)) )
{
::std::cerr << "BUILD FAILED" << ::std::endl;
-#if _WIN32
- ::std::cout << "Press enter to exit..." << ::std::endl;
- ::std::cin.get();
-#endif
+ if(opts.pause_before_quit) {
+ ::std::cout << "Press enter to exit..." << ::std::endl;
+ ::std::cin.get();
+ }
return 1;
}
}
catch(const ::std::exception& e)
{
::std::cerr << "EXCEPTION: " << e.what() << ::std::endl;
-#if _WIN32
- ::std::cout << "Press enter to exit..." << ::std::endl;
- ::std::cin.get();
-#endif
+ if(opts.pause_before_quit) {
+ ::std::cout << "Press enter to exit..." << ::std::endl;
+ ::std::cin.get();
+ }
return 1;
}
-#if _WIN32
- ::std::cout << "Press enter to exit..." << ::std::endl;
- ::std::cin.get();
-#endif
+ if(opts.pause_before_quit) {
+ ::std::cout << "Press enter to exit..." << ::std::endl;
+ ::std::cin.get();
+ }
return 0;
}
@@ -101,6 +114,28 @@ int ProgramOptions::parse(int argc, const char* argv[])
else if( arg[1] != '-' )
{
// Short arguments
+ switch(arg[1])
+ {
+ case 'l':
+ if(i+1 == argc) {
+ ::std::cerr << "Flag " << arg << " takes an argument" << ::std::endl;
+ return 1;
+ }
+ this->lib_search_dirs.push_back(argv[++i]);
+ break;
+ case 'o':
+ if(i+1 == argc) {
+ ::std::cerr << "Flag " << arg << " takes an argument" << ::std::endl;
+ return 1;
+ }
+ this->output_directory = argv[++i];
+ break;
+ case 'h':
+ break;
+ default:
+ ::std::cerr << "Unknown flag -" << arg[1] << ::std::endl;
+ return 1;
+ }
}
else if( arg[1] == '\0' )
{
@@ -123,6 +158,13 @@ int ProgramOptions::parse(int argc, const char* argv[])
}
this->vendor_dir = argv[++i];
}
+ else if( ::std::strcmp(arg, "--output-dir") == 0 ) {
+ if(i+1 == argc) {
+ ::std::cerr << "Flag " << arg << " takes an argument" << ::std::endl;
+ return 1;
+ }
+ this->output_directory = argv[++i];
+ }
else {
::std::cerr << "Unknown flag " << arg << ::std::endl;
return 1;
diff --git a/tools/minicargo/manifest.cpp b/tools/minicargo/manifest.cpp
index 7b48d1d7..84c1e257 100644
--- a/tools/minicargo/manifest.cpp
+++ b/tools/minicargo/manifest.cpp
@@ -592,7 +592,9 @@ void PackageManifest::load_dependencies(Repository& repo, bool include_build)
{
for(auto& dep : m_build_dependencies)
{
- assert( !dep.m_optional );
+ if( dep.m_optional ) {
+ throw ::std::runtime_error(::format( "build-dependencies can't be optional - ", dep.m_name, " for ", m_name));
+ }
dep.load_manifest(repo, base_path, true);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-16 18:12:05 +0000