vic-buildr 1.3.1 → 1.3.3

data/lib/buildr/ide/eclipse.rb

@@ -35,15 +35,6 @@ module Buildr
 
     after_define do |project|
       eclipse = project.task("eclipse")
-      # We need paths relative to the top project's base directory.
-      root_path = lambda { |p| f = lambda { |p| p.parent ? f[p.parent] : p.base_dir } ; f[p] }[project]
-
-      # We want the Eclipse files changed every time the Buildfile changes, but also anything loaded by
-      # the Buildfile (buildr.rb, separate file listing dependencies, etc), so we add anything required
-      # after the Buildfile. So which don't know where Buildr shows up exactly, ignore files that show
-      # in $LOADED_FEATURES that we cannot resolve.
-      sources = Buildr.application.build_files.map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
-      sources << File.expand_path(Buildr.application.buildfile, root_path) if Buildr.application.buildfile
 
       # Check if project has scala facet
       scala = project.compile.language == :scala
@@ -56,23 +47,14 @@ module Buildr
         eclipse.enhance [ file(project.path_to(".classpath")), file(project.path_to(".project")) ]
 
         # The only thing we need to look for is a change in the Buildfile.
-        file(project.path_to(".classpath")=>sources) do |task|
-          puts "Writing #{task.name}" if verbose
-
-          # Find a path relative to the project's root directory.
-          relative = lambda do |path|
-            path or raise "Invalid path '#{path.inspect}'"
-            msg = [:to_path, :to_str, :to_s].find { |msg| path.respond_to? msg }
-            path = path.__send__(msg)
-            Util.relative_path(File.expand_path(path), project.path_to)
-          end
+        file(project.path_to(".classpath")=>Buildr.application.buildfile) do |task|
+          info "Writing #{task.name}"
 
           m2repo = Buildr::Repositories.instance.local
-          excludes = [ '**/.svn/', '**/CVS/' ].join('|')
 
           File.open(task.name, "w") do |file|
-            xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
-            xml.classpath do
+            classpathentry = ClasspathEntryWriter.new project, file
+            classpathentry.write do
               # Note: Use the test classpath since Eclipse compiles both "main" and "test" classes using the same classpath
               cp = project.test.compile.dependencies.map(&:to_s) - [ project.compile.target.to_s, project.resources.target.to_s ]
               cp = cp.uniq
@@ -89,81 +71,49 @@ module Buildr
               # Generated: classpath elements in the project are assumed to be generated
               generated, libs = others.partition { |path| path.to_s.index(project.path_to.to_s) == 0 }
 
-              srcs = project.compile.sources
-
-              srcs = srcs.map { |src| relative[src] } + generated.map { |src| relative[src] }
-              srcs.sort.uniq.each do |path|
-                xml.classpathentry :kind=>'src', :path=>path, :excluding=>excludes
-              end
-
-              # Main resources implicitly copied into project.compile.target
-              main_resource_sources = project.resources.sources.map { |src| relative[src] }
-              main_resource_sources.each do |path|
-                if File.exist? project.path_to(path)
-                  xml.classpathentry :kind=>'src', :path=>path, :excluding=>excludes
-                end
-              end
+              classpathentry.src project.compile.sources + generated
+              classpathentry.src project.resources
 
               if project.test.compile.target
-                # Test classes are generated in a separate output directory
-                test_sources = project.test.compile.sources.map { |src| relative[src] }
-                test_sources.each do |paths|
-                  paths.sort.uniq.each do |path|
-                    xml.classpathentry :kind=>'src', :path=>path, :output => relative[project.test.compile.target], :excluding=>excludes
-                  end
-                end
-
-                # Test resources go in separate output directory as well
-                project.test.resources.sources.each do |path|
-                  if File.exist? project.path_to(path)
-                    xml.classpathentry :kind=>'src', :path=>relative[path], :output => relative[project.test.compile.target], :excluding=>excludes
-                  end
-                end
+                classpathentry.src project.test.compile
+                classpathentry.src project.test.resources
               end
 
               # Classpath elements from other projects
