Rearrange source handling around sdists

src/dds/build/builder.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dds/build/params.hpp>
-#include <dds/source/dist.hpp>
+#include <dds/sdist/dist.hpp>
 
 #include <cassert>
 #include <map>

src/dds/build/params.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <dds/source/dist.hpp>
+#include <dds/sdist/dist.hpp>
 #include <dds/toolchain/toolchain.hpp>
 #include <dds/util/fs.hpp>
 

src/dds/build/plan/compile_file.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dds/build/plan/base.hpp>
-#include <dds/source/file.hpp>
+#include <dds/sdist/file.hpp>
 
 #include <libman/library.hpp>
 

src/dds/build/plan/library.hpp

@@ -3,7 +3,7 @@
 #include <dds/build/plan/archive.hpp>
 #include <dds/build/plan/exe.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/util/fs.hpp>
 

src/dds/build/plan/template.cpp

@@ -1,7 +1,7 @@
 #include <dds/build/plan/template.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/string.hpp>
 

src/dds/build/plan/template.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dds/build/plan/base.hpp>
-#include <dds/source/file.hpp>
+#include <dds/sdist/file.hpp>
 
 #include <utility>
 

src/dds/cli/cmd/pkg_import.cpp

@@ -2,7 +2,7 @@
 
 #include <dds/http/session.hpp>
 #include <dds/pkg/cache.hpp>
-#include <dds/source/dist.hpp>
+#include <dds/sdist/dist.hpp>
 #include <dds/util/result.hpp>
 
 #include <boost/leaf/handle_exception.hpp>

src/dds/cli/cmd/pkg_ls.cpp

@@ -1,7 +1,7 @@
 #include "../options.hpp"
 
 #include <dds/pkg/cache.hpp>
-#include <dds/source/dist.hpp>
+#include <dds/sdist/dist.hpp>
 #include <dds/util/result.hpp>
 
 #include <boost/leaf/handle_exception.hpp>

src/dds/cli/cmd/sdist_create.cpp

@@ -1,6 +1,6 @@
 #include "../options.hpp"
 
-#include <dds/source/dist.hpp>
+#include <dds/sdist/dist.hpp>
 
 #include <fmt/core.h>
 

src/dds/pkg/cache.cpp

@@ -2,8 +2,8 @@
 
 #include <dds/error/errors.hpp>
 #include <dds/pkg/db.hpp>
+#include <dds/sdist/dist.hpp>
 #include <dds/solve/solve.hpp>
-#include <dds/source/dist.hpp>
 #include <dds/util/log.hpp>
 #include <dds/util/paths.hpp>
 #include <dds/util/string.hpp>

src/dds/pkg/cache.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dds/pkg/db.hpp>
-#include <dds/source/dist.hpp>
+#include <dds/sdist/dist.hpp>
 #include <dds/util/flock.hpp>
 #include <dds/util/fs.hpp>
 

src/dds/pkg/get/get.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <dds/source/dist.hpp>
+#include <dds/sdist/dist.hpp>
 #include <dds/temp.hpp>
 
 namespace dds {

src/dds/pkg/get/http.test.cpp

@@ -1,7 +1,7 @@
 #include "./http.hpp"
 
 #include <dds/error/errors.hpp>
-#include <dds/source/dist.hpp>
+#include <dds/sdist/dist.hpp>
 #include <dds/util/log.hpp>
 
 #include <catch2/catch.hpp>

src/dds/repoman/repoman.cpp

@@ -1,6 +1,6 @@
 #include "./repoman.hpp"
 
-#include <dds/package/manifest.hpp>
+#include <dds/sdist/package.hpp>
 #include <dds/util/log.hpp>
 #include <dds/util/result.hpp>
 
@@ -178,8 +178,7 @@ void repo_manager::import_targz(path_ref tgz_file) {
                    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::copy(tgz_file, dest_path);
 

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

@@ -1,8 +1,8 @@
 #include "./dist.hpp"
 
 #include <dds/error/errors.hpp>
-#include <dds/library/root.hpp>
 #include <dds/pkg/get/http.hpp>
+#include <dds/sdist/library/root.hpp>
 #include <dds/temp.hpp>
 #include <dds/util/fs.hpp>
 #include <dds/util/log.hpp>

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

@@ -2,7 +2,7 @@
 
 #include <tuple>
 
-#include <dds/package/manifest.hpp>
+#include <dds/sdist/package.hpp>
 #include <dds/temp.hpp>
 #include <dds/util/fs.hpp>
 

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

@@ -1,4 +1,4 @@
-#include <dds/source/file.hpp>
+#include <dds/sdist/file.hpp>
 
 #include <catch2/catch.hpp>
 

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

@@ -1,8 +1,8 @@
-#include <dds/library/root.hpp>
+#include <dds/sdist/library/root.hpp>
 
 #include <dds/build/plan/compile_file.hpp>
 #include <dds/error/errors.hpp>
-#include <dds/source/root.hpp>
+#include <dds/sdist/root.hpp>
 #include <dds/util/algo.hpp>
 #include <dds/util/log.hpp>
 

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

@@ -1,9 +1,10 @@
 #pragma once
 
+#include "./manifest.hpp"
+
+#include "../file.hpp"
+#include "../root.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>
 

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

@@ -1,4 +1,4 @@
-#include "./manifest.hpp"
+#include "./package.hpp"
 
 #include <dds/dym.hpp>
 #include <dds/error/errors.hpp>

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

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <dds/source/file.hpp>
+#include <dds/sdist/file.hpp>
 #include <dds/util/fs.hpp>
 
 #include <vector>