jruby-launcher 1.1.10-java → 1.1.11-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3b24c5f7f39dc16c443b3023c06d46d7c2aca8fad7b8a00df2edda6247d00873
-  data.tar.gz: a5f8980eac3ecf0a8aa90f9bbae75263ffbe2fd789105c29a01abf4e9e62ad18
+SHA1:
+  metadata.gz: 0df0a6555d52db18638a42846c682ec11d845ec4
+  data.tar.gz: e94a1ad4c0c9f5f4bb80cc33d3d063f9d3495ba8
 SHA512:
-  metadata.gz: 48a8a233f7bdcf6ad4f9ed1356a5583222408913710715e6b270b9d65c005e55a89b48b6a7c94d255bdf895db592109ff5d72adbfe504ea84ad7f90b82729b20
-  data.tar.gz: 0cbf35cfaed6b9ff60e4bd9cbfdde9dae18434ca4004ab983a13c0a29ff94f4f1cf5aad32f7b4f476efc8405b154cd58145065a50c2ebfd3ea79b0471cc4390c
+  metadata.gz: 64ef44c1a08fd07bf5d07d1c23f78d2d8af65cfa3dfed5d694f4bb7f545ddc5b4aff32b34ab458f4ac5ada50a6f6be938f8f9794cde9e2a35c6b34e4258752b1
+  data.tar.gz: 99cae0daa07fb6456fc70510ac10bcaeb1b892be5702a0399cc20236ceb4692d8d687310e9d558b110ba7bcfbd7b1671722b136be90556dcb9d609ecb0626e41

data/Makefile

@@ -1,6 +1,8 @@
 # These line gets substituted with the actual Config::CONFIG items location by extconf.rb
 PREFIX = notspecified
 BINDIR = $(PREFIX)/bin
+JRUBY_VERSION = notspecified
+JRUBY_MODULE =
 INSTALLDIR = $(PREFIX)/lib/ruby/shared/rubygems/defaults
 INSTALLDIR9000 = $(PREFIX)/lib/ruby/stdlib/rubygems/defaults
 OLDINSTALLDIR = $(PREFIX)/lib/ruby/site_ruby/1.8/rubygems/defaults

data/argparser.cpp

@@ -498,12 +498,25 @@ void ArgParser::prepareOptions() {
     }
 
     if (useModulePath) {
-        javaOptions.push_back("--add-opens");
-        javaOptions.push_back("java.base/java.io=org.jruby.dist");
-        javaOptions.push_back("--add-opens");
-        javaOptions.push_back("java.base/java.nio.channels=org.jruby.dist");
-        javaOptions.push_back("--add-opens");
-        javaOptions.push_back("java.base/sun.nio.ch=org.jruby.dist");
+        string moduleOptsFile = platformDir + "/bin/.jruby.module_opts";
+        if (access(moduleOptsFile.c_str(), R_OK) == 0) {
+            logMsg("using @arguments file for Java module options");
+            javaOptions.push_back(string("@") + platformDir + "/bin/.jruby.module_opts");
+        } else {
+            // If .module_opts file is not detected, only add options if JRUBY_MODULE is defined.
+            // See extconf.rb for rules on which JRuby versions get JRUBY_MODULE.
+#ifdef JRUBY_MODULE
+            logMsg("using hardcoded module options");
+            javaOptions.push_back("--add-opens");
+            javaOptions.push_back("java.base/java.io=org.jruby.dist");
+            javaOptions.push_back("--add-opens");
+            javaOptions.push_back("java.base/java.nio.channels=org.jruby.dist");
+            javaOptions.push_back("--add-opens");
+            javaOptions.push_back("java.base/sun.nio.ch=org.jruby.dist");
+#else
+            logMsg("no JRuby module support detected, skipping module flags");
+#endif
+        }
     }
 
     if (separateProcess) {

data/extconf.rb

@@ -1,5 +1,13 @@
 mf = File.read('Makefile')
 mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{RbConfig::CONFIG['bindir']}")
 mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(RbConfig::CONFIG['libdir'])}")
