jruby-launcher 1.1.9-java → 1.1.15-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a24cd17a7e856fa27004cd2ecae5be7f6fe133bec57528e9cfcdd287293eb76
-  data.tar.gz: 7a5c616e66f9423f27ea5ed477c5500960527e84fcccb0c12fe53056959c581b
+  metadata.gz: 0b6988d6ac03341b36b3f204165bee190f7f7ae0a73ad223527b7631bd4e5b80
+  data.tar.gz: 0c797f2e012c00217e9defc6081c69c636443ca836436d25fc21d95326c398c7
 SHA512:
-  metadata.gz: fc086ec3f19e35e4c70d0a8176230785cefc796032ce32f85dfc6c84e723c721e924fe6fd345a3682164e66430e6eb10f569c55342d124a1f6fd0a6dc22b5ba8
-  data.tar.gz: 07e802263388bb7395b879beef5883189775296c07b4ab81b0a9191a560d797207ebafadb870316a261ef11f9d4b97179a7f2203f1d7089d7e7463d3f16deb54
+  metadata.gz: 26b78fd8b5b97ac99c2d3822805ff6acaebdc39e9a015a0c99cbc4b8de563b6ebe34d09376d9a7a5c0759362e7dd97bdeffe5303aa91085c21a706e77a441964
+  data.tar.gz: 6f39b0b7f613069696db0acfd3494b029c14e7d847e7093fa8527cab76ff40ba3c61325bfb5b119e189103b2457eab2a50bd27feb52d3dae19079dbf41560371

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 = 1
 INSTALLDIR = $(PREFIX)/lib/ruby/shared/rubygems/defaults
 INSTALLDIR9000 = $(PREFIX)/lib/ruby/stdlib/rubygems/defaults
 OLDINSTALLDIR = $(PREFIX)/lib/ruby/site_ruby/1.8/rubygems/defaults
@@ -112,6 +114,7 @@ include $(SUB_IMPLMK)
 
 # Pick conf based on OS. for mingw64, must manually override for now.
 ifeq ($(OS),Windows_NT)
+CC=gcc
 CONF=mingw
 else
 CONF=unix

data/Rakefile

@@ -28,12 +28,11 @@ task :gemspec => './lib/jruby-launcher.rb' do
     s.extensions = ["extconf.rb"]
     s.files = FileList["COPYING", "README.md", "Makefile", "Rakefile", "*.c", "*.cpp", "*.h", "inc/*.*", "**/*.rb", "resources/*.*"]
     s.homepage = %q{http://jruby.org}
-    s.rubyforge_project = %q{jruby-extras}
   end
 end
 
 desc "Create gem file"
-task :package => [:update_version, :gemspec, :spec] do
+task :package => [:update_version, :gemspec] do
   Gem::PackageTask.new(@gemspec) do |pkg|
   end
   Rake::Task['gem'].invoke

data/argparser.cpp

@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <unistd.h>
 #include <limits>
+#include <fstream>
 #include "utilsfuncs.h"
 #include "argparser.h"
 #include "argnames.h"
@@ -247,9 +248,9 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
     }
 #endif
 
+
     // Force OpenJDK-based JVMs to use /dev/urandom for random number generation
     // See https://github.com/jruby/jruby/issues/4685 among others.
