Bladeren bron

Warnings and formatting

default_compile_flags
vector-of-bool 5 jaren geleden
bovenliggende
commit
afdec26a5c
4 gewijzigde bestanden met toevoegingen van 8 en 6 verwijderingen
  1. +4
    -3
      src/dds/build/plan/library.cpp
  2. +1
    -1
      src/dds/ddslim.main.cpp
  3. +3
    -0
      src/dds/package_manifest.cpp
  4. +0
    -2
      src/libman/library.cpp

+ 4
- 3
src/dds/build/plan/library.cpp Bestand weergeven

@@ -2,8 +2,8 @@

#include <dds/util/algo.hpp>

#include <range/v3/view/filter.hpp>
#include <range/v3/view/concat.hpp>
#include <range/v3/view/filter.hpp>
#include <spdlog/spdlog.h>

using namespace dds;
@@ -39,7 +39,7 @@ library_plan library_plan::create(const library& lib,
}
}

auto compile_rules = lib.base_compile_rules();
auto compile_rules = lib.base_compile_rules();
compile_rules.enable_warnings() = params.enable_warnings;
for (const auto& use : lib.manifest().uses) {
ureqs.apply(compile_rules, use.namespace_, use.name);
@@ -65,7 +65,8 @@ library_plan library_plan::create(const library& lib,
}

for (const source_file& source : ranges::views::concat(app_sources, test_sources)) {
auto subdir = source.kind == source_kind::test ? params.out_subdir / "test" : params.out_subdir;
auto subdir
= source.kind == source_kind::test ? params.out_subdir / "test" : params.out_subdir;
link_executables.emplace_back(in_libs,
compile_file_plan(compile_rules,
source,

+ 1
- 1
src/dds/ddslim.main.cpp Bestand weergeven

@@ -236,7 +236,7 @@ struct cli_sdist {
int run() {
auto repo_dir = repo_where.Get();
// TODO: Generate a unique name to avoid conflicts
auto tmp_sdist = repo_dir / ".tmp.sdist";
auto tmp_sdist = repo_dir / ".tmp.sdist";
if (dds::fs::exists(tmp_sdist)) {
dds::fs::remove_all(tmp_sdist);
}

+ 3
- 0
src/dds/package_manifest.cpp Bestand weergeven

@@ -31,6 +31,9 @@ package_manifest package_manifest::load_from_file(const fs::path& fpath) {
throw std::runtime_error(
fmt::format("'Version' field in [{}] may not be an empty string", fpath.string()));
}
if (ret.namespace_.empty()) {
ret.namespace_ = ret.name;
}

ret.version = semver::version::parse(version_str);


+ 0
- 2
src/libman/library.cpp Bestand weergeven

@@ -27,8 +27,6 @@ library library::from_file(path_ref fpath) {
read_accumulate("Links", links_strs),
read_accumulate("Special-Uses", ret.special_uses));

auto split_req = [](auto&& str) {};

for (auto&& uses_str : uses_strs) {
ret.uses.push_back(split_usage_string(uses_str));
}

Laden…
Annuleren
Opslaan