buildr 1.3.5 → 1.4.0

data/lib/buildr/ide/eclipse/java.rb

@@ -38,9 +38,9 @@ module Buildr
 
         # :java nature explicitly set
         if eclipse.natures.include? :java
-          eclipse.natures += NATURE unless eclipse.natures.include? NATURE
-          eclipse.classpath_containers += CONTAINER unless eclipse.classpath_containers.include? CONTAINER
-          eclipse.builders += BUILDER unless eclipse.builders.include? BUILDER
+          eclipse.natures += [NATURE] unless eclipse.natures.include? NATURE
+          eclipse.classpath_containers += [CONTAINER] unless eclipse.classpath_containers.include? CONTAINER
+          eclipse.builders += [BUILDER] unless eclipse.builders.include? BUILDER
         end
       end
 

data/lib/buildr/ide/eclipse/plugin.rb

@@ -30,7 +30,10 @@ module Buildr
         eclipse = project.eclipse
 
         # smart defaults
-        if eclipse.natures.empty? && ((File.exists? project.path_to("plugin.xml")) || (File.exists? project.path_to("OSGI-INF")))
+        if eclipse.natures.empty? && (
+            (File.exists? project.path_to("plugin.xml")) ||
+            (File.exists? project.path_to("OSGI-INF")) ||
+            (File.exists?(project.path_to("META-INF/MANIFEST.MF")) && File.read(project.path_to("META-INF/MANIFEST.MF")).match(/^Bundle-SymbolicName:/)))
           eclipse.natures = [NATURE, Buildr::Eclipse::Java::NATURE]
           eclipse.classpath_containers = [CONTAINER, Buildr::Eclipse::Java::CONTAINER] if eclipse.classpath_containers.empty?
           eclipse.builders = BUILDERS + [Buildr::Eclipse::Java::BUILDER] if eclipse.builders.empty?
@@ -49,12 +52,12 @@ module Buildr
             index = eclipse.classpath_containers.index(Buildr::Eclipse::Java::CONTAINER) || -1
             eclipse.classpath_containers = eclipse.classpath_containers.insert(index, CONTAINER)
           end
-          unless (eclipse.builders.include?(BUILDER[0]) && eclipse.builders.include?(BUILDER[1]))
+          unless (eclipse.builders.include?(BUILDERS[0]) && eclipse.builders.include?(BUILDERS[1]))
             # plugin builder must be before java builder
             index = eclipse.classpath_containers.index(Buildr::Eclipse::Java::BUILDER) || -1
-            eclipse.builders = eclipse.builders.insert(index, BUILDER[1]) unless eclipse.builders.include? BUILDER[1]
-            index = eclipse.classpath_containers.index(BUILDER[1]) || -1
-            eclipse.builders = eclipse.builders.insert(index, BUILDER[0]) unless eclipse.builders.include? BUILDER[0]
+            eclipse.builders = eclipse.builders.insert(index, BUILDERS[1]) unless eclipse.builders.include? BUILDERS[1]
+            index = eclipse.classpath_containers.index(BUILDERS[1]) || -1
+            eclipse.builders = eclipse.builders.insert(index, BUILDERS[0]) unless eclipse.builders.include? BUILDERS[0]
           end
         end
       end

data/lib/buildr/ide/eclipse/scala.rb

@@ -26,14 +26,15 @@ module Buildr
       CONTAINER = 'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER'
       BUILDER   = 'ch.epfl.lamp.sdt.core.scalabuilder'
 
-      after_define do |project|
+      after_define :eclipse => :eclipse_scala
+      after_define :eclipse_scala do |project|
         eclipse = project.eclipse
-
         # smart defaults
         if eclipse.natures.empty? && (project.compile.language == :scala || project.test.compile.language == :scala)
           eclipse.natures = [NATURE, Buildr::Eclipse::Java::NATURE]
           eclipse.classpath_containers = [CONTAINER, Buildr::Eclipse::Java::CONTAINER] if eclipse.classpath_containers.empty?
           eclipse.builders = BUILDER if eclipse.builders.empty?
+          eclipse.exclude_libs += Buildr::Scala::Scalac.dependencies
         end
 
         # :scala nature explicitly set