-    struct stat buffer;
     if (access("/dev/urandom", R_OK) == 0) {
         // OpenJDK tries really hard to prevent you from using urandom.
         // See https://bugs.openjdk.java.net/browse/JDK-6202721
@@ -485,12 +486,46 @@ void ArgParser::prepareOptions() {
     option += cmdName;
     javaOptions.push_back(option);
 
-    if (useModulePath) {
-        // When modules are present, use module path
-        option = OPT_CMDLINE_MODULE_PATH;
-        option += classPath;
+    if (!bootClassPath.empty()) {
+        if (useModulePath) {
+#ifdef JRUBY_MODULE
+            // When modules are present, use module path for the jruby libs (aka bootClassPath)
+            option = OPT_CMDLINE_MODULE_PATH;
+#else
+            option = OPT_BOOT_CLASS_PATH;
+#endif
+        } else {
+            option = OPT_BOOT_CLASS_PATH;
+        }
+        option += bootClassPath;
         javaOptions.push_back(option);
-    } else if (separateProcess) {
+    }
+
+    if (useModulePath) {
+        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");
+            javaOptions.push_back("--add-opens");
+            javaOptions.push_back("java.management/sun.management=org.jruby.dist");
+#else
+            logMsg("no JRuby module support detected, skipping module flags");
+#endif
+        }
+    }
+
+    if (separateProcess) {
         // When launching a separate process, use '-cp' which expands embedded wildcards
         javaOptions.push_back(OPT_CMDLINE_CLASS_PATH);
         javaOptions.push_back(classPath);
@@ -500,12 +535,6 @@ void ArgParser::prepareOptions() {
         javaOptions.push_back(option);
     }
 
-    if (!bootClassPath.empty()) {
-        option = OPT_BOOT_CLASS_PATH;
-        option += bootClassPath;
-        javaOptions.push_back(option);
-    }
-
     javaOptions.insert(javaOptions.end(), userOptions.begin(), userOptions.end());
 }
 
@@ -529,13 +558,25 @@ void ArgParser::useModulesIfPresent() {
 
     if (jdkhome.empty()) {
         logMsg("Unable to detect JPMS modules as JAVA_HOME is not specified");
-    } else if (access((jdkhome + "/jmods").c_str(), R_OK) == 0) {
+    } else if (access((jdkhome + "/lib/modules").c_str(), R_OK) == 0 ||
+            releaseFileHasModules()) {
         logMsg("JPMS jmods dir detected, using module flags");
-        noBootClassPath = 1;
         useModulePath = 1;
     }
 }
 
+bool ArgParser::releaseFileHasModules() {
+    string releaseFile = jdkhome + "/release";
+    std::string line;
+    ifstream in(releaseFile.c_str());
+    if (in.is_open()) {
+        while (getline(in,line)) {
+            if (line.find("MODULES") == 0) return true;
+        }
+    }
+    return false;
+}
+
 void ArgParser::constructBootClassPath() {
     logMsg("constructBootClassPath()");
     addedToBootCP.clear();

data/argparser.h

@@ -54,6 +54,7 @@ protected:
     void addOptionsToCommandLine(std::list<std::string> & commandLine);
     bool endsWith(const std::string &string, const std::string &end);
     void useModulesIfPresent();
+    bool releaseFileHasModules();
 
 protected:
     bool separateProcess;

data/extconf.rb

@@ -1,5 +1,12 @@
 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.
+# Module options are only supported on JRuby 9.2.1 or higher.
+if JRUBY_VERSION =~ /(^1)|(^9\.[01])|(^9\.2\.0\.0)/
+  mf = mf.gsub(/^JRUBY_MODULE\s*=.*1$/, "JRUBY_MODULE =")
+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.9"
+  VERSION = "1.1.15"
 end

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

@@ -0,0 +1,12 @@
+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.
+# Module options are only supported on JRuby 9.2.1 or higher.
+if JRUBY_VERSION =~ /(^1)|(^9\.[01])|(^9\.2\.0\.0)/
+  mf = mf.gsub(/^JRUBY_MODULE\s*=.*1$/, "JRUBY_MODULE =")
+end
+puts mf
+File.open('Makefile', 'wb') {|f| f << mf}

data/pkg/{jruby-launcher-1.1.8-java → jruby-launcher-1.1.14-java}/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.1.9"
+  VERSION = "1.1.15"
 end

data/pkg/{jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java → jruby-launcher-1.1.14-java}/spec/launcher_spec.rb

@@ -1,3 +1,4 @@
+require 'tmpdir'
 require File.expand_path('../spec_helper.rb', __FILE__)
 load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)
 
@@ -255,4 +256,26 @@ describe "JRuby native launcher" do
   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+ jruby 9.2.1+" do
+    # versions prior to 9.2.1 do not set a predictable module name
+    skip unless (JRUBY_VERSION.split('.') <=> ['9', '2', '1']) >= 0
+    
+    Dir.mktmpdir do |java_home|
+      FileUtils.mkdir_p(File.join(java_home, 'lib/modules'))
+      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.5-java/pkg/jruby-launcher-1.1.5.pre-java → jruby-launcher-1.1.14-java}/spec/spec_helper.rb

@@ -2,11 +2,6 @@ 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/

data/platformlauncher.cpp

@@ -147,14 +147,29 @@ bool PlatformLauncher::start(char* argv[], int argc, DWORD *retCode, const char*
         suppressConsole = false;
     } else {
         if (jdkhome.empty()) {
-            if (!jvmLauncher.initialize(REQ_JAVA_VERSION)) {
-                logErr(false, true, "Cannot find Java %s or higher.", REQ_JAVA_VERSION);
-                return false;
+            // attempt to get JDK home from registry
+            jvmLauncher.initialize(REQ_JAVA_VERSION);
+        }
+
+        if (!jdkhome.empty()) {
+            java = jdkhome + "\\bin\\java.exe";
+        } else if (getenv("JAVA_HOME") != NULL) {
+            string java_home = string(getenv("JAVA_HOME"));
+            jdkhome = java_home;
+            java_home = trimTrailingBackslashes(java_home);
+            java = java_home + "\\bin\\java.exe";
+        } else {
+            java = findOnPath("java.exe");
+            if (!java.empty()) {
+                int home_index = java.find_last_of('\\', java.find_last_of('\\') - 1);
+                jdkhome = java.substr(0, home_index);
             }
         }
+    }
 
-        jvmLauncher.getJavaPath(jdkhome);
-        java = jdkhome + "\\bin\\java";
+    if (java.empty()) {
+        printToConsole("No `java.exe' executable found on PATH.");
+        return 255;
     }
 
     prepareOptions();

data/rb_w32_cmdvector.h

@@ -52,7 +52,7 @@ int rb_w32_cmdvector(const char *cmd, char ***vec) {
     char *ptr, *base, *buffer, *cmdline;
     char **vptr;
     char quote;
-    NtCmdLineElement *curr, **tail;
+    NtCmdLineElement *curr;
     NtCmdLineElement *cmdhead = NULL, **cmdtail = &cmdhead;
 
     //
@@ -237,7 +237,7 @@ int rb_w32_cmdvector(const char *cmd, char ***vec) {
     buffer = (char *)malloc(len);
     if (!buffer) {
       do_nothing:
-	while (curr = cmdhead) {
+	while ((curr = cmdhead)) {
 	    cmdhead = curr->next;
 	    if (curr->flags & NTMALLOC) free(curr->str);
 	    free(curr);
@@ -263,7 +263,7 @@ int rb_w32_cmdvector(const char *cmd, char ***vec) {
 
     ptr = buffer + (elements+1) * sizeof(char *);
 
-    while (curr = cmdhead) {
+    while ((curr = cmdhead)) {
 	strlcpy(ptr, curr->str, curr->len + 1);
 	*vptr++ = ptr;
 	ptr += curr->len + 1;

data/spec/launcher_spec.rb

@@ -1,3 +1,4 @@
+require 'tmpdir'
 require File.expand_path('../spec_helper.rb', __FILE__)
 load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)
 
@@ -20,11 +21,12 @@ describe "JRuby native launcher" do
   end
 
   it "should use $JAVACMD when JAVACMD is specified" do
-    with_environment "JAVACMD" => File.join("jato") do
+    javacmd_path = File.join("path", "to", "jato")
+    with_environment "JAVACMD" => javacmd_path do
       if windows?
-        jruby_launcher_args("-v 2>&1").join.should =~ %r{jato}
+        jruby_launcher_args("-v 2>&1").join.should =~ /#{javacmd_path}/
       else
-        jruby_launcher_args("-v").first.should == File.join("jato")
+        jruby_launcher_args("-v").first.should == javacmd_path
       end
     end
   end
@@ -179,6 +181,9 @@ describe "JRuby native launcher" do
 
   # JRUBY-4706
   it "should put JRuby on regular classpath when -Xnobootclasspath is used" do
+    # Java 9+ do not like bootclasspath so we do not use it
+    skip if ENV_JAVA['java.specification.version'].to_i >= 9
+
     args = jruby_launcher_args("-e true")
     args.grep(/Xbootclasspath/).should_not be_empty
     args = jruby_launcher_args("-Xnobootclasspath -e true")
@@ -235,6 +240,9 @@ describe "JRuby native launcher" do
     after { FileUtils.rm_rf jruby_home }
 
     it "should add jruby.jar to the bootclasspath" do
+      # Java 9+ do not like bootclasspath so we do not use it
+      skip if ENV_JAVA['java.specification.version'].to_i >= 9
+
       with_environment "JRUBY_HOME" => jruby_home do
         jruby_launcher_args("").should include("-Xbootclasspath/a:#{jruby_home}/lib/jruby.jar")
       end
@@ -255,4 +263,26 @@ describe "JRuby native launcher" do
   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+ jruby 9.2.1+" do
+    # versions prior to 9.2.1 do not set a predictable module name
+    skip unless (JRUBY_VERSION.split('.') <=> ['9', '2', '1']) >= 0
+    
+    Dir.mktmpdir do |java_home|
+      FileUtils.mkdir_p(File.join(java_home, 'lib/modules'))
+      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/spec/spec_helper.rb

@@ -2,11 +2,6 @@ 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/

data/unixlauncher.cpp

@@ -46,6 +46,9 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
 
     if (getenv("JAVACMD") != NULL) {
         java = getenv("JAVACMD");
+        if (java.find_last_of('/') == -1) {
+            java = findOnPath(java.c_str());
+        }
     } else {
         if (!jdkhome.empty()) {
             java = jdkhome + "/bin/java";
@@ -64,6 +67,13 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
         return 255;
     }
 
+    // still no jdk home, use java command to resolve it
+    if (jdkhome.empty()) {
+        java = resolveSymlinks(java);
+        int home_index = java.find_last_of('/', java.find_last_of('/') - 1);
+        jdkhome = java.substr(0, home_index);
+    }
+
     prepareOptions();
 
     list<string> commandLine;

data/utilsfuncs.cpp

@@ -54,6 +54,7 @@
 #include <unistd.h>
 #include "utilsfuncs.h"
 #include "argnames.h"
+#include <limits.h>
 
 #ifndef WIN32
 #include <sys/stat.h>
@@ -123,7 +124,6 @@ string findOnPath(const char* name) {
     string path(getenv("PATH"));
     size_t start = 0;
     size_t sep;
-    char * found;
 
     while (start < path.length()) {
 	sep = path.find(PATH_SEP, start);
@@ -147,6 +147,18 @@ string findOnPath(const char* name) {
     return "";
 }
 
+string resolveSymlinks(string path) {
+    struct stat st;
+    char tmp[PATH_MAX + 1];
+
+    if (lstat(path.c_str(), &st) && st.st_mode & S_IFLNK) {
+        realpath(path.c_str(), tmp);
+        path = tmp;
+    }
+
+    return path;
+}
+
 const char* getSysError(char *str, int strSize) {
 #ifdef WIN32
     int err = GetLastError();