Sfoglia il codice sorgente

Fix remaining references to library.dds

default_compile_flags
vector-of-bool 4 anni fa
parent
commit
c1f970f161
2 ha cambiato i file con 11 aggiunte e 8 eliminazioni
  1. +5
    -2
      src/dds/catalog/get.cpp
  2. +6
    -6
      src/dds/source/dist.cpp

+ 5
- 2
src/dds/catalog/get.cpp Vedi File

@@ -42,8 +42,11 @@ temporary_sdist do_pull_sdist(const package_info& listing, const git_remote_list
man_json["namespace"] = git.auto_lib->namespace_;
pkg_strm << nlohmann::to_string(man_json);

auto lib_strm = dds::open(tmpdir.path() / "library.dds", std::ios::binary | std::ios::out);
lib_strm << "Name: " << git.auto_lib->name;
auto lib_strm
= dds::open(tmpdir.path() / "library.json5", std::ios::binary | std::ios::out);
auto lib_json = nlohmann::json::object();
lib_json["name"] = git.auto_lib->name;
lib_strm << nlohmann::to_string(lib_json);
}

sdist_params params;

+ 6
- 6
src/dds/source/dist.cpp Vedi File

@@ -43,14 +43,14 @@ void sdist_copy_library(path_ref out_root, const library_root& lib, const sdist_

ranges::sort(sources_to_keep, std::less<>(), [](auto&& s) { return s.path; });

auto lib_dds_path = lib.path() / "library.dds";
if (!fs::is_regular_file(lib_dds_path)) {
auto lib_man_path = library_manifest::find_in_directory(lib.path());
if (!lib_man_path) {
throw_user_error<errc::invalid_lib_filesystem>(
"Each library root in a source distribution requires a library manifest (Expected "
"[{}])",
lib_dds_path.string());
"Each library root in a source distribution requires a library manifest (Expected a "
"library manifest in [{}])",
lib.path().string());
}
sdist_export_file(out_root, params.project_dir, lib_dds_path);
sdist_export_file(out_root, params.project_dir, *lib_man_path);

spdlog::info("sdist: Export library from {}", lib.path().string());
fs::create_directories(out_root);

Loading…
Annulla
Salva