From e6cb429ecbaf80abc573f9f3774898b71b2c62a5 Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Tue, 14 Nov 2017 22:06:33 +0100 Subject: [PATCH 1/6] changes --- buildAll.cmd | 7 +++++-- buildAll.sh | 15 +++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/buildAll.cmd b/buildAll.cmd index 4805eb3..b7ded55 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -15,12 +15,15 @@ dotnet restore dotnet build echo "Invoke electronize build in WebApp Demo" -echo "-- win" +echo "-- win (dev-build)" dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build win -echo "-- linux" +echo "-- linux (dev-build)" dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux +REM Be aware, that for non-electronnet-dev environemnts the correct +REM invoke command would be dotnet electronize ... + REM Not supported on Windows Systems, because of SymLinks... REM echo "-- osx" REM dotnet electronize build osx diff --git a/buildAll.sh b/buildAll.sh index 38c6694..f9e724d 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -16,11 +16,14 @@ dotnet restore dotnet build echo "Invoke electronize build in WebApp Demo" -echo "-- win" -dotnet electronize build win +echo "-- win (dev-build)" +dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build win -echo "-- linux" -dotnet electronize build linux +echo "-- linux (dev-build)" +dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux -echo "-- osx" -dotnet electronize build osx +echo "-- osx (dev-build)" +dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build osx + +# Be aware, that for non-electronnet-dev environemnts the correct +# invoke command would be dotnet electronize ... \ No newline at end of file From 4bccbdf61de84d2ad95c1243c6ea3b506b95768b Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Tue, 14 Nov 2017 22:13:15 +0100 Subject: [PATCH 2/6] test --- buildAll.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildAll.sh b/buildAll.sh index f9e724d..ff412c5 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -17,13 +17,13 @@ dotnet build echo "Invoke electronize build in WebApp Demo" echo "-- win (dev-build)" -dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build win +dotnet $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll build win echo "-- linux (dev-build)" -dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux +dotnet $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll build linux echo "-- osx (dev-build)" -dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build osx +dotnet $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll build osx # Be aware, that for non-electronnet-dev environemnts the correct # invoke command would be dotnet electronize ... \ No newline at end of file From 220b4b290d015d253f2abc2b52a015dc62624928 Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Tue, 14 Nov 2017 22:23:19 +0100 Subject: [PATCH 3/6] shell test --- buildAll.cmd | 2 +- buildAll.sh | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/buildAll.cmd b/buildAll.cmd index b7ded55..3a545e0 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -21,7 +21,7 @@ dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build echo "-- linux (dev-build)" dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux -REM Be aware, that for non-electronnet-dev environemnts the correct +REM Be aware, that for non-electronnet-dev environments the correct REM invoke command would be dotnet electronize ... REM Not supported on Windows Systems, because of SymLinks... diff --git a/buildAll.sh b/buildAll.sh index ff412c5..fc01b22 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -5,25 +5,28 @@ cd $dir/ElectronNET.API dotnet restore dotnet build cd .. + echo "Restore & Build API" cd $dir/ElectronNET.CLI dotnet restore dotnet build cd .. + echo "Restore & Build WebApp Demo" cd $dir/ElectronNET.WebApp dotnet restore dotnet build +cd .. echo "Invoke electronize build in WebApp Demo" echo "-- win (dev-build)" -dotnet $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll build win +dotnet "$dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build win echo "-- linux (dev-build)" -dotnet $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll build linux +dotnet "$dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux echo "-- osx (dev-build)" -dotnet $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll build osx +dotnet "$dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build osx -# Be aware, that for non-electronnet-dev environemnts the correct +# Be aware, that for non-electronnet-dev environments the correct # invoke command would be dotnet electronize ... \ No newline at end of file From 4ba247d77c4d5e1995728ea81c4b9d8d8608aeda Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Tue, 14 Nov 2017 22:27:58 +0100 Subject: [PATCH 4/6] hrm --- buildAll.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildAll.sh b/buildAll.sh index fc01b22..2031eef 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -20,7 +20,9 @@ cd .. echo "Invoke electronize build in WebApp Demo" echo "-- win (dev-build)" -dotnet "$dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build win +cd $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/ +ls +dotnet "dotnet-electronize.dll" build win echo "-- linux (dev-build)" dotnet "$dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux From 652cc60f6bddcaf91410e773a3f67d421d81b9b6 Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Tue, 14 Nov 2017 22:35:42 +0100 Subject: [PATCH 5/6] typooooo --- buildAll.cmd | 6 +++--- buildAll.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildAll.cmd b/buildAll.cmd index 3a545e0..99badd3 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -4,7 +4,7 @@ cd ElectronNet.API dotnet restore dotnet build cd .. -echo "Restore & Build API" +echo "Restore & Build CLI" cd ElectronNet.CLI dotnet restore dotnet build @@ -16,10 +16,10 @@ dotnet build echo "Invoke electronize build in WebApp Demo" echo "-- win (dev-build)" -dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build win +dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build win echo "-- linux (dev-build)" -dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux +dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux REM Be aware, that for non-electronnet-dev environments the correct REM invoke command would be dotnet electronize ... diff --git a/buildAll.sh b/buildAll.sh index 2031eef..a8d323d 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -6,7 +6,7 @@ dotnet restore dotnet build cd .. -echo "Restore & Build API" +echo "Restore & Build CLI" cd $dir/ElectronNET.CLI dotnet restore dotnet build @@ -20,15 +20,15 @@ cd .. echo "Invoke electronize build in WebApp Demo" echo "-- win (dev-build)" -cd $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/ +cd $dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/ ls dotnet "dotnet-electronize.dll" build win echo "-- linux (dev-build)" -dotnet "$dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux +dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux echo "-- osx (dev-build)" -dotnet "$dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build osx +dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build osx # Be aware, that for non-electronnet-dev environments the correct # invoke command would be dotnet electronize ... \ No newline at end of file From 8c91c1765623f9352d0b700038642f9413222e6f Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Tue, 14 Nov 2017 22:45:09 +0100 Subject: [PATCH 6/6] remove cd in sh --- buildAll.cmd | 1 + buildAll.sh | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/buildAll.cmd b/buildAll.cmd index 99badd3..f042297 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -13,6 +13,7 @@ echo "Restore & Build WebApp Demo" cd ElectronNet.WebApp dotnet restore dotnet build + echo "Invoke electronize build in WebApp Demo" echo "-- win (dev-build)" diff --git a/buildAll.sh b/buildAll.sh index a8d323d..6d6ace8 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -16,13 +16,10 @@ echo "Restore & Build WebApp Demo" cd $dir/ElectronNET.WebApp dotnet restore dotnet build -cd .. echo "Invoke electronize build in WebApp Demo" echo "-- win (dev-build)" -cd $dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/ -ls -dotnet "dotnet-electronize.dll" build win +dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build win echo "-- linux (dev-build)" dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux