From ba0b563eac6fc53dd5ede64a23b3b691c0e5be99 Mon Sep 17 00:00:00 2001 From: dmharrah Date: Fri, 11 Sep 2009 19:07:16 +0000 Subject: [PATCH] Installer plugin: version bump and fix publish-local on parent git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@995 d89573ee-9141-11dd-94d4-bdf5e562f29c --- install/project/build.properties | 4 ++-- install/project/build/InstallProject.scala | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/install/project/build.properties b/install/project/build.properties index a5d08b8a0..53491ed04 100644 --- a/install/project/build.properties +++ b/install/project/build.properties @@ -2,6 +2,6 @@ #Sun Jul 26 22:17:46 EDT 2009 project.organization=org.scala-tools.sbt project.name=extract -sbt.version=0.5.2 -project.version=0.2 +sbt.version=0.5.3 +project.version=0.2.1 scala.version=2.7.4 diff --git a/install/project/build/InstallProject.scala b/install/project/build/InstallProject.scala index 0fca6c848..bdfbe97ef 100644 --- a/install/project/build/InstallProject.scala +++ b/install/project/build/InstallProject.scala @@ -6,7 +6,7 @@ import sbt._ import java.io.File import java.nio.charset.Charset -class InstallerProject(info: ProjectInfo) extends ParentProject(info) +class InstallerProject(info: ProjectInfo) extends ParentProject(info) with NoPublish { lazy val installExtractor: InstallExtractProject = project("extract", "Installer Extractor", new InstallExtractProject(_, installPlugin)) lazy val installPlugin: InstallPluginProject = project("plugin", "Installer Plugin", new InstallPluginProject(_, installExtractor), installExtractor) @@ -24,12 +24,15 @@ protected class InstallPluginProject(info: ProjectInfo, extract: => InstallExtra val publishTo = "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/" Credentials(Path.fromFile(System.getProperty("user.home")) / ".ivy2" / ".credentials", log) } -protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info) +trait NoPublish extends BasicManagedProject { override def publishLocalAction = publishAction override def deliverAction = publishAction override def deliverLocalAction = publishAction override def publishAction = task {None} +} +protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info) with NoPublish +{ override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil) private lazy val plugin = pluginProject val mainClassName = "sbt.extract.Main"