From ef3708f936e2824632cb136add4496227af5cf88 Mon Sep 17 00:00:00 2001
From: Tobias Roeser <le.petit.fou@web.de>
Date: Fri, 20 Sep 2019 22:45:27 +0200
Subject:  Use dedicated output dir for mill-build module in IntelliJ IDEA
 (#696)

* Use dedicated output dir for mill-build module in IntelliJ IDEA

This fixes issues with missing generated sources in IntelliJ IDEA after a rebuild.

* Exclude mill's out dir
---
 scalalib/src/GenIdeaImpl.scala                                         | 3 ++-
 .../gen-idea-extended-hello-world/idea_modules/mill-build.iml          | 3 ++-
 .../test/resources/gen-idea-hello-world/idea_modules/mill-build.iml    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scalalib/src/GenIdeaImpl.scala b/scalalib/src/GenIdeaImpl.scala
index f1483d8a..25bfdbd0 100755
--- a/scalalib/src/GenIdeaImpl.scala
+++ b/scalalib/src/GenIdeaImpl.scala
@@ -451,10 +451,11 @@ case class GenIdeaImpl(evaluator: Evaluator,
   def rootXmlTemplate(libNames: Strict.Agg[String]) = {
     <module type="JAVA_MODULE" version={"" + ideaConfigVersion}>
       <component name="NewModuleRootManager">
-        <output url="file://$MODULE_DIR$/../out"/>
+        <output url="file://$MODULE_DIR$/../out/ideaOutputDir-mill-build"/>
         <content url="file://$MODULE_DIR$/..">
           <excludeFolder url="file://$MODULE_DIR$/../project" />
           <excludeFolder url="file://$MODULE_DIR$/../target" />
+          <excludeFolder url="file://$MODULE_DIR$/../out" />
         </content>
         <exclude-output/>
         <orderEntry type="inheritedJdk" />
diff --git a/scalalib/test/resources/gen-idea-extended-hello-world/idea_modules/mill-build.iml b/scalalib/test/resources/gen-idea-extended-hello-world/idea_modules/mill-build.iml
index 46fd8c3b..86c221ba 100644
--- a/scalalib/test/resources/gen-idea-extended-hello-world/idea_modules/mill-build.iml
+++ b/scalalib/test/resources/gen-idea-extended-hello-world/idea_modules/mill-build.iml
@@ -1,9 +1,10 @@
 <module type="JAVA_MODULE" version="4">
     <component name="NewModuleRootManager">
-        <output url="file://$MODULE_DIR$/../out"/>
+        <output url="file://$MODULE_DIR$/../out/ideaCompileOutput-mill-build"/>
         <content url="file://$MODULE_DIR$/..">
             <excludeFolder url="file://$MODULE_DIR$/../project"/>
             <excludeFolder url="file://$MODULE_DIR$/../target"/>
+            <excludeFolder url="file://$MODULE_DIR$/../out"/>
         </content>
         <exclude-output/>
         <orderEntry type="inheritedJdk"/>
diff --git a/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml b/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml
index 46fd8c3b..86c221ba 100644
--- a/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml
@@ -1,9 +1,10 @@
 <module type="JAVA_MODULE" version="4">
     <component name="NewModuleRootManager">
-        <output url="file://$MODULE_DIR$/../out"/>
+        <output url="file://$MODULE_DIR$/../out/ideaCompileOutput-mill-build"/>
         <content url="file://$MODULE_DIR$/..">
             <excludeFolder url="file://$MODULE_DIR$/../project"/>
             <excludeFolder url="file://$MODULE_DIR$/../target"/>
+            <excludeFolder url="file://$MODULE_DIR$/../out"/>
         </content>
         <exclude-output/>
         <orderEntry type="inheritedJdk"/>
-- 
cgit v1.2.3