From 1508c967a9761eca1bf9cd8462965960d871e781 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Mon, 14 Apr 2014 12:27:11 -0400 Subject: [PATCH 1/5] Fix native package location for bintray distribution. --- src/sphinx/conf.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/sphinx/conf.py b/src/sphinx/conf.py index a98fc6165..44861af4e 100644 --- a/src/sphinx/conf.py +++ b/src/sphinx/conf.py @@ -75,8 +75,12 @@ typesafe_base = 'http://repo.typesafe.com/typesafe/' typesafe_ivy_snapshots = typesafe_base + 'ivy-snapshots/' typesafe_ivy_releases = typesafe_base + 'ivy-releases/' launcher_release_base = typesafe_ivy_releases + 'org.scala-sbt/sbt-launch/' +bintray_dl_base = 'http://dl.bintray.com/' launcher_snapshots_base = typesafe_ivy_snapshots + 'org.scala-sbt/sbt-launch/' -sbt_native_package_base = 'http://repo.scala-sbt.org/scalasbt/sbt-native-packages/org/scala-sbt/sbt/' +sbt_native_package_base_old = 'http://repo.scala-sbt.org/scalasbt/sbt-native-packages/org/scala-sbt/sbt/' +sbt_native_package_base = bintray_dl_base + 'sbt/native-packages/sbt/' +sbt_debian_base = bintray_dl_base + 'sbt/debian/' +sbt_rpm_base = bintray_dl_base + 'sbt/rpm/' rst_epilog = """ .. |scalaVersion| replace:: %(scalaVersion)s @@ -84,11 +88,11 @@ rst_epilog = """ .. _typesafe-snapshots: %(typesafe_ivy_snapshots)s .. |typesafe-snapshots| replace:: Typesafe Snapshots .. _sbt-launch.jar: %(launcher_release_base)s%(release)s/sbt-launch.jar -.. _MSI: %(sbt_native_package_base)s%(release)s/sbt.msi -.. _TGZ: %(sbt_native_package_base)s%(release)s/sbt.tgz -.. _ZIP: %(sbt_native_package_base)s%(release)s/sbt.zip -.. _DEB: %(sbt_native_package_base)s%(release)s/sbt.deb -.. _RPM: %(sbt_native_package_base)s%(release)s/sbt.rpm +.. _MSI: %(sbt_native_package_base_old)s%(release)s/sbt.msi +.. _TGZ: %(sbt_native_package_base)s%(release)s/sbt-%(release)s.tgz +.. _ZIP: %(sbt_native_package_base)s%(release)s/sbt-%(release)s.zip +.. _DEB: %(sbt_debian_base)ssbt-%(release)s.deb +.. _RPM: %(sbt_rpm_base)ssbt-%(release)s.rpm .. |nightly-launcher| replace:: %(launcher_snapshots_base)s .. _sbt-dev mailing list: https://groups.google.com/forum/#!forum/sbt-dev .. _adept: https://groups.google.com/group/adept-dev/topics @@ -102,6 +106,9 @@ rst_epilog = """ 'launcher_snapshots_base': launcher_snapshots_base, 'typesafe_ivy_snapshots': typesafe_ivy_snapshots, 'sbt_native_package_base': sbt_native_package_base, + 'sbt_rpm_base': sbt_rpm_base, + 'sbt_debian_base': sbt_debian_base, + 'sbt_native_package_base_old': sbt_native_package_base_old, 'scalaRelease': scalaRelease, 'scalaVersion': scalaVersion, 'release': release From 2adbe0e1e84e7d7c7b3fe8db4c6ad6c948a9d392 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Mon, 14 Apr 2014 12:59:22 -0400 Subject: [PATCH 2/5] Fix for new location of MSI files. --- src/sphinx/conf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sphinx/conf.py b/src/sphinx/conf.py index 44861af4e..be4638eaf 100644 --- a/src/sphinx/conf.py +++ b/src/sphinx/conf.py @@ -77,7 +77,6 @@ typesafe_ivy_releases = typesafe_base + 'ivy-releases/' launcher_release_base = typesafe_ivy_releases + 'org.scala-sbt/sbt-launch/' bintray_dl_base = 'http://dl.bintray.com/' launcher_snapshots_base = typesafe_ivy_snapshots + 'org.scala-sbt/sbt-launch/' -sbt_native_package_base_old = 'http://repo.scala-sbt.org/scalasbt/sbt-native-packages/org/scala-sbt/sbt/' sbt_native_package_base = bintray_dl_base + 'sbt/native-packages/sbt/' sbt_debian_base = bintray_dl_base + 'sbt/debian/' sbt_rpm_base = bintray_dl_base + 'sbt/rpm/' @@ -88,7 +87,7 @@ rst_epilog = """ .. _typesafe-snapshots: %(typesafe_ivy_snapshots)s .. |typesafe-snapshots| replace:: Typesafe Snapshots .. _sbt-launch.jar: %(launcher_release_base)s%(release)s/sbt-launch.jar -.. _MSI: %(sbt_native_package_base_old)s%(release)s/sbt.msi +.. _MSI: %(sbt_native_package_base)s%(release)s/sbt-%(release)s.msi .. _TGZ: %(sbt_native_package_base)s%(release)s/sbt-%(release)s.tgz .. _ZIP: %(sbt_native_package_base)s%(release)s/sbt-%(release)s.zip .. _DEB: %(sbt_debian_base)ssbt-%(release)s.deb From 26b7a5cea10c426aa145f62e6bf42d8a9fde6021 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Mon, 14 Apr 2014 13:01:12 -0400 Subject: [PATCH 3/5] removing last type in python conf. --- src/sphinx/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sphinx/conf.py b/src/sphinx/conf.py index be4638eaf..f00ef3483 100644 --- a/src/sphinx/conf.py +++ b/src/sphinx/conf.py @@ -107,7 +107,6 @@ rst_epilog = """ 'sbt_native_package_base': sbt_native_package_base, 'sbt_rpm_base': sbt_rpm_base, 'sbt_debian_base': sbt_debian_base, - 'sbt_native_package_base_old': sbt_native_package_base_old, 'scalaRelease': scalaRelease, 'scalaVersion': scalaVersion, 'release': release From 13322a2d0d48648166627a39e06a1c2d18db09b7 Mon Sep 17 00:00:00 2001 From: rschatz Date: Fri, 25 Apr 2014 17:18:59 +0200 Subject: [PATCH 4/5] added npt as new Utility Plugin --- src/sphinx/Community/Community-Plugins.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sphinx/Community/Community-Plugins.rst b/src/sphinx/Community/Community-Plugins.rst index db9e82871..fcf30aaad 100644 --- a/src/sphinx/Community/Community-Plugins.rst +++ b/src/sphinx/Community/Community-Plugins.rst @@ -227,6 +227,8 @@ Utility plugins https://github.com/softprops/jot - np (Dead simple new project directory generation): https://github.com/softprops/np +- npt (Creates new project skeletons based on templates): + https://github.com/reikje/npt - sbt-editsource (A poor man's *sed*\ (1), for sbt): http://software.clapper.org/sbt-editsource/ - sbt-cross-building (Simplifies building your plugins for multiple From e69a0bc79e00222ce0c8a5838b8daf857505888c Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Fri, 25 Apr 2014 19:13:25 -0400 Subject: [PATCH 5/5] Added links to `imagej` and `install4j` plugins --- src/sphinx/Community/Community-Plugins.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sphinx/Community/Community-Plugins.rst b/src/sphinx/Community/Community-Plugins.rst index fcf30aaad..c869fa396 100644 --- a/src/sphinx/Community/Community-Plugins.rst +++ b/src/sphinx/Community/Community-Plugins.rst @@ -95,6 +95,7 @@ Frontend development plugins https://github.com/btd/sbt-less-plugin - sbt-emberjs: https://github.com/stefri/sbt-emberjs - sbt-closure: https://github.com/eltimn/sbt-closure +- sbt-imagej: https://github.com/jpsacha/sbt-imagej - 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 @@ -122,6 +123,7 @@ Release plugins https://github.com/sbt/sbt-release - sbt-unique-version (emulates unique snapshots): https://github.com/sbt/sbt-unique-version +- sbt-install4j: https://github.com/jpsacha/sbt-install4j - sbt-pack (generates packages with dependent jars and launch scripts): https://github.com/xerial/sbt-pack - sbt-start-script: