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.

Sign up for GitHub

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

Jump to bottom

Cleanup Scripts #205

Merged
merged 5 commits into from
Jun 16, 2023
Merged

Cleanup Scripts #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81ad527
Update to pull real builds from scripts
Jun 6, 2023
170befd
Remove Soup folder
Jun 8, 2023
85ae645
Update windows scripts
Jun 8, 2023
936ea09
Enable swhere builds in workflow
Jun 8, 2023
8871a0e
Disable swhere build
Jun 8, 2023
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
10 changes: 4 additions & 6 deletions Scripts/Linux/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ set -e
SCRIPTS_DIR=$(dirname "$0")

# Build Client
echo $SCRIPTS_DIR/build-client
eval $SCRIPTS_DIR/build-client

# Build BuiltIns
echo $SCRIPTS_DIR/build-builtins
eval $SCRIPTS_DIR/build-builtins
# echo $SCRIPTS_DIR/build-client
# eval $SCRIPTS_DIR/build-client
echo $SCRIPTS_DIR/soup build Source/Client/CLI
eval $SCRIPTS_DIR/soup build Source/Client/CLI

# Build SWhere tool
echo $SCRIPTS_DIR/build-swhere
Expand Down
40 changes: 0 additions & 40 deletions Scripts/Linux/build-builtins
View file
Open in desktop

This file was deleted.

36 changes: 32 additions & 4 deletions Scripts/Linux/soup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,44 @@ SCRIPTS_DIR=$(dirname "$0")
ROOT_DIR=$SCRIPTS_DIR/../..
OUT_DIR=$ROOT_DIR/out
RUN_DIR=$OUT_DIR/run
SOUP_DIR=$OUT_DIR/Cpp/Soup/0.34.0/J_HqSstV55vlb-x6RWC_hLRFRDU
SOURCE_DIR=$ROOT_DIR/Source
GLOBAL_PACKAGES_DIR=~/.soup/packages
GLOBAL_OUT_DIR=~/.soup/out

SOUP_VERSION="0.34.0"
COPY_VERSION="1.0.0"
MKDIR_VERSION="1.0.0"
SOUP_CPP_VERSION="0.8.2"
SOUP_CSHARP_VERSION="0.9.0"
SOUP_WREN_VERSION="0.2.0"

# Cleanup previous runs
rm -rf $RUN_DIR
mkdir -p $RUN_DIR

cp $SOUP_DIR/bin/Soup.exe $RUN_DIR/soup
cp $SOUP_DIR/bin/Soup.Generate.exe $RUN_DIR/generate
cp $OUT_DIR/Cpp/Soup/$SOUP_VERSION/J_HqSstV55vlb-x6RWC_hLRFRDU/bin/Soup.exe $RUN_DIR/soup
cp $OUT_DIR/Cpp/Soup/$SOUP_VERSION/J_HqSstV55vlb-x6RWC_hLRFRDU/bin/Soup.Generate.exe $RUN_DIR/generate

mkdir -p $RUN_DIR/BuiltIn/copy/$COPY_VERSION
cp $SOURCE_DIR/Tools/Copy/Recipe.sml $RUN_DIR/BuiltIn/copy/$COPY_VERSION/Recipe.sml
cp -R $OUT_DIR/Cpp/copy/$COPY_VERSION/J_HqSstV55vlb-x6RWC_hLRFRDU/ $RUN_DIR/BuiltIn/copy/$COPY_VERSION/out/

mkdir -p $RUN_DIR/BuiltIn/mkdir/$MKDIR_VERSION
cp $SOURCE_DIR/Tools/Mkdir/Recipe.sml $RUN_DIR/BuiltIn/mkdir/$MKDIR_VERSION/Recipe.sml
cp -R $OUT_DIR/Cpp/mkdir/$MKDIR_VERSION/J_HqSstV55vlb-x6RWC_hLRFRDU/ $RUN_DIR/BuiltIn/mkdir/$MKDIR_VERSION/out/

