rake-compiler 1.0.8 → 1.1.2

data/lib/rake/javaextensiontask.rb

@@ -19,6 +19,9 @@ module Rake
 
     attr_accessor :encoding
 
+    # Specify lint option
+    attr_accessor :lint_option
+
     def platform
       @platform ||= 'java'
     end
@@ -32,10 +35,11 @@ module Rake
       @source_pattern = '**/*.java'
       @classpath      = nil
       @debug          = false
-      @source_version = '1.6'
-      @target_version = '1.6'
+      @source_version = '1.7'
+      @target_version = '1.7'
       @encoding       = nil
       @java_compiling = nil
+      @lint_option    = nil
     end
 
     def define
@@ -95,10 +99,19 @@ execute the Rake compilation task using the JRuby interpreter.
         EOF
         warn_once(not_jruby_compile_msg) unless defined?(JRUBY_VERSION)
 
-        classpath_arg = java_classpath_arg(@classpath)
-        debug_arg     = @debug ? '-g' : ''
-
-        sh "javac #{java_encoding_arg} #{java_extdirs_arg} -target #{@target_version} -source #{@source_version} -Xlint:unchecked #{debug_arg} #{classpath_arg} -d #{tmp_path} #{source_files.join(' ')}"
+        javac_command_line = [
+          "javac",
+          "-target", @target_version,
+          "-source", @source_version,
+          java_lint_arg,
+          "-d", tmp_path,
+        ]
+        javac_command_line.concat(java_encoding_args)
+        javac_command_line.concat(java_extdirs_args)
+        javac_command_line.concat(java_classpath_args)
+        javac_command_line << "-g" if @debug
+        javac_command_line.concat(source_files)
+        sh(*javac_command_line)
 
         # Checkpoint file
         touch "#{tmp_path}/.build"
@@ -188,38 +201,43 @@ execute the Rake compilation task using the JRuby interpreter.
     end
 
     #
-    # Discover Java Extension Directories and build an extdirs argument
+    # Discover Java Extension Directories and build an extdirs arguments
     #
-    def java_extdirs_arg
+    def java_extdirs_args
       extdirs = Java::java.lang.System.getProperty('java.ext.dirs') rescue nil
-      extdirs = ENV['JAVA_EXT_DIR'] unless extdirs
-      java_extdir = extdirs.nil? ? "" : "-extdirs \"#{extdirs}\""
+      extdirs ||= ENV['JAVA_EXT_DIR']
+      if extdirs.nil?
+        []
+      else
+        ["-extdirs", extdirs]
+      end
     end
 
     #
-    # Build an encoding argument
+    # Build an encoding arguments
     #
-    def java_encoding_arg
-      @encoding.nil? ? "" : "-encoding \"#{@encoding}\""
+    def java_encoding_args
+      if @encoding.nil?
+        []
+      else
+        ["-encoding", @encoding]
+      end
     end
 
     #
-    # Discover the Java/JRuby classpath and build a classpath argument
-    #
-    # @params
-    #   *args:: Additional classpath arguments to append
+    # Discover the Java/JRuby classpath and build a classpath arguments
     #
     # Copied verbatim from the ActiveRecord-JDBC project. There are a small myriad
     # of ways to discover the Java classpath correctly.
     #
-    def java_classpath_arg(*args)
+    def java_classpath_args
       jruby_cpath = nil
       if RUBY_PLATFORM =~ /java/
         begin
           cpath  = Java::java.lang.System.getProperty('java.class.path').split(File::PATH_SEPARATOR)
           cpath += Java::java.lang.System.getProperty('sun.boot.class.path').split(File::PATH_SEPARATOR)
           jruby_cpath = cpath.compact.join(File::PATH_SEPARATOR)
-        rescue => e
+        rescue
         end
       end
 
@@ -250,9 +268,21 @@ execute the Rake compilation task using the JRuby interpreter.
         raise "Could not find jruby.jar. Please set JRUBY_HOME or use jruby in rvm"
       end
 
