Revert "Use dotnet msbuild to launch makefile.shade"

This reverts commit 0e30b52.

build/KoreBuild.ps1

@@ -1,7 +1,5 @@
 #requires -version 4
 
-param([parameter(ValueFromRemainingArguments=$true)][string[]] $allparams)
-
 $repoFolder = $env:REPO_FOLDER
 if (!$repoFolder) {
     throw "REPO_FOLDER is not set"
@@ -93,34 +91,13 @@ if (!(Test-Path "$koreBuildFolder\Sake"))
     Invoke-WebRequest "https://dist.nuget.org/win-x86-commandline/v3.5.0-beta2/NuGet.exe" -OutFile "$koreBuildFolder/nuget.exe"
 }
 
-$env:KOREBUILD_FOLDER=$koreBuildFolder
-$makeFileProj = "$koreBuildFolder/targets/makefile.proj"
-
-$msbuildArtifactsDir = "$repoFolder/artifacts/msbuild"
-$msbuildLogFilePath = "$msbuildArtifactsDir/msbuild.log"
-$msBuildResponseFile = "$msbuildArtifactsDir/msbuild.rsp"
-
-if ($allparams)
+$makeFilePath = "makefile.shade"
+if (!(Test-Path $makeFilePath))
 {
-    $targets += "/t:$($allparams.Replace(' ', ';'))"
+    $makeFilePath = "$koreBuildFolder\shade\makefile.shade"
 }
 
-$msBuildArguments = @"
-/nologo
-/m
-/detailedsummary
-"$makeFileProj"
-/p:KoreBuildDirectory="$koreBuildFolder/"
-/p:RepositoryRoot="$repoFolder/"
-/fl
-/flp:LogFile="$msbuildLogFilePath";Verbosity=diagnostic;Encoding=UTF-8
-$targets
-"@
-
-if (!(Test-Path $msbuildArtifactsDir))
-{
-    mkdir $msbuildArtifactsDir | Out-Null
-}
-$msBuildArguments | Out-File -Encoding ASCII -FilePath $msBuildResponseFile
+Write-Host "Using makefile: $makeFilePath"
 
-dotnet msbuild `@"$msBuildResponseFile"
+$env:KOREBUILD_FOLDER=$koreBuildFolder
+&"$koreBuildFolder\Sake\0.2.2\tools\Sake.exe" -I $koreBuildFolder\shade -f $makeFilePath @args

build/KoreBuild.sh

@@ -9,11 +9,7 @@ while [[ $# > 0 ]]; do
             repoFolder=$1
             ;;
         *)
-            if [ -z "$targets" ]; then
-                targets="/t:$1"
-            else
-                targets+=";$1"
-            fi
+            targets+=" $1"
             ;;
     esac
     shift
@@ -114,28 +110,10 @@ if [ ! -f $nugetPath ]; then
     wget -O $nugetPath $nugetUrl 2>/dev/null || curl -o $nugetPath --location $nugetUrl 2>/dev/null
 fi
 
-export KOREBUILD_FOLDER="$koreBuildFolder"
-
-
-makeFileProj="$koreBuildFolder/targets/makefile.proj"
-msbuildArtifactsDir="$repoFolder/artifacts/msbuild"
-msbuildResponseFile="$msbuildArtifactsDir/msbuild.rsp"
-msbuildLogFile="$msbuildArtifactsDir/msbuild.log"
-
-if [ ! -f $msbuildArtifactsDir ]; then
-    mkdir -p $msbuildArtifactsDir
+makeFile="makefile.shade"
+if [ ! -e $makeFile ]; then
+    makeFile="$koreBuildFolder/shade/makefile.shade"
 fi
 
-cat > $msbuildResponseFile <<ENDMSBUILDARGS
-/nologo
-/m
-/detailedsummary
-"$makeFileProj"
-/p:KoreBuildDirectory="$koreBuildFolder/"
-/p:RepositoryRoot="$repoFolder/"
-/fl
--flp:LogFile="$msbuildLogFile";Verbosity=diagnostic;Encoding=UTF-8
-$targets
-ENDMSBUILDARGS
-
-dotnet msbuild @"$msbuildResponseFile"
+export KOREBUILD_FOLDER="$koreBuildFolder"
+mono $sakeFolder/0.2.2/tools/Sake.exe -I $koreBuildFolder/shade -f $makeFile $targets

build/shade/_k-standard-goals.shade

@@ -98,16 +98,12 @@ default SAMPLES_PROJECT_GLOB = "samples/*/*.csproj"
           var directory = new DirectoryInfo(TARGET_DIR);
           directory.Attributes &= ~FileAttributes.ReadOnly;
 
-          foreach (var subDirectory in directory.GetDirectories().Where(d => d.Name != "msbuild"))
+          foreach (var info in directory.GetFileSystemInfos("*", SearchOption.AllDirectories))
           {
-              subDirectory.Attributes &= ~FileAttributes.ReadOnly;
-              subDirectory.Delete(true);
+              info.Attributes &= ~FileAttributes.ReadOnly;
           }
 
-          foreach (var file in directory.EnumerateFiles())
-          {
-            file.Delete();
-          }
+          directory.Delete(true);
         }
     }