Undo Custom Refs (#277)

* Revert back to string references * Update refs * Fix paths * Fix windows paths
SoupBuild · Dec 10, 2024 · 21b6bef · 21b6bef
1 parent 5733a04
commit 21b6bef
Show file tree

Hide file tree

Showing 63 changed files with 90 additions and 98 deletions.
diff --git a/Samples/C/BuildExtension/Executable/Recipe.sml b/Samples/C/BuildExtension/Executable/Recipe.sml
@@ -1,7 +1,9 @@
 Name: 'Samples.C.SimpleBuildExtension.Executable'
-Language: (C@0)
+Language: 'C|0'
 Type: 'Executable'
 Version: 1.0.0
 Dependencies: {
-	Build: [ '../Extension/' ]
+	Build: [
+		'../Extension/'
+	]
 }
diff --git a/Samples/C/BuildExtension/Extension/Recipe.sml b/Samples/C/BuildExtension/Extension/Recipe.sml
@@ -1,11 +1,11 @@
 Name: 'Samples.C.BuildExtension.Extension'
-Language: (Wren@0)
+Language: 'Wren|0'
 Version: 1.0.0
 Source: [
 	'CustomBuildTask.wren'
 ]
 Dependencies: {
 	Runtime: [
-		<Soup|Build.Utils@0>
+		'Soup|Build.Utils@0'
 	]
 }
diff --git a/Samples/C/ConsoleApplication/Recipe.sml b/Samples/C/ConsoleApplication/Recipe.sml
@@ -1,4 +1,4 @@
 Name: 'Samples.C.ConsoleApplication'
-Language: (C@0)
+Language: 'C|0'
 Type: 'Executable'
 Version: 1.0.0
diff --git a/Samples/C/DynamicLibrary/Application/Recipe.sml b/Samples/C/DynamicLibrary/Application/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.C.DynamicLibrary.Application'
-Language: (C@0)
+Language: 'C|0'
 Type: 'Executable'
 Version: 1.0.0
 Dependencies: {

diff --git a/Samples/C/DynamicLibrary/Library/Recipe.sml b/Samples/C/DynamicLibrary/Library/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.C.DynamicLibrary.Library'
-Language: (C@0)
+Language: 'C|0'
 Version: 1.0.0
 Type: 'DynamicLibrary'
 IncludePaths: [

diff --git a/Samples/C/StaticLibrary/Application/Recipe.sml b/Samples/C/StaticLibrary/Application/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.C.StaticLibrary.Application'
-Language: (C@0)
+Language: 'C|0'
 Type: 'Executable'
 Version: 1.0.0
 Dependencies: {

diff --git a/Samples/C/StaticLibrary/Library/Recipe.sml b/Samples/C/StaticLibrary/Library/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.C.StaticLibrary.Library'
-Language: (C@0)
+Language: 'C|0'
 Version: 1.0.0
 Type: 'StaticLibrary'
 IncludePaths: [

diff --git a/Samples/C/WindowsApplication/Recipe.sml b/Samples/C/WindowsApplication/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.C.WindowsApplication'
-Language: (C@0)
+Language: 'C|0'
 Type: 'Windows'
 Version: 1.0.0
 Resources: 'WindowsProject.rc'

diff --git a/Samples/CSharp/BuildExtension/Executable/Recipe.sml b/Samples/CSharp/BuildExtension/Executable/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.CSharp.BuildExtension.Executable'
-Language: (C#@0)
+Language: 'C#|0'
 TargetFramework: 'net8.0'
 Type: 'Executable'
 Version: 1.0.0

diff --git a/Samples/CSharp/BuildExtension/Extension/Recipe.sml b/Samples/CSharp/BuildExtension/Extension/Recipe.sml
@@ -1,11 +1,11 @@
 Name: 'Samples.CSharp.BuildExtension.Extension'
-Language: (Wren@0)
+Language: 'Wren|0'
 Version: 1.0.0
 Source: [
 	'CustomBuildTask.wren'
 ]
 Dependencies: {
 	Runtime: [
-		<Soup|Build.Utils@0>
+		'Soup|Build.Utils@0'
 	]
 }
diff --git a/Samples/CSharp/ConsoleApplication/Recipe.sml b/Samples/CSharp/ConsoleApplication/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.CSharp.ConsoleApplication'
-Language: (C#@0)
+Language: 'C#|0'
 TargetFramework: 'net8.0'
 Type: 'Executable'
 Version: 1.0.0
diff --git a/Samples/CSharp/Library/Application/Recipe.sml b/Samples/CSharp/Library/Application/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.CSharp.Library.ConsoleApplication'
-Language: (C#@0)
+Language: 'C#|0'
 TargetFramework: 'net8.0'
 Type: 'Executable'
 Version: 1.0.0

diff --git a/Samples/CSharp/Library/Library/Recipe.sml b/Samples/CSharp/Library/Library/Recipe.sml
@@ -1,4 +1,4 @@
 Name: 'Samples.CSharp.Library.Library'
-Language: (C#@0)
+Language: 'C#|0'
 TargetFramework: 'net8.0'
 Version: 1.0.0
diff --git a/Samples/Cpp/BuildExtension/Executable/Recipe.sml b/Samples/Cpp/BuildExtension/Executable/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.SimpleBuildExtension.Executable'
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Executable'
 Version: 1.0.0
 Dependencies: {

diff --git a/Samples/Cpp/BuildExtension/Extension/Recipe.sml b/Samples/Cpp/BuildExtension/Extension/Recipe.sml
@@ -1,13 +1,13 @@
 Name: 'Samples.Cpp.BuildExtension.Extension'
-Language: (Wren@0)
+Language: 'Wren|0'
 Version: 1.0.0
 Source: [
 	'CustomBuildTask.wren'
 ]
 
 Dependencies: {
 	Runtime: [
-		<Soup|Build.Utils@0>
+		'Soup|Build.Utils@0'
 	]
 	Tool: [
 		'../Tool/'

diff --git a/Samples/Cpp/BuildExtension/Tool/Recipe.sml b/Samples/Cpp/BuildExtension/Tool/Recipe.sml
@@ -1,4 +1,4 @@
 Name: 'Samples.SimpleBuildExtension.Tool'
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Executable'
 Version: 1.0.0
diff --git a/Samples/Cpp/ConsoleApplication/Recipe.sml b/Samples/Cpp/ConsoleApplication/Recipe.sml
@@ -1,4 +1,4 @@
 Name: 'Samples.Cpp.ConsoleApplication'
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Executable'
 Version: 1.0.0
diff --git a/Samples/Cpp/DirectX/Recipe.sml b/Samples/Cpp/DirectX/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.DirectX'
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Windows'
 Version: 1.0.0
 Partitions: [

diff --git a/Samples/Cpp/DynamicLibrary/Application/Recipe.sml b/Samples/Cpp/DynamicLibrary/Application/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.DynamicLibrary.Application'
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Executable'
 Version: 1.0.0
 Dependencies: {

diff --git a/Samples/Cpp/DynamicLibrary/Library/Recipe.sml b/Samples/Cpp/DynamicLibrary/Library/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.DynamicLibrary.Library'
-Language: (C++@0)
+Language: 'C++|0'
 Version: 1.0.0
 Type: 'DynamicLibrary'
 Defines: [

diff --git a/Samples/Cpp/HeaderLibrary/Application/Recipe.sml b/Samples/Cpp/HeaderLibrary/Application/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.HeaderLibrary.Application'
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Executable'
 Version: 1.0.0
 Dependencies: {

diff --git a/Samples/Cpp/HeaderLibrary/Library/Recipe.sml b/Samples/Cpp/HeaderLibrary/Library/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.HeaderLibrary.Library'
-Language: (C++@0)
+Language: 'C++|0'
 Version: 1.0.0
 PublicHeaders: [
 	{

diff --git a/Samples/Cpp/ModuleDynamicLibrary/Application/Recipe.sml b/Samples/Cpp/ModuleDynamicLibrary/Application/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.ModuleDynamicLibrary.Application'
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Executable'
 Version: 1.0.0
 Dependencies: {

diff --git a/Samples/Cpp/ModuleDynamicLibrary/Library/Recipe.sml b/Samples/Cpp/ModuleDynamicLibrary/Library/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.ModuleDynamicLibrary.Library'
-Language: (C++@0)
+Language: 'C++|0'
 Version: 1.0.0
 Interface: 'Module.cpp'
 Type: 'DynamicLibrary'

diff --git a/Samples/Cpp/ModuleInterface/Recipe.sml b/Samples/Cpp/ModuleInterface/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.ModuleInterface'
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Executable'
 Version: 1.0.0
 Interface: 'Module.cpp'

diff --git a/Samples/Cpp/ParseJsonFile/Recipe.sml b/Samples/Cpp/ParseJsonFile/Recipe.sml
@@ -1,9 +1,9 @@
 Name: 'Samples.Cpp.ParseJsonFile'
-Language: (C++@0)
+Language: 'C++|0'
 Version: 1.0.0
 Type: 'Executable'
 Dependencies: {
 	Runtime: [
-		<mwasplund|json11@1>
+		'mwasplund|json11@1'
 	]
 }
diff --git a/Samples/Cpp/StaticLibrary/Application/Recipe.sml b/Samples/Cpp/StaticLibrary/Application/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.StaticLibrary.Application'
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Executable'
 Version: 1.0.0
 Dependencies: {

diff --git a/Samples/Cpp/StaticLibrary/Library/Recipe.sml b/Samples/Cpp/StaticLibrary/Library/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.StaticLibrary.Library'
-Language: (C++@0)
+Language: 'C++|0'
 Version: 1.0.0
 Interface: 'Module.cpp'
 Type: 'StaticLibrary'

diff --git a/Samples/Cpp/WindowsApplication/Recipe.sml b/Samples/Cpp/WindowsApplication/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Samples.Cpp.WindowsApplication'
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Windows'
 Version: 1.0.0
 Resources: 'WindowsProject.rc'
diff --git a/Scripts/Linux/soup b/Scripts/Linux/soup
@@ -6,6 +6,7 @@ set -e
 SCRIPTS_DIR=$(dirname "$0")
 ROOT_DIR=$SCRIPTS_DIR/../..
 OUT_DIR=$ROOT_DIR/out
+MSBUILD_DIR=$OUT_DIR/msbuild
 RUN_DIR=$OUT_DIR/run
 SOURCE_DIR=$ROOT_DIR/Source
 GLOBAL_PACKAGES_DIR=~/.soup/packages
@@ -39,10 +40,10 @@ mkdir -p $RUN_DIR/BuiltIn/Soup/Wren/$SOUP_WREN_VERSION
 cp -p $GLOBAL_PACKAGES_DIR/Wren/Soup/Wren/$SOUP_WREN_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup/Wren/$SOUP_WREN_VERSION/Recipe.sml
 cp -p -R $GLOBAL_PACKAGES_DIR/Wren/Soup/Wren/$SOUP_WREN_VERSION/out/$CONFIG_HASH/ $RUN_DIR/BuiltIn/Soup/Wren/$SOUP_WREN_VERSION/out/
 
-cp -p -R $ROOT_DIR/Source/out/bin/Soup.Build.PackageManager/Release/net8.0/linux-x64/publish/ $RUN_DIR/PackageManager
+cp -p -R $MSBUILD_DIR/bin/Soup.Build.PackageManager/Release/net8.0/linux-x64/publish/ $RUN_DIR/PackageManager
 
-cp -p -R $ROOT_DIR/Source/out/bin/SoupView/Release/net8.0/linux-x64/publish/ $RUN_DIR/View
+cp -p -R $MSBUILD_DIR/bin/SoupView/Release/net8.0/linux-x64/publish/ $RUN_DIR/View
 
-cp -p -R $ROOT_DIR/Source/out/bin/Swhere/Release/net8.0/linux-x64/publish/Swhere $RUN_DIR/swhere
+cp -p -R $MSBUILD_DIR/bin/Swhere/Release/net8.0/linux-x64/publish/Swhere $RUN_DIR/swhere
 
 eval $RUN_DIR/soup "$@"
diff --git a/Scripts/Linux/soupd b/Scripts/Linux/soupd
@@ -6,6 +6,7 @@ set -e
 SCRIPTS_DIR=$(dirname "$0")
 ROOT_DIR=$SCRIPTS_DIR/../..
 OUT_DIR=$ROOT_DIR/out
+MSBUILD_DIR=$OUT_DIR/msbuild
 RUN_DIR=$OUT_DIR/run
 SOURCE_DIR=$ROOT_DIR/Source
 GLOBAL_PACKAGES_DIR=~/.soup/packages
@@ -39,10 +40,10 @@ mkdir -p $RUN_DIR/BuiltIn/Soup/Wren/$SOUP_WREN_VERSION
 cp -p $GLOBAL_PACKAGES_DIR/Wren/Soup/Wren/$SOUP_WREN_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup/Wren/$SOUP_WREN_VERSION/Recipe.sml
 cp -p -R $GLOBAL_PACKAGES_DIR/Wren/Soup/Wren/$SOUP_WREN_VERSION/out/$CONFIG_HASH/ $RUN_DIR/BuiltIn/Soup/Wren/$SOUP_WREN_VERSION/out/
 
-cp -p -R $ROOT_DIR/Source/out/bin/Soup.Build.PackageManager/Debug/net8.0/linux-x64/publish/ $RUN_DIR/PackageManager
+cp -p -R $MSBUILD_DIR/bin/Soup.Build.PackageManager/Debug/net8.0/linux-x64/publish/ $RUN_DIR/PackageManager
 
-cp -p -R $ROOT_DIR/Source/out/bin/SoupView/Debug/net8.0/linux-x64/publish/ $RUN_DIR/View
+cp -p -R $MSBUILD_DIR/bin/SoupView/Debug/net8.0/linux-x64/publish/ $RUN_DIR/View
 
-cp -p -R $ROOT_DIR/Source/out/bin/Swhere/Debug/net8.0/linux-x64/publish/Swhere $RUN_DIR/swhere
+cp -p -R $MSBUILD_DIR/bin/Swhere/Debug/net8.0/linux-x64/publish/Swhere $RUN_DIR/swhere
 
 eval $RUN_DIR/soup "$@"
diff --git a/Scripts/Linux/swhere b/Scripts/Linux/swhere
@@ -5,7 +5,7 @@ set -e
 
 SCRIPTS_DIR=$(dirname "$0")
 ROOT_DIR=$SCRIPTS_DIR/../..
-OUT_DIR=$ROOT_DIR/Source/out
+OUT_DIR=$ROOT_DIR/out
 
 
 eval $OUT_DIR/msbuild/bin/Swhere/Release/net8.0/linux-x64/publish/Swhere "$@"
diff --git a/Scripts/Windows/soup.cmd b/Scripts/Windows/soup.cmd
@@ -3,6 +3,7 @@ SETLOCAL
 SET ScriptsDir=%~dp0
 SET RootDir=%ScriptsDir%..\..
 SET OutDir=%RootDir%\out
+SET MSBuildDir=%OutDir%\msbuild
 SET RunDir=%OutDir%\run
 SET SourceDir=%RootDir%\Source
 SET GlobalPackagesDir=%UserProfile%\.soup\packages
@@ -30,10 +31,10 @@ robocopy %OutDir%\C++\Local\mkdir\%MKDIR_VERSION%\%ConfigHash%\ %RunDir%\Soup\Bu
 robocopy %GlobalPackagesDir%\Wren\Soup\Wren\%SOUP_WREN_VERSION%\ %RunDir%\Soup\BuiltIn\Soup\Wren\%SOUP_WREN_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
 robocopy %GlobalOutDir%\Wren\Soup\Wren\%SOUP_WREN_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\Soup\Wren\%SOUP_WREN_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
 
-robocopy %OutDir%\bin\Soup.Build.PackageManager\Release\net8.0\win-x64\publish\ %RunDir%\Soup\PackageManager\ /MIR /NJH /NJS /NDL > NUL
+robocopy %MSBuildDir%\bin\Soup.Build.PackageManager\Release\net8.0\win-x64\publish\ %RunDir%\Soup\PackageManager\ /MIR /NJH /NJS /NDL > NUL
 
-robocopy %OutDir%\bin\SoupView\Release\net8.0\win-x64\publish\ %RunDir%\Soup\View\ /MIR /NJH /NJS /NDL > NUL
+robocopy %MSBuildDir%\bin\SoupView\Release\net8.0\win-x64\publish\ %RunDir%\Soup\View\ /MIR /NJH /NJS /NDL > NUL
 
-robocopy %OutDir%\bin\Swhere\Release\net8.0\win-x64\publish\ %RunDir%\ swhere.exe /NJH /NJS /NDL > NUL
+robocopy %MSBuildDir%\bin\Swhere\Release\net8.0\win-x64\publish\ %RunDir%\ swhere.exe /NJH /NJS /NDL > NUL
 
 %RunDir%\Soup.cmd %*
diff --git a/Scripts/Windows/soupd.cmd b/Scripts/Windows/soupd.cmd
@@ -3,6 +3,7 @@ SETLOCAL
 SET ScriptsDir=%~dp0
 SET RootDir=%ScriptsDir%..\..
 SET OutDir=%RootDir%\out
+SET MSBuildDir=%OutDir%\msbuild
 SET RunDir=%OutDir%\run
 SET SourceDir=%RootDir%\Source
 SET GlobalPackagesDir=%UserProfile%\.soup\packages
@@ -30,10 +31,10 @@ robocopy %OutDir%\C++\Local\mkdir\%MKDIR_VERSION%\%ConfigHash%\ %RunDir%\Soup\Bu
 robocopy %GlobalPackagesDir%\Wren\Soup\Wren\%SOUP_WREN_VERSION%\ %RunDir%\Soup\BuiltIn\Soup\Wren\%SOUP_WREN_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
 robocopy %GlobalOutDir%\Wren\Soup\Wren\%SOUP_WREN_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\Soup\Wren\%SOUP_WREN_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
 
-robocopy %OutDir%\bin\Soup.Build.PackageManager\Debug\net8.0\win-x64\publish\ %RunDir%\Soup\PackageManager\ /MIR /NJH /NJS /NDL > NUL
+robocopy %MSBuildDir%\bin\Soup.Build.PackageManager\Debug\net8.0\win-x64\publish\ %RunDir%\Soup\PackageManager\ /MIR /NJH /NJS /NDL > NUL
 
-robocopy %OutDir%\bin\SoupView\Debug\net8.0\win-x64\publish\ %RunDir%\Soup\View\ /MIR /NJH /NJS /NDL > NUL
+robocopy %MSBuildDir%\bin\SoupView\Debug\net8.0\win-x64\publish\ %RunDir%\Soup\View\ /MIR /NJH /NJS /NDL > NUL
 
-robocopy %OutDir%\bin\Swhere\Debug\net8.0\win-x64\publish\ %RunDir%\ swhere.exe /NJH /NJS /NDL > NUL
+robocopy %MSBuildDir%\bin\Swhere\Debug\net8.0\win-x64\publish\ %RunDir%\ swhere.exe /NJH /NJS /NDL > NUL
 
 %RunDir%\Soup.cmd %*
diff --git a/Scripts/Windows/swhere.cmd b/Scripts/Windows/swhere.cmd
@@ -3,5 +3,6 @@ SETLOCAL
 SET ScriptsDir=%~dp0
 SET RootDir=%ScriptsDir%..\..
 SET OutDir=%RootDir%\out
+SET MSBuildDir=%OutDir%\msbuild
 
-%OutDir%\bin\Swhere\Release\net8.0\win-x64\publish\swhere.exe %*
+%MSBuildDir%\bin\Swhere\Release\net8.0\win-x64\publish\swhere.exe %*
diff --git a/Source/BenchTests/Recipe.sml b/Source/BenchTests/Recipe.sml
@@ -1,11 +1,7 @@
 Name: 'Soup.BenchTests'
-Language: (C++@0)
+Language: 'C++|0'
 Version: 1.0.0
 Type: 'Executable'
-Source: [
-	'Main.cpp'
-	'Nanobench.cpp'
-]
 Dependencies: {
 	Runtime: [
 		'../Client/Core/'

diff --git a/Source/Client/CLI/Recipe.sml b/Source/Client/CLI/Recipe.sml
@@ -1,6 +1,6 @@
 Name: 'Soup'
 Version: 0.41.1
-Language: (C++@0)
+Language: 'C++|0'
 Type: 'Executable'
 Source: [
 	'Source/Main.cpp'

diff --git a/Source/Client/Core/Recipe.sml b/Source/Client/Core/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'Soup.Core'
-Language: (C++@0)
+Language: 'C++|0'
 Version: 0.1.1
 Defines: [
 	# 'TRACE_SYSTEM_ACCESS'

diff --git a/Source/Client/Tools/Recipe.sml b/Source/Client/Tools/Recipe.sml
@@ -1,5 +1,5 @@
 Name: 'SoupTools'
-Language: (C++@0)
+Language: 'C++|0'
 Version: 1.0.0
 Type: 'DynamicLibrary'
 Dependencies: {