jruby-launcher 1.1.12-java → 1.1.17-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ea2da6a0636abdc37955fd898b3dce7c59e26b852b140987663b5d99ccb374
-  data.tar.gz: 6a8b47a675cef8d9416790c57c2af6ebe3bc5df0bb038f6f1e1764d8e61faf35
+  metadata.gz: 362ec35e0d3c674dc7eca8aa2df8ccd97b183dc5a8caa8490666149f4c41c70e
+  data.tar.gz: ed87dade0caf41331b0ad7c149191bf2dd5cb352f79c7f5a93a2e6e3c45e9966
 SHA512:
-  metadata.gz: 4b1893448084229a3d7949f3579e1a949ecf5441eb0d94004cc397695afe8e7fd75a8a91d8f391dfed88e2c1bc00bbec1ae9aaab123d758634ebbc4211e8be3d
-  data.tar.gz: 9fefa739941cd98038b419337b4b6e0a455fbfaee64ca0060c01d34cff002e2186273501fd515d2b537db53cebe8542aea49cbccf50748729b92faed3ecdc357
+  metadata.gz: 6444e3b8be2e0389634a54070e83a2cc252eec656704847f43a964e15c8dfaeb5bd0e4b68712a46a0b60c6a72c4fced3353a23c843bf1a4ed24b243d90fbdb8a
+  data.tar.gz: b2053acbaf369dd76b40fb2d55644ccaa2c14012db24bf9c2826667e4532a181cd9d2aa00114ce7ebc381e6d63628df6e8967c60647aed031065888470a1048b

data/Makefile

@@ -2,7 +2,7 @@
 PREFIX = notspecified
 BINDIR = $(PREFIX)/bin
 JRUBY_VERSION = notspecified
-JRUBY_MODULE =
+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
@@ -114,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

@@ -32,7 +32,7 @@ task :gemspec => './lib/jruby-launcher.rb' do
 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"
@@ -250,7 +251,6 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
 
     // 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
@@ -488,8 +488,12 @@ void ArgParser::prepareOptions() {
 
     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;
         }
@@ -554,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/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/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.1.12"
+  VERSION = "1.1.17"
 end

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

@@ -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/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,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/utilsfuncswin.cpp

@@ -39,10 +39,27 @@ bool disableFolderVirtualization(HANDLE hProcess) {
     return true;
 }
 
+typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
+
+LPFN_ISWOW64PROCESS IsWow64Process;
+
+BOOL is64bits() {
+    BOOL is64Bits = FALSE;
+    IsWow64Process = (LPFN_ISWOW64PROCESS) GetProcAddress(GetModuleHandle(TEXT("kernel32")),"IsWow64Process");
+
+    if (IsWow64Process && !IsWow64Process(GetCurrentProcess(),&is64Bits)) {}
+
+    return is64Bits;
+}
+
+#define KEY_WOW64_64KEY 0x0100
+#define KEY_WOW64_32KEY 0x0200
+
 bool getStringFromRegistry(HKEY rootKey, const char *keyName, const char *valueName, string &value) {
     logMsg("getStringFromRegistry()\n\tkeyName: %s\n\tvalueName: %s", keyName, valueName);
+    DWORD openFlags = KEY_READ | (is64bits() ? KEY_WOW64_64KEY : KEY_WOW64_32KEY);
     HKEY hKey = 0;
-    if (RegOpenKeyEx(rootKey, keyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {
+    if (RegOpenKeyEx(rootKey, keyName, 0, openFlags, &hKey) == ERROR_SUCCESS) {
         DWORD valSize = 4096;
         DWORD type = 0;
         char val[4096] = "";
@@ -64,8 +81,9 @@ bool getStringFromRegistry(HKEY rootKey, const char *keyName, const char *valueN
 
 bool getDwordFromRegistry(HKEY rootKey, const char *keyName, const char *valueName, DWORD &value) {
     logMsg("getDwordFromRegistry()\n\tkeyName: %s\n\tvalueName: %s", keyName, valueName);
+    DWORD openFlags = KEY_READ | (is64bits() ? KEY_WOW64_64KEY : KEY_WOW64_32KEY);
     HKEY hKey = 0;
-    if (RegOpenKeyEx(rootKey, keyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {
+    if (RegOpenKeyEx(rootKey, keyName, 0, openFlags, &hKey) == ERROR_SUCCESS) {
         DWORD valSize = sizeof(DWORD);
         DWORD type = 0;
         if (RegQueryValueEx(hKey, valueName, 0, &type, (BYTE *) &value, &valSize) == ERROR_SUCCESS

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.1.12"
+#define JRUBY_LAUNCHER_VERSION "1.1.17"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-launcher
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.17
 platform: java
 authors:
 - Nick Sieger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email:
@@ -71,7 +71,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