-              project_libs.map(&:id).sort.uniq.each do |project_id|
-                xml.classpathentry :kind=>'src', :combineaccessrules=>"false", :path=>"/#{project_id}" 
-              end
+              classpathentry.src_projects project_libs
 
-              { :output => relative[project.compile.target],
-                :lib    => libs.map(&:to_s),
-                :var    => m2_libs.map { |path| path.to_s.sub(m2repo, 'M2_REPO') }
-              }.each do |kind, paths|
-                paths.sort.uniq.each do |path|
-                  xml.classpathentry :kind=>kind, :path=>path
-                end
-              end
+              classpathentry.output project.compile.target
+              classpathentry.lib libs
+              classpathentry.var m2_libs, 'M2_REPO', m2repo
 
-              xml.classpathentry :kind=>'con', :path=>'org.eclipse.jdt.launching.JRE_CONTAINER'
-              xml.classpathentry :kind=>'con', :path=>'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER' if scala
+              classpathentry.con 'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER' if scala
+              classpathentry.con 'org.eclipse.jdt.launching.JRE_CONTAINER'
             end
           end
         end
 
         # The only thing we need to look for is a change in the Buildfile.
-        file(project.path_to(".project")=>sources) do |task|
-          puts "Writing #{task.name}" if verbose
+        file(project.path_to(".project")=>Buildr.application.buildfile) do |task|
+          info "Writing #{task.name}"
           File.open(task.name, "w") do |file|
             xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
             xml.projectDescription do
               xml.name project.id
               xml.projects
               xml.buildSpec do
-                xml.buildCommand do
-                  xml.name "org.eclipse.jdt.core.javabuilder"
-                end
                 if scala
                   xml.buildCommand do
                     xml.name "ch.epfl.lamp.sdt.core.scalabuilder"
-                    #xml.name "scala.plugin.scalabuilder"
+                  end
+                else
+                  xml.buildCommand do
+                    xml.name "org.eclipse.jdt.core.javabuilder"
                   end
                 end
               end
               xml.natures do
-                xml.nature "org.eclipse.jdt.core.javanature"
                 xml.nature "ch.epfl.lamp.sdt.core.scalanature" if scala
-                #xml.nature "scala.plugin.scalanature" if scala
+                xml.nature "org.eclipse.jdt.core.javanature"
               end
             end
           end
@@ -172,6 +122,87 @@ module Buildr
 
     end
 
+    # Writes 'classpathentry' tags in an xml file.
+    # It converts tasks to paths.
+    # It converts absolute paths to relative paths.
+    # It ignores duplicate directories.
+    class ClasspathEntryWriter
+      def initialize project, target
+        @project = project
+        @xml = Builder::XmlMarkup.new(:target=>target, :indent=>2)
+        @excludes = [ '**/.svn/', '**/CVS/' ].join('|')
+        @paths_written = []
+      end
+      
+      def write &block
+        @xml.classpath &block
+      end
+      
+      def con path
+        @xml.classpathentry :kind=>'con', :path=>path
+      end
+
+      def lib libs
+        libs.map(&:to_s).sort.uniq.each do |path|
+          @xml.classpathentry :kind=>'lib', :path=>path
+        end
+      end
+
+      # Write a classpathentry of kind 'src'.
+      # Accepts an array of absolute paths or a task.
+      def src arg
+        if [:sources, :target].all? { |message| arg.respond_to?(message) }
+          src_from_task arg
+        else
+          src_from_absolute_paths arg
+        end
+      end
+
+      # Write a classpathentry of kind 'src' for dependent projects.
+      # Accepts an array of projects.
+      def src_projects project_libs
+        project_libs.map(&:id).sort.uniq.each do |project_id|
+          @xml.classpathentry :kind=>'src', :combineaccessrules=>"false", :path=>"/#{project_id}"
+        end
+      end
+      
+      def output target
+        @xml.classpathentry :kind=>'output', :path=>relative(target)
+      end
+
+      def var libs, var_name, var_value
+        libs.map { |lib| lib.to_s.sub(var_value, var_name) }.sort.uniq.each do |path|
+          @xml.classpathentry :kind=>'var', :path=>path
+        end
+      end
+              
+      private
+
+      # Find a path relative to the project's root directory.
+      def relative path
+        path or raise "Invalid path '#{path.inspect}'"
+        msg = [:to_path, :to_str, :to_s].find { |msg| path.respond_to? msg }
+        path = path.__send__(msg)
+        Util.relative_path(File.expand_path(path), @project.path_to)
+      end
+
+      def src_from_task task
+        src_from_absolute_paths task.sources, task.target
+      end
+
+      def src_from_absolute_paths absolute_paths, output=nil
+        relative_paths = absolute_paths.map { |src| relative(src) }
+        relative_paths.sort.uniq.each do |path|
+          unless @paths_written.include?(path)
+            attributes = { :kind=>'src', :path=>path, :excluding=>@excludes }
+            attributes[:output] = relative(output) if output
+            @xml.classpathentry attributes
+            @paths_written << path
+          end
+        end
+      end
+    end
+
   end
 end # module Buildr
 

