From e1fa8990efcc4e3f327963c4db04bdf6e50bf897 Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Wed, 24 Jan 2018 22:39:46 +0100 Subject: [PATCH 1/9] wip --- .../Actions/GetTargetPlatformInformation.cs | 39 +++++++++++-------- ElectronNET.CLI/Commands/BuildCommand.cs | 12 +++--- buildAll.cmd | 4 +- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs b/ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs index a5cf151..f36df3f 100644 --- a/ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs +++ b/ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs @@ -9,7 +9,6 @@ namespace ElectronNET.CLI.Commands.Actions { public struct GetTargetPlatformInformationResult { - public string DesiredPlatform { get; set; } public string NetCorePublishRid { get; set; } public string ElectronPackerPlatform { get; set; } @@ -35,31 +34,39 @@ namespace ElectronNET.CLI.Commands.Actions electronPackerPlatform = "linux"; break; default: - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + if (desiredPlatform.StartsWith("custom=")) { - desiredPlatform = "win"; - netCorePublishRid = "win-x64"; - electronPackerPlatform = "win32"; + } - if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + else { - desiredPlatform = "osx"; - netCorePublishRid = "osx-x64"; - electronPackerPlatform = "darwin"; - } - if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) - { - desiredPlatform = "linux"; - netCorePublishRid = "linux-x64"; - electronPackerPlatform = "linux"; + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + desiredPlatform = "win"; + netCorePublishRid = "win-x64"; + electronPackerPlatform = "win32"; + } + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + desiredPlatform = "osx"; + netCorePublishRid = "osx-x64"; + electronPackerPlatform = "darwin"; + } + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + desiredPlatform = "linux"; + netCorePublishRid = "linux-x64"; + electronPackerPlatform = "linux"; + } } + break; } return new GetTargetPlatformInformationResult() { - DesiredPlatform = desiredPlatform, ElectronPackerPlatform = electronPackerPlatform, NetCorePublishRid = netCorePublishRid }; diff --git a/ElectronNET.CLI/Commands/BuildCommand.cs b/ElectronNET.CLI/Commands/BuildCommand.cs index b9866c9..133cd5c 100644 --- a/ElectronNET.CLI/Commands/BuildCommand.cs +++ b/ElectronNET.CLI/Commands/BuildCommand.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; using ElectronNET.CLI.Commands.Actions; @@ -27,15 +28,16 @@ namespace ElectronNET.CLI.Commands { Console.WriteLine("Build Electron Application..."); - string desiredPlatform = ""; + var parsedArgs = _args + .Select(s => s.Split(new[] { ':' }, 1)) + .ToDictionary(s => s[0], s => s[1]); - if (_args.Length > 0) - { - desiredPlatform = _args[0]; - } + var desiredPlatform = parsedArgs["/target"]; var platformInfo = GetTargetPlatformInformation.Do(desiredPlatform); + Console.WriteLine($"Build ASP.NET Core App for {platformInfo.NetCorePublishRid}..."); + string tempPath = Path.Combine(Directory.GetCurrentDirectory(), "obj", "desktop", desiredPlatform); if (Directory.Exists(tempPath) == false) diff --git a/buildAll.cmd b/buildAll.cmd index a1dd47f..a678d3f 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -17,10 +17,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 /target: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 /target:linux :: Be aware, that for non-electronnet-dev environments the correct :: invoke command would be dotnet electronize ... From a1aaabd588fb2d7283e05812e30a3c3c640ea83e Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Sun, 11 Feb 2018 22:24:12 +0100 Subject: [PATCH 2/9] test target stuff --- .../Actions/GetTargetPlatformInformation.cs | 41 ++++++++----------- ElectronNET.CLI/Commands/BuildCommand.cs | 16 +++++--- .../Commands/StartElectronCommand.cs | 2 +- ElectronNET.CLI/Program.cs | 1 - ElectronNET.CLI/SimpleCommandLineParser.cs | 38 +++++++++++++++++ buildAll.cmd | 12 +++--- buildAll.sh | 12 +++--- 7 files changed, 78 insertions(+), 44 deletions(-) create mode 100644 ElectronNET.CLI/SimpleCommandLineParser.cs diff --git a/ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs b/ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs index f36df3f..856b77c 100644 --- a/ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs +++ b/ElectronNET.CLI/Commands/Actions/GetTargetPlatformInformation.cs @@ -14,7 +14,7 @@ namespace ElectronNET.CLI.Commands.Actions } - public static GetTargetPlatformInformationResult Do(string desiredPlatform) + public static GetTargetPlatformInformationResult Do(string desiredPlatform, string specifiedPlatfromFromCustom) { string netCorePublishRid = string.Empty; string electronPackerPlatform = string.Empty; @@ -33,34 +33,27 @@ namespace ElectronNET.CLI.Commands.Actions netCorePublishRid = "linux-x64"; electronPackerPlatform = "linux"; break; + case "custom": + var splittedSpecified = specifiedPlatfromFromCustom.Split(';'); + netCorePublishRid = splittedSpecified[0]; + electronPackerPlatform = splittedSpecified[1]; + break; default: - if (desiredPlatform.StartsWith("custom=")) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - + netCorePublishRid = "win-x64"; + electronPackerPlatform = "win32"; } - else + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { - - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - desiredPlatform = "win"; - netCorePublishRid = "win-x64"; - electronPackerPlatform = "win32"; - } - if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - { - desiredPlatform = "osx"; - netCorePublishRid = "osx-x64"; - electronPackerPlatform = "darwin"; - } - if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) - { - desiredPlatform = "linux"; - netCorePublishRid = "linux-x64"; - electronPackerPlatform = "linux"; - } + netCorePublishRid = "osx-x64"; + electronPackerPlatform = "darwin"; + } + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + netCorePublishRid = "linux-x64"; + electronPackerPlatform = "linux"; } - break; } diff --git a/ElectronNET.CLI/Commands/BuildCommand.cs b/ElectronNET.CLI/Commands/BuildCommand.cs index 133cd5c..d017b3d 100644 --- a/ElectronNET.CLI/Commands/BuildCommand.cs +++ b/ElectronNET.CLI/Commands/BuildCommand.cs @@ -28,13 +28,17 @@ namespace ElectronNET.CLI.Commands { Console.WriteLine("Build Electron Application..."); - var parsedArgs = _args - .Select(s => s.Split(new[] { ':' }, 1)) - .ToDictionary(s => s[0], s => s[1]); + SimpleCommandLineParser parser = new SimpleCommandLineParser(); + parser.Parse(_args); - var desiredPlatform = parsedArgs["/target"]; - - var platformInfo = GetTargetPlatformInformation.Do(desiredPlatform); + var desiredPlatform = parser.Arguments["/target"][0]; + string specifiedFromCustom = string.Empty; + if (desiredPlatform == "custom" && parser.Arguments["/target"].Length > 1) + { + specifiedFromCustom = parser.Arguments["/target"][1]; + } + + var platformInfo = GetTargetPlatformInformation.Do(desiredPlatform, specifiedFromCustom); Console.WriteLine($"Build ASP.NET Core App for {platformInfo.NetCorePublishRid}..."); diff --git a/ElectronNET.CLI/Commands/StartElectronCommand.cs b/ElectronNET.CLI/Commands/StartElectronCommand.cs index 355d3cc..48e0fba 100644 --- a/ElectronNET.CLI/Commands/StartElectronCommand.cs +++ b/ElectronNET.CLI/Commands/StartElectronCommand.cs @@ -48,7 +48,7 @@ namespace ElectronNET.CLI.Commands Directory.CreateDirectory(tempPath); } - var platformInfo = GetTargetPlatformInformation.Do(string.Empty); + var platformInfo = GetTargetPlatformInformation.Do(String.Empty, String.Empty); string tempBinPath = Path.Combine(tempPath, "bin"); var resultCode = ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} --output \"{tempBinPath}\"", aspCoreProjectPath); diff --git a/ElectronNET.CLI/Program.cs b/ElectronNET.CLI/Program.cs index 87032cb..c053a58 100644 --- a/ElectronNET.CLI/Program.cs +++ b/ElectronNET.CLI/Program.cs @@ -7,7 +7,6 @@ using System.Text; namespace ElectronNET.CLI { - class Program { static void Main(string[] args) diff --git a/ElectronNET.CLI/SimpleCommandLineParser.cs b/ElectronNET.CLI/SimpleCommandLineParser.cs new file mode 100644 index 0000000..e5cf86e --- /dev/null +++ b/ElectronNET.CLI/SimpleCommandLineParser.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; + +namespace ElectronNET.CLI +{ + public class SimpleCommandLineParser + { + public SimpleCommandLineParser() + { + Arguments = new Dictionary(); + } + public IDictionary Arguments { get; private set; } + public void Parse(string[] args) + { + var currentName = ""; + var values = new List(); + foreach (var arg in args) + { + if (arg.StartsWith("/")) + { + if (currentName != "") + Arguments[currentName] = values.ToArray(); + values.Clear(); + currentName = arg.Substring(1); + } + else if (currentName == "") + Arguments[arg] = new string[0]; + else + values.Add(arg); + } + if (currentName != "") + Arguments[currentName] = values.ToArray(); + } + public bool Contains(string name) + { + return Arguments.ContainsKey(name); + } + } +} \ No newline at end of file diff --git a/buildAll.cmd b/buildAll.cmd index a678d3f..b9b37e6 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -16,15 +16,15 @@ dotnet build echo "Invoke electronize build in WebApp Demo" -echo "-- win (dev-build)" -dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target:win +echo "/target win (dev-build)" +dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target win -echo "-- linux (dev-build)" -dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target:linux +echo "/target linux (dev-build)" +dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target linux :: Be aware, that for non-electronnet-dev environments the correct :: invoke command would be dotnet electronize ... :: Not supported on Windows Systems, because of SymLinks... -:: echo "-- osx" -:: dotnet electronize build osx +:: echo "/target osx" +:: dotnet electronize build /target osx diff --git a/buildAll.sh b/buildAll.sh index 6d6ace8..8a78c98 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -18,14 +18,14 @@ dotnet restore dotnet build echo "Invoke electronize build in WebApp Demo" -echo "-- win (dev-build)" -dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build win +echo "/target win (dev-build)" +dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target win -echo "-- linux (dev-build)" -dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux +echo "/target linux (dev-build)" +dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target linux -echo "-- osx (dev-build)" -dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build osx +echo "/target osx (dev-build)" +dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target osx # Be aware, that for non-electronnet-dev environments the correct # invoke command would be dotnet electronize ... \ No newline at end of file From 92087bc3c86443ace9a2e3bfda56a8b6838a3720 Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Sun, 11 Feb 2018 22:28:00 +0100 Subject: [PATCH 3/9] fix usage --- ElectronNET.CLI/Commands/BuildCommand.cs | 6 +++--- ElectronNET.sln | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ElectronNET.CLI/Commands/BuildCommand.cs b/ElectronNET.CLI/Commands/BuildCommand.cs index d017b3d..94b8e0a 100644 --- a/ElectronNET.CLI/Commands/BuildCommand.cs +++ b/ElectronNET.CLI/Commands/BuildCommand.cs @@ -31,11 +31,11 @@ namespace ElectronNET.CLI.Commands SimpleCommandLineParser parser = new SimpleCommandLineParser(); parser.Parse(_args); - var desiredPlatform = parser.Arguments["/target"][0]; + var desiredPlatform = parser.Arguments["target"][0]; string specifiedFromCustom = string.Empty; - if (desiredPlatform == "custom" && parser.Arguments["/target"].Length > 1) + if (desiredPlatform == "custom" && parser.Arguments["target"].Length > 1) { - specifiedFromCustom = parser.Arguments["/target"][1]; + specifiedFromCustom = parser.Arguments["target"][1]; } var platformInfo = GetTargetPlatformInformation.Do(desiredPlatform, specifiedFromCustom); diff --git a/ElectronNET.sln b/ElectronNET.sln index ce70b61..9ca181a 100644 --- a/ElectronNET.sln +++ b/ElectronNET.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27004.2002 +VisualStudioVersion = 15.0.27130.2024 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ElectronNET.WebApp", "ElectronNET.WebApp\ElectronNET.WebApp.csproj", "{7C048379-401C-4345-B5E7-BE232DEA8157}" EndProject @@ -32,6 +32,8 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "ElectronNET.Host", "Electro EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2914CCF7-27C2-42AE-849A-2F0C1BC7CDFA}" ProjectSection(SolutionItems) = preProject + buildAll.cmd = buildAll.cmd + buildAll.sh = buildAll.sh buildReleaseNuGetPackages.cmd = buildReleaseNuGetPackages.cmd EndProjectSection EndProject From d01d82ffecf80f8cc946b1a5554c2c6d6416a289 Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Sun, 11 Feb 2018 22:33:22 +0100 Subject: [PATCH 4/9] custom target testing --- buildAll.cmd | 4 ++++ buildAll.sh | 3 +++ 2 files changed, 7 insertions(+) diff --git a/buildAll.cmd b/buildAll.cmd index b9b37e6..db1f17c 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -22,6 +22,10 @@ dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build echo "/target linux (dev-build)" dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target linux +echo "/target custom win7-x86;win32 (dev-build)" +dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target custom win7-x86;win32 + + :: Be aware, that for non-electronnet-dev environments the correct :: invoke command would be dotnet electronize ... diff --git a/buildAll.sh b/buildAll.sh index 8a78c98..19263f3 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -27,5 +27,8 @@ dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" bui echo "/target osx (dev-build)" dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target osx +echo "/target custom win7-x86;win32 (dev-build)" +dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target custom win7-x86;win32 + # Be aware, that for non-electronnet-dev environments the correct # invoke command would be dotnet electronize ... \ No newline at end of file From a2ab76d18d33185cdaf6072181933e5c5d7ab0db Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Mon, 12 Feb 2018 21:17:40 +0100 Subject: [PATCH 5/9] electron arch and co --- ElectronNET.CLI/Commands/BuildCommand.cs | 36 ++++++++++++++++++++---- buildAll.cmd | 5 ++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/ElectronNET.CLI/Commands/BuildCommand.cs b/ElectronNET.CLI/Commands/BuildCommand.cs index 94b8e0a..c6a5ab6 100644 --- a/ElectronNET.CLI/Commands/BuildCommand.cs +++ b/ElectronNET.CLI/Commands/BuildCommand.cs @@ -22,6 +22,11 @@ namespace ElectronNET.CLI.Commands _args = args; } + private string _paramTarget = "target"; + private string _paramDotNetConfig = "dotnet-configuration"; + private string _paramElectronArch = "electron-arch"; + private string _paramElectronParams = "electron-params"; + public Task ExecuteAsync() { return Task.Run(() => @@ -31,13 +36,19 @@ namespace ElectronNET.CLI.Commands SimpleCommandLineParser parser = new SimpleCommandLineParser(); parser.Parse(_args); - var desiredPlatform = parser.Arguments["target"][0]; + var desiredPlatform = parser.Arguments[_paramTarget][0]; string specifiedFromCustom = string.Empty; - if (desiredPlatform == "custom" && parser.Arguments["target"].Length > 1) + if (desiredPlatform == "custom" && parser.Arguments[_paramTarget].Length > 1) { specifiedFromCustom = parser.Arguments["target"][1]; } - + + string configuration = "Release"; + if (parser.Arguments.ContainsKey(_paramDotNetConfig)) + { + configuration = parser.Arguments[_paramDotNetConfig][0]; + } + var platformInfo = GetTargetPlatformInformation.Do(desiredPlatform, specifiedFromCustom); Console.WriteLine($"Build ASP.NET Core App for {platformInfo.NetCorePublishRid}..."); @@ -53,9 +64,9 @@ namespace ElectronNET.CLI.Commands string tempBinPath = Path.Combine(tempPath, "bin"); - Console.WriteLine($"Build ASP.NET Core App for {platformInfo.NetCorePublishRid}..."); + Console.WriteLine($"Build ASP.NET Core App for {platformInfo.NetCorePublishRid} under {configuration}-Configuration..."); - var resultCode = ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} --output \"{tempBinPath}\"", Directory.GetCurrentDirectory()); + var resultCode = ProcessHelper.CmdExecute($"dotnet publish -r {platformInfo.NetCorePublishRid} -c {configuration} --output \"{tempBinPath}\"", Directory.GetCurrentDirectory()); if (resultCode != 0) { @@ -99,8 +110,21 @@ namespace ElectronNET.CLI.Commands Console.WriteLine("Executing electron magic in this directory: " + buildPath); // ToDo: Need a solution for --asar support + + string electronArch = "x64"; + if (parser.Arguments.ContainsKey(_paramElectronArch)) + { + electronArch = parser.Arguments[_paramElectronArch][0]; + } + + string electronParams = ""; + if (parser.Arguments.ContainsKey(_paramElectronParams)) + { + electronParams = parser.Arguments[electronParams][0]; + } + Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}..."); - ProcessHelper.CmdExecute($"electron-packager . --platform={platformInfo.ElectronPackerPlatform} --arch=x64 --out=\"{buildPath}\" --overwrite", tempPath); + ProcessHelper.CmdExecute($"electron-packager . --platform={platformInfo.ElectronPackerPlatform} --arch={electronArch} {electronParams} --out=\"{buildPath}\" --overwrite", tempPath); Console.WriteLine("... done"); diff --git a/buildAll.cmd b/buildAll.cmd index db1f17c..ad6ad6b 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -16,6 +16,11 @@ dotnet build echo "Invoke electronize build in WebApp Demo" + +echo "/target xxx (dev-build)" +dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch x86 /electron-params "--prune=true " + + echo "/target win (dev-build)" dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target win From 2aba2a498ec6990875c32de799929c2e31f63417 Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Mon, 12 Feb 2018 21:23:23 +0100 Subject: [PATCH 6/9] fix --- ElectronNET.CLI/Commands/BuildCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElectronNET.CLI/Commands/BuildCommand.cs b/ElectronNET.CLI/Commands/BuildCommand.cs index c6a5ab6..6e0308d 100644 --- a/ElectronNET.CLI/Commands/BuildCommand.cs +++ b/ElectronNET.CLI/Commands/BuildCommand.cs @@ -120,7 +120,7 @@ namespace ElectronNET.CLI.Commands string electronParams = ""; if (parser.Arguments.ContainsKey(_paramElectronParams)) { - electronParams = parser.Arguments[electronParams][0]; + electronParams = parser.Arguments[_paramElectronParams][0]; } Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}..."); From cbb7a5bc4afceeaa763e1eac38d859a872d21f26 Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Mon, 12 Feb 2018 21:38:18 +0100 Subject: [PATCH 7/9] test --- buildAll.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildAll.cmd b/buildAll.cmd index ad6ad6b..3899395 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -18,7 +18,7 @@ echo "Invoke electronize build in WebApp Demo" echo "/target xxx (dev-build)" -dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch x86 /electron-params "--prune=true " +dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch ia32 /electron-params "--prune=true " echo "/target win (dev-build)" From 293980c0d13a1b128e7ecb94e9b6fbcb39128e0e Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Wed, 14 Feb 2018 20:51:15 +0100 Subject: [PATCH 8/9] test with quotes --- buildAll.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildAll.sh b/buildAll.sh index 19263f3..3862db5 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -28,7 +28,7 @@ echo "/target osx (dev-build)" dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target osx echo "/target custom win7-x86;win32 (dev-build)" -dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target custom win7-x86;win32 +dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" "build /target custom win7-x86;win32" # Be aware, that for non-electronnet-dev environments the correct -# invoke command would be dotnet electronize ... \ No newline at end of file +# invoke command would be dotnet electronize ... From eee2a3e34db551c6d93c321713e058d6613f2037 Mon Sep 17 00:00:00 2001 From: Robert Muehsig Date: Wed, 14 Feb 2018 20:58:06 +0100 Subject: [PATCH 9/9] Update buildAll.sh --- buildAll.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildAll.sh b/buildAll.sh index 3862db5..4141a10 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -28,7 +28,7 @@ echo "/target osx (dev-build)" dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target osx echo "/target custom win7-x86;win32 (dev-build)" -dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" "build /target custom win7-x86;win32" +dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target custom "win7-x86;win32" # Be aware, that for non-electronnet-dev environments the correct # invoke command would be dotnet electronize ...