SubGraph Macros (#193)

* Create helper to contain dependency targets * Cleanup package access set in build runner * Resolve subgraph macros into unique names
SoupBuild · Mar 20, 2023 · 31b88cd · 31b88cd
1 parent 177509f
commit 31b88cd
Show file tree

Hide file tree

Showing 10 changed files with 654 additions and 334 deletions.
diff --git a/Source/Client/CLI/Recipe.sml b/Source/Client/CLI/Recipe.sml
@@ -17,14 +17,14 @@ Dependencies: {
 	Runtime: [
 		"../Core/"
 		"../../Generate/"
-		# "../../Tools/Copy/"
-		# "../../Tools/Mkdir/"
 		"../../Monitor/Host/"
 	]
 	Other: [
-		# "Wren|Soup.Cpp@0.6.2"
-		# "Wren|Soup.CSharp@0.8.0"
-		# "Wren|Soup.Wren@0.1.2"
+		"../../Tools/Copy/"
+		"../../Tools/Mkdir/"
+		"Wren|Soup.Cpp@0.6.2"
+		"Wren|Soup.CSharp@0.8.0"
+		"Wren|Soup.Wren@0.1.2"
 	]
 	Build: [
 		# TODO: "Soup.Test.Cpp@0.4.0"

diff --git a/Source/Client/Core/Recipe.sml b/Source/Client/Core/Recipe.sml
@@ -17,7 +17,7 @@ Source: [
 
 Dependencies: {
 	Build: [
-		# "Soup.Test.Cpp@0.6.0"
+		"Soup.Test.Cpp@0.6.0"
 	]
 	Runtime: [
 		"Opal@0.5.0"

diff --git a/Source/Client/Core/Source/Build/BuildLoadEngine.h b/Source/Client/Core/Source/Build/BuildLoadEngine.h
@@ -121,7 +121,7 @@ namespace Soup::Core
 			auto parentSet = std::set<std::string>();
 			auto knownPackageSet = KnownPackageMap();
 			auto toolDependencyProjects = std::vector<PackageChildInfo>();
-			auto rootBuildToolClosureName = std::string();
+			std::optional<std::string> rootBuildToolClosureName = std::nullopt;
 			LoadClosure(
 				rootBuildToolClosureName,
 				*recipe,
@@ -590,7 +590,7 @@ namespace Soup::Core
 		std::vector<PackageChildInfo> LoadToolDependencies(
 			const Recipe& recipe,
 			const Path& projectRoot,
-			const std::string& buildClosureName,
+			const std::string& toolClosureName,
 			const PackageLockState& packageLockState)
 		{
 			auto dependencyTypeProjects = std::vector<PackageChildInfo>();
@@ -600,7 +600,7 @@ namespace Soup::Core
 					LoadToolDependency(
 						dependency,
 						projectRoot,
-						buildClosureName,
+						toolClosureName,
 						packageLockState));
 			}