Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Undo Custom Refs #277

Merged
merged 4 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Samples/C/BuildExtension/Executable/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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/'
]
}
4 changes: 2 additions & 2 deletions Samples/C/BuildExtension/Extension/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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'
]
}
2 changes: 1 addition & 1 deletion Samples/C/ConsoleApplication/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name: 'Samples.C.ConsoleApplication'
Language: (C@0)
Language: 'C|0'
Type: 'Executable'
Version: 1.0.0
2 changes: 1 addition & 1 deletion Samples/C/DynamicLibrary/Application/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.C.DynamicLibrary.Application'
Language: (C@0)
Language: 'C|0'
Type: 'Executable'
Version: 1.0.0
Dependencies: {
Expand Down
2 changes: 1 addition & 1 deletion Samples/C/DynamicLibrary/Library/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.C.DynamicLibrary.Library'
Language: (C@0)
Language: 'C|0'
Version: 1.0.0
Type: 'DynamicLibrary'
IncludePaths: [
Expand Down
2 changes: 1 addition & 1 deletion Samples/C/StaticLibrary/Application/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.C.StaticLibrary.Application'
Language: (C@0)
Language: 'C|0'
Type: 'Executable'
Version: 1.0.0
Dependencies: {
Expand Down
2 changes: 1 addition & 1 deletion Samples/C/StaticLibrary/Library/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.C.StaticLibrary.Library'
Language: (C@0)
Language: 'C|0'
Version: 1.0.0
Type: 'StaticLibrary'
IncludePaths: [
Expand Down
2 changes: 1 addition & 1 deletion Samples/C/WindowsApplication/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.C.WindowsApplication'
Language: (C@0)
Language: 'C|0'
Type: 'Windows'
Version: 1.0.0
Resources: 'WindowsProject.rc'
Expand Down
2 changes: 1 addition & 1 deletion Samples/CSharp/BuildExtension/Executable/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.CSharp.BuildExtension.Executable'
Language: (C#@0)
Language: 'C#|0'
TargetFramework: 'net8.0'
Type: 'Executable'
Version: 1.0.0
Expand Down
4 changes: 2 additions & 2 deletions Samples/CSharp/BuildExtension/Extension/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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'
]
}
2 changes: 1 addition & 1 deletion Samples/CSharp/ConsoleApplication/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.CSharp.ConsoleApplication'
Language: (C#@0)
Language: 'C#|0'
TargetFramework: 'net8.0'
Type: 'Executable'
Version: 1.0.0
2 changes: 1 addition & 1 deletion Samples/CSharp/Library/Application/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.CSharp.Library.ConsoleApplication'
Language: (C#@0)
Language: 'C#|0'
TargetFramework: 'net8.0'
Type: 'Executable'
Version: 1.0.0
Expand Down
2 changes: 1 addition & 1 deletion Samples/CSharp/Library/Library/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name: 'Samples.CSharp.Library.Library'
Language: (C#@0)
Language: 'C#|0'
TargetFramework: 'net8.0'
Version: 1.0.0
2 changes: 1 addition & 1 deletion Samples/Cpp/BuildExtension/Executable/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.SimpleBuildExtension.Executable'
Language: (C++@0)
Language: 'C++|0'
Type: 'Executable'
Version: 1.0.0
Dependencies: {
Expand Down
4 changes: 2 additions & 2 deletions Samples/Cpp/BuildExtension/Extension/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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/'
Expand Down
2 changes: 1 addition & 1 deletion Samples/Cpp/BuildExtension/Tool/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name: 'Samples.SimpleBuildExtension.Tool'
Language: (C++@0)
Language: 'C++|0'
Type: 'Executable'
Version: 1.0.0
2 changes: 1 addition & 1 deletion Samples/Cpp/ConsoleApplication/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name: 'Samples.Cpp.ConsoleApplication'
Language: (C++@0)
Language: 'C++|0'
Type: 'Executable'
Version: 1.0.0
2 changes: 1 addition & 1 deletion Samples/Cpp/DirectX/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.DirectX'
Language: (C++@0)
Language: 'C++|0'
Type: 'Windows'
Version: 1.0.0
Partitions: [
Expand Down
2 changes: 1 addition & 1 deletion Samples/Cpp/DynamicLibrary/Application/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.DynamicLibrary.Application'
Language: (C++@0)
Language: 'C++|0'
Type: 'Executable'
Version: 1.0.0
Dependencies: {
Expand Down
2 changes: 1 addition & 1 deletion Samples/Cpp/DynamicLibrary/Library/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.DynamicLibrary.Library'
Language: (C++@0)
Language: 'C++|0'
Version: 1.0.0
Type: 'DynamicLibrary'
Defines: [
Expand Down
2 changes: 1 addition & 1 deletion Samples/Cpp/HeaderLibrary/Application/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.HeaderLibrary.Application'
Language: (C++@0)
Language: 'C++|0'
Type: 'Executable'
Version: 1.0.0
Dependencies: {
Expand Down
2 changes: 1 addition & 1 deletion Samples/Cpp/HeaderLibrary/Library/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.HeaderLibrary.Library'
Language: (C++@0)
Language: 'C++|0'
Version: 1.0.0
PublicHeaders: [
{
Expand Down
2 changes: 1 addition & 1 deletion Samples/Cpp/ModuleDynamicLibrary/Application/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.ModuleDynamicLibrary.Application'
Language: (C++@0)
Language: 'C++|0'
Type: 'Executable'
Version: 1.0.0
Dependencies: {
Expand Down
2 changes: 1 addition & 1 deletion Samples/Cpp/ModuleDynamicLibrary/Library/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.ModuleDynamicLibrary.Library'
Language: (C++@0)
Language: 'C++|0'
Version: 1.0.0
Interface: 'Module.cpp'
Type: 'DynamicLibrary'
Expand Down
2 changes: 1 addition & 1 deletion Samples/Cpp/ModuleInterface/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.ModuleInterface'
Language: (C++@0)
Language: 'C++|0'
Type: 'Executable'
Version: 1.0.0
Interface: 'Module.cpp'
Expand Down
4 changes: 2 additions & 2 deletions Samples/Cpp/ParseJsonFile/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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'
]
}
2 changes: 1 addition & 1 deletion Samples/Cpp/StaticLibrary/Application/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.StaticLibrary.Application'
Language: (C++@0)
Language: 'C++|0'
Type: 'Executable'
Version: 1.0.0
Dependencies: {
Expand Down
2 changes: 1 addition & 1 deletion Samples/Cpp/StaticLibrary/Library/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.StaticLibrary.Library'
Language: (C++@0)
Language: 'C++|0'
Version: 1.0.0
Interface: 'Module.cpp'
Type: 'StaticLibrary'
Expand Down
2 changes: 1 addition & 1 deletion Samples/Cpp/WindowsApplication/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Samples.Cpp.WindowsApplication'
Language: (C++@0)
Language: 'C++|0'
Type: 'Windows'
Version: 1.0.0
Resources: 'WindowsProject.rc'
7 changes: 4 additions & 3 deletions Scripts/Linux/soup
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 "$@"
7 changes: 4 additions & 3 deletions Scripts/Linux/soupd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 "$@"
2 changes: 1 addition & 1 deletion Scripts/Linux/swhere
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
7 changes: 4 additions & 3 deletions Scripts/Windows/soup.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 %*
7 changes: 4 additions & 3 deletions Scripts/Windows/soupd.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 %*
3 changes: 2 additions & 1 deletion Scripts/Windows/swhere.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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 %*
6 changes: 1 addition & 5 deletions Source/BenchTests/Recipe.sml
Original file line number Diff line number Diff line change
@@ -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/'
Expand Down
2 changes: 1 addition & 1 deletion Source/Client/CLI/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: 'Soup'
Version: 0.41.1
Language: (C++@0)
Language: 'C++|0'
Type: 'Executable'
Source: [
'Source/Main.cpp'
Expand Down
2 changes: 1 addition & 1 deletion Source/Client/Core/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'Soup.Core'
Language: (C++@0)
Language: 'C++|0'
Version: 0.1.1
Defines: [
# 'TRACE_SYSTEM_ACCESS'
Expand Down
2 changes: 1 addition & 1 deletion Source/Client/Tools/Recipe.sml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: 'SoupTools'
Language: (C++@0)
Language: 'C++|0'
Version: 1.0.0
Type: 'DynamicLibrary'
Dependencies: {
Expand Down
Loading
Loading