diff --git a/Docs/Architecture.md b/Docs/Architecture.md index 0b9a4d140..2369939c1 100644 --- a/Docs/Architecture.md +++ b/Docs/Architecture.md @@ -8,7 +8,7 @@ The Soup Recipe is a property bag defined in the [toml](https://github.com/toml- Soup builds are fairly simple at their core. There are five phases. 1. **Parse Recipe** - The Recipe toml file is read from disk. -2. **Build Dependencies** - The build engine recursively builds all transient dependencies. +2. **Build Dependencies** - The build engine recursively builds all trasitive dependencies. 3. **Build Extensions** - The build engine recursively builds all build extension DLLs. The engine will then invoke the "RegisterBuildExtension" method that is exported from the Extension DLL. 4. **Run Tasks** - The build engine will invoke all registered build tasks in their defined order (Note: this is still being worked on.) The Tasks can influence each other by reading and setting properties on the active state. A build task should not actually perform any commands itself, it will instead generate Build Commands which are self contained operation definitions with input/output files. 5. **Run Commands** - The final stage of the build is to execute the build commands that were generated from the build tasks. These commands contain the input and output files that will be used to perform incremental builds. (Note: There is currently a very simple time-stamp based incremental build that relies on the compiler to print all included files. There is an open question if this can be replaced with a better system that monitors the filesystem for changes, possibly BuildXL). diff --git a/Docs/CLI.md b/Docs/CLI.md index 8c6a0b277..f5df505e5 100644 --- a/Docs/CLI.md +++ b/Docs/CLI.md @@ -9,4 +9,8 @@ soup [arguments] [Initialize](cli/initialize) +[Install](cli/install) + +[Publish](cli/publish) + [Version](cli/version) diff --git a/Docs/CLI/Build.md b/Docs/CLI/Build.md index 2eb9d79c7..75ccf808d 100644 --- a/Docs/CLI/Build.md +++ b/Docs/CLI/Build.md @@ -1,6 +1,6 @@ # Build ## Overview -Build a recipe and all transient dependencies. +Build a recipe and all transitive dependencies. ``` soup build [-flavor |-force] ``` diff --git a/Docs/CLI/Install.md b/Docs/CLI/Install.md index e56f95ba7..08b11115d 100644 --- a/Docs/CLI/Install.md +++ b/Docs/CLI/Install.md @@ -1,13 +1,24 @@ -# Install packages +# Install +## Overview +Install packages from the public feed. +``` +soup install [[@]] +``` -## Synopsis +`[@]` - An optional parameter to specify the name and optional version of the package you would like to install. If not present then the install command will install all of the packages already in the recipe. +## Examples +Install all of the current external dependencies and build extension packages. ``` soup install -soup install -soup install @ ``` -## Description +Install the latest `json11` package. +``` +soup install json11 +``` -Used to install individual packages or all register dependencies for a given recipe. +Install version `1.0.0` of the `json11` package. +``` +soup install json11@1.0.0 +``` \ No newline at end of file diff --git a/Docs/CLI/Publish.md b/Docs/CLI/Publish.md index 9f3572fc8..10d12729c 100644 --- a/Docs/CLI/Publish.md +++ b/Docs/CLI/Publish.md @@ -1,11 +1,12 @@ -# Install packages - -## Synopsis - +# Publish +## Overview +Pack the current recipe folder and publish its contents to the official feed. ``` soup publish ``` -## Description - -Package up the contents of the current recipe and publish its contents to the official feed. +## Examples +Publish the latest version of the package in the current folder. +``` +soup publish +``` diff --git a/Managed/Core/Build/BuildEngine.cs b/Managed/Core/Build/BuildEngine.cs index 2009887a5..31b84a2b9 100644 --- a/Managed/Core/Build/BuildEngine.cs +++ b/Managed/Core/Build/BuildEngine.cs @@ -209,7 +209,7 @@ private async Task CompileModuleAsync( // Add all of the direct dependencies as module references // and set their version defintions - // TODO: MSVC requires all transient modules also + // TODO: MSVC requires all trasnsitive modules also bool isRecursive = _compiler.Name == "MSVC"; await BuildDependencyModuleReferences(path, binaryDirectory, recipe, modules, defines, isRecursive); @@ -276,7 +276,7 @@ private async Task CheckCompileSourceAsync( // Add all of the direct dependencies as module references // and set their version defintions - // TODO: MSVC requires all transient modules also + // TODO: MSVC requires all trasnsitive modules also bool isRecursive = _compiler.Name == "MSVC"; await BuildDependencyModuleReferences(path, binaryDirectory, recipe, modules, defines, isRecursive); diff --git a/Managed/Core/Build/BuildRequiredChecker.cs b/Managed/Core/Build/BuildRequiredChecker.cs index 79c50fedf..b8affde2b 100644 --- a/Managed/Core/Build/BuildRequiredChecker.cs +++ b/Managed/Core/Build/BuildRequiredChecker.cs @@ -15,7 +15,7 @@ public static bool IsSourceFileOutdated(string rootPath, BuildState buildState, var sourceFiles = new List(); sourceFiles.Add(sourceFile); - // Copy the dependencies and add all transient dependencies to the collection + // Copy the dependencies and add all transitive dependencies to the collection var dependencyClosure = new List(); dependencyClosure.AddRange(dependencies); dependencyClosure.Add(sourceFile); diff --git a/Managed/Core/Package/PackageManager.cs b/Managed/Core/Package/PackageManager.cs index b68e780df..5b9af73f3 100644 --- a/Managed/Core/Package/PackageManager.cs +++ b/Managed/Core/Package/PackageManager.cs @@ -93,8 +93,8 @@ public static async Task> BuildRecursiveDependeciesAsync( result.Add(dependency); var dependencyPackagePath = BuildKitchenPackagePath(config, dependency); var dependencyRecipe = await RecipeManager.LoadFromFileAsync(dependencyPackagePath); - var transientDependencies = await BuildRecursiveDependeciesAsync(config, dependencyRecipe); - result.AddRange(transientDependencies); + var transsitiveDependencies = await BuildRecursiveDependeciesAsync(config, dependencyRecipe); + result.AddRange(transsitiveDependencies); } return result; diff --git a/Source/Core/Build/BuildEngine.h b/Source/Core/Build/BuildEngine.h index 1452f1608..0c010e46a 100644 --- a/Source/Core/Build/BuildEngine.h +++ b/Source/Core/Build/BuildEngine.h @@ -262,7 +262,7 @@ namespace Soup::Build { linkArguments.TargetType = Soup::LinkTarget::StaticLibrary; - // Add the library as a link dependency and all transient libraries + // Add the library as a link dependency and all transitive libraries result.LinkDependencies = arguments.LinkDependencies; result.LinkDependencies.push_back(linkArguments.RootDirectory + linkArguments.TargetFile); break;