Put user-supplied options after default options on command-line

Author: nicksieger

argparser.cpp

@@ -351,6 +351,9 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
 }
 
 void ArgParser::prepareOptions() {
+    list<string> userOptions(javaOptions);
+    javaOptions.clear();
+
     string option = OPT_JDK_HOME;
     option += jdkhome;
     javaOptions.push_back(option);
@@ -398,7 +401,7 @@ void ArgParser::prepareOptions() {
 #endif
     javaOptions.push_back(option);
 
-    setupMaxHeapAndStack();
+    setupMaxHeapAndStack(userOptions);
 
     constructBootClassPath();
     constructClassPath();
@@ -429,13 +432,14 @@ void ArgParser::prepareOptions() {
         javaOptions.push_back(option);
     }
 
+    javaOptions.insert(javaOptions.end(), userOptions.begin(), userOptions.end());
 }
 
-void ArgParser::setupMaxHeapAndStack() {
+void ArgParser::setupMaxHeapAndStack(list<string> userOptions) {
     // Hard-coded 500m, 2048k is for consistency with jruby shell script.
     string heapSize("500m"), stackSize("2048k");
     bool maxHeap = false, maxStack = false;
-    for (list<string>::iterator it = javaOptions.begin(); it != javaOptions.end(); it++) {
+    for (list<string>::iterator it = userOptions.begin(); it != userOptions.end(); it++) {
         if (!maxHeap && strncmp("-Xmx", it->c_str(), 4) == 0) {
             heapSize = it->substr(4, it->size() - 4);
             maxHeap = true;

argparser.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 JRuby Team (www.jruby.org).
+ * Copyright 2009-2012 JRuby Team (www.jruby.org).
  */
 
 
@@ -41,7 +41,7 @@ class ArgParser {
 
     bool initPlatformDir();
     void prepareOptions();
-    void setupMaxHeapAndStack();
+    void setupMaxHeapAndStack(std::list<std::string> userOptions);
     void addEnvVarToOptions(std::list<std::string> & optionsList, const char * envvar);
     void constructClassPath();
     void constructBootClassPath();

spec/launcher_spec.rb

@@ -210,6 +210,13 @@
     end
   end
 
+  it "should place user-supplied options after default options" do
+    args = jruby_launcher_args("-J-Djruby.home=/tmp")
+    home_args = args.select {|x| x =~ /^-Djruby\.home/ }
+    home_args.length.should == 2
+    home_args.last.should == "-Djruby.home=/tmp"
+  end
+
   it "should print the version" do
     jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version #{JRubyLauncher::VERSION}/
   end

version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.11"
+#define JRUBY_LAUNCHER_VERSION "1.0.12"
 
 #endif // ! _VERSION_H_