add crosscompilation for 2.12.0-M1

This commit is contained in:
Roland Kuhn 2015-05-21 21:07:37 +02:00
parent 53c5d974ea
commit 5dc25fbb44
20 changed files with 62 additions and 84 deletions

View file

@ -37,10 +37,15 @@ object MultiNode {
(if (onlyTestTags.value.isEmpty) Seq.empty else Seq("-n", if (multiNodeEnabled) onlyTestTags.value.mkString("\"", " ", "\"") else onlyTestTags.value.mkString(" ")))
}
lazy val multiJvmSettings = SbtMultiJvm.multiJvmSettings ++ inConfig(MultiJvm)(SbtScalariform.configScalariformSettings) ++ Seq(
jvmOptions in MultiJvm := defaultMultiJvmOptions,
compileInputs in(MultiJvm, compile) <<= (compileInputs in(MultiJvm, compile)) dependsOn (ScalariformKeys.format in MultiJvm),
compile in MultiJvm <<= (compile in MultiJvm) triggeredBy (compile in Test)) ++
lazy val multiJvmSettings =
SbtMultiJvm.multiJvmSettings ++
inConfig(MultiJvm)(SbtScalariform.configScalariformSettings) ++
Seq(
jvmOptions in MultiJvm := defaultMultiJvmOptions,
compileInputs in(MultiJvm, compile) <<= (compileInputs in(MultiJvm, compile)) dependsOn (ScalariformKeys.format in MultiJvm),
scalacOptions in MultiJvm <<= scalacOptions in Test,
compile in MultiJvm <<= (compile in MultiJvm) triggeredBy (compile in Test)
) ++
Option(System.getProperty("akka.test.multi-node.hostsFileName")).map(x => Seq(multiNodeHostsFileName in MultiJvm := x)).getOrElse(Seq.empty) ++
Option(System.getProperty("akka.test.multi-node.java")).map(x => Seq(multiNodeJavaName in MultiJvm := x)).getOrElse(Seq.empty) ++
Option(System.getProperty("akka.test.multi-node.targetDirName")).map(x => Seq(multiNodeTargetDirName in MultiJvm := x)).getOrElse(Seq.empty) ++