Fix installer and sign all dlls (#294)

* Convert more TUs to partitions
soup-build · Feb 5, 2025 · 8c50d76 · 8c50d76
1 parent 7a64097
commit 8c50d76
Show file tree

Hide file tree

Showing 44 changed files with 647 additions and 156 deletions.
diff --git a/code/client/core/Recipe.sml b/code/client/core/Recipe.sml
@@ -16,20 +16,56 @@ Source: [
 Partitions: [
 	{ Source: 'source/build/BuildConstants.cpp' }
 	{ Source: 'source/build/BuildFailedException.cpp' }
+	{ Source: 'source/build/BuildHistoryChecker.cpp', Imports: [ 'source/build/FileSystemState.cpp' ] }
 	{ Source: 'source/build/DependencyTargetSet.cpp' }
 	{ Source: 'source/build/FileSystemState.cpp' }
+	{ Source: 'source/build/IEvaluateEngine.cpp', Imports: [ 'source/operation-graph/OperationGraph.cpp', 'source/operation-graph/OperationResults.cpp' ] }
 	{ Source: 'source/build/KnownLanguage.cpp' }
+	{ Source: 'source/build/RecipeBuildArguments.cpp', Imports: [ 'source/value-table/Value.cpp' ] }
 	{ Source: 'source/build/MacroManager.cpp' }
+	{ Source: 'source/build/PackageProvider.cpp', Imports: [ 'source/recipe/PackageName.cpp', 'source/recipe/PackageReference.cpp','source/recipe/Recipe.cpp', 'source/value-table/Value.cpp' ] }
 	{ Source: 'source/build/RecipeBuildCacheState.cpp' }
+	{ Source: 'source/build/RecipeBuildLocationManager.cpp', Imports: [ 'source/build/KnownLanguage.cpp', 'source/recipe/PackageName.cpp', 'source/recipe/Recipe.cpp', 'source/recipe/RecipeCache.cpp', 'source/recipe/RootRecipeExtensions.cpp', 'source/value-table/Value.cpp', 'source/value-table/ValueTableWriter.cpp', 'source/utilities/HandledException.cpp' ] }
 	{ Source: 'source/build/SystemAccessTracker.cpp' }
+	{ Source: 'source/local-user-config/LocalUserConfig.cpp', Imports: [ 'source/local-user-config/SDKConfig.cpp' ] }
+	{ Source: 'source/local-user-config/LocalUserConfigExtensions.cpp', Imports: [ 'source/local-user-config/LocalUserConfig.cpp', 'source/recipe/RecipeSML.cpp' ] }
+	{ Source: 'source/local-user-config/SDKConfig.cpp', Imports: [ 'source/recipe/RecipeValue.cpp' ] }
 	{ Source: 'source/operation-graph/CommandInfo.cpp' }
+	{ Source: 'source/operation-graph/OperationGraph.cpp', Imports: [ 'source/operation-graph/CommandInfo.cpp', 'source/operation-graph/OperationInfo.cpp' ] }
+	{ Source: 'source/operation-graph/OperationGraphManager.cpp', Imports: [ 'source/operation-graph/OperationGraphReader.cpp', 'source/operation-graph/OperationGraphWriter.cpp' ] }
+	{ Source: 'source/operation-graph/OperationGraphReader.cpp', Imports: [ 'source/operation-graph/OperationGraph.cpp', 'source/build/FileSystemState.cpp' ] }
+	{ Source: 'source/operation-graph/OperationGraphWriter.cpp', Imports: [ 'source/operation-graph/OperationGraph.cpp', 'source/build/FileSystemState.cpp' ] }
+	{ Source: 'source/operation-graph/OperationInfo.cpp', Imports: [ 'source/build/FileSystemState.cpp', 'source/operation-graph/CommandInfo.cpp' ] }
+	{ Source: 'source/operation-graph/OperationResult.cpp', Imports: [ 'source/build/FileSystemState.cpp', 'source/operation-graph/OperationInfo.cpp' ] }
+	{ Source: 'source/operation-graph/OperationResults.cpp', Imports: [ 'source/build/FileSystemState.cpp', 'source/operation-graph/OperationInfo.cpp', 'source/operation-graph/OperationResult.cpp' ] }
+	{ Source: 'source/operation-graph/OperationResultsManager.cpp', Imports: [ 'source/build/FileSystemState.cpp', 'source/operation-graph/OperationResultsReader.cpp', 'source/operation-graph/OperationResultsWriter.cpp' ] }
+	{ Source: 'source/operation-graph/OperationResultsReader.cpp', Imports: [ 'source/build/FileSystemState.cpp', 'source/operation-graph/OperationResults.cpp' ] }
+	{ Source: 'source/operation-graph/OperationResultsWriter.cpp', Imports: [ 'source/build/FileSystemState.cpp', 'source/operation-graph/OperationResults.cpp' ] }
+	{ Source: 'source/package/PackageManager.cpp', Imports: [ 'source/utilities/HandledException.cpp' ] }
+	{ Source: 'source/package-lock/PackageLock.cpp', Imports: [ 'source/recipe/PackageName.cpp', 'source/recipe/PackageReference.cpp', 'source/recipe/RecipeValue.cpp' ] }
+	{ Source: 'source/package-lock/PackageLockExtensions.cpp', Imports: [ 'source/package-lock/PackageLock.cpp', 'source/recipe/RecipeSML.cpp' ] }
 	{ Source: 'source/recipe/LanguageReference.cpp' }
 	{ Source: 'source/recipe/PackageIdentifier.cpp', Imports: [ 'source/recipe/PackageName.cpp' ] }
 	{ Source: 'source/recipe/PackageName.cpp' }
 	{ Source: 'source/recipe/PackageReference.cpp', Imports: [ 'source/recipe/PackageIdentifier.cpp' ] }
+	{ Source: 'source/recipe/Recipe.cpp', Imports: [ 'source/recipe/LanguageReference.cpp', 'source/recipe/PackageReference.cpp', 'source/recipe/RecipeValue.cpp' ] }
+	{ Source: 'source/recipe/RecipeBuildStateConverter.cpp', Imports: [ 'source/recipe/PackageReference.cpp', 'source/recipe/RecipeValue.cpp','source/value-table/Value.cpp'  ] }
+	{ Source: 'source/recipe/RecipeCache.cpp', Imports: [ 'source/recipe/Recipe.cpp', 'source/recipe/RecipeExtensions.cpp', 'source/recipe/RootRecipe.cpp', 'source/recipe/RootRecipeExtensions.cpp' ] }
+	{ Source: 'source/recipe/RecipeExtensions.cpp', Imports: [ 'source/recipe/PackageReference.cpp', 'source/recipe/Recipe.cpp', 'source/recipe/RecipeSML.cpp' ] }
+	{ Source: 'source/recipe/RecipeSML.cpp', Imports: [ 'source/recipe/LanguageReference.cpp', 'source/recipe/PackageReference.cpp', 'source/recipe/RecipeValue.cpp', 'source/sml/SML.cpp', 'source/utilities/SequenceMap.cpp' ] }
+	{ Source: 'source/recipe/RecipeValue.cpp', Imports: [ 'source/recipe/LanguageReference.cpp', 'source/recipe/PackageReference.cpp', 'source/utilities/SequenceMap.cpp' ] }
+	{ Source: 'source/recipe/RootRecipe.cpp', Imports: [ 'source/recipe/RecipeValue.cpp' ] }
+	{ Source: 'source/recipe/RootRecipeExtensions.cpp', Imports: [ 'source/recipe/RootRecipe.cpp', 'source/recipe/RecipeSML.cpp' ] }
+	{ Source: 'source/sml/SML.cpp', Imports: [ 'source/recipe/LanguageReference.cpp', 'source/recipe/PackageReference.cpp', 'source/utilities/SequenceMap.cpp' ] }
 	{ Source: 'source/utilities/HandledException.cpp' }
 	{ Source: 'source/utilities/SequenceMap.cpp' }
 	{ Source: 'source/value-table/Value.cpp', Imports: [ 'source/recipe/LanguageReference.cpp', 'source/recipe/PackageReference.cpp' ] }
+	{ Source: 'source/value-table/ValueTableManager.cpp', Imports: [ 'source/value-table/Value.cpp',  'source/value-table/ValueTableReader.cpp',  'source/value-table/ValueTableWriter.cpp' ] }
+	{ Source: 'source/value-table/ValueTableReader.cpp', Imports: [ 'source/recipe/LanguageReference.cpp', 'source/recipe/PackageReference.cpp', 'source/value-table/Value.cpp' ] }
+	{ Source: 'source/value-table/ValueTableWriter.cpp', Imports: [ 'source/value-table/Value.cpp' ] }
+	{ Source: 'source/wren/WrenHelpers.cpp' }
+	{ Source: 'source/wren/WrenHost.cpp', Imports: [ 'source/sml/SML.cpp', 'source/wren/WrenHelpers.cpp' ] }
+	{ Source: 'source/wren/WrenValueTable.cpp', Imports: [ 'source/value-table/Value.cpp', 'source/wren/WrenHelpers.cpp' ] }
 ]
 Dependencies: {
 	Build: [

diff --git a/code/client/core/source/Module.cpp b/code/client/core/source/Module.cpp
@@ -58,34 +58,75 @@ import Opal;
 // Build
 export import :BuildConstants;
 export import :BuildFailedException;
-export import :CommandInfo;
+export import :BuildHistoryChecker;
 export import :DependencyTargetSet;
 export import :FileSystemState;
+export import :IEvaluateEngine;
 export import :KnownLanguage;
 export import :MacroManager;
+export import :PackageProvider;
+export import :RecipeBuildArguments;
 export import :RecipeBuildCacheState;
+export import :RecipeBuildLocationManager;
 export import :SystemAccessTracker;
 
-// Recipe
+// Local User Config
+export import :LocalUserConfig;
+export import :LocalUserConfigExtensions;
+export import :SDKConfig;
+
+// Operation Graph
+export import :CommandInfo;
+export import :OperationGraph;
+export import :OperationGraphManager;
+export import :OperationGraphReader;
+export import :OperationGraphWriter;
+export import :OperationInfo;
+export import :OperationResult;
+export import :OperationResults;
+export import :OperationResultsManager;
+export import :OperationResultsReader;
+export import :OperationResultsWriter;
+
+// Package
+export import :PackageManager;
+
+// Package Lock
+export import :PackageLock;
+export import :PackageLockExtensions;
+
+// Recipe 
 export import :LanguageReference;
 export import :PackageIdentifier;
 export import :PackageName;
 export import :PackageReference;
+export import :Recipe;
+export import :RecipeBuildStateConverter;
+export import :RecipeCache;
+export import :RecipeExtensions;
+export import :RecipeSML;
+export import :RecipeValue;
+export import :RootRecipe;
+export import :RootRecipeExtensions;
+
+// SML
+export import :SML;
 
 // Utilities
 export import :HandledException;
 export import :SequenceMap;
 
 // Value Table
 export import :Value;
+export import :ValueTableManager;
+export import :ValueTableReader;
+export import :ValueTableWriter;
 
-using namespace Opal;
+// Wren
+export import :WrenHelpers;
+export import :WrenHost;
+export import :WrenValueTable;
 
-#define CLIENT_CORE_IMPLEMENTATION
+using namespace Opal;
 
-#include "build/RecipeBuildLocationManager.h"
-#include "build/BuildEngine.h"
-#include "local-user-config/LocalUserConfigExtensions.h"
-#include "package/PackageManager.h"
-#include "wren/WrenHost.h"
-#include "wren/WrenValueTable.h"
+#include "build/BuildEngine.h"
diff --git a/code/client/core/source/build/BuildEngine.h b/code/client/core/source/build/BuildEngine.h
@@ -6,7 +6,6 @@
 #include "BuildRunner.h"
 #include "BuildEvaluateEngine.h"
 #include "BuildLoadEngine.h"
-#include "local-user-config/LocalUserConfigExtensions.h"
 
 namespace Soup::Core
 {

diff --git a/code/client/core/source/build/BuildEvaluateEngine.h b/code/client/core/source/build/BuildEvaluateEngine.h
@@ -3,9 +3,6 @@
 // </copyright>
 
 #pragma once
-#include "IEvaluateEngine.h"
-#include "BuildHistoryChecker.h"
-#include "operation-graph/OperationGraph.h"
 
 namespace Soup::Core
 {

diff --git a/...t/core/source/build/BuildHistoryChecker.h → ...core/source/build/BuildHistoryChecker.cpp b/...t/core/source/build/BuildHistoryChecker.h → ...core/source/build/BuildHistoryChecker.cpp
@@ -1,8 +1,18 @@
-// <copyright file="BuildHistoryChecker.h" company="Soup">
+// <copyright file="BuildHistoryChecker.cpp" company="Soup">
 // Copyright (c) Soup. All rights reserved.
 // </copyright>
 
-#pragma once
+module;
+
+#include <chrono>
+#include <vector>
+
+export module Soup.Core:BuildHistoryChecker;
+
+import Opal;
+import :FileSystemState;
+
+using namespace Opal;
 
 namespace Soup::Core
 {

diff --git a/code/client/core/source/build/BuildLoadEngine.h b/code/client/core/source/build/BuildLoadEngine.h
@@ -3,9 +3,6 @@
 // </copyright>
 
 #pragma once
-#include "package-lock/PackageLockExtensions.h"
-#include "RecipeBuildArguments.h"
-#include "recipe/RecipeCache.h"
 
 namespace Soup::Core
 {

diff --git a/code/client/core/source/build/BuildRunner.h b/code/client/core/source/build/BuildRunner.h
@@ -3,15 +3,6 @@
 // </copyright>
 
 #pragma once
-#include "IEvaluateEngine.h"
-#include "PackageProvider.h"
-#include "RecipeBuildArguments.h"
-#include "RecipeBuildLocationManager.h"
-#include "local-user-config/LocalUserConfig.h"
-#include "operation-graph/OperationGraphManager.h"
-#include "operation-graph/OperationResultsManager.h"
-#include "value-table/ValueTableManager.h"
-#include "recipe/RecipeBuildStateConverter.h"
 
 namespace Soup::Core
 {

diff --git a/...lient/core/source/build/IEvaluateEngine.h → ...ent/core/source/build/IEvaluateEngine.cpp b/...lient/core/source/build/IEvaluateEngine.h → ...ent/core/source/build/IEvaluateEngine.cpp
@@ -1,10 +1,18 @@
-// <copyright file="IBuildEvaluateEngine.h" company="Soup">
+// <copyright file="IEvaluateEngine.cpp" company="Soup">
 // Copyright (c) Soup. All rights reserved.
 // </copyright>
 
-#pragma once
-#include "operation-graph/OperationGraph.h"
-#include "operation-graph/OperationResults.h"
+module;
+
+#include <vector>
+
+export module Soup.Core:IEvaluateEngine;
+
+import Opal;
+import :OperationGraph;
+import :OperationResults;
+
+using namespace Opal;
 
 namespace Soup::Core
 {
@@ -25,4 +33,4 @@ namespace Soup::Core
 			const std::vector<Path>& globalAllowedReadAccess,
 			const std::vector<Path>& globalAllowedWriteAccess) = 0;
 	};
-}
+}
diff --git a/...lient/core/source/build/PackageProvider.h → ...ent/core/source/build/PackageProvider.cpp b/...lient/core/source/build/PackageProvider.h → ...ent/core/source/build/PackageProvider.cpp
@@ -1,11 +1,24 @@
-// <copyright file="PackageProvider.h" company="Soup">
+// <copyright file="PackageProvider.cpp" company="Soup">
 // Copyright (c) Soup. All rights reserved.
 // </copyright>
 
-#pragma once
-#include "package-lock/PackageLockExtensions.h"
-#include "RecipeBuildArguments.h"
-#include "recipe/RecipeCache.h"
+module;
+
+#include <format>
+#include <stdexcept>
+#include <map>
+#include <string>
+#include <vector>
+
+export module Soup.Core:PackageProvider;
+
+import Opal;
+import :PackageName;
+import :PackageReference;
+import :Recipe;
+import :Value;
+
+using namespace Opal;
 
 export namespace Soup::Core
 {

diff --git a/.../core/source/build/RecipeBuildArguments.h → ...ore/source/build/RecipeBuildArguments.cpp b/.../core/source/build/RecipeBuildArguments.h → ...ore/source/build/RecipeBuildArguments.cpp
@@ -1,8 +1,18 @@
-// <copyright file="RecipeBuildArguments.h" company="Soup">
+// <copyright file="RecipeBuildArguments.cpp" company="Soup">
 // Copyright (c) Soup. All rights reserved.
 // </copyright>
 
-#pragma once
+module;
+
+#include <map>
+#include <string>
+
+export module Soup.Core:RecipeBuildArguments;
+
+import Opal;
+import :Value;
+
+using namespace Opal;
 
 namespace Soup::Core
 {

diff --git a/...source/build/RecipeBuildLocationManager.h → ...urce/build/RecipeBuildLocationManager.cpp b/...source/build/RecipeBuildLocationManager.h → ...urce/build/RecipeBuildLocationManager.cpp
@@ -1,11 +1,29 @@
-// <copyright file="RecipeBuildLocationManager.h" company="Soup">
+// <copyright file="RecipeBuildLocationManager.cpp" company="Soup">
 // Copyright (c) Soup. All rights reserved.
 // </copyright>
 
-#pragma once
-#include "recipe/Recipe.h"
-#include "value-table/ValueTableWriter.h"
-#include "PackageProvider.h"
+module;
+
+#include <format>
+#include <map>
+#include <string>
+#include <sstream>
+
+export module Soup.Core:RecipeBuildLocationManager;
+
+import CryptoPP;
+import Opal;
+import :HandledException;
+import :KnownLanguage;
+import :PackageName;
+import :Recipe;
+import :RecipeCache;
+import :RootRecipe;
+import :RootRecipeExtensions;
+import :Value;
+import :ValueTableWriter;
+
+using namespace Opal;
 
 namespace Soup::Core
 {
@@ -97,4 +115,4 @@ namespace Soup::Core
 			return rootOutput;
 		}
 	};
-}
+}
diff --git a/...ource/local-user-config/LocalUserConfig.h → ...rce/local-user-config/LocalUserConfig.cpp b/...ource/local-user-config/LocalUserConfig.h → ...rce/local-user-config/LocalUserConfig.cpp
@@ -1,10 +1,20 @@
-// <copyright file="LocalUserConfig.h" company="Soup">
+// <copyright file="LocalUserConfig.cpp" company="Soup">
 // Copyright (c) Soup. All rights reserved.
 // </copyright>
 
-#pragma once
-#include "recipe/RecipeValue.h"
-#include "SDKConfig.h"
+module;
+
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+export module Soup.Core:LocalUserConfig;
+
+import Opal;
+import :RecipeValue;
+import :SDKConfig;
+
+using namespace Opal;
 
 namespace Soup::Core
 {

diff --git a/...l-user-config/LocalUserConfigExtensions.h → ...user-config/LocalUserConfigExtensions.cpp b/...l-user-config/LocalUserConfigExtensions.h → ...user-config/LocalUserConfigExtensions.cpp
@@ -1,10 +1,18 @@
-// <copyright file="LocalUserConfigExtensions.h" company="Soup">
+// <copyright file="LocalUserConfigExtensions.cpp" company="Soup">
 // Copyright (c) Soup. All rights reserved.
 // </copyright>
 
-#pragma once
-#include "LocalUserConfig.h"
-#include "recipe/RecipeSML.h"
+module;
+
+#include <memory>
+
+export module Soup.Core:LocalUserConfigExtensions;
+
+import Opal;
+import :LocalUserConfig;
+import :RecipeSML;
+
+using namespace Opal;
 
 namespace Soup::Core
 {