buildr 1.4.7-x86-mswin32 → 1.4.8-x86-mswin32

data/lib/buildr/java/commands.rb

@@ -62,7 +62,7 @@ module Java
             # If our cmd line is longer, we create a batch file and execute it instead.
           if Util.win_os? &&  cmd_args.map(&:inspect).join(' ').size > 2048
             # remove '-classpath' and the classpath itself from the cmd line.
-            cp_i = cmd_args.index{|x| x.starts_with('-classpath')}
+            cp_i = cmd_args.index{|x| x.to_s =~ /^-classpath/}
             2.times do
               cmd_args.delete_at cp_i unless cp_i.nil?
             end

data/lib/buildr/java/rjb.rb

@@ -13,6 +13,11 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+if RbConfig::CONFIG['host_os'] =~ /darwin/i
+  # On OS X we attempt to guess where JAVA_HOME is, if not set
+  # We set JAVA_HOME early so we can use it without calling Java.load first.
+  ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home'
+end
 
 require 'rjb'
 
@@ -72,10 +77,6 @@ module Java
 
   end
 
-  # On OS X we know where the default JDK is. We can try to guess for other OS.
-  # We set JAVA_HOME early so we can use it without calling Java.load first.
-  ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if RbConfig::CONFIG['host_os'] =~ /darwin/i
-
   class << self
 
     # Returns the classpath, an array listing directories, JAR files and

data/lib/buildr/packaging/artifact.rb

@@ -814,7 +814,7 @@ module Buildr
   def transitive(*args)
     options = Hash === args.last ? args.pop : {}
     dep_opts = {
-      :scopes   => options[:scopes] || [nil, "compile", "runtime", "provided"],
+      :scopes   => options[:scopes] || [nil, "compile", "runtime"],
       :optional => options[:optional]
     }
     specs = args.flatten

data/lib/buildr/packaging/ziptask.rb

@@ -157,8 +157,8 @@ module Buildr
                   dest = File.expand_path(dest, target.to_s)
                   trace "Extracting #{dest}"
                   mkpath File.dirname(dest) rescue nil
-                  #entry.restore_permissions = true
-                  File.open(dest, 'wb') {|f| f.write entry.read}
+                  File.open(dest, 'wb', entry.mode) {|f| f.write entry.read}
+                  File.chmod(entry.mode, dest)
                 end
               end
             end

data/lib/buildr/scala.rb

@@ -15,7 +15,7 @@
 
 
 ENV['SCALA_HOME'] ||= '/opt/local/share/scala/' if File.exist?('/opt/local/share/scala/lib/scala-compiler.jar')
-Buildr.repositories.remote << 'http://scala-tools.org/repo-releases'
+Buildr.repositories.remote << 'http://oss.sonatype.org/content/repositories/releases'
 
 require 'buildr/scala/compiler'
 require 'buildr/scala/tests'

data/lib/buildr/scala/bdd.rb

@@ -134,8 +134,10 @@ module Buildr::Scala
     VERSION = case
       when Buildr::Scala.version?("2.8.0"),  Buildr::Scala.version?("2.8.1"), Buildr::Scala.version?("2.8.2")
         '1.5'
+      when Buildr::Scala.version?("2.9")
+        '1.11'
       else
-        '1.6.1'
+        fail "No default specs2 version for Scala #{Scala.version_without_build}"
     end
 
     class << self
@@ -150,7 +152,12 @@ module Buildr::Scala
       end
 
       def artifact
-        Buildr.settings.build['scala.specs2.artifact'] || "specs2_#{Buildr::Scala.version_without_build}"
+        case
+          when Buildr.settings.build['scala.specs2.artifact']
+            Buildr.settings.build['scala.specs2.artifact']
+          else
+            "specs2_#{Buildr::Scala.version_without_build}"
+        end
       end
 
       def scalaz_dependencies

data/lib/buildr/scala/compiler.rb

@@ -14,7 +14,7 @@
 # the License.
 
 module Buildr::Scala