mkdir -p $RUN_DIR/BuiltIn/Soup.Cpp/$SOUP_CPP_VERSION
cp $GLOBAL_PACKAGES_DIR/Wren/Soup.Cpp/$SOUP_CPP_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup.Cpp/$SOUP_CPP_VERSION/Recipe.sml
cp -R $GLOBAL_OUT_DIR/Wren/Soup.Cpp/$SOUP_CPP_VERSION/J_HqSstV55vlb-x6RWC_hLRFRDU/ $RUN_DIR/BuiltIn/Soup.Cpp/$SOUP_CPP_VERSION/out/

mkdir -p $RUN_DIR/BuiltIn/Soup.CSharp/$SOUP_CSHARP_VERSION
cp $GLOBAL_PACKAGES_DIR/Wren/Soup.CSharp/$SOUP_CSHARP_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup.CSharp/$SOUP_CSHARP_VERSION/Recipe.sml
cp -R $GLOBAL_OUT_DIR/Wren/Soup.CSharp/$SOUP_CSHARP_VERSION/J_HqSstV55vlb-x6RWC_hLRFRDU/ $RUN_DIR/BuiltIn/Soup.CSharp/$SOUP_CSHARP_VERSION/out/

mkdir -p $RUN_DIR/BuiltIn/Soup.Wren/$SOUP_WREN_VERSION
cp $GLOBAL_PACKAGES_DIR/Wren/Soup.Wren/$SOUP_WREN_VERSION/Recipe.sml $RUN_DIR/BuiltIn/Soup.Wren/$SOUP_WREN_VERSION/Recipe.sml
cp -R $GLOBAL_OUT_DIR/Wren/Soup.Wren/$SOUP_WREN_VERSION/J_HqSstV55vlb-x6RWC_hLRFRDU/ $RUN_DIR/BuiltIn/Soup.Wren/$SOUP_WREN_VERSION/out/

cp -R $OUT_DIR/BuiltIn $RUN_DIR/BuiltIn
cp -R $ROOT_DIR/Source/out/msbuild/bin/Soup.Build.PackageManager/Debug/net6.0/linux-x64/publish/ $RUN_DIR/PackageManager

eval $RUN_DIR/soup "$@"
27 changes: 16 additions & 11 deletions Scripts/Windows/soup.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ SET ScriptsDir=%~dp0
SET RootDir=%ScriptsDir%..\..
SET OutDir=%RootDir%\out
SET RunDir=%OutDir%\run
SET SourceDir=%RootDir%\Source
SET GlobalPackagesDir=C:\Users\mwasp\.soup\packages
SET GlobalOutDir=C:\Users\mwasp\.soup\out

SET ConfigHash=Oltq7cGwk0Rbgy1I-3mCMDDE5yM

SET SOUP_VERSION=0.34.0
SET COPY_VERSION=1.0.0
Expand All @@ -14,22 +19,22 @@ SET SOUP_WREN_VERSION=0.2.0

REM - Use a copy of the final binary in case we are re-buiding itself
robocopy %ScriptsDir%\Install\ %RunDir%\ /MIR /NJH /NJS /NDL > NUL
robocopy %OutDir%\Cpp\Soup\%SOUP_VERSION%\Oltq7cGwk0Rbgy1I-3mCMDDE5yM\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL
robocopy %OutDir%\Cpp\Soup\%SOUP_VERSION%\%ConfigHash%\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL

robocopy C:\Users\mwasp\Dev\Repos\Soup\Source\Tools\Copy\ %RunDir%\Soup\BuiltIn\copy\%COPY_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy C:\Users\mwasp\Dev\Repos\Soup\out\Cpp\copy\%COPY_VERSION%\Oltq7cGwk0Rbgy1I-3mCMDDE5yM\ %RunDir%\Soup\BuiltIn\copy\%COPY_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
robocopy %SourceDir%\Tools\Copy\ %RunDir%\Soup\BuiltIn\copy\%COPY_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy %OutDir%\Cpp\copy\%COPY_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\copy\%COPY_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL

robocopy C:\Users\mwasp\Dev\Repos\Soup\Source\Tools\Mkdir\ %RunDir%\Soup\BuiltIn\mkdir\%MKDIR_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy C:\Users\mwasp\Dev\Repos\Soup\out\Cpp\mkdir\%MKDIR_VERSION%\Oltq7cGwk0Rbgy1I-3mCMDDE5yM\ %RunDir%\Soup\BuiltIn\mkdir\%MKDIR_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
robocopy %SourceDir%\Tools\Mkdir\ %RunDir%\Soup\BuiltIn\mkdir\%MKDIR_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy %OutDir%\Cpp\mkdir\%MKDIR_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\mkdir\%MKDIR_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL

