Browse Source

Rearrange source handling around sdists

default_compile_flags
vector-of-bool 3 years ago
parent
commit
5390c6f262
27 changed files with 26 additions and 26 deletions
  1. +1
    -1
      src/dds/build/builder.hpp
  2. +1
    -1
      src/dds/build/params.hpp
  3. +1
    -1
      src/dds/build/plan/compile_file.hpp
  4. +1
    -1
      src/dds/build/plan/library.hpp
  5. +1
    -1
      src/dds/build/plan/template.cpp
  6. +1
    -1
      src/dds/build/plan/template.hpp
  7. +1
    -1
      src/dds/cli/cmd/pkg_import.cpp
  8. +1
    -1
      src/dds/cli/cmd/pkg_ls.cpp
  9. +1
    -1
      src/dds/cli/cmd/sdist_create.cpp
  10. +1
    -1
      src/dds/pkg/cache.cpp
  11. +1
    -1
      src/dds/pkg/cache.hpp
  12. +1
    -1
      src/dds/pkg/get/get.hpp
  13. +1
    -1
      src/dds/pkg/get/http.test.cpp
  14. +2
    -3
      src/dds/repoman/repoman.cpp
  15. +1
    -1
      src/dds/sdist/dist.cpp
  16. +1
    -1
      src/dds/sdist/dist.hpp
  17. +0
    -0
      src/dds/sdist/file.cpp
  18. +0
    -0
      src/dds/sdist/file.hpp
  19. +1
    -1
      src/dds/sdist/file.test.cpp
  20. +0
    -0
      src/dds/sdist/library/manifest.cpp
  21. +0
    -0
      src/dds/sdist/library/manifest.hpp
  22. +2
    -2
      src/dds/sdist/library/root.cpp
  23. +4
    -3
      src/dds/sdist/library/root.hpp
  24. +1
    -1
      src/dds/sdist/package.cpp
  25. +0
    -0
      src/dds/sdist/package.hpp
  26. +0
    -0
      src/dds/sdist/root.cpp
  27. +1
    -1
      src/dds/sdist/root.hpp

+ 1
- 1
src/dds/build/builder.hpp View File

#pragma once #pragma once


#include <dds/build/params.hpp> #include <dds/build/params.hpp>
#include <dds/source/dist.hpp>
#include <dds/sdist/dist.hpp>


#include <cassert> #include <cassert>
#include <map> #include <map>

+ 1
- 1
src/dds/build/params.hpp View File

#pragma once #pragma once


#include <dds/source/dist.hpp>
#include <dds/sdist/dist.hpp>
#include <dds/toolchain/toolchain.hpp> #include <dds/toolchain/toolchain.hpp>
#include <dds/util/fs.hpp> #include <dds/util/fs.hpp>



+ 1
- 1
src/dds/build/plan/compile_file.hpp View File

#pragma once #pragma once


#include <dds/build/plan/base.hpp> #include <dds/build/plan/base.hpp>
#include <dds/source/file.hpp>
#include <dds/sdist/file.hpp>


#include <libman/library.hpp> #include <libman/library.hpp>



+ 1
- 1
src/dds/build/plan/library.hpp View File

#include <dds/build/plan/archive.hpp> #include <dds/build/plan/archive.hpp>
#include <dds/build/plan/exe.hpp> #include <dds/build/plan/exe.hpp>
#include <dds/build/plan/template.hpp> #include <dds/build/plan/template.hpp>
#include <dds/library/root.hpp>
#include <dds/sdist/library/root.hpp>
#include <dds/usage_reqs.hpp> #include <dds/usage_reqs.hpp>
#include <dds/util/fs.hpp> #include <dds/util/fs.hpp>



+ 1
- 1
src/dds/build/plan/template.cpp View File

#include <dds/build/plan/template.hpp> #include <dds/build/plan/template.hpp>


