Merge pull request #67 from ThoughtWorksInc/master

Fix dependency between BaseHaxePlugin and other plugins
qifun · Sep 15, 2015 · 92b666e · 92b666e
2 parents 27afbc6 + 5ea62c4
commit 92b666e
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 1 deletion.
diff --git a/src/main/scala/com/qifun/sbtHaxe/HaxeAs3Plugin.scala b/src/main/scala/com/qifun/sbtHaxe/HaxeAs3Plugin.scala
@@ -26,6 +26,9 @@ import sbt._
  * A Plugin used to compile Haxe sources to Action Script 3 sources.
  */
 object HaxeAs3Plugin extends AutoPlugin {
+
+  override final def requires = BaseHaxePlugin
+
   override final lazy val projectSettings: Seq[Setting[_]] = {
     sbt.addArtifact(artifact in packageBin in HaxeAs3, packageBin in HaxeAs3) ++
       inConfig(As3)(SbtHaxe.baseHaxeSettings) ++

diff --git a/src/main/scala/com/qifun/sbtHaxe/HaxeCSharpPlugin.scala b/src/main/scala/com/qifun/sbtHaxe/HaxeCSharpPlugin.scala
@@ -26,6 +26,9 @@ import HaxeConfigurations._
  * A plugin used to compile Haxe sources to CSharp sources.
  */
 final object HaxeCSharpPlugin extends AutoPlugin {
+
+  override final def requires = BaseHaxePlugin
+
   override final lazy val projectSettings: Seq[Setting[_]] =
     sbt.addArtifact(artifact in packageBin in HaxeCSharp, packageBin in HaxeCSharp) ++
       inConfig(CSharp)(SbtHaxe.baseHaxeSettings) ++

diff --git a/src/main/scala/com/qifun/sbtHaxe/HaxeCppPlugin.scala b/src/main/scala/com/qifun/sbtHaxe/HaxeCppPlugin.scala
@@ -26,6 +26,9 @@ import sbt._
  * A Plugin used to compile Haxe sources to C++ sources.
  */
 object HaxeCppPlugin extends AutoPlugin {
+
+  override final def requires = BaseHaxePlugin
+
   override final lazy val projectSettings: Seq[Setting[_]] = {
     sbt.addArtifact(artifact in packageBin in HaxeCpp, packageBin in HaxeCpp) ++
       inConfig(Cpp)(SbtHaxe.baseHaxeSettings) ++

diff --git a/src/main/scala/com/qifun/sbtHaxe/HaxeFlashPlugin.scala b/src/main/scala/com/qifun/sbtHaxe/HaxeFlashPlugin.scala
@@ -26,6 +26,9 @@ import sbt._
  * A Plugin used to compile Haxe sources to Flash swf file.
  */
 object HaxeFlashPlugin extends AutoPlugin {
+
+  override final def requires = BaseHaxePlugin
+
   override final lazy val projectSettings: Seq[Setting[_]] = {
     sbt.addArtifact(artifact in packageBin in HaxeFlash, packageBin in HaxeFlash) ++
       inConfig(Flash)(SbtHaxe.baseHaxeSettings) ++

diff --git a/src/main/scala/com/qifun/sbtHaxe/HaxeJavaPlugin.scala b/src/main/scala/com/qifun/sbtHaxe/HaxeJavaPlugin.scala
@@ -27,7 +27,9 @@ import sbt.AutoPlugin
  * A Plugin used to compile Haxe sources to Java sources.
  */
 final object HaxeJavaPlugin extends AutoPlugin {
+
   override final def requires = BaseHaxePlugin
+
   override final def trigger = allRequirements
 
   override final lazy val projectSettings: Seq[Setting[_]] =

diff --git a/src/main/scala/com/qifun/sbtHaxe/HaxeJsPlugin.scala b/src/main/scala/com/qifun/sbtHaxe/HaxeJsPlugin.scala
@@ -26,6 +26,9 @@ import sbt._
  * A Plugin used to compile Haxe sources to JavaScript sources.
  */
 object HaxeJsPlugin extends AutoPlugin {
+
+  override final def requires = BaseHaxePlugin
+
   override final lazy val projectSettings: Seq[Setting[_]] = {
     sbt.addArtifact(artifact in packageBin in HaxeJs, packageBin in HaxeJs) ++
       inConfig(Js)(SbtHaxe.baseHaxeSettings) ++

diff --git a/src/main/scala/com/qifun/sbtHaxe/HaxeNekoPlugin.scala b/src/main/scala/com/qifun/sbtHaxe/HaxeNekoPlugin.scala
@@ -26,6 +26,9 @@ import sbt._
  * A Plugin used to compile Haxe sources to Neko binary.
  */
 object HaxeNekoPlugin extends AutoPlugin {
+
+  override final def requires = BaseHaxePlugin
+
   override final lazy val projectSettings: Seq[Setting[_]] = {
     sbt.addArtifact(artifact in packageBin in HaxeNeko, packageBin in HaxeNeko) ++
       inConfig(Neko)(SbtHaxe.baseHaxeSettings) ++

diff --git a/src/main/scala/com/qifun/sbtHaxe/HaxePhpPlugin.scala b/src/main/scala/com/qifun/sbtHaxe/HaxePhpPlugin.scala
@@ -26,6 +26,9 @@ import sbt._
  * A Plugin used to compile Haxe sources to PHP sources.
  */
 object HaxePhpPlugin extends AutoPlugin {
+
+  override final def requires = BaseHaxePlugin
+
   override final lazy val projectSettings: Seq[Setting[_]] = {
     sbt.addArtifact(artifact in packageBin in HaxePhp, packageBin in HaxePhp) ++
       inConfig(Php)(SbtHaxe.baseHaxeSettings) ++

diff --git a/src/main/scala/com/qifun/sbtHaxe/HaxePythonPlugin.scala b/src/main/scala/com/qifun/sbtHaxe/HaxePythonPlugin.scala
@@ -26,6 +26,9 @@ import sbt._
  * A Plugin used to compile Haxe sources to Python sources.
  */
 object HaxePythonPlugin extends AutoPlugin {
+
+  override final def requires = BaseHaxePlugin
+
   override final lazy val projectSettings: Seq[Setting[_]] = {
     sbt.addArtifact(artifact in packageBin in HaxePython, packageBin in HaxePython) ++
       inConfig(Python)(SbtHaxe.baseHaxeSettings) ++

diff --git a/src/main/scala/com/qifun/sbtHaxe/SbtHaxe.scala b/src/main/scala/com/qifun/sbtHaxe/SbtHaxe.scala
@@ -22,6 +22,8 @@ import Keys._
 import HaxeKeys._
 import HaxeConfigurations._
 
+import scala.util.parsing.json.JSONFormat
+
 final object SbtHaxe {
 
   private lazy val HaxeFileRegex = """^(.*)\.hx$""".r
@@ -74,7 +76,7 @@ final object SbtHaxe {
                       (haxeOutputPath in injectConfiguration).value.getOrElse(temporaryDirectory).getPath) ++
               (haxeOptions in injectConfiguration in haxe).value ++
                 haxeModules(in, (sourceDirectories in haxeConfiguration).value)
-              (streams in haxeConfiguration).value.log.info(processBuilder.mkString("\"", "\" \"", "\""))
+              (streams in haxeConfiguration).value.log.info(processBuilder.map(JSONFormat.quoteString).mkString("\"", "\" \"", "\""))
               val logger = (streams in haxeConfiguration).value.log
               IO.delete(haxeOutput)
               class HaxeProcessLogger extends ProcessLogger {