From b5269625afb4f027fe9c22d4967f74566b0d76e7 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 28 Jul 2010 16:10:00 +0100
Subject: [PATCH] Incorporate Chris's improvements to the bundlor build file
 (proper integration with incremental build support).

---
 gradle/bundlor.gradle | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/gradle/bundlor.gradle b/gradle/bundlor.gradle
index b081c9e1d4..1c2946fa4c 100644
--- a/gradle/bundlor.gradle
+++ b/gradle/bundlor.gradle
@@ -11,19 +11,26 @@ dependencies {
 }
 
 task bundlor(dependsOn: compileJava) {
-    onlyIf {
-        dependsOnTaskDidWork()
-    }
+    def template = new File(projectDir, 'template.mf')
+    def bundlorDir = new File("${project.buildDir}/bundlor")
+    def manifest = file("${bundlorDir}/META-INF/MANIFEST.MF")
+
+    outputs.dir bundlorDir
+    outputs.files manifest
+    inputs.files template, project.sourceSets.main.runtimeClasspath
+
+    jar.manifest.from manifest
+    jar.inputs.files manifest
+
     doFirst {
         ant.taskdef(resource: 'com/springsource/bundlor/ant/antlib.xml', classpath: configurations.bundlor.asPath)
-        File template = new File(projectDir, 'template.mf')
-        mkdir("$buildDir/bundlor")
-        if (template.exists()) {
-            ant.bundlor(inputPath: sourceSets.main.classesDir, outputPath: "$buildDir/bundlor", manifestTemplatePath: template) {
-                property(name: 'version', value: "$version")
-                property(name: 'spring.version', value: "$springVersion")
-            }
-            jar.manifest.from("$buildDir/bundlor/META-INF/MANIFEST.MF")
+        captureStandardOutput(LogLevel.INFO)
+
+        mkdir(bundlorDir)
+
+        ant.bundlor(inputPath: sourceSets.main.classesDir, outputPath: "$buildDir/bundlor", manifestTemplatePath: template) {
+            property(name: 'version', value: project.version)
+            property(name: 'spring.version', value: project.springVersion)
         }
     }
 }