@@ -54,6 +55,7 @@ module Buildr
             eclipse.builders -= [Buildr::Eclipse::Java::BUILDER]
             eclipse.builders += [BUILDER]
           end
+          eclipse.exclude_libs += Buildr::Scala::Scalac.dependencies
         end
       end
 

data/lib/buildr/ide/eclipse.rb

@@ -31,6 +31,29 @@ module Buildr
         @options = Options.new(project)
       end
 
+      # :call-seq:
+      #   classpath_variables { :VAR => '/path/to/location' }
+      # Sets classpath variables to be used for library path substitution
+      # on the project.
+      #
+      def classpath_variables(*values)
+        fail "eclipse.classpath_variables expects a single hash argument" if values.size > 1
+        if values.size == 1
+          fail "eclipse.classpath_variables expects a Hash argument" unless values[0].is_a? Hash
+          # convert keys to strings
+          values = values[0].inject({}) { |h, (k,v)| h[k.to_s] = @project.path_to(v); h }
+          @variables = values.merge(@variables || {})
+        end
+        @variables || (@project.parent ? @project.parent.eclipse.classpath_variables : default_classpath_variables)
+      end
+
+      def default_classpath_variables
+        vars = {}
+        vars[:SCALA_HOME] = ENV['SCALA_HOME'] if ENV['SCALA_HOME']
+        vars[:JAVA_HOME]  = ENV['JAVA_HOME']  if ENV['JAVA_HOME']
+        vars
+      end
+
       # :call-seq:
       #   natures=(natures)
       # Sets the Eclipse project natures on the project.
@@ -49,7 +72,7 @@ module Buildr
       def natures(*values)
         if values.size > 0
           @natures ||= []
-          @natures += values
+          @natures += values.flatten
         else
           @natures || (@project.parent ? @project.parent.eclipse.natures : [])
         end
@@ -74,12 +97,32 @@ module Buildr
       def classpath_containers(*values)
         if values.size > 0
           @classpath_containers ||= []
-          @classpath_containers += values
+          @classpath_containers += values.flatten
         else
           @classpath_containers || (@project.parent ? @project.parent.eclipse.classpath_containers : [])
         end
       end
 
+      # :call-seq:
+      #   exclude_libs() => [lib1, lib2]
+      # Returns the an array of libraries to be excluded from the generated Eclipse classpath
+      def exclude_libs(*values)
+        if values.size > 0
+          @exclude_libs ||= []
+          @exclude_libs += values.flatten
+        else
+          @exclude_libs || (@project.parent ? @project.parent.eclipse.exclude_libs : [])
+        end
+      end
+
+      # :call-seq:
+      #   exclude_libs=(lib1, lib2)
+      # Sets libraries to be excluded from the generated Eclipse classpath
+      #
+      def exclude_libs=(libs)
+        @exclude_libs = arrayfy(libs)
+      end
+
       # :call-seq:
       #   builders=(builders)
       # Sets the Eclipse project builders on the project.
@@ -98,7 +141,7 @@ module Buildr
       def builders(*values)
         if values.size > 0
           @builders ||= []
-          @builders += values
+          @builders += values.flatten
         else
           @builders || (@project.parent ? @project.parent.eclipse.builders : [])
         end
@@ -147,80 +190,99 @@ module Buildr
       project.recursive_task('eclipse')
     end
 