#include <dds/error/errors.hpp> #include <dds/error/errors.hpp>
#include <dds/library/root.hpp>
#include <dds/sdist/library/root.hpp>
#include <dds/util/fs.hpp> #include <dds/util/fs.hpp>
#include <dds/util/string.hpp> #include <dds/util/string.hpp>



+ 1
- 1
src/dds/build/plan/template.hpp View File

#pragma once #pragma once


#include <dds/build/plan/base.hpp> #include <dds/build/plan/base.hpp>
#include <dds/source/file.hpp>
#include <dds/sdist/file.hpp>


#include <utility> #include <utility>



+ 1
- 1
src/dds/cli/cmd/pkg_import.cpp View File



#include <dds/http/session.hpp> #include <dds/http/session.hpp>
#include <dds/pkg/cache.hpp> #include <dds/pkg/cache.hpp>
#include <dds/source/dist.hpp>
#include <dds/sdist/dist.hpp>
#include <dds/util/result.hpp> #include <dds/util/result.hpp>


#include <boost/leaf/handle_exception.hpp> #include <boost/leaf/handle_exception.hpp>

+ 1
- 1
src/dds/cli/cmd/pkg_ls.cpp View File

#include "../options.hpp" #include "../options.hpp"


#include <dds/pkg/cache.hpp> #include <dds/pkg/cache.hpp>
#include <dds/source/dist.hpp>
#include <dds/sdist/dist.hpp>
#include <dds/util/result.hpp> #include <dds/util/result.hpp>


#include <boost/leaf/handle_exception.hpp> #include <boost/leaf/handle_exception.hpp>

+ 1
- 1
src/dds/cli/cmd/sdist_create.cpp View File

#include "../options.hpp" #include "../options.hpp"


#include <dds/source/dist.hpp>
#include <dds/sdist/dist.hpp>


#include <fmt/core.h> #include <fmt/core.h>



+ 1
- 1
src/dds/pkg/cache.cpp View File



#include <dds/error/errors.hpp> #include <dds/error/errors.hpp>
#include <dds/pkg/db.hpp> #include <dds/pkg/db.hpp>
#include <dds/sdist/dist.hpp>
#include <dds/solve/solve.hpp> #include <dds/solve/solve.hpp>
#include <dds/source/dist.hpp>
#include <dds/util/log.hpp> #include <dds/util/log.hpp>
#include <dds/util/paths.hpp> #include <dds/util/paths.hpp>
#include <dds/util/string.hpp> #include <dds/util/string.hpp>

+ 1
- 1
src/dds/pkg/cache.hpp View File

#pragma once #pragma once


#include <dds/pkg/db.hpp> #include <dds/pkg/db.hpp>
#include <dds/source/dist.hpp>
#include <dds/sdist/dist.hpp>
#include <dds/util/flock.hpp> #include <dds/util/flock.hpp>
#include <dds/util/fs.hpp> #include <dds/util/fs.hpp>



+ 1
- 1
src/dds/pkg/get/get.hpp View File

#pragma once #pragma once


#include <dds/source/dist.hpp>
#include <dds/sdist/dist.hpp>
#include <dds/temp.hpp> #include <dds/temp.hpp>


namespace dds { namespace dds {

+ 1
- 1
src/dds/pkg/get/http.test.cpp View File

#include "./http.hpp" #include "./http.hpp"


#include <dds/error/errors.hpp> #include <dds/error/errors.hpp>
#include <dds/source/dist.hpp>
#include <dds/sdist/dist.hpp>
#include <dds/util/log.hpp> #include <dds/util/log.hpp>


#include <catch2/catch.hpp> #include <catch2/catch.hpp>

+ 2
- 3
src/dds/repoman/repoman.cpp View File

#include "./repoman.hpp" #include "./repoman.hpp"


#include <dds/package/manifest.hpp>
#include <dds/sdist/package.hpp>
#include <dds/util/log.hpp> #include <dds/util/log.hpp>
#include <dds/util/result.hpp> #include <dds/util/result.hpp>


iv_1.high.to_string()); iv_1.high.to_string());
} }


