diff options
| -rw-r--r-- | tools/minicargo/build.cpp | 6 | ||||
| -rw-r--r-- | tools/minicargo/manifest.cpp | 3 | ||||
| -rw-r--r-- | tools/minicargo/repository.cpp | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/tools/minicargo/build.cpp b/tools/minicargo/build.cpp index 7c93e842..51d861d2 100644 --- a/tools/minicargo/build.cpp +++ b/tools/minicargo/build.cpp @@ -260,14 +260,13 @@ bool MiniCargo_Build(const PackageManifest& manifest, BuildOptions opts) void BuildList::add_dependencies(const PackageManifest& p, unsigned level, bool include_build) { - TRACE_FUNCTION_F(p.name()); for (const auto& dep : p.dependencies()) { if( dep.is_disabled() ) { continue ; } - DEBUG("Depenency " << dep.name()); + DEBUG(p.name() << ": Dependency " << dep.name()); add_package(dep.get_package(), level+1, include_build); } @@ -279,6 +278,7 @@ void BuildList::add_dependencies(const PackageManifest& p, unsigned level, bool { continue ; } + DEBUG(p.name() << ": Build Dependency " << dep.name()); add_package(dep.get_package(), level+1, include_build); } } @@ -413,7 +413,7 @@ bool Builder::build_target(const PackageManifest& manifest, const PackageTarget& // TODO: Run commands specified by build script (override) } - ::std::cout << "BUILDING " << target.m_name << " from " << manifest.name() << " v" << manifest.version() << ::std::endl; + ::std::cout << "BUILDING " << target.m_name << " from " << manifest.name() << " v" << manifest.version() << " with features [" << manifest.active_features() << "]" << ::std::endl; StringList args; args.push_back(::helpers::path(manifest.manifest_path()).parent() / ::helpers::path(target.m_path)); args.push_back("--crate-name"); args.push_back(target.m_name.c_str()); diff --git a/tools/minicargo/manifest.cpp b/tools/minicargo/manifest.cpp index 91da5105..b1e947e8 100644 --- a/tools/minicargo/manifest.cpp +++ b/tools/minicargo/manifest.cpp @@ -590,6 +590,9 @@ void PackageManifest::set_features(const ::std::vector<::std::string>& features, } } } + + // Return true if any features were activated + //return start < m_active_features.size(); } void PackageManifest::load_dependencies(Repository& repo, bool include_build) { diff --git a/tools/minicargo/repository.cpp b/tools/minicargo/repository.cpp index 300d84ab..c0b39b5a 100644 --- a/tools/minicargo/repository.cpp +++ b/tools/minicargo/repository.cpp @@ -37,7 +37,7 @@ void Repository::load_vendored(const ::helpers::path& path) if( ! ::std::ifstream(manifest_path.str()).good() ) continue ; - DEBUG("Opening manifest " << manifest_path); + //DEBUG("Opening manifest " << manifest_path); // Scan the manifiest until both the name and version are set bool name_set = false; @@ -70,7 +70,7 @@ void Repository::load_vendored(const ::helpers::path& path) } } - DEBUG("Package '" << name << "' v" << ver); + //DEBUG("Package '" << name << "' v" << ver); if(name == "") continue ; |