diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-04-06 01:24:27 +0000 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-04-06 01:24:27 +0000 |
commit | 34f3d10608d6f11deb90979066d69d31b7a8fe4f (patch) | |
tree | 087596ae13c334b22e713a8b2d0788f2543680f6 | |
parent | 9bfe739adc62ba073342f78a64e24c18e12d4792 (diff) | |
download | cbt-34f3d10608d6f11deb90979066d69d31b7a8fe4f.tar.gz cbt-34f3d10608d6f11deb90979066d69d31b7a8fe4f.tar.bz2 cbt-34f3d10608d6f11deb90979066d69d31b7a8fe4f.zip |
change IntelliJ plugin draft to follow now recommend plugin style
-rw-r--r-- | build/build.scala | 3 | ||||
-rw-r--r-- | examples/idea-plugin-example/build/build.scala | 8 | ||||
-rw-r--r-- | examples/idea-plugin-example/build/build/build.scala | 6 | ||||
-rw-r--r-- | examples/intellij/README.md (renamed from examples/idea-plugin-example/README.md) | 0 | ||||
-rw-r--r-- | examples/intellij/build/build.scala | 5 | ||||
-rw-r--r-- | examples/intellij/src/Main.scala (renamed from examples/idea-plugin-example/src/Main.scala) | 2 | ||||
-rw-r--r-- | plugins/idea_plugin/IdeaPlugin.scala | 85 | ||||
-rw-r--r-- | plugins/idea_plugin/build/build.scala | 9 | ||||
-rw-r--r-- | stage2/plugins.scala | 1 | ||||
-rw-r--r-- | stage2/plugins/IntelliJ.scala | 70 |
10 files changed, 78 insertions, 111 deletions
diff --git a/build/build.scala b/build/build.scala index 4635159..74bf6da 100644 --- a/build/build.scala +++ b/build/build.scala @@ -2,7 +2,7 @@ package cbt_build.cbt import cbt._ import cbt_internal._ -class Build(val context: Context) extends Shared with Scalariform with PublishLocal{ +class Build(val context: Context) extends Shared with Scalariform with PublishLocal with CommandLineOverrides{ override def name: String = "cbt" override def version: String = "0.1" override def description: String = "Fast, intuitive Build Tool for Scala" @@ -24,6 +24,7 @@ class Build(val context: Context) extends Shared with Scalariform with PublishLo Seq( context.cbtHome / "stage2" / "DirectoryDependency.scala", context.cbtHome / "stage2" / "LazyDependency.scala", + context.cbtHome / "stage2" / "plugins" / "IntelliJ.scala", context.cbtHome / "stage2" / "plugins" / "ScalaTest.scala", context.cbtHome / "stage2" / "plugins" / "Scalatex.scala", context.cbtHome / "stage2" / "plugins" / "Tut.scala", diff --git a/examples/idea-plugin-example/build/build.scala b/examples/idea-plugin-example/build/build.scala deleted file mode 100644 index 6252402..0000000 --- a/examples/idea-plugin-example/build/build.scala +++ /dev/null @@ -1,8 +0,0 @@ - -import cbt._ -import idea_plugin.IdeaPlugin - - -class Build(val context: Context) extends BaseBuild with IdeaPlugin { - override def name = "idea-plugin-example" -} diff --git a/examples/idea-plugin-example/build/build/build.scala b/examples/idea-plugin-example/build/build/build.scala deleted file mode 100644 index df4934a..0000000 --- a/examples/idea-plugin-example/build/build/build.scala +++ /dev/null @@ -1,6 +0,0 @@ - -import cbt._ - -class Build(val context: Context) extends BuildBuild { - override def dependencies = super.dependencies :+ plugins.ideaPlugin -} diff --git a/examples/idea-plugin-example/README.md b/examples/intellij/README.md index 8b13789..8b13789 100644 --- a/examples/idea-plugin-example/README.md +++ b/examples/intellij/README.md diff --git a/examples/intellij/build/build.scala b/examples/intellij/build/build.scala new file mode 100644 index 0000000..921cf40 --- /dev/null +++ b/examples/intellij/build/build.scala @@ -0,0 +1,5 @@ +import cbt._ + +class Build(val context: Context) extends BaseBuild with IntelliJ { + override def name = "idea-plugin-example" +} diff --git a/examples/idea-plugin-example/src/Main.scala b/examples/intellij/src/Main.scala index ec68f73..407a577 100644 --- a/examples/idea-plugin-example/src/Main.scala +++ b/examples/intellij/src/Main.scala @@ -1,3 +1,3 @@ object Main extends App { - println("This is an example Application for illustrating CBT IDEA plugin ") + println("This is an example Application for illustrating CBT IntelliJ project generator") } diff --git a/plugins/idea_plugin/IdeaPlugin.scala b/plugins/idea_plugin/IdeaPlugin.scala deleted file mode 100644 index 97e53b1..0000000 --- a/plugins/idea_plugin/IdeaPlugin.scala +++ /dev/null @@ -1,85 +0,0 @@ -package idea_plugin - -import java.io.{File, FileWriter} - -import cbt.{BaseBuild, ExitCode} - -trait IdeaPlugin extends BaseBuild { - - import IdeaPlugin._ - - // @TODO add only the top level dependencies - // @TODO return exit code dynamically - def generateIdeaProject: ExitCode = { - - val dependencyEntry: (String) => String = (url: String) => <orderEntry type="module-library"> - <library> - <CLASSES> - <root url={url}/> - </CLASSES> - <JAVADOC/> - <SOURCES/> - </library> - </orderEntry>.toString() - - val moduleDir = projectDirectory.getPath - val projectDependencies: List[String] = for { - depJarFile <- this.dependencies - .flatMap(dep => dep.dependenciesArray().toList) - .flatMap(x => x.exportedClasspathArray().toList) - .toList - depIdeaOrderEntry = dependencyEntry( - s"jar://$moduleDir/../cbt/${depJarFile.getPath.split("/cbt")(1)}!/") - } yield depIdeaOrderEntry - - val imlFile = new File(projectDirectory.getPath + s"/$name.iml") - if (!imlFile.exists()) { - imlFile.createNewFile() - } - val fw = new FileWriter(imlFile.getPath, false) - fw.write(templateWithCBTSources(projectDependencies.mkString("\n"), moduleDir)) - fw.close() - ExitCode.Success - } - -} - -private[idea_plugin] object IdeaPlugin { - - // @TODO inject from the build.scala - // @TODO infer scala version from project - // path of cbt relative to module dir - - private val templateWithCBTSources: (String, String) => String = (dependencies: String, - moduleRootDir: String) => - """<?xml version="1.0" encoding="UTF-8"?> - |<module type="JAVA_MODULE" version="4"> - | <component name="NewModuleRootManager" inherit-compiler-output="true"> - | <exclude-output /> - | <content url="file://$MODULE_DIR$/../cbt/compatibility"> - | <sourceFolder url="file://$MODULE_DIR$/../cbt/compatibility" isTestSource="false" /> - | <excludeFolder url="file://$MODULE_DIR$/../cbt/compatibility/target/scala-2.11" /> - | </content> - | <content url="file://$MODULE_DIR$/../cbt/nailgun_launcher"> - | <sourceFolder url="file://$MODULE_DIR$/../cbt/nailgun_launcher" isTestSource="false" /> - | <excludeFolder url="file://$MODULE_DIR$/../cbt/nailgun_launcher/target" /> - | </content> - | <content url="file://$MODULE_DIR$/../cbt/stage1"> - | <sourceFolder url="file://$MODULE_DIR$/../cbt/stage1" isTestSource="false" /> - | <excludeFolder url="file://$MODULE_DIR$/../cbt/stage1/target/scala-2.11" /> - | </content> - | <content url="file://$MODULE_DIR$/../cbt/stage2"> - | <sourceFolder url="file://$MODULE_DIR$/../cbt/stage2" isTestSource="false" /> - | <excludeFolder url="file://$MODULE_DIR$/../cbt/stage2/target/scala-2.11" /> - | </content> - | <content url="file://$MODULE_DIR$"> - | <sourceFolder url="file://$MODULE_DIR$/src/main/scala/main" isTestSource="false" /> - | <sourceFolder url="file://$MODULE_DIR$/src/test/scala" isTestSource="false" /> - | </content> - | <orderEntry type="inheritedJdk" /> - | <orderEntry type="sourceFolder" forTests="false" /> - | <orderEntry type="library" name="scala-sdk-2.11.7" level="application" /> | - | """.stripMargin + dependencies + - """ </component> - |</module>""".stripMargin -} diff --git a/plugins/idea_plugin/build/build.scala b/plugins/idea_plugin/build/build.scala deleted file mode 100644 index 991e07e..0000000 --- a/plugins/idea_plugin/build/build.scala +++ /dev/null @@ -1,9 +0,0 @@ -import cbt._ - -class Build(val context: Context) extends Plugin { - override def dependencies = - super.dependencies ++ - Resolver(mavenCentral).bind( - ScalaDependency("org.scala-lang.modules", "scala-xml", "1.0.5") - ) -} diff --git a/stage2/plugins.scala b/stage2/plugins.scala index c48a31b..ea1aa74 100644 --- a/stage2/plugins.scala +++ b/stage2/plugins.scala @@ -7,7 +7,6 @@ class plugins( context: Context, scalaVersion: String ) { ), None ) - final lazy val ideaPlugin = plugin( "idea_plugin" ) final lazy val googleJavaFormat = plugin( "google-java-format" ) final lazy val proguard = plugin( "proguard" ) final lazy val sbtLayout = plugin( "sbt_layout" ) diff --git a/stage2/plugins/IntelliJ.scala b/stage2/plugins/IntelliJ.scala new file mode 100644 index 0000000..c41ea51 --- /dev/null +++ b/stage2/plugins/IntelliJ.scala @@ -0,0 +1,70 @@ +package cbt + +import java.io.{ File, FileWriter } + +trait IntelliJ extends BaseBuild { + private // this plugin is not functional right now, needs fixing + def intellij = { + lib.writeIfChanged( + projectDirectory / name ++ ".iml", + IntelliJ.iml( + scalaVersion, + transitiveDependencies + ) + ) + } +} + +// TODO: +// - projects, their builds, their build builds, etc should be represented individually +// ideally with cbt's main sources being editable, but not the sources of other cbt versions +object IntelliJ { + def iml( + scalaVersion: String, + transitiveDependencies: Seq[Dependency] + ): String = { + """<?xml version="1.0" encoding="UTF-8"?>""" ++ "\n" ++ +// format: OFF +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output/> + <content url="file://$MODULE_DIR$/../cbt/compatibility"> + <sourceFolder url="file://$MODULE_DIR$/../cbt/compatibility" isTestSource="false"/> + <excludeFolder url="file://$MODULE_DIR$/../cbt/compatibility/target/scala-2.11"/> + </content> + <content url="file://$MODULE_DIR$/../cbt/nailgun_launcher"> + <sourceFolder url="file://$MODULE_DIR$/../cbt/nailgun_launcher" isTestSource="false"/> + <excludeFolder url="file://$MODULE_DIR$/../cbt/nailgun_launcher/target"/> + </content> + <content url="file://$MODULE_DIR$/../cbt/stage1"> + <sourceFolder url="file://$MODULE_DIR$/../cbt/stage1" isTestSource="false"/> + <excludeFolder url="file://$MODULE_DIR$/../cbt/stage1/target/scala-2.11"/> + </content> + <content url="file://$MODULE_DIR$/../cbt/stage2"> + <sourceFolder url="file://$MODULE_DIR$/../cbt/stage2" isTestSource="false"/> + <excludeFolder url="file://$MODULE_DIR$/../cbt/stage2/target/scala-2.11"/> + </content> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/scala/main" isTestSource="false"/> + <sourceFolder url="file://$MODULE_DIR$/src/test/scala" isTestSource="false"/> + </content> + <orderEntry type="inheritedJdk"/> + <orderEntry type="sourceFolder" forTests="false"/> + <orderEntry type="library" name="scala-sdk-{scalaVersion}" level="application"/> + { + transitiveDependencies.flatMap( _.exportedClasspath.files ).map( _.string ).map { cp => + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url={ if ( cp.endsWith( ".jar" ) ) s"jar://$cp!/" else s"file://$cp/" }/> + </CLASSES> + <JAVADOC/> + <SOURCES/> + </library> + </orderEntry> + } + } + </component> +</module>.buildString( stripComments = false ) // format: ON + } +} |