-      jruby_cpath += File::PATH_SEPARATOR + args.join(File::PATH_SEPARATOR) unless args.empty?
-      jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
+      if @classpath and @classpath.size > 0
+        jruby_cpath = [jruby_cpath, *@classpath].join(File::PATH_SEPARATOR)
+      end
+      ["-cp", jruby_cpath]
     end
 
+    #
+    # Convert a `-Xlint:___` linting option such as `deprecation` into a full javac argument, such as `-Xlint:deprecation`.
+    #
+    # @return [String]              Default: _Simply `-Xlint` is run, which enables recommended warnings.
+    #
+    def java_lint_arg
+      return '-Xlint' unless @lint_option
+
+      "-Xlint:#{@lint_option}"
+    end
   end
 end

data/spec/lib/rake/javaextensiontask_spec.rb

@@ -76,9 +76,14 @@ describe Rake::JavaExtensionTask do
       @ext.config_options.should be_empty
     end
 
+    it 'should have no lint option preset to delegate' do
+      @ext.lint_option.should be_falsey
+    end
+
     it 'should default to Java platform' do
       @ext.platform.should == 'java'
     end
+  end
 
   context '(tasks)' do
     before :each do
@@ -165,6 +170,31 @@ describe Rake::JavaExtensionTask do
         end
       end
     end
+
+    context 'A custom extension' do
+      let(:extension) do
+        Rake::JavaExtensionTask.new('extension_two') do |ext|
+          ext.lint_option = lint_option if lint_option
+        end
+      end
+
+      context 'without a specified lint option' do
+        let(:lint_option) { nil }
+
+        it 'should honor the lint option' do
+          (extension.lint_option).should be_falsey
+          (extension.send :java_lint_arg).should eq '-Xlint'
+        end
+      end
+
+      context "with a specified lint option of 'deprecated'" do
+        let(:lint_option) { 'deprecated'.freeze }
+
+        it 'should honor the lint option' do
+          (extension.lint_option).should eq lint_option
+          (extension.send :java_lint_arg).should eq '-Xlint:deprecated'
+        end
+      end
     end
   end
   private

data/tasks/bin/cross-ruby.rake

@@ -41,127 +41,104 @@ end
 require 'rake/extensioncompiler'
 
 MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system("#{c} -v > /dev/null 2>&1") }
-USER_HOME = File.expand_path("~/.rake-compiler")
-RUBY_CC_VERSION = "ruby-" << ENV.fetch("VERSION", "1.8.7-p371")
+USER_HOME = File.realpath(File.expand_path("~/.rake-compiler"))
 RUBY_SOURCE = ENV['SOURCE']
 RUBY_BUILD = RbConfig::CONFIG["host"]
 
-# grab the major "1.8" or "1.9" part of the version number
-MAJOR = RUBY_CC_VERSION.match(/.*-(\d.\d).\d/)[1]
-
-# Use Rake::ExtensionCompiler helpers to find the proper host
-MINGW_HOST = ENV['HOST'] || Rake::ExtensionCompiler.mingw_host
-MINGW_TARGET = MINGW_HOST.gsub('msvc', '')
-
 # Unset any possible variable that might affect compilation
-["CC", "CXX", "CPPFLAGS", "LDFLAGS", "RUBYOPT"].each do |var|
+["RUBYOPT"].each do |var|
   ENV.delete(var)
 end
 
