aboutsummaryrefslogtreecommitdiff
path: root/plugins/scalajs
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-06-15 02:38:26 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2016-06-19 18:33:53 -0400
commit12d5bad267b5759e941b7101578808aeb6351e66 (patch)
tree92750b6141a5083c1c56db1ce140d692a89d8aa9 /plugins/scalajs
parent4f9151765bea5217eb1b5c67008784d8b81bc1e7 (diff)
downloadcbt-12d5bad267b5759e941b7101578808aeb6351e66.tar.gz
cbt-12d5bad267b5759e941b7101578808aeb6351e66.tar.bz2
cbt-12d5bad267b5759e941b7101578808aeb6351e66.zip
add support for custom scalaJsOptions
Diffstat (limited to 'plugins/scalajs')
-rw-r--r--plugins/scalajs/ScalaJs.scala9
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/scalajs/ScalaJs.scala b/plugins/scalajs/ScalaJs.scala
index 9677896..8b55044 100644
--- a/plugins/scalajs/ScalaJs.scala
+++ b/plugins/scalajs/ScalaJs.scala
@@ -59,7 +59,6 @@ trait ScalaJsBuild extends BaseBuild with ScalaJsSbtDependencyDsl with ScalaJsIn
private def output(mode: JsOutputMode) = s"${jsBuild.target.getAbsolutePath}/$projectName-${mode.fileSuffix}.js"
- //TODO: should process all options that Scalajsld recognizes?
private def link(mode: JsOutputMode, outputPath: String) = {
lib.runMain(
"org.scalajs.cli.Scalajsld",
@@ -68,9 +67,15 @@ trait ScalaJsBuild extends BaseBuild with ScalaJsSbtDependencyDsl with ScalaJsIn
"--sourceMap",
"--stdlib", s"${scalaJsLibDep.jar.getAbsolutePath}",
"--output", outputPath
+ ) ++ scalaJsOptions ++ Seq(
jsBuild.target.getAbsolutePath) ++
jsBuild.dependencies.collect{case d: BoundMavenDependency => d.jar.getAbsolutePath},
- scalaJsCliDep.classLoader(jsBuild.context.classLoaderCache))
+ scalaJsCliDep.classLoader(jsBuild.context.classLoaderCache)
+ )
+ }
+
+ def scalaJsOptions: Seq[String] = Seq()
+
def fastOptJS = {
compile
link(FastOptJS, fastOptOutput, scalaJsOptions)