jruby-launcher 1.0-java → 1.0.1-java

data/Rakefile

@@ -6,22 +6,37 @@ Spec::Rake::SpecTask.new
 
 task :default => :spec
 
-load './lib/jruby-launcher.rb'
+file './lib/jruby-launcher.rb' => 'version.h' do |t|
+  version = nil
+  IO.readlines(t.prerequisites.first).grep(/LAUNCHER_VERSION\s+"([^"]+)"/) {|l| version = $1 }
+  ruby = IO.readlines(t.name)
+  File.open(t.name, "wb") do |f|
+    ruby.each do |l|
+      f << l.sub(/VERSION\s*=\s*"([^"]*)"/, "VERSION = \"#{version}\"")
+    end
+  end
+end
 
-gemspec = Gem::Specification.new do |s|
-  s.name = %q{jruby-launcher}
-  s.platform = Gem::Platform.new("java")
-  s.version = JRubyLauncher::VERSION
-  s.authors = ["Nick Sieger", "Vladimir Sizikov"]
-  s.date = Date.today.to_s
-  s.description = %q{Builds and installs a native launcher for JRuby on your system}
-  s.summary = %q{Native launcher for JRuby}
-  s.email = ["nick@nicksieger.com", "vsizikov@gmail.com"]
-  s.extensions = ["extconf.rb"]
-  s.files = FileList["COPYING", "README.txt", "Makefile", "Rakefile", "*.c", "*.cpp", "*.h", "inc/*.*", "**/*.rb", "resources/*.*"]
-  s.homepage = %q{http://jruby.org}
-  s.rubyforge_project = %q{jruby-extras}
+task :gemspec => './lib/jruby-launcher.rb' do
+  @gemspec ||= Gem::Specification.new do |s|
+    load './lib/jruby-launcher.rb'
+    s.name = %q{jruby-launcher}
+    s.platform = Gem::Platform.new("java")
+    s.version = JRubyLauncher::VERSION
+    s.authors = ["Nick Sieger", "Vladimir Sizikov"]
+    s.date = Date.today.to_s
+    s.description = %q{Builds and installs a native launcher for JRuby on your system}
+    s.summary = %q{Native launcher for JRuby}
+    s.email = ["nick@nicksieger.com", "vsizikov@gmail.com"]
+    s.extensions = ["extconf.rb"]
+    s.files = FileList["COPYING", "README.txt", "Makefile", "Rakefile", "*.c", "*.cpp", "*.h", "inc/*.*", "**/*.rb", "resources/*.*"]
+    s.homepage = %q{http://jruby.org}
+    s.rubyforge_project = %q{jruby-extras}
+  end
 end
 
-Rake::GemPackageTask.new(gemspec) do |pkg|
+task :package => :gemspec do
+  Rake::GemPackageTask.new(@gemspec) do |pkg|
+  end
+  Rake::Task['gem'].invoke
 end

data/argnames.h

@@ -1,8 +1,5 @@
 /*
- * File:   argnames.h
- * Author: Holy
- *
- * Created on 4. prosinec 2008, 14:13
+ * Copyright 2009-2010 JRuby Team (www.jruby.org).
  */
 
 #ifndef _ARGNAMES_H
@@ -22,6 +19,7 @@
 #define ARG_NAME_CP_PREPEND "-Xcp:p"
 #define ARG_NAME_CP_APPEND "-Xcp:a"
 #define ARG_NAME_CMD_ONLY "-Xcommand"
+#define ARG_NAME_NO_BOOTCLASSPATH "-Xnobootclasspath"
 
 /* Below are standard JRuby args handled by the launcher. */
 #define ARG_NAME_SERVER "--server"

data/argparser.cpp

@@ -8,6 +8,7 @@
 #include "utilsfuncs.h"
 #include "argparser.h"
 #include "argnames.h"
+#include "version.h"
 
 #ifndef WIN32
 #include <sys/types.h>
@@ -21,24 +22,26 @@
 using namespace std;
 
 const char *ArgParser::HELP_MSG =
-"\nJRuby Launcher usage: jruby" EXEEXT " {options} arguments\n\
+"JRuby Launcher usage: jruby" EXEEXT " {options} arguments\n\n\
 Options:\n\
   -Xhelp                show this help\n\
-  -Xjdkhome <path>      path to JDK\n\
+  -Xversion             print launcher's version\n\
+\nJvm Management:\n\
+  -Xjdkhome <path>      set path to JDK\n\
+  -Xfork-java           run java in separate process\n\
   -J<jvm_option>        pass <jvm_option> to JVM\n\
-\n\
+\nClasspath Management:\n\
   -Xcp   <classpath>    set the classpath\n\
   -Xcp:p <classpath>    prepend <classpath> to classpath\n\
   -Xcp:a <classpath>    append <classpath> to classpath\n\
-\n\
-  -Xfork-java           run java in separate process\n\
+  -Xnobootclasspath     don't put jruby jars on the bootclasspath\n\
+\nMisc:\n\
   -Xtrace <path>        path for launcher log (for troubleshooting)\n\
   -Xcommand             just print the equivalent java command and exit\n"
 #ifdef WIN32
 "  -Xconsole <mode>      jrubyw console attach mode (new|attach|suppress)\n\n"
 #endif
-"To see general JRuby options, type 'jruby -h' or 'jruby --help'.\n\
---------------------------------------------------------------------\n\n";
+"To see general JRuby options, type 'jruby -h' or 'jruby --help'.\n";
 
 const char *ArgParser::REQ_JAVA_VERSION = "1.5";
 
@@ -58,7 +61,7 @@ const char *ArgParser::DEFAULT_EXECUTABLE = "jruby";
 ArgParser::ArgParser()
     : separateProcess(false)
     , nailgunClient(false)
-    , nailgunServer(false)
+    , noBootClassPath(false)
     , printCommandLine(false)
 {
 }
@@ -242,6 +245,8 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
             logMsg("Run Java in separater process");
         } else if (it->compare(ARG_NAME_CMD_ONLY) == 0) {
             printCommandLine = true;
+        } else if (it->compare(ARG_NAME_NO_BOOTCLASSPATH) == 0) {
+            noBootClassPath = true;
         } else if (it->compare(ARG_NAME_LAUNCHER_LOG) == 0) {
             // We only check the validity of args here,
             // the actual parsing and setting the log file
@@ -294,21 +299,31 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
             javaOptions.push_front("-Dprofile.properties=" + platformDir + "/lib/profile-" + filterType + ".properties");
             javaOptions.push_front("-javaagent:" + platformDir + "/lib/profile.jar");
             progArgs.push_back("-X+C");
+            noBootClassPath = true;
             printToConsole("Running with instrumented profiler\n");
         } else if (it->compare(ARG_NAME_NG) == 0) {
             nailgunClient = true;
         } else if (it->compare(ARG_NAME_NG_SERVER) == 0) {
             bootclass = "com/martiansoftware/nailgun/NGServer";
             javaOptions.push_back("-server");
-            nailgunServer = true;
+            noBootClassPath = true;
         } else if (it->compare(0, 2, "-J", 2) == 0) {
-            javaOptions.push_back(it->substr(2));
+            std::string javaOpt = it->substr(2);
+            if (javaOpt.compare(0, 3, "-ea", 3) == 0
+                    || javaOpt.compare(0, 17, "-enableassertions", 17) == 0) {
+                logMsg("Note: -ea option is specified, there will be no bootclasspath in order to enable assertions");
+                noBootClassPath = true;
+            }
+            javaOptions.push_back(javaOpt);
         } else if (strcmp(it->c_str(), "-Xhelp") == 0) {
             printToConsole(HELP_MSG);
             if (!appendHelp.empty()) {
                 printToConsole(appendHelp.c_str());
             }
             return false;
+        } else if (strcmp(it->c_str(), "-Xversion") == 0) {
+            printToConsole("JRuby Launcher Version " JRUBY_LAUNCHER_VERSION "\n");
+            return false;
         } else {
             progArgs.push_back(*it);
         }
@@ -467,6 +482,11 @@ void ArgParser::constructClassPath() {
         classPath += cpAfter;
     }
 
+    // JRUBY-4709: Include this by default to have PWD as part of classpath
+    if (!classPath.empty()) {
+        classPath += PATH_SEP;
+    }
+
     logMsg("ClassPath: %s", classPath.c_str());
 }
 
