From e0b453225e754191af86912430d74f3ec545499c Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 22 Mar 2011 20:42:21 -0400
Subject: [PATCH] logging for packaging

---
 main/Package.scala | 13 +++++++++----
 main/Tests.scala   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/main/Package.scala b/main/Package.scala
index b48d64cfe..e2642b483 100644
--- a/main/Package.scala
+++ b/main/Package.scala
@@ -71,7 +71,9 @@ object Package
 			val sources :+: _ :+: manifest :+: HNil = inputs
 			outputChanged(cacheFile / "output") { (outChanged, jar: PlainFileInfo) =>
 				if(inChanged || outChanged)
-					makeJar(sources.toSeq, jar.file, manifest)
+					makeJar(sources.toSeq, jar.file, manifest, log)
+				else
+					log.debug("Jar uptodate: " + jar.file)
 			}
 		}
 
@@ -85,13 +87,16 @@ object Package
 		if(main.getValue(version) eq null)
 			main.put(version, "1.0")
 	}
-	def makeJar(sources: Seq[(File, String)], jar: File, manifest: Manifest)
+	def makeJar(sources: Seq[(File, String)], jar: File, manifest: Manifest, log: Logger)
 	{
-		println("Packaging " + jar.getAbsolutePath + " ...")
+		log.info("Packaging " + jar.getAbsolutePath + " ...")
 		IO.delete(jar)
+		log.debug(sourcesDebugString(sources))
 		IO.jar(sources, jar, manifest)
-		println("Done packaging.")
+		log.info("Done packaging.")
 	}
+	def sourcesDebugString(sources: Seq[(File, String)]): String =
+		"Input file mappings:\n\t" + (sources map { case (f,s) => s + "\n\t  " + f} mkString("\n\t") )
 
 	implicit def manifestEquiv: Equiv[Manifest] = defaultEquiv
 	implicit def manifestFormat: Format[Manifest] = streamFormat( _ write _, in => new Manifest(in))
diff --git a/main/Tests.scala b/main/Tests.scala
index c776cbae5..a20b3981e 100644
--- a/main/Tests.scala
+++ b/main/Tests.scala
@@ -18,6 +18,7 @@ package sbt
 sealed trait TestOption
 object Tests
 {
+	// (overall result, individual results)
 	type Output = (TestResult.Value, Map[String,TestResult.Value])
 	
 	final case class Setup(setup: ClassLoader => Unit) extends TestOption
@@ -82,7 +83,6 @@ object Tests
 		testTask(frameworks.values.toSeq, testLoader, tests, setup.readOnly, cleanup.readOnly, log, testListeners.readOnly, arguments)
 	}
 
-	// (overall result, individual results)
 	def testTask(frameworks: Seq[Framework], loader: ClassLoader, tests: Seq[TestDefinition],
 		userSetup: Iterable[ClassLoader => Unit], userCleanup: Iterable[ClassLoader => Unit],
 		log: Logger, testListeners: Seq[TestReportListener], arguments: Map[Framework, Seq[String]]): Task[Output] =