jruby-launcher 1.0.6-java → 1.0.7-java

data/jvmlauncher.cpp

@@ -206,7 +206,29 @@ bool JvmLauncher::isVersionString(const char *str) {
     return *end == '\0';
 }
 
-bool JvmLauncher::startInProcJvm(const char *mainClassName, std::list<std::string> args, std::list<std::string> options) {
+bool JvmLauncher::startInProcJvm(const char *mainClassName, std::list<std::string> mbcs_args, std::list<std::string> mbcs_options) {
+
+  std::list<std::string> args;
+  for (std::list<std::string>::iterator it = mbcs_args.begin(); it != mbcs_args.end(); ++it) {
+    wchar_t wstr[2048];
+    UINT cp = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
+    MultiByteToWideChar(cp, 0, it->c_str(), -1, wstr, sizeof(wstr) / sizeof(wchar_t));
+    int mb_size = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL);
+    char *mbstr = (char*)malloc(mb_size);
+    WideCharToMultiByte(CP_UTF8, 0, wstr, -1, mbstr, mb_size, NULL, NULL);
+    args.push_back(mbstr);
+  }
+
+  std::list<std::string> options;
+  for (std::list<std::string>::iterator it = mbcs_options.begin(); it != mbcs_options.end(); ++it) {
+    wchar_t wstr[2048];
+    UINT cp = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
+    MultiByteToWideChar(cp, 0, it->c_str(), -1, wstr, sizeof(wstr) / sizeof(wchar_t));
+    int mb_size = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL);
+    char *mbstr = (char*)malloc(mb_size);
+    WideCharToMultiByte(CP_UTF8, 0, wstr, -1, mbstr, mb_size, NULL, NULL);
+    options.push_back(mbstr);
+  }
 
     class Jvm {
     public:

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/launcher_spec.rb

@@ -12,10 +12,10 @@ describe "JRuby native launcher" do
   it "should print help message" do
     args = jruby_launcher_args("-Xhelp 2>&1")
     args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
-    args[-1].should == "-X"
+    args.should include("-X")
     args = jruby_launcher_args("-X 2>&1")
     args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
-    args[-1].should == "-X"
+    args.should include("-X")
   end
 
   it "should use $JAVACMD when JAVACMD is specified" do

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.6"
+#define JRUBY_LAUNCHER_VERSION "1.0.7"
 
 #endif // ! _VERSION_H_

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: java
 authors: 
 - Nick Sieger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -06:00
+date: 2011-02-08 00:00:00 -06:00
 default_executable: 
 dependencies: []