data/lib/buildr/ide/idea.rb

@@ -39,12 +39,6 @@ module Buildr
       idea = project.task("idea")
       # We need paths relative to the top project's base directory.
       root_path = lambda { |p| f = lambda { |p| p.parent ? f[p.parent] : p.base_dir }; f[p] }[project]
-      # We want the Eclipse files changed every time the Buildfile changes, but also anything loaded by
-      # the Buildfile (buildr.rb, separate file listing dependencies, etc), so we add anything required
-      # after the Buildfile. So which don't know where Buildr shows up exactly, ignore files that show
-      # in $LOADED_FEATURES that we cannot resolve.
-      sources = Buildr.application.build_files.map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
-      sources << File.expand_path(Buildr.application.buildfile, root_path) if Buildr.application.buildfile
 
       # Find a path relative to the project's root directory.
       relative = lambda { |path| Util.relative_path(path.to_s, project.path_to) }
@@ -57,8 +51,8 @@ module Buildr
       idea.enhance [ file(task_name) ]
 
       # The only thing we need to look for is a change in the Buildfile.
-      file(task_name=>sources) do |task|
-        puts "Writing #{task.name}" if verbose
+      file(task_name=>Buildr.application.buildfile) do |task|
+        info "Writing #{task.name}"
 
         # Idea handles modules slightly differently if they're WARs
         idea_types = Hash.new("JAVA_MODULE")
@@ -153,8 +147,8 @@ module Buildr
         task_name = project.path_to("#{project.name.gsub(':', '-')}.ipr")
         idea.enhance [ file(task_name) ]
 
-        file(task_name=>sources) do |task|
-          puts "Writing #{task.name}" if verbose
+        file(task_name=>Buildr.application.buildfile) do |task|
+          info "Writing #{task.name}"
 
           # Generating just the little stanza that chanages from one project to another
           partial = StringIO.new
@@ -178,8 +172,9 @@ module Buildr
           template_xml = REXML::Document.new(File.open(File.dirname(__FILE__)+"/idea.ipr.template"))
           include_xml = REXML::Document.new(partial.string)
           template_xml.root.add_element(include_xml.root)
-          template_xml.write(File.new(task.name, "w"))
-
+          File.open task.name, 'w' do |file|
+            template_xml.write file
+          end
         end
       end
 

data/lib/buildr/ide/idea7x.rb

@@ -49,9 +49,6 @@ module Buildr
       # We need paths relative to the top project's base directory.
       root_path = lambda { |p| f = lambda { |p| p.parent ? f[p.parent] : p.base_dir }; f[p] }[project]
 
-      sources = Buildr.application.build_files.map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
-      sources << File.expand_path(Buildr.application.buildfile, root_path) if Buildr.application.buildfile
-
       # Find a path relative to the project's root directory.
       relative = lambda { |path| Util.relative_path(File.expand_path(path.to_s), project.path_to) }
 
@@ -63,7 +60,7 @@ module Buildr
       idea7x.enhance [ file(task_name) ]
 
       # The only thing we need to look for is a change in the Buildfile.