-    after_define do |project|
-      eclipse = project.task('eclipse')
-
-      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')=>Buildr.application.buildfile) do |task|
-        if (project.eclipse.natures.reject { |x| x.is_a?(Symbol) }.size > 0)
-          info "Writing #{task.name}"
-
-          m2repo = Buildr::Repositories.instance.local
-
-          File.open(task.name, 'w') do |file|
-            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
+    after_define(:eclipse => :package) do |project|
+      # Need to enhance because using project.projects during load phase of the
+      # buildfile has harmful side-effects on project definition order
+      project.enhance do
+        eclipse = project.task('eclipse')
+        # We don't create the .project and .classpath files if the project contains projects.
+        if project.projects.empty?
+
+          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')=>Buildr.application.buildfile) do |task|
+            if (project.eclipse.natures.reject { |x| x.is_a?(Symbol) }.size > 0)
+              info "Writing #{task.name}"
+
+              m2repo = Buildr::Repositories.instance.local
+
+              File.open(task.name, 'w') do |file|
+                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
+
+                  # Convert classpath elements into applicable Project objects
+                  cp.collect! { |path| Buildr.projects.detect { |prj| prj.packages.detect { |pkg| pkg.to_s == path } } || path }
+
+                  # Remove excluded libs
+                  cp -= project.eclipse.exclude_libs.map(&:to_s)
+
+                  # project_libs: artifacts created by other projects
+                  project_libs, others = cp.partition { |path| path.is_a?(Project) }
+
+                  # Separate artifacts under known classpath variable paths
+                  # including artifacts located in local Maven2 repository
+                  vars = []
+                  project.eclipse.classpath_variables.merge(project.eclipse.options.m2_repo_var => m2repo).each do |name, path|
+                    matching, others = others.partition { |f| File.expand_path(f.to_s).index(path) == 0 }
+                    matching.each do |m|
+                      vars << [m, name, path]
+                    end
+                  end
 
-              # Convert classpath elements into applicable Project objects
-              cp.collect! { |path| Buildr.projects.detect { |prj| prj.packages.detect { |pkg| pkg.to_s == path } } || path }
+                  # Generated: Any non-file classpath elements in the project are assumed to be generated
+                  libs, generated = others.partition { |path| File.file?(path.to_s) }
 
-              # project_libs: artifacts created by other projects
-              project_libs, others = cp.partition { |path| path.is_a?(Project) }
+                  classpathentry.src project.compile.sources + generated
+                  classpathentry.src project.resources
 
-              # Separate artifacts from Maven2 repository
-              m2_libs, others = others.partition { |path| path.to_s.index(m2repo) == 0 }
+                  if project.test.compile.target
+                    classpathentry.src project.test.compile
+                    classpathentry.src project.test.resources
+                  end
 
-              # Generated: Any non-file classpath elements in the project are assumed to be generated
-              libs, generated = others.partition { |path| File.file?(path.to_s) }
+                  # Classpath elements from other projects
+                  classpathentry.src_projects project_libs
 
-              classpathentry.src project.compile.sources + generated
-              classpathentry.src project.resources
+                  classpathentry.output project.compile.target if project.compile.target
+                  classpathentry.lib libs
+                  classpathentry.var vars
 
-              if project.test.compile.target
-                classpathentry.src project.test.compile
-                classpathentry.src project.test.resources
+                  project.eclipse.classpath_containers.each { |container|
+                    classpathentry.con container
+                  }
+                end
               end
-
-              # Classpath elements from other projects
-              classpathentry.src_projects project_libs
-
-              classpathentry.output project.compile.target if project.compile.target
-              classpathentry.lib libs
-              classpathentry.var m2_libs, project.eclipse.options.m2_repo_var, m2repo
-
-              project.eclipse.classpath_containers.each { |container|
-                classpathentry.con container
-              }
             end
           end
-        end
-      end
 
-      # The only thing we need to look for is a change in the Buildfile.
-      file(project.path_to('.project')=>Buildr.application.buildfile) do |task|
-        if (project.eclipse.natures.reject { |x| x.is_a?(Symbol) }.size > 0)
-          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
-                project.eclipse.builders.each { |builder|
-                  xml.buildCommand do
-                    xml.name builder
+          # The only thing we need to look for is a change in the Buildfile.
+          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
+                unless project.eclipse.builders.empty?
+                  xml.buildSpec do
+                    project.eclipse.builders.each { |builder|
+                      xml.buildCommand do
+                        xml.name builder
+                      end
+                    }
                   end
-                }
-              end
-              xml.natures do
-                project.eclipse.natures.each { |nature|
-                  xml.nature nature unless nature.is_a? Symbol
-                }
+                end
+                unless project.eclipse.natures.empty?
+                  xml.natures do
+                    project.eclipse.natures.each { |nature|
+                      xml.nature nature unless nature.is_a? Symbol
+                    }
+                  end
+                end
               end
             end
           end
@@ -251,7 +313,7 @@ module Buildr
 
       def lib libs
         libs.map(&:to_s).sort.uniq.each do |path|
-          @xml.classpathentry :kind=>'lib', :path=>path
+          @xml.classpathentry :kind=>'lib', :path=>relative(path)
         end
       end
 
