jruby-launcher 1.0.10-java → 1.0.11-java

data/Rakefile

@@ -13,17 +13,7 @@ rescue LoadError
   end
 end
 
-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
-
+desc "Generate gemspec file"
 task :gemspec => './lib/jruby-launcher.rb' do
   @gemspec ||= Gem::Specification.new do |s|
     load './lib/jruby-launcher.rb'
@@ -42,8 +32,20 @@ task :gemspec => './lib/jruby-launcher.rb' do
   end
 end
 
-task :package => :gemspec do
+desc "Create gem file"
+task :package => [:update_version, :gemspec, :spec] do
   Gem::PackageTask.new(@gemspec) do |pkg|
   end
   Rake::Task['gem'].invoke
 end
+
+desc "Update version.h based on information in lib/jruby-launcher.rb"
+task :update_version do
+  load File.join(File.dirname(__FILE__), "lib", "jruby-launcher.rb")
+  version_file = File.join(File.dirname(__FILE__), "version.h")
+  version_file_content = File.read(version_file)
+  version_file_content.gsub! /JRUBY_LAUNCHER_VERSION\s+"[^"]+"/, "JRUBY_LAUNCHER_VERSION \"#{JRubyLauncher::VERSION}\""
+  File.open(version_file, "w") do |f|
+    f.puts version_file_content
+  end
+end

data/argparser.cpp

@@ -1,10 +1,11 @@
 /*
- * Copyright 2009-2011 JRuby Team (www.jruby.org).
+ * Copyright 2009-2012 JRuby Team (www.jruby.org).
  */
 
 #include <cstring>
 #include <cstdlib>
 #include <memory>
+#include <string>
 #include "utilsfuncs.h"
 #include "argparser.h"
 #include "argnames.h"
@@ -166,12 +167,9 @@ bool ArgParser::initPlatformDir() {
 
     if (!found) {               // try via PATH search
         logMsg("initPlatformDir: trying to find executable on PATH");
-        char * location = findOnPath(platformDir.c_str());
-        if (location != NULL) {
-            strncpy(path, location, PATH_MAX);
-            free(location);
-            found = true;
-        }
+        std::string location = findOnPath(platformDir.c_str());
+        strncpy(path, location.c_str(), PATH_MAX);
+        found = true;
     }
 
     if (!found) {               // try via JRUBY_HOME
@@ -430,6 +428,7 @@ void ArgParser::prepareOptions() {
         option += bootClassPath;
         javaOptions.push_back(option);
     }
+
 }
 
 void ArgParser::setupMaxHeapAndStack() {

data/jvmlauncher.cpp

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2009-2011 JRuby Team (www.jruby.org).
+ * Copyright 2009-2012 JRuby Team (www.jruby.org).
  * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU

data/jvmlauncher.h

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2009-2011 JRuby Team (www.jruby.org).
+ * Copyright 2009-2012 JRuby Team (www.jruby.org).
  * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

data/platformlauncher.cpp

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2009-2011 JRuby Team (www.jruby.org).
+ * Copyright 2009-2012 JRuby Team (www.jruby.org).
  * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU

data/platformlauncher.h

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2009-2011 JRuby Team (www.jruby.org).
+ * Copyright 2009-2012 JRuby Team (www.jruby.org).
  * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU

data/spec/launcher_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../spec_helper.rb', __FILE__)
+load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)
 
 describe "JRuby native launcher" do
   it "should run org.jruby.Main" do
@@ -210,6 +211,6 @@ describe "JRuby native launcher" do
   end
 
   it "should print the version" do
-    jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version [0-9.]+/
+    jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version #{JRubyLauncher::VERSION}/
   end
 end

data/unixlauncher.cpp

@@ -28,8 +28,15 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
     if (nailgunClient) {
         progArgs.push_front("org.jruby.util.NailMain");
         char ** nailArgv = convertToArgvArray(progArgs);
+        int nailArgc = progArgs.size();
+
         if (printCommandLine) {
-            return printArgvToConsole(nailArgv);
+            printListToConsole(progArgs);
+            for (int i = 0; i < nailArgc; i++) {
+                free(nailArgv[i]);
+            }
+            delete[] nailArgv;
+            return 0;
         }
         return nailgunClientMain(progArgs.size(), (char**)nailArgv, envp);
     }
@@ -65,12 +72,17 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
     }
 
     char** newArgv = convertToArgvArray(commandLine);