-      file(task_name=>sources) do |task|
+      file(task_name=>Buildr.application.buildfile) do |task|
         # Note: Use the test classpath since Eclipse compiles both "main" and "test" classes using the same classpath
         deps = project.test.compile.dependencies.map(&:to_s) - [ project.compile.target.to_s ]
 
@@ -76,12 +73,9 @@ module Buildr
         # Separate artifacts from Maven2 repository
         m2_libs, others = others.partition { |path| path.to_s.index(m2repo) == 0 }
 
-        # Generated: classpath elements in the project are assumed to be generated
-        generated, libs = others.partition { |path| path.to_s.index(project.path_to.to_s) == 0 }
-
         # Project type is going to be the first package type
         if package = project.packages.first
-          puts "Writing #{task.name}" if verbose
+          info "Writing #{task.name}"
           File.open(task.name, "w") do |file|
             xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
             xml.module(:version=>"4", :relativePaths=>"true", :type=>"JAVA_MODULE") do
@@ -89,13 +83,15 @@ module Buildr
 
                 Buildr::Idea7x.generate_compile_output(project, xml, relative)
 
-                Buildr::Idea7x.generate_content(project, xml, generated, relative)
+                Buildr::Idea7x.generate_content(project, xml, relative)
 
                 Buildr::Idea7x.generate_order_entries(project_libs, xml)
 
-                ext_libs = libs.map {|path| "#{MODULE_DIR}/#{path.to_s}" } + m2_libs.map { |path| path.to_s.sub(m2repo, "$M2_REPO$") }
+                ext_libs = m2_libs.map { |path| "jar://#{path.to_s.sub(m2repo, "$M2_REPO$")}!/" }
+                ext_libs << "#{MODULE_DIR_URL}/#{relative[project.test.resources.target.to_s]}" if project.test.resources.target
+                ext_libs << "#{MODULE_DIR_URL}/#{relative[project.resources.target.to_s]}" if project.resources.target
+                
                 Buildr::Idea7x.generate_module_libs(xml, ext_libs)
-
                 xml.orderEntryProperties
               end
             end
@@ -105,7 +101,7 @@ module Buildr
 
       # Root project aggregates all the subprojects.
       if project.parent == nil
-        Buildr::Idea7x.generate_ipr(project, idea7x, sources)
+        Buildr::Idea7x.generate_ipr(project, idea7x, Buildr.application.buildfile)
       end
 
     end # after_define
@@ -124,13 +120,14 @@ module Buildr
 
       def generate_compile_output(project, xml, relative)
         xml.output(:url=>"#{MODULE_DIR_URL}/#{relative[project.compile.target.to_s]}") if project.compile.target
-        xml.tag!("output-test", :url=>"#{MODULE_DIR_URL}/#{relative[project.test.compile.target.to_s]}") if project.test.compile.target  
+        xml.tag!("output-test", :url=>"#{MODULE_DIR_URL}/#{relative[project.test.compile.target.to_s]}") if project.test.compile.target
+        xml.tag!("exclude-output")
       end
 
-      def generate_content(project, xml, generated, relative)
+      def generate_content(project, xml, relative)
         xml.content(:url=>"#{MODULE_DIR_URL}") do
           unless project.compile.sources.empty?
-            srcs = project.compile.sources.map { |src| relative[src.to_s] } + generated.map { |src| relative[src.to_s] }
+            srcs = project.compile.sources.map { |src| relative[src.to_s] }
             srcs.sort.uniq.each do |path|
               xml.sourceFolder :url=>"#{MODULE_DIR_URL}/#{path}", :isTestSource=>"false"
             end
@@ -142,7 +139,7 @@ module Buildr
                 xml.sourceFolder :url=>"#{MODULE_DIR_URL}/#{path}", :isTestSource=>"true"
               end
             end
-          end          
+          end
           [project.resources=>false, project.test.resources=>true].each do |resources, test|
             resources.each do |path|
               path[0].sources.each do |srcpath|
@@ -150,7 +147,8 @@ module Buildr
               end
             end
           end