@@ -282,24 +344,35 @@ module Buildr
       # * +var_name+ is a variable name as defined in Eclipse (e.g., 'M2_REPO').
       # * +var_value+ is the value of this variable (e.g., '/home/me/.m2').
       # E.g., <tt>var([lib1, lib2], 'M2_REPO', '/home/me/.m2/repo')</tt>
-      def var libs, var_name, var_value
-        libs.each do |lib_path|
+      def var(libs)
+        libs.each do |lib_path, var_name, var_value|
           lib_artifact = file(lib_path)
-          source_path = lib_artifact.sources_artifact.to_s
-          relative_lib_path = lib_path.sub(var_value, var_name)
-          relative_source_path = source_path.sub(var_value, var_name)
-          @xml.classpathentry :kind=>'var', :path=>relative_lib_path, :sourcepath=>relative_source_path
+          relative_lib_path = lib_path.sub(var_value, var_name.to_s)
+          if lib_artifact.respond_to? :sources_artifact
+            source_path = lib_artifact.sources_artifact.to_s
+            relative_source_path = source_path.sub(var_value, var_name)
+            @xml.classpathentry :kind=>'var', :path=>relative_lib_path, :sourcepath=>relative_source_path
+          else
+            @xml.classpathentry :kind=>'var', :path=>relative_lib_path
+          end
         end
       end
 
       private
 
-      # Find a path relative to the project's root directory.
+      # Find a path relative to the project's root directory if possible. If the
+      # two paths do not share the same root the absolute path is returned. This
+      # can happen on Windows, for instance, when the two paths are not on the
+      # same drive.
       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)
+        begin
+          Util.relative_path(File.expand_path(path), @project.path_to)
+        rescue ArgumentError
+          File.expand_path(path)
+        end
       end
 
       def src_from_task task

data/lib/buildr/ide/idea.rb

@@ -30,11 +30,11 @@ module Buildr
       Project.local_task "idea"=>"artifacts"
     end
 
-    before_define do |project|
+    before_define(:idea) do |project|
       project.recursive_task("idea")
     end
 
-    after_define do |project|
+    after_define(:idea => :package) do |project|
       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]

data/lib/buildr/ide/idea7x.rb

@@ -37,13 +37,17 @@ module Buildr
       # Global task "idea" generates artifacts for all projects.
       desc "Generate Idea 7.x artifacts for all projects"
       Project.local_task "idea7x"=>"artifacts"
+
+      desc "Delete the generated  Idea 7.x artifacts for all projects"
+      Project.local_task "idea7x:clean"
     end
 
-    before_define do |project|
+    before_define(:idea7x) do |project|
       project.recursive_task("idea7x")
+      project.recursive_task("idea7x:clean")
     end
 
-    after_define do |project|
+    after_define(:idea7x => :package) do |project|
       idea7x = project.task("idea7x")
 
       # We need paths relative to the top project's base directory.
@@ -90,7 +94,7 @@ module Buildr
                 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
@@ -99,11 +103,18 @@ module Buildr
         end
       end
 
+      # Add task to remove generated module
+      project.task("idea7x:clean") do
+        if File.exist?(task_name)
+          info "Removing #{task_name}"
+          rm_rf task_name 
+        end
+      end
+
       # Root project aggregates all the subprojects.
       if project.parent == nil
         Buildr::Idea7x.generate_ipr(project, idea7x, Buildr.application.buildfile)
       end
-
     end # after_define
 
     class << self
@@ -200,6 +211,14 @@ module Buildr
             template_xml.write file
           end
         end
+
+        # Add task to remove generated project file
+        project.task("idea7x:clean") do
+          if File.exist?(task_name)
+            info "Removing #{task_name}" 
+            rm_rf task_name 
+          end
+        end
       end
 
     end

data/lib/buildr/java/ant.rb

@@ -25,8 +25,8 @@ module Buildr
   module Ant
 
     # Which version of Ant we're using by default.
-    VERSION = '1.7.1'
-    
+    VERSION = '1.8.0'
+
     class << self
       # Current version of Ant being used.
       def version
@@ -40,14 +40,14 @@ module Buildr
         @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    
+    end
 
 
     Java.classpath << lambda { Ant.dependencies }