diff options
| -rw-r--r-- | compiler/test/dotc/build.scala | 40 | ||||
| -rw-r--r-- | project/Build.scala | 19 |
2 files changed, 8 insertions, 51 deletions
diff --git a/compiler/test/dotc/build.scala b/compiler/test/dotc/build.scala deleted file mode 100644 index b1c8db7c7..000000000 --- a/compiler/test/dotc/build.scala +++ /dev/null @@ -1,40 +0,0 @@ -package dotc - -import java.io.File - -object build extends tests { - - private def deleteFilesInFolder(folder: File, deleteFolder: Boolean = false): Unit = { - val files = folder.listFiles() - if(files != null) { //some JVMs return null for empty dirs - for(f <- files) { - if(f.isDirectory) { - deleteFilesInFolder(f, deleteFolder = true) - } else { - f.delete() - } - } - } - if(deleteFolder) folder.delete() - } - - def clearOutput() = { - deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output - val keepFile = new File(defaultOutputDir + ".keep") - keepFile.createNewFile() - } - - def main(args: Array[String]): Unit = { - println("---------- Building bootstrapped dotty-lib ----------------------------------------------") - clearOutput() - dottyBootedLib - val p1 = Runtime.getRuntime.exec(Array("jar", "cf", "dotty-lib.jar", "-C", "out", ".")) - p1.waitFor() - - println("---------- Building bootstrapped dotty depending on dotty-lib compiled by dotty ----------") - clearOutput() - dottyDependsOnBootedLib - val p2 = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", ".")) - p2.waitFor() - } -} diff --git a/project/Build.scala b/project/Build.scala index 4c8854267..a24fc5371 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -119,23 +119,20 @@ object DottyBuild extends Build { addCommandAlias("run", "dotty-compiler/run") ++ addCommandAlias( "partest", - ";packageAll" + - ";dotty-compiler/test:runMain dotc.build" + - ";dotty-compiler/lockPartestFile" + - ";dotty-compiler/test:test" + - ";dotty-compiler/runPartestRunner" + ";publishLocal" + // Non-bootstrapped dotty needs to be published first + ";dotty-compiler-bootstrapped/lockPartestFile" + + ";dotty-compiler-bootstrapped/test:test" + + ";dotty-compiler-bootstrapped/runPartestRunner" ) ++ addCommandAlias( "partest-only", - ";packageAll" + - ";dotty-compiler/test:runMain dotc.build" + - ";dotty-compiler/lockPartestFile" + - ";dotty-compiler/test:test-only dotc.tests" + - ";dotty-compiler/runPartestRunner" + ";publishLocal" + // Non-bootstrapped dotty needs to be published first + ";dotty-compiler-bootstrapped/lockPartestFile" + + ";dotty-compiler-bootstrapped/test:test-only dotc.tests" + + ";dotty-compiler-bootstrapped/runPartestRunner" ) ++ addCommandAlias( "partest-only-no-bootstrap", - ";packageAll" + ";dotty-compiler/lockPartestFile" + ";dotty-compiler/test:test-only dotc.tests" + ";dotty-compiler/runPartestRunner" |