-  DEFAULT_VERSION = '2.9.1'
+  DEFAULT_VERSION = '2.9.2'
 
   class << self
 
@@ -80,6 +80,10 @@ module Buildr::Scala
   # * :other       -- Array of options to pass to the Scalac compiler as is, e.g. -Xprint-types
   class Scalac < Buildr::Compiler::Base
 
+    DEFAULT_ZINC_VERSION  = '0.1.0'
+    DEFAULT_SBT_VERSION   = '0.12.0'
+    DEFAULT_JLINE_VERSION = '1.0'
+
     # The scalac compiler jars are added to classpath at load time,
     # if you want to customize artifact versions, you must set them on the
     #
@@ -93,6 +97,17 @@ module Buildr::Scala
       ns.compiler!     'org.scala-lang:scala-compiler:jar:>=' + version
     end
 
+    ZINC_REQUIRES = ArtifactNamespace.for(self) do |ns|
+      zinc_version  = Buildr.settings.build['zinc.version']  || DEFAULT_ZINC_VERSION
+      sbt_version   = Buildr.settings.build['sbt.version']   || DEFAULT_SBT_VERSION
+      jline_version = Buildr.settings.build['jline.version'] || DEFAULT_JLINE_VERSION
+      ns.zinc!          "com.typesafe.zinc:zinc:jar:>=#{zinc_version}"
+      ns.sbt_interface! "com.typesafe.sbt:sbt-interface:jar:>=#{sbt_version}"
+      ns.incremental!   "com.typesafe.sbt:incremental-compiler:jar:>=#{sbt_version}"
+      ns.compiler_interface_sources! "com.typesafe.sbt:compiler-interface:jar:sources:>=#{sbt_version}"
+      ns.jline!        "jline:jline:jar:>=#{jline_version}"
+    end
+
     class << self
       def scala_home
         env_home = ENV['SCALA_HOME']
@@ -117,11 +132,15 @@ module Buildr::Scala
       end
 
       def dependencies
-        if use_installed?
+        scala_dependencies = if use_installed?
           ['scala-library', 'scala-compiler'].map { |s| File.expand_path("lib/#{s}.jar", scala_home) }
         else
           REQUIRES.artifacts.map(&:to_s)
         end
+
+        zinc_dependencies = ZINC_REQUIRES.artifacts.map(&:to_s)
+
+        scala_dependencies + zinc_dependencies
       end
 
       def use_fsc
@@ -155,11 +174,18 @@ module Buildr::Scala
       options[:optimise] ||= false
       options[:make] ||= :transitivenocp if Scala.version? 2.8
       options[:javac] ||= {}
-
       @java = Javac.new(project, options[:javac])
     end
 
     def compile(sources, target, dependencies) #:nodoc:
+      if zinc?
+        compile_with_zinc(sources, target, dependencies)
+      else
+        compile_with_scalac(sources, target, dependencies)
+      end
+    end
+
+    def compile_with_scalac(sources, target, dependencies) #:nodoc:
       check_options(options, OPTIONS + (Scala.version?(2.8) ? [:make] : []))
 
       java_sources = java_sources(sources)
@@ -211,6 +237,40 @@ module Buildr::Scala
       end
     end
 
