From 0a8d844071b675c496649892e5c17cbfd7e215b5 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Thu, 6 Mar 2014 10:10:38 -0500 Subject: [PATCH] Fix merge conflicts in pulling doc fixes from 0.13.1 into 0.13 branch. --- src/sphinx/Community/Community-Plugins.rst | 39 ++++++++++--------- src/sphinx/Detailed-Topics/Advanced-Index.rst | 2 + src/sphinx/Detailed-Topics/Launcher.rst | 2 +- src/sphinx/Howto/generatefiles.rst | 6 +-- testing/agent/src/main/java/sbt/ForkMain.java | 1 - 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/sphinx/Community/Community-Plugins.rst b/src/sphinx/Community/Community-Plugins.rst index d59374506..4c40ce10a 100644 --- a/src/sphinx/Community/Community-Plugins.rst +++ b/src/sphinx/Community/Community-Plugins.rst @@ -86,6 +86,25 @@ One jar plugins - sbt-onejar (Packages your project using One-JAR™): https://github.com/sbt/sbt-onejar +Frontend development plugins +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- coffeescripted-sbt: https://github.com/softprops/coffeescripted-sbt +- less-sbt (for less-1.3.0): https://github.com/softprops/less-sbt +- sbt-less-plugin (it uses less-1.3.0): + https://github.com/btd/sbt-less-plugin +- sbt-emberjs: https://github.com/stefri/sbt-emberjs +- sbt-closure: https://github.com/eltimn/sbt-closure +- sbt-yui-compressor: https://github.com/indrajitr/sbt-yui-compressor +- sbt-requirejs: https://github.com/scalatra/sbt-requirejs +- sbt-vaadin-plugin: https://github.com/henrikerola/sbt-vaadin-plugin + +Game development plugins +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- sbt-lwjgl-plugin (Light Weight Java Game Library): https://github.com/philcali/sbt-lwjgl-plugin +- sbt-scage-plugin (Scala Game Engine): https://github.com/mvallerie/sbt-scage-plugin + Release plugins ~~~~~~~~~~~~~~~ @@ -114,24 +133,6 @@ Release plugins - xitrum-package (collects dependency .jar files for standalone Scala programs): https://github.com/ngocdaothanh/xitrum-package -Frontend development plugins -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -- coffeescripted-sbt: https://github.com/softprops/coffeescripted-sbt -- less-sbt (for less-1.3.0): https://github.com/softprops/less-sbt -- sbt-less-plugin (it uses less-1.3.0): - https://github.com/btd/sbt-less-plugin -- sbt-emberjs: https://github.com/stefri/sbt-emberjs -- sbt-closure: https://github.com/eltimn/sbt-closure -- sbt-yui-compressor: https://github.com/indrajitr/sbt-yui-compressor -- sbt-requirejs: https://github.com/scalatra/sbt-requirejs -- sbt-vaadin-plugin: https://github.com/henrikerola/sbt-vaadin-plugin - -Game development plugins -~~~~~~~~~~~~~~~~~~~~~~~~ - -- sbt-lwjgl-plugin (Light Weight Java Game Library): https://github.com/philcali/sbt-lwjgl-plugin -- sbt-scage-plugin (Scala Game Engine): https://github.com/mvallerie/sbt-scage-plugin System plugins ~~~~~~~~~~~~~~ @@ -253,7 +254,7 @@ Utility plugins Code coverage plugins ~~~~~~~~~~~~~~~~~~~~~ -- sbt-scct: https://github.com/sqality/sbt-scct +- sbt-scct: https://github.com/dvc94ch/sbt-scct - sbt-scoverage: https://github.com/scoverage/sbt-scoverage - jacoco4sbt: https://github.com/sbt/jacoco4sbt - xsbt-coveralls-plugin: https://github.com/theon/xsbt-coveralls-plugin diff --git a/src/sphinx/Detailed-Topics/Advanced-Index.rst b/src/sphinx/Detailed-Topics/Advanced-Index.rst index 884a96292..95d00810e 100644 --- a/src/sphinx/Detailed-Topics/Advanced-Index.rst +++ b/src/sphinx/Detailed-Topics/Advanced-Index.rst @@ -9,6 +9,8 @@ Before reading anything in here, you will need the information in the .. toctree:: :maxdepth: 2 + + Launcher Scripts TaskInputs Understanding-incremental-recompilation diff --git a/src/sphinx/Detailed-Topics/Launcher.rst b/src/sphinx/Detailed-Topics/Launcher.rst index eced0102b..3f3a78836 100644 --- a/src/sphinx/Detailed-Topics/Launcher.rst +++ b/src/sphinx/Detailed-Topics/Launcher.rst @@ -2,4 +2,4 @@ Sbt Launcher ============ -This docuemntation has been moved to :doc:`The Launcher section `. +This documentation has been moved to :doc:`The Launcher section `. \ No newline at end of file diff --git a/src/sphinx/Howto/generatefiles.rst b/src/sphinx/Howto/generatefiles.rst index a8a1c3ec3..f90806598 100644 --- a/src/sphinx/Howto/generatefiles.rst +++ b/src/sphinx/Howto/generatefiles.rst @@ -29,7 +29,7 @@ As a specific example, the following generates a hello world source file: :: - sourceGenerators in Compile += Def.task { + sourceGenerators in Compile <+= Def.task { val file = (sourceManaged in Compile).value / "demo" / "Test.scala" IO.write(file, """object Test extends App { println("Hi") }""") Seq(file) @@ -44,7 +44,7 @@ By default, generated sources are not included in the packaged source artifact. :title: Generate resources :type: setting - resourceGenerators in Compile += + resourceGenerators in Compile += .taskValue A resource generation task should generate resources in a subdirectory of :key:`resourceManaged` and return a sequence of files generated. The key to add the task to is called :key:`resourceGenerators`. Because we want to add the unexecuted task, we use `taskValue` instead of the usual `value`. It should be scoped according to whether the generated files are main (`Compile`) or test (`Test`) resources. This basic structure looks like: @@ -56,7 +56,7 @@ For example, assuming a method `def makeSomeResources(base: File): Seq[File]`, :: - resourceGenerators in Compile += Def.task { + resourceGenerators in Compile <+= Def.task { makeSomeResources( (resourceManaged in Compile).value / "demo") }.taskValue diff --git a/testing/agent/src/main/java/sbt/ForkMain.java b/testing/agent/src/main/java/sbt/ForkMain.java index a56783fcd..32cbb62ef 100755 --- a/testing/agent/src/main/java/sbt/ForkMain.java +++ b/testing/agent/src/main/java/sbt/ForkMain.java @@ -115,7 +115,6 @@ public class ForkMain { final ObjectOutputStream os = new ObjectOutputStream(socket.getOutputStream()); // Must flush the header that the constructor writes, otherwise the ObjectInputStream on the other end may block indefinitely os.flush(); - try { new Run().run(is, os); } finally {