-          xml.excludeFolder :url=>"#{MODULE_DIR_URL}/#{relative[project.compile.target.to_s]}" if project.compile.target
+          xml.excludeFolder :url=>"#{MODULE_DIR_URL}/#{relative[project.resources.target.to_s]}" if project.resources.target
+          xml.excludeFolder :url=>"#{MODULE_DIR_URL}/#{relative[project.test.resources.target.to_s]}" if project.test.resources.target
         end
       end
 
@@ -159,7 +157,7 @@ module Buildr
           xml.orderEntry :type=>"module-library" do
             xml.library do
               xml.CLASSES do
-                xml.root :url=>"jar://#{path}!/"
+                xml.root :url=> path
               end
               xml.JAVADOC
               xml.SOURCES
@@ -172,7 +170,7 @@ module Buildr
         task_name = project.path_to("#{project.name.gsub(':', '-')}-7x.ipr")
         idea7x.enhance [ file(task_name) ]
         file(task_name=>sources) do |task|
-          puts "Writing #{task.name}" if verbose
+          info "Writing #{task.name}"
 
           # Generating just the little stanza that chanages from one project to another
           partial = StringIO.new
@@ -196,7 +194,9 @@ module Buildr
           template_xml = REXML::Document.new(File.open(File.join(File.dirname(__FILE__), IPR_TEMPLATE)))
           include_xml = REXML::Document.new(partial.string)
           template_xml.root.add_element(include_xml.root)
-          template_xml.write(File.new(task.name, "w"))
+          File.open task.name, 'w' do |file|
+            template_xml.write file
+          end
         end
       end
 

data/lib/buildr/java.rb

@@ -14,13 +14,10 @@
 # the License.
 
 
-ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if Config::CONFIG['host_os'] =~ /darwin/i
-require PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
-
-
-require 'buildr/java/compilers'
-require 'buildr/java/test_frameworks'
-require 'buildr/java/bdd_frameworks'
+require RUBY_PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
+require 'buildr/java/compiler'
+require 'buildr/java/tests'
+require 'buildr/java/bdd'
 require 'buildr/java/packaging'
 require 'buildr/java/commands'
 require 'buildr/java/deprecated'

data/lib/buildr/java/ant.rb

@@ -23,11 +23,32 @@ module Buildr
   module Ant
 
     # Which version of Ant we're using by default.
-    VERSION = '1.7.0' unless const_defined?('VERSION')
+    VERSION = '1.7.1'
+    
+    class << self
+      # Current version of Ant being used.
+      def version
+        Buildr.settings.build['ant'] || VERSION
+      end
+
+      # Ant classpath dependencies.
+      def dependencies
+        # Ant-Trax required for running the JUnitReport task, and there's no other place
+        # to put it but the root classpath.
+        @dependencies ||= ["org.apache.ant:ant:jar:#{version}", "org.apache.ant:ant-launcher:jar:#{version}",
+                           "org.apache.ant:ant-trax:jar:#{version}"]
+      end
+      
+    private
+      def const_missing(const)
+        return super unless const == :REQUIRES # TODO: remove in 1.5
+        Buildr.application.deprecated "Please use Ant.dependencies/.version instead of Ant::REQUIRES/VERSION"
+        dependencies
+      end
+    end    
+
 
-    # Libraries used by Ant.
-    REQUIRES = [ "org.apache.ant:ant:jar:#{VERSION}", "org.apache.ant:ant-launcher:jar:#{VERSION}", 'xerces:xercesImpl:jar:2.6.2' ]
-    Java.classpath << REQUIRES
+    Java.classpath << lambda { Ant.dependencies }
 
     # :call-seq:
     #   ant(name) { |AntProject| ... } => AntProject
@@ -65,7 +86,7 @@ module Buildr
 
   Buildr.help do
     Java.load
-    "\nUsing Java #{ENV_JAVA['java.version']}, Ant #{Ant::VERSION}."
+    "\nUsing Java #{ENV_JAVA['java.version']}, Ant #{Ant.version}."
   end
 
 end