-# define a location where sources will be stored
-directory "#{USER_HOME}/sources/#{RUBY_CC_VERSION}"
-directory "#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}"
-
-# clean intermediate files and folders
-CLEAN.include("#{USER_HOME}/sources/#{RUBY_CC_VERSION}")
-CLEAN.include("#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}")
-
-# remove the final products and sources
-CLOBBER.include("#{USER_HOME}/sources")
-CLOBBER.include("#{USER_HOME}/builds")
-CLOBBER.include("#{USER_HOME}/ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}")
-CLOBBER.include("#{USER_HOME}/config.yml")
+RUBY_CC_VERSIONS = ENV.fetch("VERSION", "1.8.7-p371")
+RUBY_CC_VERSIONS.split(":").each do |ruby_cc_version|
+  ruby_cc_version = "ruby-" + ruby_cc_version
+  # grab the major "1.8" or "1.9" part of the version number
+  major = ruby_cc_version.match(/.*-(\d.\d).\d/)[1]
+
+  # define a location where sources will be stored
+  source_dir = "#{USER_HOME}/sources/#{ruby_cc_version}"
+  directory source_dir
+  # clean intermediate files and folders
+  CLEAN.include(source_dir)
+
+  # remove the final products and sources
+  CLOBBER.include("#{USER_HOME}/sources")
+  CLOBBER.include("#{USER_HOME}/builds")
+  CLOBBER.include("#{USER_HOME}/config.yml")
+
+  # Extract the sources
+  source_file = RUBY_SOURCE ? RUBY_SOURCE.split('/').last : "#{ruby_cc_version}.tar.gz"
+  file source_dir => ["#{USER_HOME}/sources/#{source_file}"] do |t|
+    t.prerequisites.each { |f| sh "tar xf #{File.basename(f)}", chdir: File.dirname(t.name) }
+  end
 
-# ruby source file should be stored there
-file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}.tar.bz2" => ["#{USER_HOME}/sources"] do |t|
-  # download the source file using wget or curl
-  chdir File.dirname(t.name) do
+  # ruby source file should be stored there
+  file "#{USER_HOME}/sources/#{ruby_cc_version}.tar.gz" => ["#{USER_HOME}/sources"] do |t|
+    # download the source file using wget or curl
     if RUBY_SOURCE
       url = RUBY_SOURCE
     else
-      url = "http://cache.ruby-lang.org/pub/ruby/#{MAJOR}/#{File.basename(t.name)}"
+      url = "http://cache.ruby-lang.org/pub/ruby/#{major}/#{File.basename(t.name)}"
     end
-    sh "wget #{url} || curl -O #{url}"
+    sh "wget #{url} || curl -O #{url}", chdir: File.dirname(t.name)
   end
-end
 
-# Extract the sources
-source_file = RUBY_SOURCE ? RUBY_SOURCE.split('/').last : "#{RUBY_CC_VERSION}.tar.bz2"
-file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}" => ["#{USER_HOME}/sources/#{source_file}"] do |t|
-  chdir File.dirname(t.name) do
-    t.prerequisites.each { |f| sh "tar xf #{File.basename(f)}" }
-  end
-end
-
-# backup makefile.in
-file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}/Makefile.in.bak" => ["#{USER_HOME}/sources/#{RUBY_CC_VERSION}"] do |t|
-  cp "#{USER_HOME}/sources/#{RUBY_CC_VERSION}/Makefile.in", t.name
-end
-
-# correct the makefiles
-file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}/Makefile.in" => ["#{USER_HOME}/sources/#{RUBY_CC_VERSION}/Makefile.in.bak"] do |t|
-  content = File.open(t.name, 'rb') { |f| f.read }
-
-  out = ""
-
-  content.each_line do |line|
-    if line =~ /^\s*ALT_SEPARATOR =/
-      out << "\t\t    ALT_SEPARATOR = \"\\\\\\\\\"; \\\n"
-    else
-      out << line
+  # Create tasks for each host out of the ":" separated hosts list in the HOST variable.
+  # These tasks are processed in parallel as dependencies to the "install" task.
+  mingw_hosts = ENV['HOST'] || Rake::ExtensionCompiler.mingw_host
+  mingw_hosts.split(":").each do |mingw_host|
+
+    # Use Rake::ExtensionCompiler helpers to find the proper host
+    mingw_target = mingw_host.gsub('msvc', '')
+
+    # define a location where built files for each host will be stored
+    build_dir = "#{USER_HOME}/builds/#{mingw_host}/#{ruby_cc_version}"
+    directory build_dir
+    install_dir = "#{USER_HOME}/ruby/#{mingw_host}/#{ruby_cc_version}"
+
+    # clean intermediate files and folders
+    CLEAN.include(build_dir)
+    CLOBBER.include(install_dir)
+
+    task :mingw32 do
+      unless mingw_host then
+        warn "You need to install mingw32 cross compile functionality to be able to continue."
+        warn "Please refer to your distribution/package manager documentation about installation."
+        fail
+      end
     end
