diff options
| author | Guillaume Galy <guilgaly@users.noreply.github.com> | 2018-05-06 20:30:47 +0200 |
|---|---|---|
| committer | Nikolay Tatarinov <5min4eq.unity@gmail.com> | 2018-05-06 21:30:47 +0300 |
| commit | cb327ee2f04a5493d285b4e4dd04a89c96b7c23c (patch) | |
| tree | 0d0308775cf2a00b0cad5ea8a058dbb2d7a28084 /scalalib | |
| parent | f7a02a46f847d4433cd771840fd0b6cc314215d8 (diff) | |
| download | mill-cb327ee2f04a5493d285b4e4dd04a89c96b7c23c.tar.gz mill-cb327ee2f04a5493d285b4e4dd04a89c96b7c23c.tar.bz2 mill-cb327ee2f04a5493d285b4e4dd04a89c96b7c23c.zip | |
fix GenIdeaImpl test modules (#312)
fix the syntax for the test output and resource folders
Diffstat (limited to 'scalalib')
| -rw-r--r-- | scalalib/src/mill/scalalib/GenIdeaImpl.scala | 11 | ||||
| -rw-r--r-- | scalalib/test/resources/gen-idea/idea_modules/iml | 2 | ||||
| -rw-r--r-- | scalalib/test/resources/gen-idea/idea_modules/test.iml | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/scalalib/src/mill/scalalib/GenIdeaImpl.scala b/scalalib/src/mill/scalalib/GenIdeaImpl.scala index 7ab6ffb7..763482c8 100644 --- a/scalalib/src/mill/scalalib/GenIdeaImpl.scala +++ b/scalalib/src/mill/scalalib/GenIdeaImpl.scala @@ -329,7 +329,13 @@ object GenIdeaImpl { ) = { <module type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager"> - <output url={"file://$MODULE_DIR$/" + relify(compileOutputPath) + "/dest/classes"} /> + { + val outputUrl = "file://$MODULE_DIR$/" + relify(compileOutputPath) + "/dest/classes" + if (isTest) + <output-test url={outputUrl} /> + else + <output url={outputUrl} /> + } <exclude-output /> <content url={"file://$MODULE_DIR$/" + relify(generatedSourceOutputPath)} /> <content url={"file://$MODULE_DIR$/" + relify(basePath)}> @@ -344,9 +350,10 @@ object GenIdeaImpl { <sourceFolder url={"file://$MODULE_DIR$/" + relify(generatedSourcePath)} isTestSource={isTest.toString} generated="true" /> } { + val resourceType = if (isTest) "java-test-resource" else "java-resource" for (resourcePath <- resourcePaths.toSeq.sorted) yield - <sourceFolder url={"file://$MODULE_DIR$/" + relify(resourcePath)} isTestSource={isTest.toString} type="java-resource" /> + <sourceFolder url={"file://$MODULE_DIR$/" + relify(resourcePath)} type={resourceType} /> } <excludeFolder url={"file://$MODULE_DIR$/" + relify(basePath) + "/target"} /> </content> diff --git a/scalalib/test/resources/gen-idea/idea_modules/iml b/scalalib/test/resources/gen-idea/idea_modules/iml index 0124e06e..13e8daf7 100644 --- a/scalalib/test/resources/gen-idea/idea_modules/iml +++ b/scalalib/test/resources/gen-idea/idea_modules/iml @@ -5,7 +5,7 @@ <content url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/generatedSources/dest"/> <content url="file://$MODULE_DIR$/../target/workspace/gen-idea"> <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/src" isTestSource="false"/> - <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/resources" isTestSource="false" type="java-resource"/> + <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/resources" type="java-resource"/> <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/target"/> </content> <orderEntry type="inheritedJdk"/> diff --git a/scalalib/test/resources/gen-idea/idea_modules/test.iml b/scalalib/test/resources/gen-idea/idea_modules/test.iml index f67445ae..aecae2e3 100644 --- a/scalalib/test/resources/gen-idea/idea_modules/test.iml +++ b/scalalib/test/resources/gen-idea/idea_modules/test.iml @@ -1,11 +1,11 @@ <module type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager"> - <output url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/test/compile/dest/classes"/> + <output-test url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/test/compile/dest/classes"/> <exclude-output/> <content url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/test/generatedSources/dest"/> <content url="file://$MODULE_DIR$/../target/workspace/gen-idea/test"> <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/src" isTestSource="true"/> - <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/resources" isTestSource="true" type="java-resource"/> + <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/resources" type="java-test-resource"/> <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/target"/> </content> <orderEntry type="inheritedJdk"/> |