+mf = mf.gsub(/^JRUBY_VERSION\s*=.*$/, "JRUBY_VERSION = #{JRUBY_VERSION}")
+
+# Launcher will use .module_opts file if present, otherwise hardcoded add-opens for this module.
+# Pre-9.2.1: ALL-UNNAMED because no name was exported
+# 9.2.1 and higher: org.jruby.dist
+if JRUBY_VERSION !~ /(^1)|(9\.[01])|(9.2.0.0)/
+  mf = mf.gsub(/^JRUBY_MODULE\s*=.*$/, "JRUBY_MODULE = 1")
+end
 puts mf
 File.open('Makefile', 'wb') {|f| f << mf}

data/inc/Makefile-conf.mk

@@ -71,3 +71,8 @@ ifneq (,$(findstring SunOS,$(CND_PLATFORM)))
 CFLAGS += -D__SUNOS__
 LDLIBSOPTIONS += -lsocket -lnsl
 endif
+
+# define JRUBY_MODULE appropriately for target JRuby
+ifeq (1,$(JRUBY_MODULE))
+CFLAGS += -DJRUBY_MODULE=${JRUBY_MODULE}
+endif

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.1.10"
+  VERSION = "1.1.11"
 end

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.1.10"
+#define JRUBY_LAUNCHER_VERSION "1.1.11"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-launcher
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: java
 authors:
 - Nick Sieger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email:
@@ -39,11 +39,6 @@ files:
 - lib/rubygems/defaults/jruby_native.rb
 - nbexecloader.h
 - ng.c
-- pkg/jruby-launcher-1.1.9-java/extconf.rb
-- pkg/jruby-launcher-1.1.9-java/lib/jruby-launcher.rb
-- pkg/jruby-launcher-1.1.9-java/lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.1.9-java/spec/launcher_spec.rb
-- pkg/jruby-launcher-1.1.9-java/spec/spec_helper.rb
 - platformlauncher.cpp
 - platformlauncher.h
 - rb_w32_cmdvector.h
@@ -77,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 2.6.14.1
 signing_key:
 specification_version: 4
 summary: Native launcher for JRuby

data/pkg/jruby-launcher-1.1.9-java/extconf.rb

@@ -1,5 +0,0 @@
-mf = File.read('Makefile')
-mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{RbConfig::CONFIG['bindir']}")
-mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(RbConfig::CONFIG['libdir'])}")
-puts mf
-File.open('Makefile', 'wb') {|f| f << mf}

data/pkg/jruby-launcher-1.1.9-java/lib/jruby-launcher.rb

@@ -1,3 +0,0 @@
-module JRubyLauncher
-  VERSION = "1.1.10"
-end

data/pkg/jruby-launcher-1.1.9-java/lib/rubygems/defaults/jruby_native.rb

@@ -1,4 +0,0 @@
-class Gem::ConfigFile
-  PLATFORM_DEFAULTS['install'] = '--no-rdoc --no-ri'
-  PLATFORM_DEFAULTS['update'] = '--no-rdoc --no-ri'
-end

data/pkg/jruby-launcher-1.1.9-java/spec/launcher_spec.rb