-  end
 
-  when_writing("Patching Makefile.in") {
-    File.open(t.name, 'wb') { |f| f.write(out) }
-  }
-end
-
-task :mingw32 do
-  unless MINGW_HOST then
-    warn "You need to install mingw32 cross compile functionality to be able to continue."
-    warn "Please refer to your distribution/package manager documentation about installation."
-    fail
-  end
-end
-
-# generate the makefile in a clean build location
-file "#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/Makefile" => ["#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}",
-                                  "#{USER_HOME}/sources/#{RUBY_CC_VERSION}/Makefile.in"] do |t|
-
-  options = [
-    "--host=#{MINGW_HOST}",
-    "--target=#{MINGW_TARGET}",
-    "--build=#{RUBY_BUILD}",
-    '--enable-shared',
-    '--disable-install-doc',
-    '--with-ext='
-  ]
-
-  # Force Winsock2 for Ruby 1.8, 1.9 defaults to it
-  options << "--with-winsock2" if MAJOR == "1.8"
-
-  chdir File.dirname(t.name) do
-    prefix = File.expand_path("../../../ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}")
-    options << "--prefix=#{prefix}"
-    sh File.expand_path("../../../sources/#{RUBY_CC_VERSION}/configure"), *options
-  end
-end
+    # generate the makefile in a clean build location
+    file "#{build_dir}/Makefile" => [build_dir, source_dir] do |t|
+
+      options = [
+        "--host=#{mingw_host}",
+        "--target=#{mingw_target}",
+        "--build=#{RUBY_BUILD}",
+        '--enable-shared',
+        '--disable-install-doc',
+        '--with-ext=',
+      ]
+
+      # Force Winsock2 for Ruby 1.8, 1.9 defaults to it
+      options << "--with-winsock2" if major == "1.8"
+      options << "--prefix=#{install_dir}"
+      sh File.expand_path("#{USER_HOME}/sources/#{ruby_cc_version}/configure"), *options, chdir: File.dirname(t.name)
+    end
 
-# make
-file "#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/ruby.exe" => ["#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/Makefile"] do |t|
-  chdir File.dirname(t.prerequisites.first) do
-    sh MAKE
-  end
-end
+    # make
+    file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t|
+      sh MAKE, chdir: File.dirname(t.prerequisites.first)
+    end
 
-# make install
-file "#{USER_HOME}/ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}/bin/ruby.exe" => ["#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/ruby.exe"] do |t|
-  chdir File.dirname(t.prerequisites.first) do
-    sh "#{MAKE} install"
+    # make install
+    file "#{USER_HOME}/ruby/#{mingw_host}/#{ruby_cc_version}/bin/ruby.exe" => ["#{build_dir}/ruby.exe"] do |t|
+      sh "#{MAKE} install", chdir: File.dirname(t.prerequisites.first)
+    end
+    multitask :install => ["#{USER_HOME}/ruby/#{mingw_host}/#{ruby_cc_version}/bin/ruby.exe"]
   end
 end
-task :install => ["#{USER_HOME}/ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}/bin/ruby.exe"]
 
 desc "Update rake-compiler list of installed Ruby versions"
 task 'update-config' do
@@ -208,6 +185,5 @@ task :default do
   Rake.application.display_tasks_and_comments
 end
 
-desc "Build #{RUBY_CC_VERSION} suitable for cross-platform development."
+desc "Build rubies suitable for cross-platform development."
 task 'cross-ruby' => [:mingw32, :install, 'update-config']
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -77,14 +77,14 @@ executables:
 - rake-compiler
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 - LICENSE.txt
-- History.txt
+- History.md
 files:
 - Gemfile
-- History.txt
+- History.md
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - appveyor.yml
 - bin/rake-compiler
@@ -129,7 +129,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--main"
-- README.rdoc
+- README.md
 - "--title"
 - rake-compiler -- Documentation
 require_paths:
@@ -145,8 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: Rake-based Ruby Extension (C, Java) task generator.