auto dest_path
= pkg_dir() / man->id.name / man->id.version.to_string() / "sdist.tar.gz";
auto dest_path = pkg_dir() / man->id.name / man->id.version.to_string() / "sdist.tar.gz";
fs::create_directories(dest_path.parent_path()); fs::create_directories(dest_path.parent_path());
fs::copy(tgz_file, dest_path); fs::copy(tgz_file, dest_path);



src/dds/source/dist.cpp → src/dds/sdist/dist.cpp View File

#include "./dist.hpp" #include "./dist.hpp"


#include <dds/error/errors.hpp> #include <dds/error/errors.hpp>
#include <dds/library/root.hpp>
#include <dds/pkg/get/http.hpp> #include <dds/pkg/get/http.hpp>
#include <dds/sdist/library/root.hpp>
#include <dds/temp.hpp> #include <dds/temp.hpp>
#include <dds/util/fs.hpp> #include <dds/util/fs.hpp>
#include <dds/util/log.hpp> #include <dds/util/log.hpp>

src/dds/source/dist.hpp → src/dds/sdist/dist.hpp View File



#include <tuple> #include <tuple>


#include <dds/package/manifest.hpp>
#include <dds/sdist/package.hpp>
#include <dds/temp.hpp> #include <dds/temp.hpp>
#include <dds/util/fs.hpp> #include <dds/util/fs.hpp>



src/dds/source/file.cpp → src/dds/sdist/file.cpp View File


src/dds/source/file.hpp → src/dds/sdist/file.hpp View File


src/dds/source/file.test.cpp → src/dds/sdist/file.test.cpp View File

#include <dds/source/file.hpp>
#include <dds/sdist/file.hpp>


#include <catch2/catch.hpp> #include <catch2/catch.hpp>



src/dds/library/manifest.cpp → src/dds/sdist/library/manifest.cpp View File


src/dds/library/manifest.hpp → src/dds/sdist/library/manifest.hpp View File


src/dds/library/root.cpp → src/dds/sdist/library/root.cpp View File

#include <dds/library/root.hpp>
#include <dds/sdist/library/root.hpp>


#include <dds/build/plan/compile_file.hpp> #include <dds/build/plan/compile_file.hpp>
#include <dds/error/errors.hpp> #include <dds/error/errors.hpp>
#include <dds/source/root.hpp>
#include <dds/sdist/root.hpp>
#include <dds/util/algo.hpp> #include <dds/util/algo.hpp>
#include <dds/util/log.hpp> #include <dds/util/log.hpp>



src/dds/library/root.hpp → src/dds/sdist/library/root.hpp View File

#pragma once #pragma once


#include "./manifest.hpp"

#include "../file.hpp"
#include "../root.hpp"
#include <dds/build/plan/compile_file.hpp> #include <dds/build/plan/compile_file.hpp>
#include <dds/library/manifest.hpp>
#include <dds/source/file.hpp>
#include <dds/source/root.hpp>


#include <string> #include <string>



src/dds/package/manifest.cpp → src/dds/sdist/package.cpp View File

#include "./manifest.hpp"
#include "./package.hpp"


#include <dds/dym.hpp> #include <dds/dym.hpp>
#include <dds/error/errors.hpp> #include <dds/error/errors.hpp>

src/dds/package/manifest.hpp → src/dds/sdist/package.hpp View File


src/dds/source/root.cpp → src/dds/sdist/root.cpp View File


src/dds/source/root.hpp → src/dds/sdist/root.hpp View File

#pragma once #pragma once


#include <dds/source/file.hpp>
#include <dds/sdist/file.hpp>
#include <dds/util/fs.hpp> #include <dds/util/fs.hpp>


#include <vector> #include <vector>

Loading…
Cancel
Save