0
@@ -168,17 +168,17 @@ module Buildr
0
       def compile_map(sources, target)
0
         target_ext = self.class.target_ext
0
         ext_glob = Array(self.class.source_ext).join(',')
0
-        sources.flatten.inject({}) do |map, source|
0
+        sources.flatten.map{|f| File.expand_path(f)}.inject({}) do |map, source|
0
           if File.directory?(source)
0
             FileList["#{source}/**/*.{#{ext_glob}}"].reject { |file| File.directory?(file) }.
0
-              each { |file| map[file] = File.join(target, Util.relative_path(source, file).ext(target_ext)) }
0
+              each { |file| map[file] = File.join(target, Util.relative_path(file, source).ext(target_ext)) }
0
           else
0
             map[source] = File.join(target, File.basename(source).ext(target_ext))
0
           end
0
           map
0
         end
0
       end
0
-
0
+      
0
     end
0
 
0
   end
0
@@ -223,7 +223,7 @@ module Buildr
0
           raise 'No compiler selected and can\'t determine which compiler to use' unless compiler
0
           raise 'No target directory specified' unless target
0
           mkpath target.to_s, :verbose=>false
0
-          puts "Compiling #{task.name.gsub(/:[^:]*$/, '')}" if verbose
0
+          puts "Compiling #{task.name.gsub(/:[^:]*$/, '')} into #{target.to_s}" if verbose
0
           @compiler.compile(sources.map(&:to_s), target.to_s, dependencies.map(&:to_s))
0
           # By touching the target we let other tasks know we did something,
0
           # and also prevent recompiling again for dependencies.

0
@@ -23,19 +23,18 @@ module CompilerHelper
0
   end
0
 
0
   def sources
0
-    @sources ||= ['Test1.java', 'Test2.java'].map { |f| File.join('src/java', f) }.
0
+    @sources ||= ['Test1.java', 'Test2.java'].map { |f| File.join('src/main/java', f) }.
0
       each { |src| write src, "class #{src.pathmap('%n')} {}" }
0
   end
0
 
0
   def jars
0
     @jars ||= begin
0
-      write 'src/main/java/Dependency.java', 'class Dependency { }'
0
-      define 'jars', :version=>'1.0' do
0
-        compile.into('dependency')
0
+      write 'jars/src/main/java/Dependency.java', 'class Dependency { }'
0
+      define 'jars', :version=>'1.0', :base_dir => 'jars' do
0
         package(:jar, :id=>'jar1')
0
         package(:jar, :id=>'jar2')
0
       end
0
-      project('jars').packages.each(&:invoke).map(&:to_s)
0
+      project('jars').packages.map(&:to_s)
0
     end
0
   end
0
 end
0
@@ -188,7 +187,7 @@ describe Buildr::CompileTask, '#dependencies' do
0
   end
0
 
0
   it 'should allow artifacts' do
0
-    artifact('group:id:jar:1.0') { |task| mkpath File.dirname(task.to_s) ; cp jars.first.to_s, task.to_s }
0
+    artifact('group:id:jar:1.0') { |task| mkpath File.dirname(task.to_s) ; cp jars.first.to_s, task.to_s }.enhance jars
0
     compile_task.from(sources).with('group:id:jar:1.0').into('classes').invoke
0
   end
0
 
0
@@ -325,6 +324,7 @@ describe Buildr::CompileTask, '#invoke' do
0
   end
0
 
0
   it 'should force compilation if dependencies newer than compiled' do
0
+    jars; project('jars').task("package").invoke
0
     # On my machine the times end up the same, so need to push dependencies in the past.
0
     time = Time.now
0
     sources.map { |src| src.pathmap("#{compile_task.target}/%n.class") }.
0
@@ -334,10 +334,11 @@ describe Buildr::CompileTask, '#invoke' do
0
   end
0
 
0
   it 'should not force compilation if dependencies older than compiled' do
0
+    jars; project('jars').task("package").invoke
0
     time = Time.now
0
-    sources.map { |src| src.pathmap("#{compile_task.target}/%n.class") }.
0
+    jars.each { |jar| File.utime(time - 1 , time - 1, jar) }
0
+    sources.map { |src| File.utime(time, time, src); src.pathmap("#{compile_task.target}/%n.class") }.
0
       each { |kls| write kls ; File.utime(time, time, kls) }
0
-    jars.each { |jar| File.utime(time - 1, time - 1, jar) }
0
     lambda { compile_task.from(sources).with(jars).invoke }.should_not run_task('foo:compile')
0
   end
0