@@ -1,278 +0,0 @@
-require 'tmpdir'
-require File.expand_path('../spec_helper.rb', __FILE__)
-load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)
-
-describe "JRuby native launcher" do
-  it "should run org.jruby.Main" do
-    jruby_launcher_args("").last.should == "org/jruby/Main"
-  end
-
-  it "should pass unrecognized arguments to JRuby" do
-    jruby_launcher_args("-J-Dsome.option -v --help")[-3..-1].should == ["org/jruby/Main", "-v", "--help"]
-  end
-
-  it "should print help message" do
-    args = jruby_launcher_args("-Xhelp 2>&1")
-    args.select {|l| l =~ /JRuby Launcher usage/}.should_not be_empty
-    args.should include("-X")
-    args = jruby_launcher_args("-X 2>&1")
-    args.detect {|l| l =~ /JRuby Launcher usage/}.should_not be_empty
-    args.should include("-X")
-  end
-
-  it "should use $JAVACMD when JAVACMD is specified" do
-    with_environment "JAVACMD" => File.join("jato") do
-      if windows?
-        jruby_launcher_args("-v 2>&1").join.should =~ %r{jato}
-      else
-        jruby_launcher_args("-v").first.should == File.join("jato")
-      end
-    end
-  end
-
-  it "should use $JAVA_HOME/bin/java when JAVA_HOME is specified" do
-    with_environment "JAVA_HOME" => File.join("some", "java", "home") do
-      if windows?
-        jruby_launcher_args("-v 2>&1").join.should =~ %r{some/java/home}
-      else
-        jruby_launcher_args("-v").first.should == File.join("some", "java", "home", "bin", "java")
-      end
-    end
-  end
-
-  it "should use -Xjdkhome argument above JAVA_HOME" do
-    with_environment "JAVA_HOME" => File.join("env", "java", "home") do
-      if windows?
-        jruby_launcher_args("-Xjdkhome some/java/home 2>&1").join.should =~ %r{some/java/home}
-      else
-        jruby_launcher_args("-Xjdkhome some/java/home").first.should == File.join("some", "java", "home", "bin", "java")
-      end
-    end
-  end
-
-  it "should drop the backslashes at the end of JAVA_HOME" do
-    with_environment "JAVA_HOME" => File.join("some", "java", "home\\\\") do
-      if windows?
-        jruby_launcher_args("").join.should =~ %r{some/java/home}
-      else
-        jruby_launcher_args("").first.should == File.join("some", "java", "home", "bin", "java")
-      end
-    end
-  end
-
-  it "should complain about a missing log argument" do
-    jruby_launcher("-Xtrace 2>&1").should =~ /Argument is missing for "-Xtrace"/
-    jruby_launcher("-Xtrace -- 2>&1").should =~ /Argument is missing for "-Xtrace"/
-  end
-
-  it "should complain about a missing jdkhome argument" do
-    jruby_launcher("-Xjdkhome 2>&1").should =~ /Argument is missing/
-    jruby_launcher("-Xjdkhome -- 2>&1").should =~ /Argument is missing/
-  end
-
-  it "should complain about a missing classpath append argument" do
-    jruby_launcher("-Xcp:a 2>&1").should =~ /Argument is missing/
-    jruby_launcher("-Xcp:a -- 2>&1").should =~ /Argument is missing/
-  end
-
-  it "should run nailgun server with --ng-server option" do
-    jruby_launcher_args("--ng-server").last.should == "com/martiansoftware/nailgun/NGServer"
-  end
-
-  it "should run nailgun client with --ng option" do
-    jruby_launcher_args('--ng -e "puts 1"').should == ["org.jruby.util.NailMain", "-e", "puts 1"]
-  end
-
-  it "should handle -J JVM options" do
-    jruby_launcher_args("-J-Darg1=value1 -J-Darg2=value2").should include("-Darg1=value1", "-Darg2=value2")
-  end
-
-  it "should pass -Xprop.erty=value as -J-Djruby.prop.erty=value" do
-    jruby_launcher_args("-Xprop.erty=value").should include("-Djruby.prop.erty=value")
-  end
-
-  it "should pass -Xproperties as --properties" do
-    jruby_launcher_args("-Xproperties").should include("--properties")
-  end
-
-  it "should allow max heap to be overridden" do
-    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m")
-  end
-
-  it "should default to 2048k max stack" do
-    jruby_launcher_args("").should include("-Xss2048k")
-  end
-
-  it "should allow max stack to be overridden" do
-    jruby_launcher_args("-J-Xss512k").should include("-Xss512k")
-  end
-
-  it "should add the contents of the CLASSPATH environment variable" do
-    with_environment "CLASSPATH" => "some.jar" do
-      classpath_arg(jruby_launcher_args("")).should =~ /some.jar/
-    end
-  end
-
-  it "should add the classpath elements in proper order" do
-    s = File::PATH_SEPARATOR
-    with_environment "CLASSPATH" => "some-env.jar" do
-      args = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar")
-      classpath_arg(args).should =~ /some.jar.*#{s}some-env.jar#{s}some-other.jar/
-    end
-  end
-
-  it "should use the --server compiler" do
-    jruby_launcher_args("--server").should include("-server")
-  end
-
-  it "should use the --client compiler" do
-    jruby_launcher_args("--client").should include("-client")
-  end
-
-  it "should set the JMX settings when --manage is present" do
-    jruby_launcher_args("--manage").should include("-Dcom.sun.management.jmxremote", "-Djruby.management.enabled=true")
-  end
-
-  it "should set the headless flag when --headless is present" do
-    jruby_launcher_args("--headless").should include("-Djava.awt.headless=true")
-  end
-
-  it "should pass -Xprof when --sample is present" do
-    jruby_launcher_args("--sample").should include("-Xprof")
-  end
-
-  it "should stop argument processing when a -- is seen" do
-    jruby_launcher_args("-- -Xhelp -Xtrace --headless").should include("-Xhelp", "-Xtrace", "--headless")
-  end
-
-  # JRUBY-4151
-  it "should properly handle single quotes" do
-    jruby_launcher_args("-e 'ABC DEF'").should include("ABC DEF")
-  end
-
-  # JRUBY-4581
-  it "should prepend JRUBY_OPTS to the start of the argument list to process" do
-    with_environment "JRUBY_OPTS" => "--server -J-Dsome.key=val -rubygems" do
-      jruby_launcher_args("-e 'ABC DEF'").should include("-server", "-Dsome.key=val", "-rubygems", "-e", "ABC DEF")
-    end
-  end
-
-  # JRUBY-4611
-  it "stops argument processing on first non-option argument" do
-    jruby_launcher_args("foo.rb --sample")[-2..-1].should == ["foo.rb", "--sample"]
-  end
-
-  # JRUBY-4608
-  if RbConfig::CONFIG['target_os'] =~ /darwin/i
-    it "includes file.encoding=UTF-8 on Mac if JAVA_ENCODING is not set" do
-      jruby_launcher_args("-e true").should include("-Dfile.encoding=UTF-8")
-      with_environment "JAVA_ENCODING" => "MacRoman" do
-        jruby_launcher_args("-e true").should_not include("-Dfile.encoding=UTF-8")
-      end
-    end
-  end
-
-  it "does not crash on empty args" do
-    jruby_launcher_args("-e ''").should include("-e")
-    jruby_launcher("-Xtrace '' 2>&1").should =~ /-Xtrace/
-    jruby_launcher("-Xjdkhome '' 2>&1").should =~ /-Xjdkhome/
-  end
-
-  # JRUBY-4706
-  it "should put JRuby on regular classpath when -Xnobootclasspath is used" do
-    args = jruby_launcher_args("-e true")
-    args.grep(/Xbootclasspath/).should_not be_empty
-    args = jruby_launcher_args("-Xnobootclasspath -e true")
-    args.grep(/Xbootclasspath/).should be_empty
-  end
-
-  it "should put JRuby on regular classpath when VERIFY_JRUBY is set" do
-    with_environment "VERIFY_JRUBY" => "true" do
-      args = jruby_launcher_args("-e true")
-      args.grep(/Xbootclasspath/).should be_empty
-    end
-  end
-
-  # JRUBY-4709
-  it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
-    classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).should =~
-      if windows?
-        /;$/
-      else
-        /:$/
-      end
-  end
-
-  # JRUBY-6016
-  it "should honor JAVA_MEM" do
-    with_environment "JAVA_MEM" => "-Xmx768m" do
-      jruby_launcher_args("").should include("-Xmx768m")
-    end
-  end
-
-  it "should honor JAVA_STACK" do
-    with_environment "JAVA_STACK" => "-Xss3072k" do
-      jruby_launcher_args("").should include("-Xss3072k")
-    end
-  end
-
-  it "should honor JRUBY_HOME" do
-    with_environment "JRUBY_HOME" => "/tmp" do
-      jruby_launcher_args("").should include("-Djruby.home=/tmp")
-    end
-  end
-
-  context "JRUBY_HOME set and JRUBY_HOME/lib/jruby.jar exists" do
-    let(:jruby_home) do
-      require 'tempfile'
-      t = Tempfile.new("jruby_home")
-      t.path.tap { t.close! }
-    end
-
-    before do
-      FileUtils.mkdir_p(File.join(jruby_home, "lib"))
-      FileUtils.touch(File.join(jruby_home, "lib", "jruby.jar"))
-    end
-    after { FileUtils.rm_rf jruby_home }
-
-    it "should add jruby.jar to the bootclasspath" do
-      with_environment "JRUBY_HOME" => jruby_home do
-        jruby_launcher_args("").should include("-Xbootclasspath/a:#{jruby_home}/lib/jruby.jar")
-      end
-    end
-  end
-
-  it "should place user-supplied options after default options" do
-    args = jruby_launcher_args("-J-Djruby.home=/tmp")
-    home_args = args.select {|x| x =~ /^-Djruby\.home/ }
-    home_args.length.should == 2
-    home_args.last.should == "-Djruby.home=/tmp"
-  end
-
-  it "should print the version" do
-    jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version #{JRubyLauncher::VERSION}/
-  end
-
-  it "should not crash on format-strings" do
-    jruby_launcher_args("-e %s%s%s%s%s 2>&1").should include('-e', '%s%s%s%s%s')
-  end
-
-  it "should use --module-path on java9+" do
-    Dir.mktmpdir do |java_home|
-      Dir.mkdir(File.join(java_home, 'jmods'))
-      with_environment 'JAVA_HOME' => java_home do
-        jruby_launcher_args('').grep(/^--module-path=.*jruby.jar/).should_not be_empty
-      end
-    end
-  end
-
-  it "should not treat CLASSPATH entries as modules on java9+" do
-    Dir.mktmpdir do |java_home|
-      Dir.mkdir(File.join(java_home, 'jmods'))
-      with_environment 'JAVA_HOME' => java_home, 'CLASSPATH' => '/some/lib.jar' do
-        jruby_launcher_args('').grep(/^--module-path=.*\/some\/lib.jar/).should be_empty
-        classpath_arg(jruby_launcher_args('')).should =~ /\/some\/lib.jar/
-      end
-    end
-  end
-end

