From 21b6befe23626cb2b5cdcc7c0ba66c60eae936bf Mon Sep 17 00:00:00 2001 From: Matthew Asplund Date: Tue, 10 Dec 2024 04:30:05 -0600 Subject: [PATCH] Undo Custom Refs (#277) * Revert back to string references * Update refs * Fix paths * Fix windows paths --- Samples/C/BuildExtension/Executable/Recipe.sml | 6 ++++-- Samples/C/BuildExtension/Extension/Recipe.sml | 4 ++-- Samples/C/ConsoleApplication/Recipe.sml | 2 +- Samples/C/DynamicLibrary/Application/Recipe.sml | 2 +- Samples/C/DynamicLibrary/Library/Recipe.sml | 2 +- Samples/C/StaticLibrary/Application/Recipe.sml | 2 +- Samples/C/StaticLibrary/Library/Recipe.sml | 2 +- Samples/C/WindowsApplication/Recipe.sml | 2 +- .../CSharp/BuildExtension/Executable/Recipe.sml | 2 +- .../CSharp/BuildExtension/Extension/Recipe.sml | 4 ++-- Samples/CSharp/ConsoleApplication/Recipe.sml | 2 +- Samples/CSharp/Library/Application/Recipe.sml | 2 +- Samples/CSharp/Library/Library/Recipe.sml | 2 +- Samples/Cpp/BuildExtension/Executable/Recipe.sml | 2 +- Samples/Cpp/BuildExtension/Extension/Recipe.sml | 4 ++-- Samples/Cpp/BuildExtension/Tool/Recipe.sml | 2 +- Samples/Cpp/ConsoleApplication/Recipe.sml | 2 +- Samples/Cpp/DirectX/Recipe.sml | 2 +- .../Cpp/DynamicLibrary/Application/Recipe.sml | 2 +- Samples/Cpp/DynamicLibrary/Library/Recipe.sml | 2 +- Samples/Cpp/HeaderLibrary/Application/Recipe.sml | 2 +- Samples/Cpp/HeaderLibrary/Library/Recipe.sml | 2 +- .../ModuleDynamicLibrary/Application/Recipe.sml | 2 +- .../Cpp/ModuleDynamicLibrary/Library/Recipe.sml | 2 +- Samples/Cpp/ModuleInterface/Recipe.sml | 2 +- Samples/Cpp/ParseJsonFile/Recipe.sml | 4 ++-- Samples/Cpp/StaticLibrary/Application/Recipe.sml | 2 +- Samples/Cpp/StaticLibrary/Library/Recipe.sml | 2 +- Samples/Cpp/WindowsApplication/Recipe.sml | 2 +- Scripts/Linux/soup | 7 ++++--- Scripts/Linux/soupd | 7 ++++--- Scripts/Linux/swhere | 2 +- Scripts/Windows/soup.cmd | 7 ++++--- Scripts/Windows/soupd.cmd | 7 ++++--- Scripts/Windows/swhere.cmd | 3 ++- Source/BenchTests/Recipe.sml | 6 +----- Source/Client/CLI/Recipe.sml | 2 +- Source/Client/Core/Recipe.sml | 2 +- Source/Client/Tools/Recipe.sml | 2 +- Source/Directory.Build.props | 16 +++++++--------- Source/Generate/Recipe.sml | 2 +- Source/GenerateSharp/Api.Client/Recipe.sml | 2 +- Source/GenerateSharp/BootstrapBuild/Recipe.sml | 2 +- Source/GenerateSharp/Migrate/Recipe.sml | 2 +- Source/GenerateSharp/Opal/Recipe.sml | 2 +- .../GenerateSharp/PackageManager.Core/Recipe.sml | 2 +- Source/GenerateSharp/PackageManager/Recipe.sml | 2 +- Source/GenerateSharp/Swhere.Core/Recipe.sml | 2 +- .../Swhere/DotNet/DotNetSDKUtilities.cs | 2 +- Source/GenerateSharp/Swhere/Recipe.sml | 2 +- Source/GenerateSharp/Utilities/Recipe.sml | 2 +- Source/GenerateTest/Recipe.sml | 2 +- Source/Monitor/Client/Recipe.sml | 2 +- .../Monitor/Host/Linux/LinuxTraceEventListener.h | 9 --------- Source/Monitor/Host/Recipe.sml | 2 +- Source/Monitor/Log/Recipe.sml | 2 +- Source/Monitor/Shared/Recipe.sml | 2 +- Source/Monitor/Test/Recipe.sml | 2 +- Source/Tools/Copy/Recipe.sml | 2 +- Source/Tools/Mkdir/Recipe.sml | 4 ++-- Source/Tools/PrintGraph/Recipe.sml | 4 ++-- Source/Tools/PrintResults/Recipe.sml | 2 +- Source/Tools/PrintValueTable/Recipe.sml | 2 +- 63 files changed, 90 insertions(+), 98 deletions(-) diff --git a/Samples/C/BuildExtension/Executable/Recipe.sml b/Samples/C/BuildExtension/Executable/Recipe.sml index 4e8c1fd4..88c80efa 100644 --- 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/' + ] } \ No newline at end of file diff --git a/Samples/C/BuildExtension/Extension/Recipe.sml b/Samples/C/BuildExtension/Extension/Recipe.sml index b3b81cfa..154c6fb8 100644 --- 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' ] } \ No newline at end of file diff --git a/Samples/C/ConsoleApplication/Recipe.sml b/Samples/C/ConsoleApplication/Recipe.sml index 13821d3f..a9a2d0b6 100644 --- 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 \ No newline at end of file diff --git a/Samples/C/DynamicLibrary/Application/Recipe.sml b/Samples/C/DynamicLibrary/Application/Recipe.sml index 586fc9d2..56c7e2f9 100644 --- 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 index 288bafaa..80fe8e96 100644 --- 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 index b9772597..811e5b9a 100644 --- 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 index 95b4ae65..a55fb4e0 100644 --- 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 index a0fb048b..5ee49de7 100644 --- 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 index 37d9de8b..bdd433c7 100644 --- 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 index 20f15875..7b9f8ff2 100644 --- 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' ] } \ No newline at end of file diff --git a/Samples/CSharp/ConsoleApplication/Recipe.sml b/Samples/CSharp/ConsoleApplication/Recipe.sml index df2bb275..58f646c1 100644 --- 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 \ No newline at end of file diff --git a/Samples/CSharp/Library/Application/Recipe.sml b/Samples/CSharp/Library/Application/Recipe.sml index 652761e1..e7c78917 100644 --- 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 index 1f9e5a2e..8f154cc2 100644 --- 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 \ No newline at end of file diff --git a/Samples/Cpp/BuildExtension/Executable/Recipe.sml b/Samples/Cpp/BuildExtension/Executable/Recipe.sml index a885e6d7..b7e614a3 100644 --- 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 index fcf01215..cc304b95 100644 --- a/Samples/Cpp/BuildExtension/Extension/Recipe.sml +++ b/Samples/Cpp/BuildExtension/Extension/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Samples.Cpp.BuildExtension.Extension' -Language: (Wren@0) +Language: 'Wren|0' Version: 1.0.0 Source: [ 'CustomBuildTask.wren' @@ -7,7 +7,7 @@ Source: [ Dependencies: { Runtime: [ - + 'Soup|Build.Utils@0' ] Tool: [ '../Tool/' diff --git a/Samples/Cpp/BuildExtension/Tool/Recipe.sml b/Samples/Cpp/BuildExtension/Tool/Recipe.sml index 2cd4941f..b3d112cb 100644 --- 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 \ No newline at end of file diff --git a/Samples/Cpp/ConsoleApplication/Recipe.sml b/Samples/Cpp/ConsoleApplication/Recipe.sml index 1f9dbb58..29b948cd 100644 --- 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 \ No newline at end of file diff --git a/Samples/Cpp/DirectX/Recipe.sml b/Samples/Cpp/DirectX/Recipe.sml index 7ebc1fba..4cb5c82c 100644 --- 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 index 54d8b34e..45c98d83 100644 --- 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 index d1d2f535..591d93f4 100644 --- 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 index 39d9de22..ca1a7a36 100644 --- 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 index 16534ec3..001fe703 100644 --- 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 index 4b1af5b5..57c2e0f8 100644 --- 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 index e54cfad9..17a655ab 100644 --- 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 index cfd30eca..f1ba2468 100644 --- 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 index 33454f0e..c1d11722 100644 --- 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' ] } \ No newline at end of file diff --git a/Samples/Cpp/StaticLibrary/Application/Recipe.sml b/Samples/Cpp/StaticLibrary/Application/Recipe.sml index 1937df72..e7e0953f 100644 --- 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 index f0d0623c..594a4802 100644 --- 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 index 8ba3983c..2e6f00e8 100644 --- 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' \ No newline at end of file diff --git a/Scripts/Linux/soup b/Scripts/Linux/soup index 4e8ee963..50a6b555 100755 --- 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 "$@" \ No newline at end of file diff --git a/Scripts/Linux/soupd b/Scripts/Linux/soupd index 4a515603..975951c4 100755 --- 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 "$@" \ No newline at end of file diff --git a/Scripts/Linux/swhere b/Scripts/Linux/swhere index 2befdf96..9e79f2e7 100755 --- 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 "$@" \ No newline at end of file diff --git a/Scripts/Windows/soup.cmd b/Scripts/Windows/soup.cmd index 4f0c12ef..155b3cab 100644 --- 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 %* \ No newline at end of file diff --git a/Scripts/Windows/soupd.cmd b/Scripts/Windows/soupd.cmd index faf24420..3065768a 100644 --- 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 %* \ No newline at end of file diff --git a/Scripts/Windows/swhere.cmd b/Scripts/Windows/swhere.cmd index 7d5b0e1f..db4a6e49 100644 --- 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 %* \ No newline at end of file +%MSBuildDir%\bin\Swhere\Release\net8.0\win-x64\publish\swhere.exe %* \ No newline at end of file diff --git a/Source/BenchTests/Recipe.sml b/Source/BenchTests/Recipe.sml index 4c89a8f9..23f06463 100644 --- 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 index 02392f76..2675e319 100644 --- 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 index a116371a..d8b5c2c0 100644 --- 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 index c08287c0..61257601 100644 --- 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: { diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props index 8ed420fd..0ac08f85 100644 --- a/Source/Directory.Build.props +++ b/Source/Directory.Build.props @@ -5,20 +5,18 @@ - $(MSBuildThisFileDirectory.TrimEnd('\')) - $(RootDirectory)\GenerateSharp - $(RootDirectory)\GenerateSharp + $([System.IO.Path]::GetDirectoryName($(MSBuildThisFileDirectory))) $([System.IO.Path]::GetDirectoryName($(SourceDirectory))) - $(RootDirectory)\out - $(OutDirectory)\obj - $(OutDirectory)\bin - $(OutDirectory)\temp + $(RootDirectory)/out/msbuild + $(OutDirectory)/obj + $(OutDirectory)/bin + $(OutDirectory)/temp - $(ObjectRoot)\$(MSBuildProjectName) - $(BinaryRoot)\$(MSBuildProjectName) + $(ObjectRoot)/$(MSBuildProjectName) + $(BinaryRoot)/$(MSBuildProjectName) diff --git a/Source/Generate/Recipe.sml b/Source/Generate/Recipe.sml index 43887e62..cbd7d881 100644 --- a/Source/Generate/Recipe.sml +++ b/Source/Generate/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Soup.Generate' -Language: (C++@0) +Language: 'C++|0' Type: 'Executable' Version: 1.0.0 Source: [ diff --git a/Source/GenerateSharp/Api.Client/Recipe.sml b/Source/GenerateSharp/Api.Client/Recipe.sml index 4f299760..31cf3a86 100644 --- a/Source/GenerateSharp/Api.Client/Recipe.sml +++ b/Source/GenerateSharp/Api.Client/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Soup.Api.Client' -Language: (C#@0) +Language: 'C#|0' Version: 1.0.0 Source: [ 'Models/FileParameter.cs' diff --git a/Source/GenerateSharp/BootstrapBuild/Recipe.sml b/Source/GenerateSharp/BootstrapBuild/Recipe.sml index 48a09b01..6df2c85d 100644 --- a/Source/GenerateSharp/BootstrapBuild/Recipe.sml +++ b/Source/GenerateSharp/BootstrapBuild/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Swhere' -Language: (C#@0) +Language: 'C#|0' Version: 1.0.0 Type: 'Executable' Dependencies: { diff --git a/Source/GenerateSharp/Migrate/Recipe.sml b/Source/GenerateSharp/Migrate/Recipe.sml index 73024c3f..545a04df 100644 --- a/Source/GenerateSharp/Migrate/Recipe.sml +++ b/Source/GenerateSharp/Migrate/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Migrate' -Language: (C#@0) +Language: 'C#|0' Version: 1.0.0 Type: 'Executable' TargetFramework: 'net8.0' diff --git a/Source/GenerateSharp/Opal/Recipe.sml b/Source/GenerateSharp/Opal/Recipe.sml index e3880e27..c027e2f0 100644 --- a/Source/GenerateSharp/Opal/Recipe.sml +++ b/Source/GenerateSharp/Opal/Recipe.sml @@ -1,4 +1,4 @@ Name: 'Opal' -Language: (C#@0) +Language: 'C#|0' Version: 1.0.0 TargetFramework: 'net8.0' \ No newline at end of file diff --git a/Source/GenerateSharp/PackageManager.Core/Recipe.sml b/Source/GenerateSharp/PackageManager.Core/Recipe.sml index d7d01980..46218226 100644 --- a/Source/GenerateSharp/PackageManager.Core/Recipe.sml +++ b/Source/GenerateSharp/PackageManager.Core/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Soup.PackageManager.Core' -Language: (C#@0) +Language: 'C#|0' Version: 1.0.0 Source: [ 'ClosureManager.cs' diff --git a/Source/GenerateSharp/PackageManager/Recipe.sml b/Source/GenerateSharp/PackageManager/Recipe.sml index 8ffdb529..7b3f3ed3 100644 --- a/Source/GenerateSharp/PackageManager/Recipe.sml +++ b/Source/GenerateSharp/PackageManager/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Soup.PackageManager' -Language: (C#@0) +Language: 'C#|0' Version: 1.0.0 Type: 'Executable' Source: [ diff --git a/Source/GenerateSharp/Swhere.Core/Recipe.sml b/Source/GenerateSharp/Swhere.Core/Recipe.sml index 7dce13f0..ed52e6a7 100644 --- a/Source/GenerateSharp/Swhere.Core/Recipe.sml +++ b/Source/GenerateSharp/Swhere.Core/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Swhere.Core' -Language: (C#@0) +Language: 'C#|0' Version: 1.0.0 Source: [ 'DotNet/DotNetSDKUtilities.cs' diff --git a/Source/GenerateSharp/Swhere/DotNet/DotNetSDKUtilities.cs b/Source/GenerateSharp/Swhere/DotNet/DotNetSDKUtilities.cs index 29e4f22b..5f87f497 100644 --- a/Source/GenerateSharp/Swhere/DotNet/DotNetSDKUtilities.cs +++ b/Source/GenerateSharp/Swhere/DotNet/DotNetSDKUtilities.cs @@ -33,7 +33,7 @@ public static class DotNetSDKUtilities newline = "\r\n"; break; case OSPlatform.Linux: - dotnetInstallPath = new Path("./usr/lib/dotnet/"); + dotnetInstallPath = new Path("/usr/lib/dotnet/"); newline = "\n"; break; default: diff --git a/Source/GenerateSharp/Swhere/Recipe.sml b/Source/GenerateSharp/Swhere/Recipe.sml index 79630c8a..4a40f303 100644 --- a/Source/GenerateSharp/Swhere/Recipe.sml +++ b/Source/GenerateSharp/Swhere/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Swhere' -Language: (C#@0) +Language: 'C#|0' Version: 1.0.0 Type: 'Executable' Source: [ diff --git a/Source/GenerateSharp/Utilities/Recipe.sml b/Source/GenerateSharp/Utilities/Recipe.sml index 92bea333..9f75413a 100644 --- a/Source/GenerateSharp/Utilities/Recipe.sml +++ b/Source/GenerateSharp/Utilities/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Soup.Utilities' -Language: (C#@0) +Language: 'C#|0' Version: 1.0.0 TargetFramework: 'net8.0' Dependencies: { diff --git a/Source/GenerateTest/Recipe.sml b/Source/GenerateTest/Recipe.sml index 748d3bde..839515b3 100644 --- a/Source/GenerateTest/Recipe.sml +++ b/Source/GenerateTest/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Soup.Generate.Test' -Language: (C++@0) +Language: 'C++|0' Type: 'Executable' Version: 1.0.0 Source: [ diff --git a/Source/Monitor/Client/Recipe.sml b/Source/Monitor/Client/Recipe.sml index d1ce29b4..ee38aea1 100644 --- a/Source/Monitor/Client/Recipe.sml +++ b/Source/Monitor/Client/Recipe.sml @@ -1,6 +1,6 @@ Name: 'Monitor.Client' Description: 'The Detours dynamic library that is injected into a child process to intercept system calls.' -Language: (C++@0) +Language: 'C++|0' Version: 1.0.0 Type: 'DynamicLibrary' Defines: [ diff --git a/Source/Monitor/Host/Linux/LinuxTraceEventListener.h b/Source/Monitor/Host/Linux/LinuxTraceEventListener.h index 4b14f22f..406a7086 100644 --- a/Source/Monitor/Host/Linux/LinuxTraceEventListener.h +++ b/Source/Monitor/Host/Linux/LinuxTraceEventListener.h @@ -235,15 +235,6 @@ namespace Monitor::Linux SysCallStatus GetSysCallArgs(pid_t pid) { - // auto test1 = std::array({ - // ptrace(PTRACE_PEEKUSER, pid, 8 * RDI, NULL), - // ptrace(PTRACE_PEEKUSER, pid, 8 * RSI, NULL), - // ptrace(PTRACE_PEEKUSER, pid, 8 * RDX, NULL), - // ptrace(PTRACE_PEEKUSER, pid, 8 * R10, NULL), - // ptrace(PTRACE_PEEKUSER, pid, 8 * R8, NULL), - // ptrace(PTRACE_PEEKUSER, pid, 8 * R9, NULL), - // }); - user_regs_struct regs; iovec io; io.iov_base = ®s; diff --git a/Source/Monitor/Host/Recipe.sml b/Source/Monitor/Host/Recipe.sml index 543b34d4..64e2587c 100644 --- a/Source/Monitor/Host/Recipe.sml +++ b/Source/Monitor/Host/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Monitor.Host' -Language: (C++@0) +Language: 'C++|0' Version: 1.0.0 Defines: [ # 'TRACE_DETOUR_SERVER' diff --git a/Source/Monitor/Log/Recipe.sml b/Source/Monitor/Log/Recipe.sml index 1c10b032..b2ddaaf3 100644 --- a/Source/Monitor/Log/Recipe.sml +++ b/Source/Monitor/Log/Recipe.sml @@ -1,6 +1,6 @@ # A sample Monitor that logs all access to disk Name: 'LogMonitor' -Language: (C++@0) +Language: 'C++|0' Version: 1.0.0 Type: 'Executable' Source: [ diff --git a/Source/Monitor/Shared/Recipe.sml b/Source/Monitor/Shared/Recipe.sml index 875c0ef7..1fd4dc98 100644 --- a/Source/Monitor/Shared/Recipe.sml +++ b/Source/Monitor/Shared/Recipe.sml @@ -1,6 +1,6 @@ Name: 'Monitor.Shared' Description: 'The shared resources that are used from both the detoured process and the monitor manager.' -Language: (C++@0) +Language: 'C++|0' Version: 1.0.0 Interface: 'Module.cpp' Source: [] \ No newline at end of file diff --git a/Source/Monitor/Test/Recipe.sml b/Source/Monitor/Test/Recipe.sml index 703559aa..f38f2e0f 100644 --- a/Source/Monitor/Test/Recipe.sml +++ b/Source/Monitor/Test/Recipe.sml @@ -1,5 +1,5 @@ Name: 'Monitor.Test' -Language: (C++@0) +Language: 'C++|0' Version: 1.0.0 Type: 'Executable' Source: [ diff --git a/Source/Tools/Copy/Recipe.sml b/Source/Tools/Copy/Recipe.sml index 80d33311..a5ea4a29 100644 --- a/Source/Tools/Copy/Recipe.sml +++ b/Source/Tools/Copy/Recipe.sml @@ -1,4 +1,4 @@ Name: 'copy' -Language: (C++@0) +Language: 'C++|0' Version: 1.1.0 Type: 'Executable' \ No newline at end of file diff --git a/Source/Tools/Mkdir/Recipe.sml b/Source/Tools/Mkdir/Recipe.sml index 48e135bd..2fada4e5 100644 --- a/Source/Tools/Mkdir/Recipe.sml +++ b/Source/Tools/Mkdir/Recipe.sml @@ -1,9 +1,9 @@ Name: 'mkdir' -Language: (C++@0) +Language: 'C++|0' Version: 1.1.0 Type: 'Executable' Dependencies: { Runtime: [ - + 'mwasplund|Opal@0' ] } \ No newline at end of file diff --git a/Source/Tools/PrintGraph/Recipe.sml b/Source/Tools/PrintGraph/Recipe.sml index b6d664e7..54656f59 100644 --- a/Source/Tools/PrintGraph/Recipe.sml +++ b/Source/Tools/PrintGraph/Recipe.sml @@ -1,10 +1,10 @@ Name: 'printgraph' -Language: (C++@0) +Language: 'C++|0' Version: 1.0.0 Type: 'Executable' Dependencies: { Runtime: [ - + 'mwasplund|Opal@0' '../../Client/Core/' ] } diff --git a/Source/Tools/PrintResults/Recipe.sml b/Source/Tools/PrintResults/Recipe.sml index a28d1f97..f2172532 100644 --- a/Source/Tools/PrintResults/Recipe.sml +++ b/Source/Tools/PrintResults/Recipe.sml @@ -1,5 +1,5 @@ Name: 'printresults' -Language: (C++@0) +Language: 'C++|0' Version: 1.0.0 Type: 'Executable' Dependencies: { diff --git a/Source/Tools/PrintValueTable/Recipe.sml b/Source/Tools/PrintValueTable/Recipe.sml index 08c60daa..766ab67b 100644 --- a/Source/Tools/PrintValueTable/Recipe.sml +++ b/Source/Tools/PrintValueTable/Recipe.sml @@ -1,5 +1,5 @@ Name: 'printvaluetable' -Language: (C++@0) +Language: 'C++|0' Version: 1.0.0 Type: 'Executable' Dependencies: {