Merge pull request #852 from dotty-staging/fix-script

DarkDimius · DarkDimius · commit 3c6f28ba36e3 · 2015-10-23T13:18:14.000+02:00
Fix bug in dotc script
diff --git a/bin/dotc b/bin/dotc
@@ -192,7 +192,7 @@ trap onExit INT
 # If using the boot classpath, also pass an empty classpath
 # to java to suppress "." from materializing.
 classpathArgs () {
-  if [[ -n $bootstrapped ]]; then 
+  if [[ "true" == $bootstrapped ]]; then 
     checkjar $DOTTY_JAR "test:runMain dotc.build" src
     toolchain="$DOTTY_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR"
   else
diff --git a/test/dotc/build.scala b/test/dotc/build.scala
@@ -19,6 +19,7 @@ object build extends tests {
 }
 
   def main(args: Array[String]): Unit = {
+    println("------------  Building dotty  ------------")
     deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output
     dotty // build output dir
     val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", "."))

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ object build extends tests {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`def main(args: Array[String]): Unit = {`
	`22`	`+ println("------------ Building dotty ------------")`
`22`	`23`	`deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output`
`23`	`24`	`dotty // build output dir`
`24`	`25`	`val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", "."))`