+    def compile_with_zinc(sources, target, dependencies) #:nodoc:
+
+      java_sources = java_sources(sources)
+
+      dependencies.unshift target
+
+      cmd_args = []
+      cmd_args << '-sbt-interface' << REQUIRES.sbt_interface.artifact
+      cmd_args << '-compiler-interface' << REQUIRES.compiler_interface_sources.artifact
+      cmd_args << '-scala-library' << dependencies.find { |d| d =~ /scala-library/ }
+      cmd_args << '-scala-compiler' << dependencies.find { |d| d =~ /scala-compiler/ }
+      cmd_args << '-classpath' << dependencies.join(File::PATH_SEPARATOR)
+      source_paths = sources.select { |source| File.directory?(source) }
+      cmd_args << '-Ssourcepath' << ("-S" + source_paths.join(File::PATH_SEPARATOR)) unless source_paths.empty?
+      cmd_args << '-d' << File.expand_path(target)
+      cmd_args += scalac_args
+      cmd_args << "-debug" if trace?(:scalac)
+
+      cmd_args.map!(&:to_s)
+
+      cmd_args += files_from_sources(sources)
+
+      unless Buildr.application.options.dryrun
+        trace((['com.typesafe.zinc.Main.main'] + cmd_args).join(' '))
+
+        Java.load
+        begin
+          Java.com.typesafe.zinc.Main.main(cmd_args.to_java(Java.java.lang.String))
+        rescue => e
+          fail "Zinc compiler crashed:\n#{e.inspect}\n#{e.backtrace.join("\n")}"
+        end
+      end
+    end
+
   protected
 
     # :nodoc: see Compiler:Base
@@ -255,6 +315,10 @@ module Buildr::Scala
 
   private
 
+    def zinc?
+      (options[:incremental] || @project.scalac_options.incremental || (Buildr.settings.build['scalac.incremental'].to_s == "true"))
+    end
+
     def count(file, pattern)
       count = 0
       File.open(file, "r") do |infile|
@@ -283,13 +347,39 @@ module Buildr::Scala
       args << "-deprecation" if options[:deprecation]
       args << "-optimise" if options[:optimise]
       args << "-target:jvm-" + options[:target].to_s if options[:target]
-      args + Array(options[:other])
+      args += Array(options[:other])
+      if zinc?
+        args.map { |arg| "-S" + arg } + Array(options[:zinc_options])
+      else
+        args
+      end
     end
+  end
 
+  module ProjectExtension
+    def scalac_options
+      @scalac ||= ScalacOptions.new(self)
+    end
   end
 
+  class ScalacOptions
+    attr_writer :incremental
+
+    def initialize(project)
+      @project = project
+    end
+
+    def incremental
+      @incremental || (@project.parent ? @project.parent.scalac_options.incremental : nil)
+    end
+  end
 end
 
 # Scala compiler comes first, ahead of Javac, this allows it to pick
 # projects that mix Scala and Java code by spotting Scala code first.
 Buildr::Compiler.compilers.unshift Buildr::Scala::Scalac
+
+class Buildr::Project
+  include Buildr::Scala::ProjectExtension
+end
+

data/lib/buildr/scala/doc.rb

@@ -23,8 +23,13 @@ module Buildr
       after_define(:scaladoc => :doc) do |project|
         if project.doc.engine? Scaladoc
           options = project.doc.options
-          key = Scala.version?(2.7) ? :windowtitle : "doc-title".to_sym
-          options[key] = (project.comment || project.name) unless options[key]
+          if Scala.version?(2.7)
+            options[:windowtitle] = (project.comment || project.name) unless options[:windowtitle]
+          else
+            doc_title = "doc-title".to_sym
+            options[doc_title] = (project.comment || project.name) unless options[doc_title]
+            options.delete(:windowtitle) if options[:windowtitle]
+          end
         end
       end
     end
@@ -33,7 +38,8 @@ module Buildr
       specify :language => :scala, :source_ext => 'scala'
 
       def generate(sources, target, options = {})
-        cmd_args = [ '-d', target, trace?(:scaladoc) ? '-verbose' : '' ]
+        cmd_args = [ '-d', target]
+        cmd_args << '-verbose' if trace?(:scaladoc)
         options.reject { |key, value| [:sourcepath, :classpath].include?(key) }.
           each { |key, value| value.invoke if value.respond_to?(:invoke) }.
           each do |key, value|
@@ -74,11 +80,17 @@ module Buildr
 
     class VScaladoc < Base
       VERSION = '1.2-m1'
-      Buildr.repositories.remote << 'http://scala-tools.org/repo-snapshots'
+      Buildr.repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
 
       class << self
         def dependencies
