From ce439efab3bab70e5490eef14616341fcd59d549 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 4 Jan 2013 17:22:40 -0500 Subject: [PATCH] Convert references to harrah/xsbt to sbt/sbt --- README.md | 10 +++++----- ivy/src/main/scala/sbt/Ivy.scala | 2 +- sbt/notes/about.markdown | 2 +- .../compiler-project/inc-pickled-refinement/test | 2 +- src/sphinx/Community/Community-Plugins.rst | 2 +- src/sphinx/Community/Opportunities.rst | 2 +- src/sphinx/Detailed-Topics/Parallel-Execution.rst | 2 +- src/sphinx/Detailed-Topics/Scripts.rst | 2 +- src/sphinx/Detailed-Topics/Tasks.rst | 4 ++-- .../Understanding-incremental-recompilation.rst | 2 +- src/sphinx/Extending/Plugins.rst | 2 +- src/sphinx/_sphinx/themes/sbt/layout.html | 2 +- src/sphinx/conf.py | 4 ++-- src/sphinx/faq.rst | 4 ++-- src/sphinx/home.rst | 2 +- util/io/src/main/scala/sbt/IO.scala | 2 +- util/process/src/main/scala/sbt/ProcessImpl.scala | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 5d029c880..5a9b43319 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ This is the 0.13.x series of sbt. 1. Install the current stable binary release of sbt (see [Setup]), which will be used to build sbt from source. 2. Get the source code. - $ git clone git://github.com/harrah/xsbt.git - $ cd xsbt + $ git clone git://github.com/sbt/sbt.git + $ cd sbt 3. The initial branch is the development branch 0.13, which contains the latest code for the next major sbt release. To build a specific release or commit, switch to the associated tag. The tag for the latest stable release is v0.12.1: @@ -37,13 +37,13 @@ This is the 0.13.x series of sbt. $ sbt publish-local proguard sxr doc -5. To use this locally built version of sbt, copy your stable `~/bin/sbt` script to `~/bin/xsbt` and change it to use the launcher jar in `/target/`. For the v0.12.1 tag, the full location is: +5. To use this locally built version of sbt, copy your stable `~/bin/sbt` script to `~/bin/xsbt` and change it to use the launcher jar in `/target/`. For the v0.12.1 tag, the full location is: - /target/sbt-launch-0.12.1.jar + /target/sbt-launch-0.12.1.jar If using the 0.13 development branch, the launcher is at: - /target/sbt-launch-0.13.0-SNAPSHOT.jar + /target/sbt-launch-0.13.0-SNAPSHOT.jar ## Modifying sbt diff --git a/ivy/src/main/scala/sbt/Ivy.scala b/ivy/src/main/scala/sbt/Ivy.scala index ce985c95c..30b19368f 100644 --- a/ivy/src/main/scala/sbt/Ivy.scala +++ b/ivy/src/main/scala/sbt/Ivy.scala @@ -478,7 +478,7 @@ private object IvySbt /** Combines the artifacts, includes, and excludes of duplicate dependency definitions. * This is somewhat fragile and is only intended to workaround Ivy (or sbt's use of Ivy) not handling this case properly. * In particular, Ivy will create multiple dependency entries when converting a pom with a dependency on a classified artifact and a non-classified artifact: - * https://github.com/harrah/xsbt/issues/468 + * https://github.com/sbt/sbt/issues/468 * It will also allow users to declare dependencies on classified modules in different configurations: * https://groups.google.com/d/topic/simple-build-tool/H2MdAARz6e0/discussion * as well as basic multi-classifier handling: #285, #419, #480. diff --git a/sbt/notes/about.markdown b/sbt/notes/about.markdown index 1b961c236..29124d5ee 100644 --- a/sbt/notes/about.markdown +++ b/sbt/notes/about.markdown @@ -1 +1 @@ -[sbt](https://github.com/harrah/xsbt/wiki) is a Scala build tool. \ No newline at end of file +[sbt](http://scala-sbt.org) is a Scala build tool. \ No newline at end of file diff --git a/sbt/src/sbt-test/compiler-project/inc-pickled-refinement/test b/sbt/src/sbt-test/compiler-project/inc-pickled-refinement/test index 7cb9c59f9..5e53b6cc2 100644 --- a/sbt/src/sbt-test/compiler-project/inc-pickled-refinement/test +++ b/sbt/src/sbt-test/compiler-project/inc-pickled-refinement/test @@ -1,7 +1,7 @@ # Tests if refinement types are pickled correctly so they # do not introduce unnecessary compile iterations # See https://issues.scala-lang.org/browse/SI-6596, -# https://github.com/harrah/xsbt/issues/610 +# https://github.com/sbt/sbt/issues/610 # introduces first compile iteration > compile diff --git a/src/sphinx/Community/Community-Plugins.rst b/src/sphinx/Community/Community-Plugins.rst index b92f6441a..89972f176 100644 --- a/src/sphinx/Community/Community-Plugins.rst +++ b/src/sphinx/Community/Community-Plugins.rst @@ -52,7 +52,7 @@ To automatically deploy snapshot/release versions of your plugin use the followi Available Plugins ================= -Please feel free to `submit a pull request `_ that adds your plugin to the list. +Please feel free to `submit a pull request `_ that adds your plugin to the list. Plugins for IDEs: ~~~~~~~~~~~~~~~~~ diff --git a/src/sphinx/Community/Opportunities.rst b/src/sphinx/Community/Opportunities.rst index 5cd48e377..e683bfe17 100644 --- a/src/sphinx/Community/Opportunities.rst +++ b/src/sphinx/Community/Opportunities.rst @@ -15,7 +15,7 @@ list if you are interested in a specific topic. - Inter-project source dependencies - Binary dependencies (jars + class files) - data structure representing the - `API `_ of + `API `_ of the source code There is some code already for generating dot files that isn't hooked up, but graphing dependencies and inheritance relationships is a general area of work. diff --git a/src/sphinx/Detailed-Topics/Parallel-Execution.rst b/src/sphinx/Detailed-Topics/Parallel-Execution.rst index ab1023ea2..972975867 100644 --- a/src/sphinx/Detailed-Topics/Parallel-Execution.rst +++ b/src/sphinx/Detailed-Topics/Parallel-Execution.rst @@ -333,5 +333,5 @@ parallel execution service (``java.util.concurrent.CompletionService``). This intermediate queue restricts new tasks from being forwarded to the ``j.u.c.CompletionService`` according to the ``sbt.ConcurrentRestrictions`` implementation. See the -`sbt.ConcurrentRestrictions `_ +`sbt.ConcurrentRestrictions `_ API documentation for details. diff --git a/src/sphinx/Detailed-Topics/Scripts.rst b/src/sphinx/Detailed-Topics/Scripts.rst index 69805471c..1e7ea9102 100644 --- a/src/sphinx/Detailed-Topics/Scripts.rst +++ b/src/sphinx/Detailed-Topics/Scripts.rst @@ -28,7 +28,7 @@ Install `conscript `_. .. code-block:: console - cs harrah/xsbt --branch 0.12.0 + cs sbt/sbt --branch 0.12.0 This will create two scripts: ``screpl`` and ``scalas``. diff --git a/src/sphinx/Detailed-Topics/Tasks.rst b/src/sphinx/Detailed-Topics/Tasks.rst index 81d066a11..c1c8dce6d 100644 --- a/src/sphinx/Detailed-Topics/Tasks.rst +++ b/src/sphinx/Detailed-Topics/Tasks.rst @@ -388,7 +388,7 @@ methods, which are used to handle failure of other tasks. The ``failure`` method creates a new task that returns the ``Incomplete`` value when the original task fails to complete normally. If the original task succeeds, the new task fails. -`Incomplete `_ +`Incomplete <../../api/sbt/Incomplete.html>`_ is an exception with information about any tasks that caused the failure and any underlying exceptions thrown during task execution. @@ -443,7 +443,7 @@ A normal task definition fails when any of its inputs fail and computes its valu ~~~~~~~~~~ The ``result`` method creates a new task that returns the full ``Result[T]`` value for the original task. -`Result `_ +`Result <../../api/sbt/Result.html>`_ has the same structure as ``Either[Incomplete, T]`` for a task result of type ``T``. That is, it has two subtypes: diff --git a/src/sphinx/Detailed-Topics/Understanding-incremental-recompilation.rst b/src/sphinx/Detailed-Topics/Understanding-incremental-recompilation.rst index e24e82a02..3dfc1fcad 100644 --- a/src/sphinx/Detailed-Topics/Understanding-incremental-recompilation.rst +++ b/src/sphinx/Detailed-Topics/Understanding-incremental-recompilation.rst @@ -251,7 +251,7 @@ Further references ------------------ The incremental compilation logic is implemented in -https://github.com/harrah/xsbt/blob/0.13/compile/inc/Incremental.scala. +https://github.com/sbt/sbt/blob/0.13/compile/inc/Incremental.scala. Some related documentation for SBT 0.7 is available at: https://code.google.com/p/simple-build-tool/wiki/ChangeDetectionAndTesting. Some discussion on the incremental recompilation policies is available diff --git a/src/sphinx/Extending/Plugins.rst b/src/sphinx/Extending/Plugins.rst index 1738af36c..02ad8ab74 100644 --- a/src/sphinx/Extending/Plugins.rst +++ b/src/sphinx/Extending/Plugins.rst @@ -133,7 +133,7 @@ We can change to the plugins project in ``project/`` using .. code-block:: console - $ xsbt + $ sbt > reload plugins [info] Set current project to default (in build file:/Users/harrah/demo2/project/) > diff --git a/src/sphinx/_sphinx/themes/sbt/layout.html b/src/sphinx/_sphinx/themes/sbt/layout.html index 453f8467f..ca0e22092 100644 --- a/src/sphinx/_sphinx/themes/sbt/layout.html +++ b/src/sphinx/_sphinx/themes/sbt/layout.html @@ -32,7 +32,7 @@
  • Documentation
  • Download
  • Mailing List
    • -
  • Project
    • +
  • Project
    • diff --git a/src/sphinx/conf.py b/src/sphinx/conf.py index a91494fa5..70dcef5e8 100644 --- a/src/sphinx/conf.py +++ b/src/sphinx/conf.py @@ -58,7 +58,7 @@ latex_documents = [ # Issues role issuetracker = 'github' -issuetracker_project = 'harrah/xsbt' +issuetracker_project = 'sbt/sbt' issuetracker_plaintext_issues = True issuetracker_issue_pattern = r'\bgh-(\d+)\b' issuetracker_title_template = '#{issue.id}' @@ -86,7 +86,7 @@ rst_epilog = """ .. _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 -.. _source code: http://github.com/harrah/xsbt +.. _source code: http://github.com/sbt/sbt """ % { 'launcher_release_base': launcher_release_base, 'launcher_snapshots_base': launcher_snapshots_base, diff --git a/src/sphinx/faq.rst b/src/sphinx/faq.rst index 30babf118..674207244 100644 --- a/src/sphinx/faq.rst +++ b/src/sphinx/faq.rst @@ -20,7 +20,7 @@ Please use the `mailing list`_ for questions, comments, and discussions. How do I report a bug? ~~~~~~~~~~~~~~~~~~~~~~ -Please use the `issue tracker `_ +Please use the `issue tracker `_ to report confirmed bugs. Do not use it to ask questions. If you are uncertain whether something is a bug, please ask on the `mailing list`_ first. @@ -28,7 +28,7 @@ How can I help? ~~~~~~~~~~~~~~~ - Fix mistakes that you notice on the wiki. -- Make `bug reports `_ that are +- Make `bug reports `_ that are clear and reproducible. - Answer questions on the `mailing list`_. - Fix issues that affect you. `Fork, fix, and submit a pull diff --git a/src/sphinx/home.rst b/src/sphinx/home.rst index 0cd88bf34..e7ccd3e57 100644 --- a/src/sphinx/home.rst +++ b/src/sphinx/home.rst @@ -48,7 +48,7 @@ All documentation may be found via the :doc:`table of contents `. The mailing list is at http://groups.google.com/group/simple-build-tool/topics and should be used for discussions and questions. Questions may also be asked at `Stack Overflow `_. -This documentation can be forked `on GitHub `_. +This documentation can be forked `on GitHub `_. Feel free to make corrections and add documentation. If you are familiar with 0.7.x, please see the :doc:`migration page `. diff --git a/util/io/src/main/scala/sbt/IO.scala b/util/io/src/main/scala/sbt/IO.scala index 7ed57912d..cf619e7c5 100644 --- a/util/io/src/main/scala/sbt/IO.scala +++ b/util/io/src/main/scala/sbt/IO.scala @@ -87,7 +87,7 @@ object IO if(uri.getAuthority eq null) new File(uri) else { - /* https://github.com/harrah/xsbt/issues/564 + /* https://github.com/sbt/sbt/issues/564 * http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5086147 * The specific problem here is that `uri` will have a defined authority component for UNC names like //foo/bar/some/path.jar diff --git a/util/process/src/main/scala/sbt/ProcessImpl.scala b/util/process/src/main/scala/sbt/ProcessImpl.scala index 44dcaed2d..617a6cef3 100644 --- a/util/process/src/main/scala/sbt/ProcessImpl.scala +++ b/util/process/src/main/scala/sbt/ProcessImpl.scala @@ -403,7 +403,7 @@ private[sbt] class SimpleProcessBuilder(p: JProcessBuilder) extends AbstractProc /** A thin wrapper around a java.lang.Process. `outputThreads` are the Threads created to read from the * output and error streams of the process. * The implementation of `exitValue` wait for the process to finish and then waits until the threads reading output and error streams die before -* returning. Note that the thread that reads the input stream cannot be interrupted, see https://github.com/harrah/xsbt/issues/327 and +* returning. Note that the thread that reads the input stream cannot be interrupted, see https://github.com/sbt/sbt/issues/327 and * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4514257 */ private class SimpleProcess(p: JProcess, outputThreads: List[Thread]) extends Process {