data/pkg/jruby-launcher-1.1.9-java/spec/spec_helper.rb

@@ -1,81 +0,0 @@
-require 'rspec'
-require 'rbconfig'
-require 'fileutils'
-
-if defined?(JRUBY_VERSION)
-  require 'jruby'
-  JRuby.runtime.instance_config.run_ruby_in_process = false
-end
-
-module JRubyLauncherHelper
-  JRUBY_EXE = ''
-  WINDOWS = RbConfig::CONFIG['target_os'] =~ /mswin/
-
-  def self.check_executable_built
-    exe = File.expand_path("../../jruby", __FILE__) + RbConfig::CONFIG['EXEEXT']
-    unless File.executable?(exe)
-      raise "Error: launcher executable not built; type `make' before continuing."
-    end
-    top = File.dirname(exe)
-    name = File.basename(exe)
-    home = File.join(top, "build/home")
-    FileUtils.mkdir_p(File.join(home, "bin"))
-    FileUtils.cp(exe, File.join(home, "bin"))
-    if JRubyLauncherHelper::WINDOWS
-      FileUtils.cp(exe.sub(/exe/, 'dll'), File.join(home, "bin"))
-    end
-    FileUtils.mkdir_p(File.join(home, "lib"))
-    FileUtils.touch(File.join(home, "lib/jruby.jar"))
-    JRUBY_EXE.concat File.join(home, "bin", name)
-  end
-
-  def jruby_launcher(args)
-    `#{JRUBY_EXE} #{args}`
-  end
-
-  def jruby_launcher_args(args)
-    jruby_launcher("-Xcommand #{args}").split("\n")
-  end
-
-  def last_exit_code
-    $?.exitstatus
-  end
-
-  def windows?
-    WINDOWS
-  end
-
-  def classpath_arg(args)
-    index = args.index("-cp")
-    index.should > 0
-    args[index + 1]
-  end
-
-  def with_environment(pairs = {})
-    prev_env = {}
-    pairs.each_pair do |k,v|
-      prev_env[k] = ENV[k] if ENV.has_key?(k)
-      ENV[k] = v
-    end
-    begin
-      yield
-    ensure
-      pairs.keys.each {|k| ENV.delete(k)}
-      ENV.update(prev_env)
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.before(:all) do
-    JRubyLauncherHelper.check_executable_built
-    # clear environment for better control
-    ENV.delete("JAVA_HOME")
-    ENV.delete("JRUBY_HOME")
-    ENV.delete("JAVA_OPTS")
-    ENV.delete("JRUBY_OPTS")
-    ENV.delete("CLASSPATH")
-    ENV.delete("JAVA_ENCODING")
-  end
-  config.include(JRubyLauncherHelper)
-end