diff options
author | John Hodge <tpg@mutabah.net> | 2017-08-22 17:48:04 +0800 |
---|---|---|
committer | John Hodge <tpg@mutabah.net> | 2017-08-22 17:48:04 +0800 |
commit | ded405bcbc497595e10ccbb620c6132c4a2277ea (patch) | |
tree | e4284ed9f5748a0ddf272e3da58e09f5e0b6aae0 /tools/minicargo/main.cpp | |
parent | 8ca7753af27a431c9b2f8bec98b5cecc83fa452d (diff) | |
download | mrust-ded405bcbc497595e10ccbb620c6132c4a2277ea.tar.gz |
minicargo - MSVC timestamps, argument for build script override dir
Diffstat (limited to 'tools/minicargo/main.cpp')
-rw-r--r-- | tools/minicargo/main.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tools/minicargo/main.cpp b/tools/minicargo/main.cpp index 236b9d77..decedd6a 100644 --- a/tools/minicargo/main.cpp +++ b/tools/minicargo/main.cpp @@ -12,7 +12,7 @@ #include "helpers.h" #include "repository.h" -extern void MiniCargo_Build(const PackageManifest& manifest); +extern void MiniCargo_Build(const PackageManifest& manifest, ::helpers::path override_path); struct ProgramOptions { @@ -54,7 +54,7 @@ int main(int argc, const char* argv[]) m.load_dependencies(repo); // 3. Build dependency tree - MiniCargo_Build(m); + MiniCargo_Build(m, opts.override_directory ? ::helpers::path(opts.override_directory) : ::helpers::path() ); } catch(const ::std::exception& e) { @@ -100,7 +100,14 @@ int ProgramOptions::parse(int argc, const char* argv[]) ::std::cerr << "Flag " << arg << " takes an argument" << ::std::endl; return 1; } - //this->build_script_override_dir = argv[++i]; + this->override_directory = argv[++i]; + } + else if( ::std::strcmp(arg, "--vendor-dir") == 0 ) { + if(i+1 == argc) { + ::std::cerr << "Flag " << arg << " takes an argument" << ::std::endl; + return 1; + } + this->vendor_dir = argv[++i]; } else { ::std::cerr << "Unknown flag " << arg << ::std::endl; |