+    int newArgc = commandLine.size();
 
     if (printCommandLine) {
-        return printArgvToConsole(newArgv);
+        printListToConsole(commandLine);
+        for (int i = 0; i < newArgc; i++) {
+            free(newArgv[i]);
+        }
+        delete[] newArgv;
+        return 0;
     }
 
-
     if (!fileExists(java.c_str())) {
         string msg = "No `java' exists at " + java + ", please double-check JAVA_HOME.\n";
         printToConsole(msg.c_str());

data/utilsfuncs.cpp

@@ -47,6 +47,10 @@
 #include <cstring>
 #include <cstdlib>
 #include <memory>
+#include <list>
+#include <algorithm>
+#include <iterator>
+#include <iostream>
 #include "utilsfuncs.h"
 #include "argnames.h"
 
@@ -114,7 +118,7 @@ bool fileExists(const char *path) {
     return true;
 }
 
-char* findOnPath(const char* name) {
+string findOnPath(const char* name) {
     string path(getenv("PATH"));
     size_t start = 0;
     size_t sep;
@@ -133,9 +137,8 @@ char* findOnPath(const char* name) {
 	elem += name;
 
 	if (checkExists(elem.c_str(), 0)) {
-	    found = (char*) malloc(elem.length());
-	    strncpy(found, elem.c_str(), elem.length() + 1);
-	    return found;
+            string found_string(elem);
+	    return found_string;
 	}
 
 	start = sep + 1;
@@ -244,26 +247,24 @@ bool printToConsole(const char *msg) {
 }
 
 char** convertToArgvArray(list<string> args) {
-    char ** argv = (char**) malloc(sizeof (char*) * args.size() + 1);
+    char ** argv = new char*[args.size()+1];
     int i = 0;
     for (list<string>::iterator it = args.begin(); it != args.end(); ++it, ++i) {
-        argv[i] = (char*) malloc(sizeof(char) * it->length() + 1);
-        strncpy(argv[i], it->c_str(), it->length() + 1);
+        argv[i] = strdup((*it).c_str());
     }
-    argv[i] = NULL;
+    argv[args.size()] = NULL;
     return argv;
 }
 
 void addToArgList(list<string> & args, int argc, char ** argv) {
     for (int i = 0; i < argc; i++) {
-	args.push_back(argv[i]);
+        std::string str(argv[i]);
+	args.push_back(str);
     }
 }
 
-int printArgvToConsole(char** argv) {
-    while (*argv) {
-	printf("%s\n", *argv);
-	argv++;
+void printListToConsole(list<string> values) {
+    for (list<string>::iterator it = values.begin(); it != values.end(); ++it) {
+        std::cout << *it << std::endl;
     }
-    return 0;
 }

data/utilsfuncs.h

@@ -56,9 +56,9 @@ bool checkLoggingArg(int argc, char *argv[], bool delFile);
 bool printToConsole(const char *msg);
 char** convertToArgvArray(std::list<std::string> args);
 void addToArgList(std::list<std::string> & args, int argc, char ** argv);
-char* findOnPath(const char* name);
+std::string findOnPath(const char* name);
 bool checkDirectory(const char* path);
-int printArgvToConsole(char** argv);
+void printListToConsole(std::list<std::string> l);
 
 #ifndef WIN32
 #define FILE_SEP '/'

data/version.h

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2011 JRuby Team (www.jruby.org).
+ * Copyright 2009-2012 JRuby Team (www.jruby.org).
  */
 
 
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.9"
+#define JRUBY_LAUNCHER_VERSION "1.0.11"
 
 #endif // ! _VERSION_H_

metadata

@@ -2,7 +2,7 @@
 name: jruby-launcher
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.10
+  version: 1.0.11
 platform: java
 authors: 
   - Nick Sieger
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-03 00:00:00 Z
+date: 2012-01-09 00:00:00 Z
 dependencies: []
 
 description: Builds and installs a native launcher for JRuby on your system
@@ -61,8 +61,6 @@ files:
 homepage: http://jruby.org
 licenses: []
 
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
 
@@ -83,9 +81,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Native launcher for JRuby
 test_files: []