From 3cd0488bb1739ea30b24e1f2269bec6366e20263 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 10 Jul 2013 18:15:30 -0400 Subject: [PATCH] Docs: fix versions in links on Setup page --- src/sphinx/Getting-Started/Setup.rst | 12 +++++++----- src/sphinx/conf.py | 14 +++++++------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/sphinx/Getting-Started/Setup.rst b/src/sphinx/Getting-Started/Setup.rst index 649515b1a..e558fdb52 100644 --- a/src/sphinx/Getting-Started/Setup.rst +++ b/src/sphinx/Getting-Started/Setup.rst @@ -86,11 +86,13 @@ merge sbt from this ebuilds you can do: Manual Installation ------------------- +Manual installation requires downloading `sbt-launch.jar`_ and creating a script to start it. + Unix ~~~~ -Put sbt-launch.jar in ``~/bin``. +Put `sbt-launch.jar`_ in ``~/bin``. Create a script to run the jar, by creating ``~/bin/sbt`` with these contents: @@ -120,7 +122,7 @@ For **non-Cygwin users using the standard Windows terminal**, create a batch fil $ set SCRIPT_DIR=%~dp0 $ java -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M -jar "%SCRIPT_DIR%sbt-launch.jar" %* -and put sbt-launch.jar in the same directory as the batch file. +and put the downloaded `sbt-launch.jar`_ in the same directory as the batch file. If using **Cygwin with the standard Windows terminal**, create a bash script ``~/bin/sbt``: @@ -129,7 +131,7 @@ If using **Cygwin with the standard Windows terminal**, create a bash script ``~ $ SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M" $ java $SBT_OPTS -jar sbt-launch.jar "$@" -Replace ``sbt-launch.jar`` with your path the the launcher jar and remember to use ``cygpath`` if necessary. +Replace ``sbt-launch.jar`` with the path to your downloaded `sbt-launch.jar`_ and remember to use ``cygpath`` if necessary. Make the script executable: .. code-block:: console @@ -145,7 +147,7 @@ If using **Cygwin with an Ansi terminal** (supports Ansi escape sequences and is $ java -Djline.terminal=jline.UnixTerminal -Dsbt.cygwin=true $SBT_OPTS -jar sbt-launch.jar "$@" $ stty icanon echo > /dev/null 2>&1 -Replace ``sbt-launch.jar`` with your path the the launcher jar and remember to use ``cygpath`` if necessary. +Replace ``sbt-launch.jar`` with the path to your downloaded `sbt-launch.jar`_ and remember to use ``cygpath`` if necessary. Then, make the script executable: .. code-block:: console @@ -155,7 +157,7 @@ Then, make the script executable: .. note:: Other configurations are currently unsupported. - Please feel free to `submit a pull request `_ implementing or describing that support. + Please `submit a pull request `_ implementing or describing that support. Tips and Notes ============== diff --git a/src/sphinx/conf.py b/src/sphinx/conf.py index 2859a9edd..a74532cd0 100644 --- a/src/sphinx/conf.py +++ b/src/sphinx/conf.py @@ -9,7 +9,7 @@ extensions = ['sphinxcontrib.issuetracker', 'sphinx.ext.extlinks', 'howto'] project = 'sbt' version = '0.13' -release = '0.13.0-Beta2' +release = '0.13.0-RC1' scalaVersion = "2.10" scalaRelease = "2.10.2" @@ -84,12 +84,12 @@ rst_epilog = """ .. |scalaRelease| replace:: %(scalaRelease)s .. _typesafe-snapshots: %(typesafe_ivy_snapshots)s .. |typesafe-snapshots| replace:: Typesafe Snapshots -.. _sbt-launch.jar: %(launcher_release_base)s/%(version)s/sbt-launch.jar -.. _MSI: %(sbt_native_package_base)s/%(version)s/sbt.msi -.. _TGZ: %(sbt_native_package_base)s/%(version)s/sbt.tgz -.. _ZIP: %(sbt_native_package_base)s/%(version)s/sbt.zip -.. _DEB: %(sbt_native_package_base)s/%(version)s/sbt.deb -.. _RPM: %(sbt_native_package_base)s/%(version)s/sbt.rpm +.. _sbt-launch.jar: %(launcher_release_base)s%(version)s/sbt-launch.jar +.. _MSI: %(sbt_native_package_base)s%(version)s/sbt.msi +.. _TGZ: %(sbt_native_package_base)s%(version)s/sbt.tgz +.. _ZIP: %(sbt_native_package_base)s%(version)s/sbt.zip +.. _DEB: %(sbt_native_package_base)s%(version)s/sbt.deb +.. _RPM: %(sbt_native_package_base)s%(version)s/sbt.rpm .. |nightly-launcher| replace:: <%(launcher_snapshots_base)s .. _mailing list: http://groups.google.com/group/simple-build-tool/topics .. _adept: https://groups.google.com/group/adept-dev/topics