jruby-launcher 1.1.13-java → 1.1.18-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b11fc4e524ed4b37e0f46d973c6622df18dbf9676a5ca2c03fbb046a1dcd216b
-  data.tar.gz: 2b12dc9ce4c66cd0142747f9ec5898c051414f53f2080119c25c827df336eb13
+  metadata.gz: ee2a847c5f128137c841713780abadbab52109b3907b83f207c81bf3875e285b
+  data.tar.gz: 79c3d6ead6c02523f0b3756ed9f93ba0f5f36bd869297ba87636cb98d920e1e0
 SHA512:
-  metadata.gz: 0ebe917d3d4f1c416533a5e3afbb0ce5a1394c14c43f6618b97b0b8dc09265d6a84071da2f69423fe1d5da9d49ce3f5f03e47fc247d8c67fe38395bfaa064d29
-  data.tar.gz: ca74d57e9ca2f052e705209271eb8a6426122c9620b0423e0828de3dd7eb818808fa6f2624c2109e750582c372cb8011424e304b794eb4036e3a725b7429b136
+  metadata.gz: c71302725612bbe3e9a4c28329719528b4d15cf3b890eba24625206c735d2db27e94ad5dec691866ff21092ea24e7e8a657cba5e381ed2ed66c316b742ee61ae
+  data.tar.gz: 0f1844a66a8d8c98cce8ab8f719ef021aa7c66470aad9943c53561222c229a9639ec0dfc4c1e01b7bf8b961ec5400e75d6202aec7c886fb6d630782d77fd0add

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"
@@ -557,12 +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");
         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/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.1.13"
+  VERSION = "1.1.18"
 end

data/pkg/{jruby-launcher-1.1.12-java → jruby-launcher-1.1.17-java}/extconf.rb

@@ -4,10 +4,9 @@ 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")
+# 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.12-java → jruby-launcher-1.1.17-java}/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.1.13"
+  VERSION = "1.1.18"
 end

data/pkg/{jruby-launcher-1.1.12-java → jruby-launcher-1.1.17-java}/spec/launcher_spec.rb

@@ -21,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
@@ -180,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")
@@ -236,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
@@ -257,9 +264,12 @@ describe "JRuby native launcher" 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
+  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|
-      Dir.mkdir(File.join(java_home, 'jmods'))
+      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

data/spec/launcher_spec.rb

@@ -21,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
@@ -180,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")
@@ -236,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
@@ -257,9 +264,12 @@ describe "JRuby native launcher" 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
+  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|
-      Dir.mkdir(File.join(java_home, 'jmods'))
+      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

data/unixlauncher.cpp

@@ -1,5 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
+#include <limits.h>
+#include <string.h>
 #include "unixlauncher.h"
 #include "utilsfuncs.h"
 
@@ -46,6 +48,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";
@@ -56,10 +61,6 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
             java = java_home + "/bin/java";
         } else {
             java = findOnPath("java");
-            if (!java.empty()) {
-                int home_index = java.find_last_of('/', java.find_last_of('/') - 1);
-                jdkhome = java.substr(0, home_index);
-            }
         }
     }
 
@@ -68,6 +69,29 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
         return 255;
     }
 
+    // still no jdk home, use other means to resolve it
+    if (jdkhome.empty()) {
+        if (access("/usr/libexec/java_home", X_OK) != -1) {
+            // try java_home command when not set (on MacOS)
+            FILE *fp;
+            char tmp[PATH_MAX + 1];
+
+            fp = popen("/usr/libexec/java_home", "r");
+            if (fp != NULL) {
+                fgets(tmp, sizeof(tmp), fp);
+                tmp[strcspn(tmp, "\n")] = 0;
+                jdkhome = tmp;
+                pclose(fp);
+            } else {
+                logErr(true, false, "failed to run /usr/libexec/java_home");
+            }
+        } else {
+            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>
@@ -146,6 +147,19 @@ string findOnPath(const char* name) {
     return "";
 }
 
+string resolveSymlinks(string path) {
+#ifndef WIN32
+    struct stat st;
+    char tmp[PATH_MAX + 1];
+
+    if (lstat(path.c_str(), &st) == 0 && (st.st_mode & S_IFMT) == S_IFLNK) {
+        realpath(path.c_str(), tmp);
+        path = tmp;
+    }
+#endif
+    return path;
+}
+
 const char* getSysError(char *str, int strSize) {
 #ifdef WIN32
     int err = GetLastError();

data/utilsfuncs.h

@@ -57,6 +57,7 @@ bool printToConsole(const char *msg);
 char** convertToArgvArray(std::list<std::string> args);
 void addToArgList(std::list<std::string> & args, int argc, char ** argv);
 std::string findOnPath(const char* name);
+std::string resolveSymlinks(std::string name);
 bool checkDirectory(const char* path);
 void printListToConsole(std::list<std::string> l);
 std::string trimTrailingBackslashes(std::string orig);

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.1.13"
+#define JRUBY_LAUNCHER_VERSION "1.1.18"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-launcher
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.18
 platform: java
 authors:
 - Nick Sieger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email:
@@ -39,11 +39,11 @@ files:
 - lib/rubygems/defaults/jruby_native.rb
 - nbexecloader.h
 - ng.c
-- pkg/jruby-launcher-1.1.12-java/extconf.rb
-- pkg/jruby-launcher-1.1.12-java/lib/jruby-launcher.rb
-- pkg/jruby-launcher-1.1.12-java/lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.1.12-java/spec/launcher_spec.rb
-- pkg/jruby-launcher-1.1.12-java/spec/spec_helper.rb
+- pkg/jruby-launcher-1.1.17-java/extconf.rb
+- pkg/jruby-launcher-1.1.17-java/lib/jruby-launcher.rb
+- pkg/jruby-launcher-1.1.17-java/lib/rubygems/defaults/jruby_native.rb
+- pkg/jruby-launcher-1.1.17-java/spec/launcher_spec.rb
+- pkg/jruby-launcher-1.1.17-java/spec/spec_helper.rb
 - platformlauncher.cpp
 - platformlauncher.h
 - rb_w32_cmdvector.h
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Native launcher for JRuby