buildr 1.4.7.pre2-java → 1.4.8-java

data/lib/buildr/core/cc.rb

@@ -53,21 +53,27 @@ module Buildr
         build_failed(project, ex)
       end
 
-      dirs = []
+      srcs = []
       each_project do |p|
-        dirs += p.compile.sources.map(&:to_s)
-        dirs += p.test.compile.sources.map(&:to_s)
-        dirs += p.resources.sources.map(&:to_s)
+        srcs += p.compile.sources.map(&:to_s)
+        srcs += p.test.compile.sources.map(&:to_s)
+        srcs += p.resources.sources.map(&:to_s)
       end
-      if dirs.length == 1
-        info "Monitoring directory: #{dirs.first}"
+      if srcs.length == 1
+        info "Monitoring directory: #{srcs.first}"
       else
-        info "Monitoring directories: [#{dirs.join ', '}]"
+        info "Monitoring directories: [#{srcs.join ', '}]"
       end
 
       timestamps = lambda do
         times = {}
-        dirs.each { |d| Dir.glob("#{d}/**/*").map { |f| times[f] = File.mtime f } }
+        srcs.each do |a|
+          if File.directory? a
+            Dir.glob("#{a}/**/*").map { |f| times[f] = File.mtime f }
+          elsif File.exist? a
+            times[a] = File.mtime a
+          end
+        end
         times
       end
 

data/lib/buildr/core/doc.rb

@@ -112,7 +112,13 @@ module Buildr
       # Includes additional source files and directories when generating the documentation
       # and returns self. When specifying a directory, includes all source files in that directory.
       def include(*files)
-        @files.include *files.flatten.compact
+        files.each do |file|
+          if file.respond_to? :to_ary
+            include(*file.to_ary)
+          else
+            @files.include *files.flatten.compact.collect { |f| File.expand_path(f.to_s) }
+          end
+        end
         self
       end
 
@@ -121,7 +127,7 @@ module Buildr
       #
       # Excludes source files and directories from generating the documentation.
       def exclude(*files)
-        @files.exclude *files
+        @files.exclude *files.collect{|f|File.expand_path(f)}
         self
       end
 
@@ -205,7 +211,7 @@ module Buildr
       def source_files #:nodoc:
         @source_files ||= @files.map(&:to_s).map do |file|
           Array(engine.class.source_ext).map do |ext|
-            File.directory?(file) ? FileList[File.join(file, "**/*.#{ext}")] : file
+            File.directory?(file) ? FileList[File.join(file, "**/*.#{ext}")] : File.expand_path(file)
           end
         end.flatten.reject { |file| @files.exclude?(file) }
       end

data/lib/buildr/core/generate.rb

@@ -20,7 +20,7 @@ module Buildr
       script = nil
       choose do |menu|
         menu.header = "To use Buildr you need a buildfile. Do you want me to create one?"
-
+        menu.choice("From eclipse .project files") { script = Generate.from_eclipse(Dir.pwd).join("\n") } if has_eclipse_project?
         menu.choice("From maven2 pom file") { script = Generate.from_maven2_pom('pom.xml').join("\n") } if File.exists?("pom.xml")
         menu.choice("From directory structure") { script = Generate.from_directory(Dir.pwd).join("\n") }
         menu.choice("Skip") { }
@@ -35,14 +35,40 @@ module Buildr
 
     class << self
 
+      def compatibility_option(path)
+        # compile.options.target = '1.5'
+      end
+
+      def get_project_natures(projectFile)
+        return nil unless File.exists?(projectFile)
+        File.open(projectFile) do |f|
+          root = REXML::Document.new(f).root
+          return nil if root == nil
+          natures = root.elements.collect("natures/nature") { |n| n.text }
+          return natures if natures
+        end
+        return nil
+      end
+
+      def get_build_property(path, propertyName)
+        propertiesFile = File.join(path, 'build.properties')
+        return nil unless File.exists?(propertiesFile)
+        inhalt = Hash.from_java_properties(File.read(propertiesFile))
+        binDef = inhalt[propertyName]
+      end
+
+      def has_eclipse_project?
+        candidates = Dir.glob("**/.project")
+        return false if candidates.size == 0
+        candidates.find { |x| get_project_natures(x) }
+        return candidates.size > 0
+      end
+
+
       HEADER = "# Generated by Buildr #{Buildr::VERSION}, change to your liking\n\n"
 
-      def from_directory(path = Dir.pwd, root = true)
-        Dir.chdir(path) do
-          name = File.basename(path)
-          if root
-            script = HEADER.split("\n")
-            header = <<-EOF
+      def getEclipseBuildfileHeader(path, name)
+        x = <<-EOF
 #{"require 'buildr/scala'\n" if Dir.glob(path + "/**/*.scala").size > 0}
 #{"require 'buildr/groovy'\n" if Dir.glob(path + "/**/*.groovy").size > 0}
 # Version number for this release