@@ -533,8 +553,8 @@ void ArgParser::addToClassPath(const char *path, bool onlyIfExists) {
 void ArgParser::addToBootClassPath(const char *path, bool onlyIfExists) {
     logMsg("addToBootClassPath()\n\tpath: %s\n\tonlyIfExists: %s", path, onlyIfExists ? "true" : "false");
 
-    if (nailgunServer) {
-        logMsg("NOTE: In 'ng-server' mode there is no bootclasspath, adding to classpath...");
+    if (noBootClassPath) {
+        logMsg("NOTE: In this mode there is no bootclasspath, adding to the classpath instead...");
         return addToClassPath(path, onlyIfExists);
     }
 

data/argparser.h

@@ -54,7 +54,7 @@ protected:
 protected:
     bool separateProcess;
     bool nailgunClient;
-    bool nailgunServer;
+    bool noBootClassPath;
     bool printCommandLine;
     std::string platformDir;
     std::string bootclass;

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0"
+  VERSION = "1.0.1"
 end

data/resources/jruby.rc

@@ -12,7 +12,7 @@ BEGIN
    VALUE "FileDescription",  "Windows JRuby Launcher\0"
    VALUE "FileVersion",      "1.0\0"
    VALUE "InternalName",     "jruby.exe\0"
-   VALUE "LegalCopyright",   "Copyright (C) The JRuby Team\0"
+   VALUE "LegalCopyright",   "Copyright 2009-2010 JRuby Team\0"
    VALUE "OriginalFilename", "jruby.exe\0"
    VALUE "ProductName",      "JRuby\0"
    VALUE "ProductVersion",   "1.0\0"

data/spec/launcher_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../spec_helper.rb', __FILE__)
-require 'rbconfig'
 
 describe "JRuby native launcher" do
   it "should run org.jruby.Main" do
@@ -148,4 +147,26 @@ describe "JRuby native launcher" do
     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
+
+  # JRUBY-4709
+  it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
+    jruby_launcher_args("-Xnobootclasspath -e true").grep(/java\.class\.path/).first.should =~
+      if windows?
+        /;$/
+      else
+        /:$/
+      end
+  end
+
+  it "should print the version" do
+    jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version [0-9.]+/
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'spec'
 require 'rbconfig'
+require 'fileutils'
 
 if defined?(JRUBY_VERSION)
   require 'jruby'
@@ -7,13 +8,25 @@ if defined?(JRUBY_VERSION)
 end
 
 module JRubyLauncherHelper
-  JRUBY_EXE = File.expand_path("../../jruby", __FILE__) + Config::CONFIG['EXEEXT']
+  JRUBY_EXE = ''
   WINDOWS = Config::CONFIG['target_os'] =~ /mswin/
 
   def self.check_executable_built
-    unless File.executable?(JRUBY_EXE)
+    exe = File.expand_path("../../jruby", __FILE__) + Config::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)

data/utilsfuncs.cpp

@@ -184,7 +184,7 @@ void logV(bool appendSysError, bool showMsgBox, const char *format, va_list args
         strncat(msg, sysErr, 4096 - strlen(msg));
     }
 
-    if (!gLogFileName.empty()) {
+    if (!gLogFileName.empty() && gLogFileName != "''") {
         FILE *file = fopen(gLogFileName.c_str(), "a");
         if (file) {
             fprintf(file, "%s\n", msg);

data/version.h

@@ -0,0 +1,11 @@
+/*
+ * Copyright 2009-2010 JRuby Team (www.jruby.org).
+ */
+
+
+#ifndef _VERSION_H_
+#define _VERSION_H_
+
+#define JRUBY_LAUNCHER_VERSION "1.0.1"
+
+#endif // ! _VERSION_H_

metadata

@@ -3,64 +3,66 @@ name: jruby-launcher
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-    - 1
-    - 0
-  version: "1.0"
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: java
 authors: 
-  - Nick Sieger
-  - Vladimir Sizikov
+- Nick Sieger
+- Vladimir Sizikov
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -05:00
+date: 2010-04-13 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
 description: Builds and installs a native launcher for JRuby on your system
 email: 
-  - nick@nicksieger.com
-  - vsizikov@gmail.com
+- nick@nicksieger.com
+- vsizikov@gmail.com
 executables: []
 
 extensions: 
-  - extconf.rb
+- extconf.rb
 extra_rdoc_files: []
 
 files: 
-  - COPYING
-  - README.txt
-  - Makefile
-  - Rakefile
-  - ng.c
-  - strlcpy.c
-  - argparser.cpp
-  - jruby.cpp
-  - jrubyexe.cpp
-  - jvmlauncher.cpp
-  - platformlauncher.cpp
-  - unixlauncher.cpp
-  - utilsfuncs.cpp
-  - utilsfuncswin.cpp
-  - argnames.h
-  - argparser.h
-  - jvmlauncher.h
-  - nbexecloader.h
-  - platformlauncher.h
-  - rb_w32_cmdvector.h
-  - unixlauncher.h
-  - utilsfuncs.h
-  - inc/Makefile-conf.mk
-  - inc/Makefile-impl.mk
-  - inc/Makefile-rules.mk
-  - extconf.rb
-  - lib/jruby-launcher.rb
-  - lib/rubygems/defaults/jruby_native.rb
-  - spec/launcher_spec.rb
-  - spec/spec_helper.rb
-  - resources/jruby.ico
-  - resources/jruby.rc
+- COPYING
+- README.txt
+- Makefile
+- Rakefile
+- ng.c
+- strlcpy.c
+- argparser.cpp
+- jruby.cpp
+- jrubyexe.cpp
+- jvmlauncher.cpp
+- platformlauncher.cpp
+- unixlauncher.cpp
+- utilsfuncs.cpp
+- utilsfuncswin.cpp
+- argnames.h
+- argparser.h
+- jvmlauncher.h
+- nbexecloader.h
+- platformlauncher.h
+- rb_w32_cmdvector.h
+- unixlauncher.h
+- utilsfuncs.h
+- version.h
+- inc/Makefile-conf.mk
+- inc/Makefile-impl.mk
+- inc/Makefile-rules.mk
+- extconf.rb
+- lib/jruby-launcher.rb
+- lib/rubygems/defaults/jruby_native.rb
+- spec/launcher_spec.rb
+- spec/spec_helper.rb
+- resources/jruby.ico
+- resources/jruby.rc
 has_rdoc: true
 homepage: http://jruby.org
 licenses: []
@@ -69,21 +71,21 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: jruby-extras