robocopy C:\Users\mwasp\.soup\packages\Wren\Soup.Cpp\%SOUP_CPP_VERSION%\ %RunDir%\Soup\BuiltIn\Soup.Cpp\%SOUP_CPP_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy C:\Users\mwasp\.soup\out\Wren\Soup.Cpp\%SOUP_CPP_VERSION%\Oltq7cGwk0Rbgy1I-3mCMDDE5yM\ %RunDir%\Soup\BuiltIn\Soup.Cpp\%SOUP_CPP_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
robocopy %GlobalPackagesDir%\Wren\Soup.Cpp\%SOUP_CPP_VERSION%\ %RunDir%\Soup\BuiltIn\Soup.Cpp\%SOUP_CPP_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy %GlobalOutDir%\Wren\Soup.Cpp\%SOUP_CPP_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\Soup.Cpp\%SOUP_CPP_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL

robocopy C:\Users\mwasp\.soup\packages\Wren\Soup.CSharp\%SOUP_CSHARP_VERSION%\ %RunDir%\Soup\BuiltIn\Soup.CSharp\%SOUP_CSHARP_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy C:\Users\mwasp\.soup\out\Wren\Soup.CSharp\%SOUP_CSHARP_VERSION%\Oltq7cGwk0Rbgy1I-3mCMDDE5yM\ %RunDir%\Soup\BuiltIn\Soup.CSharp\%SOUP_CSHARP_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
robocopy %GlobalPackagesDir%\Wren\Soup.CSharp\%SOUP_CSHARP_VERSION%\ %RunDir%\Soup\BuiltIn\Soup.CSharp\%SOUP_CSHARP_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy %GlobalOutDir%\Wren\Soup.CSharp\%SOUP_CSHARP_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\Soup.CSharp\%SOUP_CSHARP_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL

robocopy C:\Users\mwasp\.soup\packages\Wren\Soup.Wren\%SOUP_WREN_VERSION%\ %RunDir%\Soup\BuiltIn\Soup.Wren\%SOUP_WREN_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy C:\Users\mwasp\.soup\out\Wren\Soup.Wren\%SOUP_WREN_VERSION%\Oltq7cGwk0Rbgy1I-3mCMDDE5yM\ %RunDir%\Soup\BuiltIn\Soup.Wren\%SOUP_WREN_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
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%\msbuild\bin\Soup.Build.PackageManager\Release\net6.0-windows10.0.17763.0\win-x64\publish\ %RunDir%\Soup\PackageManager\ /MIR /NJH /NJS /NDL > NUL

Expand Down
27 changes: 16 additions & 11 deletions Scripts/Windows/soupd.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ SET ScriptsDir=%~dp0
SET RootDir=%ScriptsDir%..\..
SET OutDir=%RootDir%\out
SET RunDir=%OutDir%\run
SET SourceDir=%RootDir%\Source
SET GlobalPackagesDir=C:\Users\mwasp\.soup\packages
SET GlobalOutDir=C:\Users\mwasp\.soup\out

SET ConfigHash=OZlIVjblazFuKXg-raWUNoGEnG4

SET SOUP_VERSION=0.34.0
SET COPY_VERSION=1.0.0
Expand All @@ -14,22 +19,22 @@ SET SOUP_WREN_VERSION=0.2.0

REM - Use a copy of the final binary in case we are re-buiding itself
robocopy %ScriptsDir%\Install\ %RunDir%\ /MIR /NJH /NJS /NDL > NUL
robocopy %OutDir%\Cpp\Soup\%SOUP_VERSION%\OZlIVjblazFuKXg-raWUNoGEnG4\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL
robocopy %OutDir%\Cpp\Soup\%SOUP_VERSION%\%ConfigHash%\bin\ %RunDir%\Soup\ /MIR /NJH /NJS /NDL > NUL