@@ -52,7 +78,7 @@ GROUP = "#{name}"
 COPYRIGHT = ""
 
 # Specify Maven 2.0 remote repositories here, like this:
-repositories.remote << "http://www.ibiblio.org/maven2/"
+repositories.remote << "http://repo1.maven.org/maven2"
 
 desc "The #{name.capitalize} project"
 define "#{name}" do
@@ -61,6 +87,121 @@ define "#{name}" do
   project.group = GROUP
   manifest["Implementation-Vendor"] = COPYRIGHT
             EOF
+        return x
+      end
+
+      def setLayout(source=nil, output = nil)
+        script = ""
+        if source
+          source = source.sub(/\/$/, '') # remove trailing /
+          script += <<-EOF
+  layout[:source, :main, :java] = "#{source}"
+  layout[:source, :main, :scala] = "#{source}"
+EOF
+        end
+        if output
+          output = output.sub(/\/$/, '') # remove trailing /
+          script += <<-EOF
+  layout[:target, :main] = "#{output}"
+  layout[:target, :main, :java] = "#{output}"
+  layout[:target, :main, :scala] = "#{output}"
+EOF
+        end
+        return script
+      end
+
+      # tries to read as much information as needed at the moment from an existing Eclipse workspace
+      # Here are some links to the relevant information
+      # * http://help.eclipse.org/juno/index.jsp?topic=/org.eclipse.pde.doc.user/reference/pde_feature_generating_build.htm
+      # * http://wiki.eclipse.org/FAQ_What_is_the_plug-in_manifest_file_%28plugin.xml%29%3F
+      # * http://help.eclipse.org/juno/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/misc/bundle_manifest.html
+      # * http://help.eclipse.org/juno/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/misc/plugin_manifest.html
+      # * http://help.eclipse.org/juno/index.jsp?topic=/org.eclipse.pde.doc.user/tasks/pde_compilation_env.htm
+      def from_eclipse(path = Dir.pwd, root = true)
+        # We need two passes to be able to determine the dependencies correctly
+        Dir.chdir(path) do
+          name = File.basename(path)
+          dot_projects = []
+          mf = nil # avoid reloading manifest
+          if root
+            @@allProjects = Hash.new
+            @@topDir = File.expand_path(Dir.pwd)
+            script = HEADER.split("\n")
+            script << "require 'buildr/ide/eclipse'"
+            header = getEclipseBuildfileHeader(path, name)
+            script += header.split("\n")
+            script << "  # you may see hints about which jars are missing and should resolve them correctly"
+            script << "  # dependencies  << 'junit should be commented out and replace by correct ARTIFACT definition. Eg"
+            script << "  # dependencies  << 'junit:junit:jar:3.8.2'"
+            script << setLayout('src', 'bin') # default values for eclipse
+            dot_projects = Dir.glob('**/.project').find_all { |dot_project| get_project_natures(dot_project) }
+            dot_projects.sort.each { |dot_project| from_eclipse(File.dirname(dot_project), false) } if dot_projects
+          else
+            # Skip fragments. Buildr cannot handle it without the help of buildr4osgi
+            return [""] if File.exists?('fragment.xml')
+            projectName = name
+            version = ""
+            mfName = File.join('META-INF', 'MANIFEST.MF')
+            if File.exists?(mfName)
+              mf = Packaging::Java::Manifest.parse(IO.readlines(mfName).join(''))
+              if mf.main['Bundle-SymbolicName']
+                projectName = mf.main['Bundle-SymbolicName'].split(';')[0]
+                bundleVersion = mf.main['Bundle-Version']
+                version = ", :version => \"#{bundleVersion}\"" unless "1.0.0".eql?(bundleVersion)
+              end
+            end
+            # in the first run we just want to know that we exist
+            unless @@allProjects[projectName]
+              @@allProjects[projectName] = Dir.pwd
+              return
+            end
+            base_dir = ""
+            unless File.join(@@topDir, projectName).eql?(File.expand_path(Dir.pwd))
+              base_dir = ", :base_dir => \"#{File.expand_path(Dir.pwd).sub(@@topDir+File::SEPARATOR, '')}\""
+            end
+            script = [%{define "#{projectName}"#{version}#{base_dir} do}]
+          end
+          natures = get_project_natures('.project')
+          if natures && natures.index('org.eclipse.pde.PluginNature')
+            script << "  package(:jar)"
+          end
+          if mf && mf.main['Require-Bundle']
+            mf.main['Require-Bundle'].split(',').each do
+              |bundle|
+              requiredName = bundle.split(';')[0]
+              if @@allProjects.has_key?(requiredName)
+                script << "  dependencies << projects(\"#{requiredName}\")"
+              else
+                script << "  # dependencies  << '#{requiredName}'"
+              end
+            end
+          end
+          script << "  compile.with dependencies # Add more classpath dependencies" if Dir.glob(File.join('src', '**', '*.java')).size > 0
+          script << "  resources" if File.exist?("rsc")
+          sourceProp = get_build_property('.', 'source..')
+          outputProp = get_build_property('.', 'output..')
+          if (sourceProp && !/src\/+/.match(sourceProp)) or (outputProp && !/bin\/+/.match(outputProp))
+            setLayout(sourceProp, outputProp) # default values are overridden in this project
+          end
+          unless dot_projects.empty?
+            script << ""
+            dot_projects.sort.each do |dot_project|
+              next if File.dirname(File.expand_path(dot_project)).eql?(File.expand_path(Dir.pwd))
+              next unless get_project_natures(dot_project)
+              script << from_eclipse(File.dirname(dot_project), false).flatten.map { |line| "  " + line } << ""
+            end
+          end
+          script << "end\n\n"
+          script.flatten
+        end
+      end
+
+      def from_directory(path = Dir.pwd, root = true)
+        Dir.chdir(path) do
+          name = File.basename(path)
+          if root
+            script = HEADER.split("\n")
+            header = getEclipseBuildfileHeader(path, name)
             script += header.split("\n")
           else
             script = [ %{define "#{name}" do} ]
@@ -122,7 +263,7 @@ define "#{name}" do
             legacy = repository["layout"].to_s =~ /legacy/
             !legacy
           } rescue nil
-          repositories = [{"name" => "Standard maven2 repository", "url" => "http://www.ibiblio.org/maven2"}] if repositories.nil? || repositories.empty?
+          repositories = [{"name" => "Standard maven2 repository", "url" => "http://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
           repositories.each do |repository|
             name, url = repository["name"], repository["url"]
             script << "# #{name}"

data/lib/buildr/core/run.rb

@@ -23,7 +23,7 @@ module Buildr
 
       def run(task)
         fail "Missing :main option" unless task.options[:main]
-        cp = project.compile.dependencies + [project.path_to(:target, :classes)] + task.classpath
+        cp = project.compile.dependencies + [project.path_to(:target, :classes), project.path_to(:target, :resources)] + task.classpath
         Java::Commands.java(task.options[:main], {
           :properties => jrebel_props(project).merge(task.options[:properties] || {}),
           :classpath => cp,

data/lib/buildr/core/shell.rb

@@ -115,7 +115,7 @@ module Buildr
 
     private
       def jruby_home
-        @jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] : ENV['JRUBY_HOME']
+        @jruby_home ||= RUBY_PLATFORM =~ /java/ ? RbConfig::CONFIG['prefix'] : ENV['JRUBY_HOME']
       end
 
       def jruby_artifact

data/lib/buildr/core/test.rb

@@ -139,7 +139,7 @@ module Buildr
   # cases are written in Java, then JUnit is selected as the test framework.  You can also select
   # a specific test framework, for example, to use TestNG instead of JUnit:
   #   test.using :testng
-  class TestTask < Rake::Task
+  class TestTask < ::Rake::Task
 
     class << self
 

data/lib/buildr/core/util.rb

@@ -32,7 +32,7 @@ module Buildr
     # For JRuby, the value for RUBY_PLATFORM will always be 'java'
     # That's why this function checks on Config::CONFIG['host_os']
     def win_os?
-      Config::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
+      RbConfig::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
     end
 
     # Runs Ruby with these command line arguments.  The last argument may be a hash,
@@ -43,7 +43,7 @@ module Buildr
     def ruby(*args)
       options = Hash === args.last ? args.pop : {}
       cmd = []
-      ruby_bin = normalize_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
+      ruby_bin = normalize_path(RbConfig::CONFIG['ruby_install_name'], RbConfig::CONFIG['bindir'])
       if options.delete(:sudo) && !(win_os? || Process.uid == File.stat(ruby_bin).uid)
         cmd << 'sudo' << '-u' << "##{File.stat(ruby_bin).uid}"
       end
@@ -308,7 +308,7 @@ if Buildr::Util.java_platform?
 
   module RakeFileUtils #:nodoc:
     def rake_merge_option(args, defaults)
-      defaults[:verbose] = false if defaults[:verbose] == :default
+      defaults[:verbose] = false if defaults[:verbose] == Rake::FileUtilsExt::DEFAULT
 
       if Hash === args.last
         defaults.update(args.last)
@@ -396,7 +396,7 @@ if Buildr::Util.java_platform?
           ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
         }
       end
-      if RakeFileUtils.verbose_flag == :default
+      if RakeFileUtils.verbose_flag == Rake::FileUtilsExt::DEFAULT
         options[:verbose] = false
       else
         options[:verbose] ||= RakeFileUtils.verbose_flag
@@ -440,7 +440,7 @@ else
           ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
         }
       end
-      if RakeFileUtils.verbose_flag == :default
+      if RakeFileUtils.verbose_flag == Rake::FileUtilsExt::DEFAULT
         options[:verbose] = false
       else
         options[:verbose] ||= RakeFileUtils.verbose_flag

data/lib/buildr/ide/eclipse.rb

@@ -250,16 +250,16 @@ module Buildr
                     classpathentry.src project.test.resources
                   end
 
+                  project.eclipse.classpath_containers.each { |container|
+                    classpathentry.con container
+                  }
+
                   # Classpath elements from other projects
                   classpathentry.src_projects project_libs
 
                   classpathentry.output project.compile.target if project.compile.target
                   classpathentry.lib libs
                   classpathentry.var vars
-
-                  project.eclipse.classpath_containers.each { |container|
-                    classpathentry.con container
-                  }
                 end
               end
             end
@@ -413,12 +413,126 @@ module Buildr
       end
     end
 
+    module Plugin
+      include Extension
+
+      NATURE    = 'org.eclipse.pde.PluginNature'
+      CONTAINER = 'org.eclipse.pde.core.requiredPlugins'
+      BUILDERS   = ['org.eclipse.pde.ManifestBuilder', 'org.eclipse.pde.SchemaBuilder']
+
+      after_define do |project|
+        eclipse = project.eclipse
+
+        # smart defaults
+        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?
+        end
+
+        # :plugin nature explicitly set
+        if eclipse.natures.include? :plugin
+          unless eclipse.natures.include? NATURE
+            # plugin nature must be before java nature
+            eclipse.natures += [Buildr::Eclipse::Java::NATURE] unless eclipse.natures.include? Buildr::Eclipse::Java::NATURE
+            index = eclipse.natures.index(Buildr::Eclipse::Java::NATURE) || -1
+            eclipse.natures = eclipse.natures.insert(index, NATURE)
+          end
+          unless eclipse.classpath_containers.include? CONTAINER
+            # plugin container must be before java container
+            index = eclipse.classpath_containers.index(Buildr::Eclipse::Java::CONTAINER) || -1
+            eclipse.classpath_containers = eclipse.classpath_containers.insert(index, CONTAINER)
+          end
+          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, 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
+    end
+
+    module Scala
+      include Extension
+
+      NATURE    = 'ch.epfl.lamp.sdt.core.scalanature'
+      CONTAINER = 'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER'
+      BUILDER   = 'ch.epfl.lamp.sdt.core.scalabuilder'
+
+      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
+        if eclipse.natures.include? :scala
+          unless eclipse.natures.include? NATURE
+            # scala nature must be before java nature
+            eclipse.natures += [Buildr::Eclipse::Java::NATURE] unless eclipse.natures.include? Buildr::Eclipse::Java::NATURE
+            index = eclipse.natures.index(Buildr::Eclipse::Java::NATURE) || -1
+            eclipse.natures = eclipse.natures.insert(index, NATURE)
+          end
+          unless eclipse.classpath_containers.include? CONTAINER
+            # scala container must be before java container
+            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
+            # scala builder overrides java builder
+            eclipse.builders -= [Buildr::Eclipse::Java::BUILDER]
+            eclipse.builders += [BUILDER]
+          end
+          eclipse.exclude_libs += Buildr::Scala::Scalac.dependencies
+        end
+      end
+    end
+
+    module Java
+      include Extension
+
+      NATURE    = 'org.eclipse.jdt.core.javanature'
+      CONTAINER = 'org.eclipse.jdt.launching.JRE_CONTAINER'
+      BUILDER    = 'org.eclipse.jdt.core.javabuilder'
+
+      after_define do |project|
+        eclipse = project.eclipse
+
+        # smart defaults
+        if project.compile.language == :java || project.test.compile.language == :java
+          eclipse.natures = NATURE if eclipse.natures.empty?
+          eclipse.classpath_containers = CONTAINER if eclipse.classpath_containers.empty?
+          eclipse.builders = BUILDER if eclipse.builders.empty?
+        end
+
+        # :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
+        end
+      end
+    end
+
   end
 
 end # module Buildr
 
 class Buildr::Project
   include Buildr::Eclipse
+  include Buildr::Eclipse::Plugin
+  include Buildr::Eclipse::Scala
+  include Buildr::Eclipse::Java
 end