-          [ "org.scala-tools:vscaladoc:jar:#{VERSION}" ]
+          case
+            when Buildr::Scala.version?("2.7")
+              [ "org.scala-tools:vscaladoc:jar:#{VERSION}" ]
+            else
+              warn "VScaladoc does not support Scala 2.8+"
+              []
+          end
         end
       end
 

data/lib/buildr/scala/tests.rb

@@ -40,7 +40,7 @@ module Buildr::Scala
       when Buildr::Scala.version?("2.8.1")
         '1.8'
       else
-        '1.9'
+        '1.10.0'
     end
 
     class << self
@@ -58,10 +58,16 @@ module Buildr::Scala
 
       def dependencies
         return [version] if (version =~ /:/)
+        group = case
+          when version =~ /^1.[67]/
+            "org.scala-tools.testing"
+          else
+            "org.scalacheck"
+        end
         if classifier
-          ["org.scala-tools.testing:#{artifact}:jar:#{classifier}:#{version}"]
+          ["#{group}:#{artifact}:jar:#{classifier}:#{version}"]
         else
-          ["org.scala-tools.testing:#{artifact}:jar:#{version}"]
+          ["#{group}:#{artifact}:jar:#{version}"]
         end
       end
 
@@ -83,7 +89,12 @@ module Buildr::Scala
   # * :java_args   -- Arguments passed as is to the JVM.
   class ScalaTest < Buildr::TestFramework::Java
 
-    VERSION = Buildr::Scala.version?(2.7, 2.8) ? '1.3' : '1.6.1'
+    VERSION = case
+      when Buildr::Scala.version?(2.7)
+        '1.3'
+      else
+        '1.8'
+    end
 
     class << self
       def version

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr
-  VERSION = '1.4.7'.freeze
+  VERSION = '1.4.8'.freeze
 end

data/rakelib/all-in-one.rake

@@ -13,60 +13,57 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-desc "Create JRuby all-in-one distribution"
-task "all-in-one" => 'all-in-one:all-in-one'
+def workspace_dir
+  "#{File.expand_path(File.join(File.dirname(__FILE__), ".."))}"
+end
+
+desc 'Create JRuby all-in-one distribution'
+task 'all-in-one' => 'all-in-one:all-in-one'
 
-namespace :'all-in-one' do
+namespace 'all-in-one' do
 
-  version = "1.6.4"
+  version = '1.6.7'
   jruby_distro = "jruby-bin-#{version}.tar.gz"
   url = "http://jruby.org.s3.amazonaws.com/downloads/#{version}/#{jruby_distro}"
   dir = "jruby-#{version}"
 
-  task "all-in-one" => [:gem,
-      # Prepare to run
-      :prepare,
-      # Download and extract JRuby
-      :download_and_extract,
-      # Cleanup JRuby distribution
-      :clean_dist,
-      # Install Buildr gem and dependencies
-      :install_dependencies,
-      # Add Buildr executables/scripts
-      :add_execs,
-      # Package distribution
-      :package
-    ]
+  task 'all-in-one' => %w(gem prepare download_and_extract clean_dist install_dependencies add_execs package)
 
   desc 'Prepare to run'
-  task :prepare do
+  task 'prepare' do
     mkpath '_all-in-one'
     cd '_all-in-one'
   end
 
   desc 'Download and extract JRuby'
-  task :download_and_extract do
-    unless File.exist? jruby_distro
+  task 'download_and_extract' do
+    unless File.exist?(jruby_distro)
       puts "Downloading JRuby from #{url} ..."
-      sh 'wget', url
-      puts "[X] Downloaded JRuby"
+      require 'open-uri'
+      File.open(jruby_distro, "wb") do |saved_file|
+        # the following "open" is provided by open-uri
+        open(url) do |read_file|
+          saved_file.write(read_file.read)
+        end
+      end
+      puts '[X] Downloaded JRuby'
     end
 
     rm_rf dir if File.exist? dir
 
     puts "Extracting JRuby to #{dir} ..."
     sh 'tar', 'xzf', jruby_distro
