summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Roeser <le.petit.fou@web.de>2019-09-20 22:45:27 +0200
committerGitHub <noreply@github.com>2019-09-20 22:45:27 +0200
commitef3708f936e2824632cb136add4496227af5cf88 (patch)
treeed05a50c3c239cf45d542d86043c5baf2f8a3b9d
parent0de4e890201315458cb438f933179afafc780f94 (diff)
downloadmill-ef3708f936e2824632cb136add4496227af5cf88.tar.gz
mill-ef3708f936e2824632cb136add4496227af5cf88.tar.bz2
mill-ef3708f936e2824632cb136add4496227af5cf88.zip
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
-rwxr-xr-xscalalib/src/GenIdeaImpl.scala3
-rw-r--r--scalalib/test/resources/gen-idea-extended-hello-world/idea_modules/mill-build.iml3
-rw-r--r--scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml3
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"/>