From 3b5947d834484074e4c49af8ffe8fe6d9c89ff6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Antonsson?= Date: Thu, 30 May 2013 21:57:25 +0200 Subject: [PATCH] Allow akka sbt plugin to be excluded from remote publishing --- project/Publish.scala | 6 ++++++ project/scripts/release | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/project/Publish.scala b/project/Publish.scala index e368dcecfd..630c6d38a8 100644 --- a/project/Publish.scala +++ b/project/Publish.scala @@ -76,6 +76,7 @@ object Publish { def akkaPluginPublishTo: Initialize[Option[Resolver]] = { (defaultPublishTo, version) { (default, version) => + pluginPublishLocally(default) orElse akkaPublishRepository orElse pluginRepo(version) orElse Some(Resolver.file("Default Local Repository", default)) @@ -102,6 +103,11 @@ object Publish { def akkaCredentials: Seq[Credentials] = Option(System.getProperty("akka.publish.credentials", null)) map (f => Credentials(new File(f))) toSeq + def pluginPublishLocally(default: File): Option[Resolver] = + Option(sys.props("publish.plugin.locally")) collect { case pl if pl.toLowerCase == "true" => + Resolver.file("Default Local Repository", default) + } + // timestamped versions def stampVersion = Command.command("stamp-version") { state => diff --git a/project/scripts/release b/project/scripts/release index 1a22ae184c..fa0955a43a 100755 --- a/project/scripts/release +++ b/project/scripts/release @@ -101,7 +101,7 @@ declare release_path=${default_path} declare -r unzipped_dir="target/dist/unzipped" # flags -unset run_tests dry_run no_revert +unset run_tests dry_run no_revert no_akka_plugin # get the source location for this script; handles symlinks function get_script_path { @@ -127,6 +127,7 @@ Usage: ${script_name} [options] VERSION -p | --path PATH Set the path on the release server (default ${default_path}) -n | --dry-run Build everything but do not push the release -r | --no-revert On dry-run don't revert git commits and tags + --no-akka-plugin Publish the akka sbt plugin locally and not to the repositry EOM } @@ -160,6 +161,7 @@ while true; do -p | --path ) release_path=$2; shift 2 ;; -n | --dry-run) dry_run=true; shift ;; -r | --no-revert) no_revert=true; shift ;; + --no-akka-plugin) no_akka_plugin=true; shift ;; * ) break ;; esac done @@ -302,6 +304,9 @@ if [ ! $dry_run ]; then else RELEASE_OPT="-Dakka.genjavadoc.enabled=true" fi +if [ $no_akka_plugin ]; then + RELEASE_OPT="${RELEASE_OPT} -Dpublish.plugin.locally=true" +fi try sbt $RELEASE_OPT build-release echolog "Creating gzipped tar download..." try tar -cz -C ${unzipped_dir} -f ${release_dir}/downloads/akka-${version}.tgz akka-${version}