Rearrange `source_*` types

src/dds.main.cpp

@@ -2,7 +2,7 @@
 #include <dds/catalog/catalog.hpp>
 #include <dds/catalog/get.hpp>
 #include <dds/repo/repo.hpp>
-#include <dds/sdist.hpp>
+#include <dds/source/dist.hpp>
 #include <dds/toolchain/from_dds.hpp>
 #include <dds/util/fs.hpp>
 #include <dds/util/paths.hpp>

src/dds/build/params.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <dds/sdist.hpp>
+#include <dds/source/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.hpp>
+#include <dds/source/file.hpp>
 
 #include <memory>
 

src/dds/catalog/get.hpp

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

src/dds/deps.cpp

@@ -1,7 +1,7 @@
 #include "./deps.hpp"
 
 #include <dds/repo/repo.hpp>
-#include <dds/sdist.hpp>
+#include <dds/source/dist.hpp>
 #include <dds/usage_reqs.hpp>
 #include <dds/util/string.hpp>
 #include <libman/index.hpp>

src/dds/library/library.cpp

@@ -1,7 +1,7 @@
 #include <dds/library/library.hpp>
 
 #include <dds/build/plan/compile_file.hpp>
-#include <dds/build/source_dir.hpp>
+#include <dds/source/dir.hpp>
 #include <dds/util/algo.hpp>
 
 #include <range/v3/view/filter.hpp>

src/dds/library/library.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <dds/build/plan/compile_file.hpp>
-#include <dds/build/source_dir.hpp>
 #include <dds/library/manifest.hpp>
-#include <dds/source.hpp>
+#include <dds/source/dir.hpp>
+#include <dds/source/file.hpp>
 
 #include <string>
 

src/dds/repo/repo.cpp

@@ -1,8 +1,8 @@
 #include "./repo.hpp"
 
 #include <dds/catalog/catalog.hpp>
-#include <dds/sdist.hpp>
 #include <dds/solve/solve.hpp>
+#include <dds/source/dist.hpp>
 #include <dds/util/paths.hpp>
 #include <dds/util/string.hpp>
 

src/dds/repo/repo.hpp

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

src/dds/build/source_dir.cpp → src/dds/source/dir.cpp

@@ -1,4 +1,4 @@
-#include "./source_dir.hpp"
+#include "./dir.hpp"
 
 #include <range/v3/range/conversion.hpp>
 #include <range/v3/view/filter.hpp>

src/dds/build/source_dir.hpp → src/dds/source/dir.hpp

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

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

@@ -1,4 +1,4 @@
-#include "./sdist.hpp"
+#include "./dist.hpp"
 
 #include <dds/temp.hpp>
 #include <dds/util/fs.hpp>

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

@@ -1,4 +1,4 @@
-#include "./source.hpp"
+#include "./file.hpp"
 
 #include <dds/util/string.hpp>