robocopy C:\Users\mwasp\Dev\Repos\Soup\Source\Tools\Copy\ %RunDir%\Soup\BuiltIn\copy\%COPY_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy C:\Users\mwasp\Dev\Repos\Soup\out\Cpp\copy\%COPY_VERSION%\OZlIVjblazFuKXg-raWUNoGEnG4\ %RunDir%\Soup\BuiltIn\copy\%COPY_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
robocopy %SourceDir%\Tools\Copy\ %RunDir%\Soup\BuiltIn\copy\%COPY_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy %OutDir%\Cpp\copy\%COPY_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\copy\%COPY_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL

robocopy C:\Users\mwasp\Dev\Repos\Soup\Source\Tools\Mkdir\ %RunDir%\Soup\BuiltIn\mkdir\%MKDIR_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy C:\Users\mwasp\Dev\Repos\Soup\out\Cpp\mkdir\%MKDIR_VERSION%\OZlIVjblazFuKXg-raWUNoGEnG4\ %RunDir%\Soup\BuiltIn\mkdir\%MKDIR_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
robocopy %SourceDir%\Tools\Mkdir\ %RunDir%\Soup\BuiltIn\mkdir\%MKDIR_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy %OutDir%\Cpp\mkdir\%MKDIR_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\mkdir\%MKDIR_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL

robocopy C:\Users\mwasp\.soup\packages\Wren\Soup.Cpp\%SOUP_CPP_VERSION%\ %RunDir%\Soup\BuiltIn\Soup.Cpp\%SOUP_CPP_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy C:\Users\mwasp\.soup\out\Wren\Soup.Cpp\%SOUP_CPP_VERSION%\OZlIVjblazFuKXg-raWUNoGEnG4\ %RunDir%\Soup\BuiltIn\Soup.Cpp\%SOUP_CPP_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
robocopy %GlobalPackagesDir%\Wren\Soup.Cpp\%SOUP_CPP_VERSION%\ %RunDir%\Soup\BuiltIn\Soup.Cpp\%SOUP_CPP_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy %GlobalOutDir%\Wren\Soup.Cpp\%SOUP_CPP_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\Soup.Cpp\%SOUP_CPP_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL

robocopy C:\Users\mwasp\.soup\packages\Wren\Soup.CSharp\%SOUP_CSHARP_VERSION%\ %RunDir%\Soup\BuiltIn\Soup.CSharp\%SOUP_CSHARP_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy C:\Users\mwasp\.soup\out\Wren\Soup.CSharp\%SOUP_CSHARP_VERSION%\OZlIVjblazFuKXg-raWUNoGEnG4\ %RunDir%\Soup\BuiltIn\Soup.CSharp\%SOUP_CSHARP_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
robocopy %GlobalPackagesDir%\Wren\Soup.CSharp\%SOUP_CSHARP_VERSION%\ %RunDir%\Soup\BuiltIn\Soup.CSharp\%SOUP_CSHARP_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy %GlobalOutDir%\Wren\Soup.CSharp\%SOUP_CSHARP_VERSION%\%ConfigHash%\ %RunDir%\Soup\BuiltIn\Soup.CSharp\%SOUP_CSHARP_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL

robocopy C:\Users\mwasp\.soup\packages\Wren\Soup.Wren\%SOUP_WREN_VERSION%\ %RunDir%\Soup\BuiltIn\Soup.Wren\%SOUP_WREN_VERSION%\ Recipe.sml /NJH /NJS /NDL > NUL
robocopy C:\Users\mwasp\.soup\out\Wren\Soup.Wren\%SOUP_WREN_VERSION%\OZlIVjblazFuKXg-raWUNoGEnG4\ %RunDir%\Soup\BuiltIn\Soup.Wren\%SOUP_WREN_VERSION%\out\ /MIR /NJH /NJS /NDL > NUL
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%\msbuild\bin\Soup.Build.PackageManager\Debug\net6.0-windows10.0.17763.0\win-x64\publish\ %RunDir%\Soup\PackageManager\ /MIR /NJH /NJS /NDL > NUL
robocopy %OutDir%\msbuild\bin\Swhere\Debug\net6.0\win-x64\publish\ %RunDir%\ swhere.exe /NJH /NJS /NDL > NUL
Expand Down