Use -cp for separate processes which will expand wildcard entries

Author: nicksieger

argparser.cpp

@@ -55,6 +55,7 @@ const char *ArgParser::OPT_JDK_HOME = "-Djdk.home=";
 const char *ArgParser::OPT_JRUBY_HOME = "-Djruby.home=";
 const char *ArgParser::OPT_JRUBY_COMMAND_NAME = "-Dsun.java.command=";
 
+const char *ArgParser::OPT_CMDLINE_CLASS_PATH = "-cp";
 const char *ArgParser::OPT_CLASS_PATH = "-Djava.class.path=";
 const char *ArgParser::OPT_BOOT_CLASS_PATH = "-Xbootclasspath/a:";
 
@@ -65,7 +66,7 @@ const char *ArgParser::MAIN_CLASS = "org/jruby/Main";
 const char *ArgParser::DEFAULT_EXECUTABLE = "jruby";
 
 ArgParser::ArgParser()
-    : separateProcess(false)
+    : separateProcess(true)
     , nailgunClient(false)
     , noBootClassPath(false)
     , printCommandLine(false)
@@ -433,9 +434,15 @@ void ArgParser::prepareOptions() {
     option += cmdName;
     javaOptions.push_back(option);
 
-    option = OPT_CLASS_PATH;
-    option += classPath;
-    javaOptions.push_back(option);
+    // When launching a separate process, use '-cp' which expands embedded wildcards
+    if (separateProcess) {
+        javaOptions.push_back(OPT_CMDLINE_CLASS_PATH);
+        javaOptions.push_back(classPath);
+    } else {
+        option = OPT_CLASS_PATH;
+        option += classPath;
+        javaOptions.push_back(option);
+    }
 
     if (!bootClassPath.empty()) {
         option = OPT_BOOT_CLASS_PATH;

argparser.h

@@ -19,6 +19,7 @@ class ArgParser {
     static const char *OPT_JRUBY_HOME;
     static const char *OPT_JRUBY_COMMAND_NAME;
 
+    static const char *OPT_CMDLINE_CLASS_PATH;
     static const char *OPT_CLASS_PATH;
     static const char *OPT_BOOT_CLASS_PATH;
 

platformlauncher.cpp

@@ -54,6 +54,7 @@ extern "C" int nailgunClientMain(int argc, char *argv[], char *env[]);
 PlatformLauncher::PlatformLauncher()
     : ArgParser()
     , suppressConsole(false)
+    , separateProcess(false)
 {
 }
 

spec/launcher_spec.rb

@@ -102,16 +102,15 @@
 
   it "should add the contents of the CLASSPATH environment variable" do
     with_environment "CLASSPATH" => "some.jar" do
-      classpath_arg = jruby_launcher_args("").detect{|a| a =~ /java\.class\.path/}
-      classpath_arg.should =~ /-Djava.class.path=.*some.jar/
+      classpath_arg(jruby_launcher_args("")).should =~ /some.jar/
     end
   end
 
   it "should add the classpath elements in proper order" do
     s = File::PATH_SEPARATOR
     with_environment "CLASSPATH" => "some-env.jar" do
-      classpath_arg = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar").detect{|a| a =~ /java\.class\.path/}
-      classpath_arg.should =~ /-Djava.class.path=some.jar.*#{s}some-env.jar#{s}some-other.jar/
+      args = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar")
+      classpath_arg(args).should =~ /some.jar.*#{s}some-env.jar#{s}some-other.jar/
     end
   end
 
@@ -189,7 +188,7 @@
 
   # 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 =~
+    classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).should =~
       if windows?
         /;$/
       else

spec/spec_helper.rb

@@ -45,6 +45,12 @@ 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|