From 9b41b94d350ddc43b016d517aa935c228f97884b Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Sat, 31 Oct 2015 12:37:17 +0100 Subject: [PATCH 1/2] Add `out/` folder correctly to gitignore. --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 95d95ca1158a..aa7fd2164774 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,8 @@ classes/ tests/partest-generated/ tests/locks/ /test-classes/ + + +# Ignore output files but keep the directory +out/ +!out/.keep From 03bf4904c9abb50d97d3a7ae0dd70d0456a9f9fb Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Sat, 31 Oct 2015 12:38:15 +0100 Subject: [PATCH 2/2] Fix #895: Maintain keep file during bootstrap --- test/dotc/build.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/dotc/build.scala b/test/dotc/build.scala index 9f47796c3fe2..2963b8f1e9c1 100644 --- a/test/dotc/build.scala +++ b/test/dotc/build.scala @@ -21,6 +21,8 @@ object build extends tests { def main(args: Array[String]): Unit = { println("------------ Building dotty ------------") deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output + val keepFile = new File(defaultOutputDir + ".keep") + keepFile.createNewFile() dotty // build output dir val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", ".")) p.waitFor()