diff --git a/Compiler/CSharp.Tasks/Makefile b/Compiler/CSharp.Tasks/Makefile deleted file mode 100644 index 2f71735..0000000 --- a/Compiler/CSharp.Tasks/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -debug: - xbuild - -release: - xbuild /p:Configuration=Release diff --git a/Compiler/CSharp.Tasks/build.ps1 b/Compiler/CSharp.Tasks/build.ps1 new file mode 100755 index 0000000..994b7f6 --- /dev/null +++ b/Compiler/CSharp.Tasks/build.ps1 @@ -0,0 +1,23 @@ +#!/bin/pwsh + +Set-Location -Path (Split-Path -Path $MyInvocation.MyCommand.Definition -Parent) + +if($IsLinux) { + + if ($args[0] -ne "release") { + msbuild CSharp.Tasks.csproj + } else { + msbuild CSharp.Tasks.csproj /p:Configuration=Release + } + +} else { + + if ($args[0] -ne "release") { + dotnet msbuild CSharp.Tasks.csproj + } else { + dotnet msbuild CSharp.Tasks.csproj /p:Configuration=Release + } + +} + + diff --git a/Compiler/CSharp.Tasks/make.cmd b/Compiler/CSharp.Tasks/make.cmd deleted file mode 100644 index 7156070..0000000 --- a/Compiler/CSharp.Tasks/make.cmd +++ /dev/null @@ -1,13 +0,0 @@ -@cd /D %~dp0 -@call ../../scripts/set-variables - -IF not "%1" == "release" ( - -%msbuild% CSharp.Tasks.csproj - -) ELSE ( - -%msbuild% /p:Configuration=Release CSharp.Tasks.csproj - -) - diff --git a/Compiler/Makefile b/Compiler/Makefile deleted file mode 100644 index c947fb2..0000000 --- a/Compiler/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -debug: - cd skc5 && $(MAKE) - cd CSharp.Tasks && $(MAKE) - -release: - cd skc5 && $(MAKE) release - cd CSharp.Tasks && $(MAKE) release diff --git a/Compiler/build.ps1 b/Compiler/build.ps1 new file mode 100755 index 0000000..834e936 --- /dev/null +++ b/Compiler/build.ps1 @@ -0,0 +1,13 @@ +#!/bin/pwsh + +Set-Location -Path (Split-Path -Path $MyInvocation.MyCommand.Definition -Parent) + +# call ../scripts/set-variables + +cd skc5 +& ./build.ps1 $args[0] +cd .. + +cd CSharp.Tasks +& ./build.ps1 $args[0] +cd .. \ No newline at end of file diff --git a/Compiler/make.cmd b/Compiler/make.cmd deleted file mode 100644 index fbe0686..0000000 --- a/Compiler/make.cmd +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -cd /D %~dp0 -call ../scripts/set-variables - -cd skc5 -call make %1 -cd .. - -cd CSharp.Tasks -call make %1 -cd .. diff --git a/Compiler/skc5/Makefile b/Compiler/skc5/Makefile deleted file mode 100644 index 2f71735..0000000 --- a/Compiler/skc5/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -debug: - xbuild - -release: - xbuild /p:Configuration=Release diff --git a/Compiler/skc5/build.ps1 b/Compiler/skc5/build.ps1 new file mode 100755 index 0000000..c427d7f --- /dev/null +++ b/Compiler/skc5/build.ps1 @@ -0,0 +1,23 @@ +#!/bin/pwsh + +Set-Location -Path (Split-Path -Path $MyInvocation.MyCommand.Definition -Parent) + +if($IsLinux) { + + if ($args[0] -ne "release") { + msbuild skc5.csproj + } else { + msbuild skc5.csproj /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None + } + +} else { + + if ($args[0] -ne "release") { + dotnet msbuild skc5.csproj + } else { + dotnet msbuild skc5.csproj /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None + } + +} + + diff --git a/Compiler/skc5/make.cmd b/Compiler/skc5/make.cmd deleted file mode 100644 index 1168b46..0000000 --- a/Compiler/skc5/make.cmd +++ /dev/null @@ -1,13 +0,0 @@ -@cd /D %~dp0 -@call ../../scripts/set-variables - -IF not "%1" == "release" ( - -dotnet msbuild skc5.csproj - -) ELSE ( - -dotnet msbuild skc5.csproj /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None - -) - diff --git a/SDK b/SDK index 66a6e64..fb8bf9b 160000 --- a/SDK +++ b/SDK @@ -1 +1 @@ -Subproject commit 66a6e64436c6254b60b7ea5aee54d026fff78237 +Subproject commit fb8bf9b5a74773f2a877c11d7808a4ab4195ee0f diff --git a/build.ps1 b/build.ps1 new file mode 100755 index 0000000..1ebc0d9 --- /dev/null +++ b/build.ps1 @@ -0,0 +1,15 @@ +#!/bin/pwsh + +Set-Location -Path (Split-Path -Path $MyInvocation.MyCommand.Definition -Parent) + +cd external +& ./build.ps1 $args[0] +cd .. + +cd Compiler +& ./build.ps1 $args[0] +cd .. + +cd SDK +& ./build.ps1 $args[0] +cd .. diff --git a/external/Makefile b/external/Makefile deleted file mode 100644 index 85d9483..0000000 --- a/external/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -debug: - xbuild /p:Configuration=net_4_5_Debug NRefactory/NRefactory.sln - xbuild corex/corex.sln - xbuild AjaxMin/AjaxMinDll/AjaxMinDll.sln - xbuild SharpZipLib/src/ICSharpCode.SharpZLib.csproj - -release: - xbuild /p:Configuration=net_4_5_Release NRefactory/NRefactory.sln - xbuild /p:Configuration=Release corex/corex.sln - xbuild /p:Configuration=Release AjaxMin/AjaxMinDll/AjaxMinDll.sln - xbuild /p:Configuration=Release SharpZipLib/src/ICSharpCode.SharpZLib.csproj - diff --git a/external/NRefactory b/external/NRefactory index 2af9704..49b936f 160000 --- a/external/NRefactory +++ b/external/NRefactory @@ -1 +1 @@ -Subproject commit 2af9704642234df1a60919d48185e863cd18649c +Subproject commit 49b936feec4efa56130b76e16f2bc1461f36993b diff --git a/external/SharpZipLib b/external/SharpZipLib index de055ea..3ef8d78 160000 --- a/external/SharpZipLib +++ b/external/SharpZipLib @@ -1 +1 @@ -Subproject commit de055ea914fbe6a346eb1490c25af6b750ef95a8 +Subproject commit 3ef8d78fd4b486d1416394eb1fca342e124d03b9 diff --git a/external/build.ps1 b/external/build.ps1 new file mode 100755 index 0000000..0ae6ee8 --- /dev/null +++ b/external/build.ps1 @@ -0,0 +1,48 @@ +#!/bin/pwsh + +Set-Location -Path (Split-Path -Path $MyInvocation.MyCommand.Definition -Parent) +#& ../scripts/set-variables.ps1 + +if ($IsLinux) { + + #nuget restore corex/corex.sln + #nuget restore AjaxMin/AjaxMinDll/AjaxMinDll.sln + + if ($args[0] -ne "release") { + dotnet build cecil/Mono.Cecil.csproj -p:Configuration=net_4_0_Release -verbosity:minimal + msbuild NRefactory/NRefactory.sln -p:Configuration=net_4_5_Debug -verbosity:minimal + dotnet build corex/src/corex -verbosity:minimal + dotnet build AjaxMin/AjaxMinDll/AjaxMinDll.sln -verbosity:minimal + xbuild SharpZipLib/src/ICSharpCode.SharpZLib.csproj -verbosity:minimal + msbuild octokit.net/Octokit/Octokit-Mono.csproj -verbosity:minimal + } else { + dotnet build cecil/Mono.Cecil.csproj -p:Configuration=net_4_0_Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + msbuild NRefactory/NRefactory.sln -p:Configuration=net_4_5_Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + dotnet build corex/src/corex -p:Configuration=Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + dotnet build AjaxMin/AjaxMinDll/AjaxMinDll.sln -p:Configuration=Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + xbuild SharpZipLib/src/ICSharpCode.SharpZLib.csproj -p:Configuration=Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + msbuild octokit.net/Octokit/Octokit-Mono.csproj -p:Configuration=Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + } + + +} else { + + nuget restore corex/corex.sln + nuget restore AjaxMin/AjaxMinDll/AjaxMinDll.sln + + if ($args[0] -ne "release") { + dotnet msbuild cecil/Mono.Cecil.csproj -p:Configuration=net_4_0_Release -verbosity:minimal + dotnet msbuild NRefactory/NRefactory.sln -p:Configuration=net_4_5_Debug -verbosity:minimal + dotnet msbuild corex/src/corex -verbosity:minimal + dotnet msbuild AjaxMin/AjaxMinDll/AjaxMinDll.sln -verbosity:minimal + dotnet msbuild SharpZipLib/src/ICSharpCode.SharpZLib.csproj -verbosity:minimal + dotnet msbuild octokit.net/Octokit/Octokit-Mono.csproj -verbosity:minimal + } else { + dotnet msbuild cecil/Mono.Cecil.csproj -p:Configuration=net_4_0_Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + dotnet msbuild NRefactory/NRefactory.sln -p:Configuration=net_4_5_Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + dotnet msbuild corex/src/corex -p:Configuration=Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + dotnet msbuild AjaxMin/AjaxMinDll/AjaxMinDll.sln -p:Configuration=Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + dotnet msbuild SharpZipLib/src/ICSharpCode.SharpZLib.csproj -p:Configuration=Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + dotnet msbuild octokit.net/Octokit/Octokit-Mono.csproj -p:Configuration=Release -p:DebugSymbols=false -p:DebugType=None -verbosity:minimal + } +} diff --git a/external/cecil b/external/cecil index 2783ebb..ceb8f4d 160000 --- a/external/cecil +++ b/external/cecil @@ -1 +1 @@ -Subproject commit 2783ebbcebb1d8d353fb269552b65eb4be13a218 +Subproject commit ceb8f4dff754bc09f27404013099f86f19fab0c0 diff --git a/external/make.cmd b/external/make.cmd deleted file mode 100644 index 02e092c..0000000 --- a/external/make.cmd +++ /dev/null @@ -1,22 +0,0 @@ -@cd /D %~dp0 -@call ../scripts/set-variables - -IF not "%1" == "release" ( - -dotnet msbuild /p:Configuration=net_4_0_Release cecil/Mono.Cecil.csproj /verbosity:minimal -dotnet msbuild NRefactory/NRefactory.sln /p:Configuration=net_4_5_Debug /verbosity:minimal -dotnet msbuild corex/corex.sln /verbosity:minimal -dotnet msbuild AjaxMin/AjaxMinDll/AjaxMinDll.sln /verbosity:minimal -dotnet msbuild SharpZipLib/src/ICSharpCode.SharpZLib.csproj /verbosity:minimal -dotnet msbuild octokit.net/Octokit/Octokit-Mono.csproj /verbosity:minimal - -) ELSE ( - -dotnet msbuild cecil/Mono.Cecil.csproj /p:Configuration=net_4_0_Release /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal -dotnet msbuild NRefactory/NRefactory.sln /p:Configuration=net_4_5_Release /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal -dotnet msbuild corex/corex.sln /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal -dotnet msbuild AjaxMin/AjaxMinDll/AjaxMinDll.sln /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal -dotnet msbuild SharpZipLib/src/ICSharpCode.SharpZLib.csproj /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal -dotnet msbuild octokit.net/Octokit/Octokit-Mono.csproj /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal - -) diff --git a/make.cmd b/make.cmd deleted file mode 100644 index a871bd2..0000000 --- a/make.cmd +++ /dev/null @@ -1,19 +0,0 @@ -@echo off -cd /D %~dp0 -call scripts/set-variables - -cd external -call make %1 -cd .. - -cd Compiler -call make %1 -cd .. - -cd SDK -call make %1 -cd .. - -cd Integration/MonoDevelop -call make %1 -cd ../..