jruby-launcher 1.1.11-java → 1.1.16-java

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

@@ -0,0 +1,76 @@
+require 'rspec'
+require 'rbconfig'
+require 'fileutils'
+
+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

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";
@@ -59,11 +62,20 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
         }
     }
 
+    logMsg("UnixLauncher::run\n\tjava command found at %s\n", java.c_str());
+
     if (java.empty()) {
         printToConsole("No `java' executable found on PATH.");
         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) == 0 && (st.st_mode & S_IFMT) == S_IFLNK) {
+        realpath(path.c_str(), tmp);
+        path = tmp;
+    }
+
+    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.11"
+#define JRUBY_LAUNCHER_VERSION "1.1.16"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jruby-launcher
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.16
 platform: java
 authors:
 - Nick Sieger
 - Vladimir Sizikov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email:
@@ -39,6 +39,21 @@ files:
 - lib/rubygems/defaults/jruby_native.rb
 - nbexecloader.h
 - ng.c
+- pkg/jruby-launcher-1.1.14-java/extconf.rb
+- pkg/jruby-launcher-1.1.14-java/lib/jruby-launcher.rb
+- pkg/jruby-launcher-1.1.14-java/lib/rubygems/defaults/jruby_native.rb
+- pkg/jruby-launcher-1.1.14-java/spec/launcher_spec.rb
+- pkg/jruby-launcher-1.1.14-java/spec/spec_helper.rb
+- pkg/jruby-launcher-1.1.15-java/extconf.rb
+- pkg/jruby-launcher-1.1.15-java/lib/jruby-launcher.rb
+- pkg/jruby-launcher-1.1.15-java/lib/rubygems/defaults/jruby_native.rb
+- pkg/jruby-launcher-1.1.15-java/pkg/jruby-launcher-1.1.14-java/extconf.rb
+- pkg/jruby-launcher-1.1.15-java/pkg/jruby-launcher-1.1.14-java/lib/jruby-launcher.rb
+- pkg/jruby-launcher-1.1.15-java/pkg/jruby-launcher-1.1.14-java/lib/rubygems/defaults/jruby_native.rb
+- pkg/jruby-launcher-1.1.15-java/pkg/jruby-launcher-1.1.14-java/spec/launcher_spec.rb
+- pkg/jruby-launcher-1.1.15-java/pkg/jruby-launcher-1.1.14-java/spec/spec_helper.rb
+- pkg/jruby-launcher-1.1.15-java/spec/launcher_spec.rb
+- pkg/jruby-launcher-1.1.15-java/spec/spec_helper.rb
 - platformlauncher.cpp
 - platformlauncher.h
 - rb_w32_cmdvector.h
@@ -56,7 +71,7 @@ files:
 homepage: http://jruby.org
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -71,9 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14.1
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.2.3
+signing_key: 
 specification_version: 4
 summary: Native launcher for JRuby
 test_files: []