-    puts "[X] Extracted JRuby"
+    puts '[X] Extracted JRuby'
     cd dir
   end
 
   desc 'Cleanup JRuby distribution'
-  task :clean_dist do
+  task 'clean_dist' do
     puts 'Cleaning...'
     rm_rf 'docs'
     mkpath 'jruby-docs'
-    mv Dir["COPYING*"], 'jruby-docs'
-    mv Dir["LICENSE*"], 'jruby-docs'
+    mv Dir['COPYING*'], 'jruby-docs'
+    mv Dir['LICENSE*'], 'jruby-docs'
     mv 'README', 'jruby-docs'
     rm_rf 'lib/ruby/1.9'
     rm_rf 'lib/ruby/gems/1.8/doc'
@@ -75,48 +72,54 @@ namespace :'all-in-one' do
   end
 
   desc 'Install Buildr gem and dependencies'
-  task :install_dependencies do
-    puts "Install rubygems-update"
-    sh "bin/jruby -S gem install rubygems-update"
+  task 'install_dependencies' do
+    puts 'Install ffi-ncurses'
+    sh 'bin/jruby -S gem install -b ffi-ncurses --version 0.4.0'
 
-    puts "Upgrade Rubygems"
-    sh "bin/jruby -S gem update --system"
+    puts 'Install rubygems-update'
+    sh 'bin/jruby -S gem install -b rubygems-update'
 
-    puts "Install ffi-ncurses"
-    sh "bin/jruby -S gem install ffi-ncurses"
+    # Disabled until we can figure out why it does not work in the CI
+    #puts 'Upgrade Rubygems'
+    #sh 'bin/jruby -S gem update --system'
 
-    puts "Install Buildr gem ..."
-    sh "bin/jruby", '-S', 'gem', 'install', FileList['../../pkg/*-java.gem'].first,
+    puts 'Install Buildr gem ...'
+    sh 'bin/jruby', '-S', 'gem', 'install', FileList['../../pkg/*-java.gem'].first,
        '--no-rdoc', '--no-ri'
-    puts "[X] Install Buildr gem"
+    puts '[X] Install Buildr gem'
   end
 
   desc 'Add Buildr executables/scripts'
-  task :add_execs do
+  task 'add_execs' do
     cp 'bin/jruby.exe', 'bin/_buildr.exe'
-    cp Dir["../../all-in-one/*"], 'bin'
+    cp "#{workspace_dir}/all-in-one/buildr", 'bin/buildr'
+    cp "#{workspace_dir}/all-in-one/_buildr", 'bin/_buildr'
+    cp "#{workspace_dir}/all-in-one/buildr.cmd", 'bin/buildr.cmd'
+    File.chmod(0500, 'bin/_buildr', 'bin/buildr')
   end
 
   desc 'Package distribution'
-  task :package do
-    puts "Zipping distribution ..."
+  task 'package' do
+    pkg_dir = "#{workspace_dir}/pkg"
+    mkpath pkg_dir
+    puts 'Zipping distribution ...'
     cd '..'
     new_dir  = "#{spec.name}-all-in-one-#{spec.version}"
     mv dir, new_dir
-    zip = "#{new_dir}.zip"
+    zip = "#{pkg_dir}/#{new_dir}.zip"
     rm zip if File.exist? zip
     sh 'zip', '-q', '-r', zip, new_dir
-    puts "[X] Zipped distribution"
+    puts '[X] Zipped distribution'
 
-    puts "Tarring distribution ..."
-    tar = "#{new_dir}.tar.gz"
+    puts 'Tarring distribution ...'
+    tar = "#{pkg_dir}/#{new_dir}.tar.gz"
     rm tar if File.exist? tar
     sh 'tar', 'czf', tar, new_dir
-    puts "[X] Tarred distribution"
+    puts '[X] Tarred distribution'
 
     rm_rf new_dir
   end
 
 end
 
-task(:clobber) { rm_rf '_all-in-one' }
+task('clobber') { rm_rf '_all-in-one' }