jruby-launcher 1.0.15-java → 1.0.16-java

data/Makefile

@@ -27,10 +27,10 @@ jruby.res: resources/jruby.rc
 	windres $^ -O coff -o $@
 
 jruby.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
-	g++ $(CXXFLAGS) $^ -s -o $@ $(LDLIBSOPTIONS)
+	g++ $(CXXFLAGS) $^ -s -o $@ $(LDLIBSOPTIONS) -static
 
 jrubyw.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
-	g++ $(CXXFLAGS) -DJRUBYW -mwindows $^ -s -o $@ $(LDLIBSOPTIONS)
+	g++ $(CXXFLAGS) -DJRUBYW -mwindows $^ -s -o $@ $(LDLIBSOPTIONS) -static
 
 install:
 	@if [ ! -f ./jruby ]; then echo "Please run 'make' first."; exit 1; fi

data/argparser.cpp

@@ -391,12 +391,14 @@ void ArgParser::prepareOptions() {
 
     option = OPT_JFFI_PATH;
 #ifdef WIN32
-    option += (platformDir + "\\lib\\native\\i386-Windows;"
+    option += (platformDir + "\\lib\\native;"
+            + platformDir + "\\lib\\native\\i386-Windows;"
             + platformDir + "\\lib\\native\\x86_64-Windows");
 #else
     struct utsname name;
     if (uname(&name) == 0) {
-        string ffiPath, ffiBase(platformDir + "/lib/native");
+        string ffiBase(platformDir + "/lib/native");
+        string ffiPath = ffiBase;
         DIR* dir = opendir(ffiBase.c_str());
         struct dirent* ent;
         if (dir != NULL) {
@@ -476,8 +478,6 @@ void ArgParser::setupMaxHeapAndStack(list<string> userOptions) {
     if (!maxStack) {
         javaOptions.push_back("-Xss" + stackSize);
     }
-    javaOptions.push_back("-Djruby.memory.max=" + heapSize);
-    javaOptions.push_back("-Djruby.stack.max=" + stackSize);
 }
 
 void ArgParser::constructBootClassPath() {
@@ -498,6 +498,14 @@ void ArgParser::constructBootClassPath() {
         addToBootClassPath(jruby_complete_jar.c_str());
     }
 
+#ifdef DISTRO_BOOT_CLASS_PATH
+// hack converting macro to string
+#define STR_HACK2(x) #x
+#define STR_HACK(x) STR_HACK2(x)
+    addToBootClassPath(STR_HACK(DISTRO_BOOT_CLASS_PATH));
+#endif
+
+
     logMsg("BootclassPath: %s", bootClassPath.c_str());
 }
 

data/inc/Makefile-conf.mk

@@ -64,7 +64,7 @@ WINDRES = windres
 LDLIBSOPTIONS = -lstdc++
 
 ifdef MINGW
-LDLIBSOPTIONS += -lws2_32 -static-libgcc -Wl,--enable-auto-import -Wl,-Bstatic -Wl,-Bdynamic
+LDLIBSOPTIONS += -lws2_32 -static-libgcc -Wl,--enable-auto-import -Wl,-Bstatic -Wl,-Bdynamic -static
 PROGRAM = jruby.dll
 else
 PROGRAM = jruby

data/jvmlauncher.cpp

@@ -78,34 +78,33 @@ void JvmLauncher::setJavaCmd(const string cmdPath) {
     javaServerDllPath = javaPath;
 }
 
-bool JvmLauncher::checkJava(const char *path, const char *prefix) {
-    assert(path);
+bool JvmLauncher::checkJava(std::string &path, const char *prefix) {
     assert(prefix);
-    logMsg("checkJava(%s)", path);
-    javaPath = path;
-    if (*javaPath.rbegin() == '\\') {
-        javaPath.erase(javaPath.length() - 1, 1);
+    logMsg("checkJava('%s', '%s')", path.c_str(), prefix);
+
+    if (*path.rbegin() == '\\') {
+        path.erase(path.length() - 1, 1);
     }
-    javaExePath = javaPath + prefix + JAVA_EXE_FILE;
-    javawExePath = javaPath + prefix + JAVAW_EXE_FILE;
-    javaClientDllPath = javaPath + prefix + JAVA_CLIENT_DLL_FILE;
-    javaServerDllPath = javaPath + prefix + JAVA_SERVER_DLL_FILE;
+    javaExePath = path + prefix + JAVA_EXE_FILE;
+    javawExePath = path + prefix + JAVAW_EXE_FILE;
+    javaClientDllPath = path + prefix + JAVA_CLIENT_DLL_FILE;
+    javaServerDllPath = path + prefix + JAVA_SERVER_DLL_FILE;
     if (!fileExists(javaClientDllPath.c_str())) {
         javaClientDllPath = "";
     }
     if (!fileExists(javaServerDllPath.c_str())) {
         javaServerDllPath = "";
     }
-    javaBinPath = javaPath + prefix + JAVA_BIN_DIR;
+    javaBinPath = path + prefix + JAVA_BIN_DIR;
     if (fileExists(javaExePath.c_str()) || !javaClientDllPath.empty() || !javaServerDllPath.empty()) {
         if (!fileExists(javawExePath.c_str())) {
             logMsg("javaw.exe not exists, forcing java.exe");
             javawExePath = javaExePath;
         }
+        javaPath = path;
         return true;
     }
 
-    javaPath.clear();
     javaBinPath.clear();
     javaExePath.clear();
     javawExePath.clear();
@@ -117,10 +116,13 @@ bool JvmLauncher::checkJava(const char *path, const char *prefix) {
 bool JvmLauncher::initialize(const char *javaPathOrMinVersion) {
     logMsg("JvmLauncher::initialize()\n\tjavaPathOrMinVersion: %s", javaPathOrMinVersion);
     assert(javaPathOrMinVersion);
+    
+    std::string pathOrVersion(javaPathOrMinVersion);
+    
     if (isVersionString(javaPathOrMinVersion)) {
         return findJava(javaPathOrMinVersion);
     } else {
-        return (checkJava(javaPathOrMinVersion, JAVA_JRE_PREFIX) || checkJava(javaPathOrMinVersion, ""));
+        return (checkJava(pathOrVersion, JAVA_JRE_PREFIX) || checkJava(pathOrVersion, ""));
     }
 }
 
@@ -444,7 +446,7 @@ bool JvmLauncher::findJava(const char *javaKey, const char *prefix, const char *
                 if (*path.rbegin() == '\\') {
                     path.erase(path.length() - 1, 1);
                 }
-                return checkJava(path.c_str(), prefix);
+                return checkJava(path, prefix);
             }
         }
     }

data/jvmlauncher.h

@@ -82,7 +82,7 @@ public:
 private:
     JvmLauncher(const JvmLauncher& orig);
 
-    bool checkJava(const char *javaPath, const char *prefix);
+    bool checkJava(std::string &javaPath, const char *version);
     bool findJava(const char *minJavaVersion);
     bool findJava(const char *javaKey, const char *prefix, const char *minJavaVersion);
     bool startOutProcJvm(const char *mainClassName, std::list<std::string> args, std::list<std::string> options, DWORD *retCode);

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.15"
+  VERSION = "1.0.16"
 end

data/ng.c

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2004, 2010, Martian Software, Inc.
+  Copyright 2004-2012, Martian Software, Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -36,8 +36,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <fcntl.h>
 
-#define NAILGUN_VERSION "0.7.1"
+#define NAILGUN_VERSION "0.9.0"
 
 #define BUFSIZE (2048)
 
@@ -62,10 +63,6 @@
 #define MIN(a,b) ((a<b)?(a):(b))
 #endif
 
-#ifndef MSG_WAITALL
-#define MSG_WAITALL 0x40 /* wait for full request or error */
-#endif
-
 #ifdef WIN32
         #define NAILGUN_FILESEPARATOR "NAILGUN_FILESEPARATOR=\\"
         #define NAILGUN_PATHSEPARATOR "NAILGUN_PATHSEPARATOR=;"
@@ -80,27 +77,45 @@
 #define NAILGUN_CLIENT_NAME "ng"
 #define CHUNK_HEADER_LEN (5)
 
-#define NAILGUN_SOCKET_FAILED (999)
-#define NAILGUN_CONNECT_FAILED (998)
-#define NAILGUN_UNEXPECTED_CHUNKTYPE (997)
-#define NAILGUN_EXCEPTION_ON_SERVER (996)
-#define NAILGUN_CONNECTION_BROKEN (995)
-#define NAILGUN_BAD_ARGUMENTS (994)
+#define NAILGUN_SOCKET_FAILED (231)
+#define NAILGUN_CONNECT_FAILED (230)
+#define NAILGUN_UNEXPECTED_CHUNKTYPE (229)
+#define NAILGUN_EXCEPTION_ON_SERVER (228)
+#define NAILGUN_CONNECTION_BROKEN (227)
+#define NAILGUN_BAD_ARGUMENTS (226)
 
 #define CHUNKTYPE_STDIN '0'
 #define CHUNKTYPE_STDOUT '1'
 #define CHUNKTYPE_STDERR '2'
 #define CHUNKTYPE_STDIN_EOF '.'
 #define CHUNKTYPE_ARG 'A'
+#define CHUNKTYPE_LONGARG 'L'
 #define CHUNKTYPE_ENV 'E'
 #define CHUNKTYPE_DIR 'D'
 #define CHUNKTYPE_CMD 'C'
 #define CHUNKTYPE_EXIT 'X'
+#define CHUNKTYPE_STARTINPUT 'S'
 
+// jruby-launcher specific constant
+#define JRUBY_EXIT_EXCEPTION (1)
+
+/*
+   the following is required to compile for hp-ux
+   originally posted at http://jira.codehaus.org/browse/JRUBY-2346
+*/
+#ifndef MSG_WAITALL
+#define MSG_WAITALL 0x40 /* wait for full request or error */
+#endif
 
 /* the socket connected to the nailgun server */
 int nailgunsocket = 0;
 
+/* buffer used for receiving and writing nail output chunks */
+char buf[BUFSIZE];
+
+/* track whether or not we've been told to send stdin to server */
+int startedInput = 0;
+
 /**
  * Clean up the application.
  */
@@ -198,6 +213,38 @@ void sendHeader(unsigned int size, char chunkType) {
   sendAll(nailgunsocket, header, CHUNK_HEADER_LEN);
 }
 
+/**
+ * Sends the contents of the specified file as a long argument (--nailgun-filearg)
+ * This is sent as one or more chunks of type CHUNK_LONGARG.  The end of the argument
+ * is indicated by an empty chunk.
+ *
+ * @param filename the name of the file to send.
+ * @return nonzero on failure
+ */
+int sendFileArg(char *filename) {
+  int i, f;
+  
+  if ((f = open(filename, O_RDONLY)) < 0) {
+    perror("--nailgun-filearg");
+    return 1;  
+  }
+
+  i = read(f, buf, BUFSIZE);
+  while (i > 0) {
+    sendHeader(i, CHUNKTYPE_LONGARG);
+    sendAll(nailgunsocket, buf, i);
+    i = read(f, buf, BUFSIZE);
+  }
+  if (i < 0) {
+    perror("--nailgun-filearg");
+    return 1;
+  }
+  sendHeader(0, CHUNKTYPE_LONGARG);
+  
+  close(f);
+  return 0;
+}
+
 /**
  * Sends a null-terminated string with the specified chunk type.
  *
@@ -205,7 +252,7 @@ void sendHeader(unsigned int size, char chunkType) {
  * @param text the null-terminated string to send
  */
 void sendText(char chunkType, char *text) {
-  int len = strlen(text);
+  int len = text ? strlen(text) : 0;
   sendHeader(len, chunkType);
   sendAll(nailgunsocket, text, len);
 }
@@ -234,6 +281,8 @@ void recvToFD(HANDLE destFD, char *buf, unsigned long len) {
     int thisPass = 0;
 
     thisPass = recv(nailgunsocket, buf, bytesToRead, MSG_WAITALL);
+    if (thisPass < bytesToRead) handleSocketClose();
+    
 
     bytesRead += thisPass;
 
@@ -278,47 +327,13 @@ void processExit(char *buf, unsigned long len) {
   buf[bytesRead] = 0;
 
   exitcode = atoi(buf);
+  if (exitcode != 0) {
+    exitcode = JRUBY_EXIT_EXCEPTION;
+  }
 
   cleanUpAndExit(exitcode);
 }
 
-/**
- * Processes data from the nailgun server.
- */
-void processnailgunstream() {
-  /* buffer used for receiving and writing nail output chunks */
-  char buf[BUFSIZE];
-
-  /*for (;;) {*/
-    int bytesRead = 0;
-    unsigned long len;
-    char chunkType;
-
-    bytesRead = recv(nailgunsocket, buf, CHUNK_HEADER_LEN, 0);
-
-    if (bytesRead < CHUNK_HEADER_LEN) {
-      handleSocketClose();
-    }
-
-    len = ((buf[0] << 24) & 0xff000000)
-      | ((buf[1] << 16) & 0x00ff0000)
-      | ((buf[2] << 8) & 0x0000ff00)
-      | ((buf[3]) & 0x000000ff);
-
-    chunkType = buf[4];
-
-    switch(chunkType) {
-      case CHUNKTYPE_STDOUT: recvToFD(NG_STDOUT_FILENO, buf, len);
-            break;
-      case CHUNKTYPE_STDERR: recvToFD(NG_STDERR_FILENO, buf, len);
-            break;
-      case CHUNKTYPE_EXIT:   processExit(buf, len);
-            break;
-      default:  fprintf(stdout, "Unexpected chunk type %d ('%c')\n", chunkType, chunkType);
-          cleanUpAndExit(NAILGUN_UNEXPECTED_CHUNKTYPE);
-    }
-  /*}*/
-}
 
 /**
  * Sends len bytes from buf to the nailgun server in a stdin chunk.
@@ -345,19 +360,19 @@ void processEof() {
  */
 DWORD WINAPI processStdin (LPVOID lpParameter) {
   /* buffer used for reading and sending stdin chunks */
-  char buf[BUFSIZE];
+  char wbuf[BUFSIZE];
 
   for (;;) {
     DWORD numberOfBytes = 0;
 
-    if (!ReadFile(NG_STDIN_FILENO, buf, BUFSIZE, &numberOfBytes, NULL)) {
+    if (!ReadFile(NG_STDIN_FILENO, wbuf, BUFSIZE, &numberOfBytes, NULL)) {
       if (numberOfBytes != 0) {
         handleError();
       }
     }
 
     if (numberOfBytes > 0) {
-      sendStdin(buf, numberOfBytes);
+      sendStdin(wbuf, numberOfBytes);
     } else {
       processEof();
       break;
@@ -400,26 +415,77 @@ void initSockets () {
  * Initialise the asynchronous io.
  */
 void initIo () {
-  SECURITY_ATTRIBUTES securityAttributes;
-  DWORD threadId = 0;
-
   /* create non-blocking console io */
   AllocConsole();
+  
+  NG_STDIN_FILENO = GetStdHandle(STD_INPUT_HANDLE);
+  NG_STDOUT_FILENO = GetStdHandle(STD_OUTPUT_HANDLE);
+  NG_STDERR_FILENO = GetStdHandle(STD_ERROR_HANDLE);
+}
+#endif
+
+#ifdef WIN32
+/**
+ * Initialise the asynchronous io.
+ */
+void winStartInput () {
+  SECURITY_ATTRIBUTES securityAttributes;
+  DWORD threadId = 0;
 
   securityAttributes.bInheritHandle = TRUE;
   securityAttributes.lpSecurityDescriptor = NULL;
   securityAttributes.nLength = 0;
 
-  NG_STDIN_FILENO = GetStdHandle(STD_INPUT_HANDLE);
-  NG_STDOUT_FILENO = GetStdHandle(STD_OUTPUT_HANDLE);
-  NG_STDERR_FILENO = GetStdHandle(STD_ERROR_HANDLE);
-
   if (!CreateThread(&securityAttributes, 0, &processStdin, NULL, 0, &threadId)) {
     handleError();
   }
 }
 #endif
 
+/**
+ * Processes data from the nailgun server.
+ */
+void processnailgunstream() {
+
+  /*for (;;) {*/
+    int bytesRead = 0;
+    unsigned long len;
+    char chunkType;
+
+    bytesRead = recv(nailgunsocket, buf, CHUNK_HEADER_LEN, MSG_WAITALL);
+
+    if (bytesRead < CHUNK_HEADER_LEN) {
+      handleSocketClose();
+    }
+  
+    len = ((buf[0] << 24) & 0xff000000)
+      | ((buf[1] << 16) & 0x00ff0000)
+      | ((buf[2] << 8) & 0x0000ff00)
+      | ((buf[3]) & 0x000000ff);
+  
+    chunkType = buf[4];
+  
+    switch(chunkType) {
+      case CHUNKTYPE_STDOUT: recvToFD(NG_STDOUT_FILENO, buf, len);
+            break;
+      case CHUNKTYPE_STDERR: recvToFD(NG_STDERR_FILENO, buf, len);
+            break;
+      case CHUNKTYPE_EXIT:   processExit(buf, len);
+            break;
+      case CHUNKTYPE_STARTINPUT:
+            if (!startedInput) {
+                #ifdef WIN32
+                winStartInput();
+                #endif
+      		startedInput = 1;
+      	    }
+            break;
+      default:  fprintf(stderr, "Unexpected chunk type %d ('%c')\n", chunkType, chunkType);
+          cleanUpAndExit(NAILGUN_UNEXPECTED_CHUNKTYPE);
+    }
+  /*}*/
+}
+
 /**
  * Trims any path info from the beginning of argv[0] to determine
  * the name used to launch the client.
@@ -450,25 +516,31 @@ int isNailgunClientName(char *s) {
  * Displays usage info and bails
  */
 void usage(int exitcode) {
-
-  fprintf(stdout, "Usage: ng class [--nailgun-options] [args]\n");
-  fprintf(stdout, "          (to execute a class)\n");
-  fprintf(stdout, "   or: ng alias [--nailgun-options] [args]\n");
-  fprintf(stdout, "          (to execute an aliased class)\n");
-  fprintf(stdout, "   or: alias [--nailgun-options] [args]\n");
-  fprintf(stdout, "          (to execute an aliased class, where \"alias\"\n");
-  fprintf(stdout, "           is both the alias for the class and a symbolic\n");
-  fprintf(stdout, "           link to the ng client)\n\n");
-
-  fprintf(stdout, "where options include:\n");
-  fprintf(stdout, "   --nailgun-D<name>=<value>   set/override a client environment variable\n");
-  fprintf(stdout, "   --nailgun-version           print product version and exit\n");
-  fprintf(stdout, "   --nailgun-showversion       print product version and continue\n");
-  fprintf(stdout, "   --nailgun-server            to specify the address of the nailgun server\n");
-  fprintf(stdout, "                               (default is localhost)\n");
-  fprintf(stdout, "   --nailgun-port              to specify the port of the nailgun server\n");
-  fprintf(stdout, "                               (default is 2113)\n");
-  fprintf(stdout, "   --nailgun-help              print this message and exit\n");
+  fprintf(stderr, "NailGun v%s\n\n", NAILGUN_VERSION);
+  fprintf(stderr, "Usage: ng class [--nailgun-options] [args]\n");
+  fprintf(stderr, "          (to execute a class)\n");
+  fprintf(stderr, "   or: ng alias [--nailgun-options] [args]\n");
+  fprintf(stderr, "          (to execute an aliased class)\n");
+  fprintf(stderr, "   or: alias [--nailgun-options] [args]\n");
+  fprintf(stderr, "          (to execute an aliased class, where \"alias\"\n");
+  fprintf(stderr, "           is both the alias for the class and a symbolic\n");
+  fprintf(stderr, "           link to the ng client)\n\n");
+  
+  fprintf(stderr, "where options include:\n");
+  fprintf(stderr, "   --nailgun-D<name>=<value>   set/override a client environment variable\n");
+  fprintf(stderr, "   --nailgun-version           print product version and exit\n");
+  fprintf(stderr, "   --nailgun-showversion       print product version and continue\n");
+  fprintf(stderr, "   --nailgun-server            to specify the address of the nailgun server\n");
+  fprintf(stderr, "                               (default is NAILGUN_SERVER environment variable\n");
+  fprintf(stderr, "                               if set, otherwise localhost)\n");
+  fprintf(stderr, "   --nailgun-port              to specify the port of the nailgun server\n");
+  fprintf(stderr, "                               (default is NAILGUN_PORT environment variable\n");
+  fprintf(stderr, "                               if set, otherwise 2113)\n");  
+  fprintf(stderr, "   --nailgun-filearg FILE      places the entire contents of FILE into the\n");
+  fprintf(stderr, "                               next argument, which is interpreted as a string\n");
+  fprintf(stderr, "                               using the server's default character set.  May be\n");
+  fprintf(stderr, "                               specified more than once.\n");
+  fprintf(stderr, "   --nailgun-help              print this message and exit\n");
 
   cleanUpAndExit(exitcode);
 }
@@ -515,6 +587,15 @@ int nailgunClientMain(int argc, char *argv[], char *env[]) {
     cmd = NULL;
   }
 
+  /* if executing just the ng client with no arguments or -h|--help, then
+     display usage and exit.  Don't handle -h|--help if a command other than
+     ng or ng.exe was used, since the appropriate nail should then handle
+     --help. */
+  if (cmd == NULL && 
+        (argc == 1 || 
+	  (argc == 2 && strcmp("--help", argv[1]) == 0) ||
+	  (argc == 2 && strcmp("-h", argv[1]) == 0))) usage(0);
+     
   firstArgIndex = 1;
 
   /* quite possibly the lamest commandline parsing ever.
@@ -533,6 +614,9 @@ int nailgunClientMain(int argc, char *argv[], char *env[]) {
       nailgun_port = argv[i + 1];
       argv[i] = argv[i + 1]= NULL;
       ++i;
+    } else if (!strcmp("--nailgun-filearg", argv[i])) {
+      /* just verify usage here.  do the rest when sending args. */
+      if (i == argc - 1) usage (NAILGUN_BAD_ARGUMENTS);
     } else if (!strcmp("--nailgun-version", argv[i])) {
       printf("NailGun client version %s\n", NAILGUN_VERSION);
       cleanUpAndExit(0);
@@ -557,7 +641,7 @@ int nailgunClientMain(int argc, char *argv[], char *env[]) {
   hostinfo = gethostbyname(nailgun_server);
 
   if (hostinfo == NULL) {
-    fprintf(stdout, "Unknown host: %s\n", nailgun_server);
+    fprintf(stderr, "Unknown host: %s\n", nailgun_server);
     cleanUpAndExit(NAILGUN_CONNECT_FAILED);
   }
 
@@ -576,7 +660,7 @@ int nailgunClientMain(int argc, char *argv[], char *env[]) {
 
   if (connect(nailgunsocket, (struct sockaddr *)&server_addr,
     sizeof(struct sockaddr)) == -1) {
-    perror("connect to Nailgun server");
+    perror("connect");
     cleanUpAndExit(NAILGUN_CONNECT_FAILED);
   }
 
@@ -585,7 +669,11 @@ int nailgunClientMain(int argc, char *argv[], char *env[]) {
      marked some arguments NULL if we read them to specify the
      nailgun server and/or port */
   for(i = firstArgIndex; i < argc; ++i) {
-    if (argv[i] != NULL) sendText(CHUNKTYPE_ARG, argv[i]);
+    if (argv[i] != NULL) {
+      if (!strcmp("--nailgun-filearg", argv[i])) {
+        sendFileArg(argv[++i]);
+      } else sendText(CHUNKTYPE_ARG, argv[i]);
+    }
   }
 
   /* now send environment */
@@ -596,7 +684,7 @@ int nailgunClientMain(int argc, char *argv[], char *env[]) {
   }
 
   /* now send the working directory */
-  cwd = getcwd(NULL, BUFSIZE);
+  cwd = getcwd(NULL, 0);
   sendText(CHUNKTYPE_DIR, cwd);
   free(cwd);
 
@@ -616,7 +704,7 @@ int nailgunClientMain(int argc, char *argv[], char *env[]) {
       FD_ZERO(&readfds);
 
       /* don't select on stdin if we've already reached its end */
-      if (!eof) {
+      if (startedInput && !eof) {
         FD_SET(NG_STDIN_FILENO, &readfds);
       }
 

data/platformlauncher.cpp

@@ -220,10 +220,10 @@ bool PlatformLauncher::checkJDKHome() {
         logMsg("-Xjdkhome is not set, checking for %%JAVA_HOME%%...");
         char *origJavaHome = getenv("JAVA_HOME");
         if (origJavaHome) {
-            const char *javaHome = trimTrailingBackslashes(origJavaHome).c_str();
-            logMsg("%%JAVA_HOME%% is set: %s", javaHome);
-            if (!jvmLauncher.initialize(javaHome)) {
-                logMsg("ERROR: Cannot locate java installation, specified by JAVA_HOME: %s", javaHome);
+            string javaHome = trimTrailingBackslashes(origJavaHome);
+            logMsg("%%JAVA_HOME%% is set: %s", javaHome.c_str());
+            if (!jvmLauncher.initialize(javaHome.c_str())) {
+                logMsg("ERROR: Cannot locate java installation, specified by JAVA_HOME: %s", javaHome.c_str());
                 string errMsg = "Cannot locate Java installation, specified by JAVA_HOME:\n";
                 errMsg += javaHome;
                 string errMsgFull = errMsg + "\nDo you want to try to use default version?";

data/spec/launcher_spec.rb

@@ -95,19 +95,19 @@ describe "JRuby native launcher" do
   end
 
   it "should default to 500m max heap" do
-    jruby_launcher_args("").should include("-Xmx500m", "-Djruby.memory.max=500m")
+    jruby_launcher_args("").should include("-Xmx500m")
   end
 
   it "should allow max heap to be overridden" do
-    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m", "-Djruby.memory.max=256m")
+    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m")
   end
 
   it "should default to 2048k max stack" do
-    jruby_launcher_args("").should include("-Xss2048k", "-Djruby.stack.max=2048k")
+    jruby_launcher_args("").should include("-Xss2048k")
   end
 
   it "should allow max stack to be overridden" do
-    jruby_launcher_args("-J-Xss512k").should include("-Xss512k", "-Djruby.stack.max=512k")
+    jruby_launcher_args("-J-Xss512k").should include("-Xss512k")
   end
 
   it "should add the contents of the CLASSPATH environment variable" do
@@ -209,13 +209,13 @@ describe "JRuby native launcher" do
   # JRUBY-6016
   it "should honor JAVA_MEM" do
     with_environment "JAVA_MEM" => "-Xmx768m" do
-      jruby_launcher_args("").should include("-Xmx768m", "-Djruby.memory.max=768m")
+      jruby_launcher_args("").should include("-Xmx768m")
     end
   end
 
   it "should honor JAVA_STACK" do
     with_environment "JAVA_STACK" => "-Xss3072k" do
-      jruby_launcher_args("").should include("-Xss3072k", "-Djruby.stack.max=3072k")
+      jruby_launcher_args("").should include("-Xss3072k")
     end
   end
 

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.15"
+#define JRUBY_LAUNCHER_VERSION "1.0.16"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: jruby-launcher
 version: !ruby/object:Gem::Version
+  version: 1.0.16
   prerelease:
-  version: 1.0.15
 platform: java
 authors:
 - Nick Sieger
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email:
@@ -25,78 +25,35 @@ files:
 - README.txt
 - Makefile
 - Rakefile
-- !binary |-
-  bmcuYw==
-- !binary |-
-  c3RybGNweS5j
-- !binary |-
-  YXJncGFyc2VyLmNwcA==
-- !binary |-
-  anJ1YnkuY3Bw
-- !binary |-
-  anJ1YnlleGUuY3Bw
-- !binary |-
-  anZtbGF1bmNoZXIuY3Bw
-- !binary |-
-  cGxhdGZvcm1sYXVuY2hlci5jcHA=
-- !binary |-
-  dW5peGxhdW5jaGVyLmNwcA==
-- !binary |-
-  dXRpbHNmdW5jcy5jcHA=
-- !binary |-
-  dXRpbHNmdW5jc3dpbi5jcHA=
-- !binary |-
-  YXJnbmFtZXMuaA==
-- !binary |-
-  YXJncGFyc2VyLmg=
-- !binary |-
-  anZtbGF1bmNoZXIuaA==
-- !binary |-
-  bmJleGVjbG9hZGVyLmg=
-- !binary |-
-  cGxhdGZvcm1sYXVuY2hlci5o
-- !binary |-
-  cmJfdzMyX2NtZHZlY3Rvci5o
-- !binary |-
-  dW5peGxhdW5jaGVyLmg=
-- !binary |-
-  dXRpbHNmdW5jcy5o
-- !binary |-
-  dmVyc2lvbi5o
-- !binary |-
-  aW5jL01ha2VmaWxlLWNvbmYubWs=
-- !binary |-
-  aW5jL01ha2VmaWxlLWltcGwubWs=
-- !binary |-
-  aW5jL01ha2VmaWxlLXJ1bGVzLm1r
-- !binary |-
-  ZXh0Y29uZi5yYg==
-- !binary |-
-  bGliL2pydWJ5LWxhdW5jaGVyLnJi
-- !binary |-
-  bGliL3J1YnlnZW1zL2RlZmF1bHRzL2pydWJ5X25hdGl2ZS5yYg==
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xNS1qYXZhL2V4dGNvbmYucmI=
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xNS1qYXZhL2xpYi9qcnVieS1sYXVu
-  Y2hlci5yYg==
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xNS1qYXZhL2xpYi9ydWJ5Z2Vtcy9k
-  ZWZhdWx0cy9qcnVieV9uYXRpdmUucmI=
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xNS1qYXZhL3NwZWMvbGF1bmNoZXJf
-  c3BlYy5yYg==
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xNS1qYXZhL3NwZWMvc3BlY19oZWxw
-  ZXIucmI=
-- !binary |-
-  c3BlYy9sYXVuY2hlcl9zcGVjLnJi
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
-- !binary |-
-  cmVzb3VyY2VzL2pydWJ5Lmljbw==
-- !binary |-
-  cmVzb3VyY2VzL2pydWJ5LnJj
+- 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
 homepage: http://jruby.org
 licenses: []
 post_install_message:
@@ -105,17 +62,15 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: jruby-extras

data/pkg/jruby-launcher-1.0.15-java/extconf.rb

@@ -1,7 +0,0 @@
-require 'rbconfig'
-
-mf = File.read('Makefile')
-mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{Config::CONFIG['bindir']}")
-mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(Config::CONFIG['libdir'])}")
-puts mf
-File.open('Makefile', 'wb') {|f| f << mf}

data/pkg/jruby-launcher-1.0.15-java/lib/jruby-launcher.rb

@@ -1,3 +0,0 @@
-module JRubyLauncher
-  VERSION = "1.0.15"
-end

data/pkg/jruby-launcher-1.0.15-java/lib/rubygems/defaults/jruby_native.rb

@@ -1,4 +0,0 @@
-class Gem::ConfigFile
-  PLATFORM_DEFAULTS['install'] = '--no-rdoc --no-ri'
-  PLATFORM_DEFAULTS['update'] = '--no-rdoc --no-ri'
-end

data/pkg/jruby-launcher-1.0.15-java/spec/launcher_spec.rb

@@ -1,258 +0,0 @@
-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
-    jruby_launcher_args("").last.should == "org/jruby/Main"
-  end
-
-  it "should pass unrecognized arguments to JRuby" do
-    jruby_launcher_args("-J-Dsome.option -v --help")[-3..-1].should == ["org/jruby/Main", "-v", "--help"]
-  end
-
-  it "should print help message" do
-    args = jruby_launcher_args("-Xhelp 2>&1")
-    args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
-    args.should include("-X")
-    args = jruby_launcher_args("-X 2>&1")
-    args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
-    args.should include("-X")
-  end
-
-  it "should use $JAVACMD when JAVACMD is specified" do
-    with_environment "JAVACMD" => File.join("jato") do
-      if windows?
-        jruby_launcher_args("-v 2>&1").join.should =~ %r{jato}
-      else
-        jruby_launcher_args("-v").first.should == File.join("jato")
-      end
-    end
-  end
-
-  it "should use $JAVA_HOME/bin/java when JAVA_HOME is specified" do
-    with_environment "JAVA_HOME" => File.join("some", "java", "home") do
-      if windows?
-        jruby_launcher_args("-v 2>&1").join.should =~ %r{some/java/home}
-      else
-        jruby_launcher_args("-v").first.should == File.join("some", "java", "home", "bin", "java")
-      end
-    end
-  end
-
-  it "should use -Xjdkhome argument above JAVA_HOME" do
-    with_environment "JAVA_HOME" => File.join("env", "java", "home") do
-      if windows?
-        jruby_launcher_args("-Xjdkhome some/java/home 2>&1").join.should =~ %r{some/java/home}
-      else
-        jruby_launcher_args("-Xjdkhome some/java/home").first.should == File.join("some", "java", "home", "bin", "java")
-      end
-    end
-  end
-
-  it "should drop the backslashes at the end of JAVA_HOME" do
-    with_environment "JAVA_HOME" => File.join("some", "java", "home\\\\") do
-      if windows?
-        jruby_launcher_args("").join.should =~ %r{some/java/home}
-      else
-        jruby_launcher_args("").first.should == File.join("some", "java", "home", "bin", "java")
-      end
-    end
-  end
-
-  it "should complain about a missing log argument" do
-    jruby_launcher("-Xtrace 2>&1").should =~ /Argument is missing for "-Xtrace"/
-    jruby_launcher("-Xtrace -- 2>&1").should =~ /Argument is missing for "-Xtrace"/
-  end
-
-  it "should complain about a missing jdkhome argument" do
-    jruby_launcher("-Xjdkhome 2>&1").should =~ /Argument is missing/
-    jruby_launcher("-Xjdkhome -- 2>&1").should =~ /Argument is missing/
-  end
-
-  it "should complain about a missing classpath append argument" do
-    jruby_launcher("-Xcp:a 2>&1").should =~ /Argument is missing/
-    jruby_launcher("-Xcp:a -- 2>&1").should =~ /Argument is missing/
-  end
-
-  it "should run nailgun server with --ng-server option" do
-    jruby_launcher_args("--ng-server").last.should == "com/martiansoftware/nailgun/NGServer"
-  end
-
-  it "should run nailgun client with --ng option" do
-    jruby_launcher_args('--ng -e "puts 1"').should == ["org.jruby.util.NailMain", "-e", "puts 1"]
-  end
-
-  it "should handle -J JVM options" do
-    jruby_launcher_args("-J-Darg1=value1 -J-Darg2=value2").should include("-Darg1=value1", "-Darg2=value2")
-  end
-
-  it "should pass -Xprop.erty=value as -J-Djruby.prop.erty=value" do
-    jruby_launcher_args("-Xprop.erty=value").should include("-Djruby.prop.erty=value")
-  end
-
-  it "should pass -Xproperties as --properties" do
-    jruby_launcher_args("-Xproperties").should include("--properties")
-  end
-
-  it "should default to 500m max heap" do
-    jruby_launcher_args("").should include("-Xmx500m", "-Djruby.memory.max=500m")
-  end
-
-  it "should allow max heap to be overridden" do
-    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m", "-Djruby.memory.max=256m")
-  end
-
-  it "should default to 2048k max stack" do
-    jruby_launcher_args("").should include("-Xss2048k", "-Djruby.stack.max=2048k")
-  end
-
-  it "should allow max stack to be overridden" do
-    jruby_launcher_args("-J-Xss512k").should include("-Xss512k", "-Djruby.stack.max=512k")
-  end
-
-  it "should add the contents of the CLASSPATH environment variable" do
-    with_environment "CLASSPATH" => "some.jar" do
-      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
-      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
-
-  it "should use the --server compiler" do
-    jruby_launcher_args("--server").should include("-server")
-  end
-
-  it "should use the --client compiler" do
-    jruby_launcher_args("--client").should include("-client")
-  end
-
-  it "should set the JMX settings when --manage is present" do
-    jruby_launcher_args("--manage").should include("-Dcom.sun.management.jmxremote", "-Djruby.management.enabled=true")
-  end
-
-  it "should set the headless flag when --headless is present" do
-    jruby_launcher_args("--headless").should include("-Djava.awt.headless=true")
-  end
-
-  it "should pass -Xprof when --sample is present" do
-    jruby_launcher_args("--sample").should include("-Xprof")
-  end
-
-  it "should stop argument processing when a -- is seen" do
-    jruby_launcher_args("-- -Xhelp -Xtrace --headless").should include("-Xhelp", "-Xtrace", "--headless")
-  end
-
-  # JRUBY-4151
-  it "should properly handle single quotes" do
-    jruby_launcher_args("-e 'ABC DEF'").should include("ABC DEF")
-  end
-
-  # JRUBY-4581
-  it "should prepend JRUBY_OPTS to the start of the argument list to process" do
-    with_environment "JRUBY_OPTS" => "--server -J-Dsome.key=val -rubygems" do
-      jruby_launcher_args("-e 'ABC DEF'").should include("-server", "-Dsome.key=val", "-rubygems", "-e", "ABC DEF")
-    end
-  end
-
-  # JRUBY-4611
-  it "stops argument processing on first non-option argument" do
-    jruby_launcher_args("foo.rb --sample")[-2..-1].should == ["foo.rb", "--sample"]
-  end
-
-  # JRUBY-4608
-  if RbConfig::CONFIG['target_os'] =~ /darwin/i
-    it "includes file.encoding=UTF-8 on Mac if JAVA_ENCODING is not set" do
-      jruby_launcher_args("-e true").should include("-Dfile.encoding=UTF-8")
-      with_environment "JAVA_ENCODING" => "MacRoman" do
-        jruby_launcher_args("-e true").should_not include("-Dfile.encoding=UTF-8")
-      end
-    end
-  end
-
-  it "does not crash on empty args" do
-    jruby_launcher_args("-e ''").should include("-e")
-    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
-
-  it "should put JRuby on regular classpath when VERIFY_JRUBY is set" do
-    with_environment "VERIFY_JRUBY" => "true" do
-      args = jruby_launcher_args("-e true")
-      args.grep(/Xbootclasspath/).should be_empty
-    end
-  end
-
-  # JRUBY-4709
-  it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
-    classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).should =~
-      if windows?
-        /;$/
-      else
-        /:$/
-      end
-  end
-
-  # JRUBY-6016
-  it "should honor JAVA_MEM" do
-    with_environment "JAVA_MEM" => "-Xmx768m" do
-      jruby_launcher_args("").should include("-Xmx768m", "-Djruby.memory.max=768m")
-    end
-  end
-
-  it "should honor JAVA_STACK" do
-    with_environment "JAVA_STACK" => "-Xss3072k" do
-      jruby_launcher_args("").should include("-Xss3072k", "-Djruby.stack.max=3072k")
-    end
-  end
-
-  it "should honor JRUBY_HOME" do
-    with_environment "JRUBY_HOME" => "/tmp" do
-      jruby_launcher_args("").should include("-Djruby.home=/tmp")
-    end
-  end
-
-  context "JRUBY_HOME set and JRUBY_HOME/lib/jruby.jar exists" do
-    let(:jruby_home) do
-      require 'tempfile'
-      t = Tempfile.new("jruby_home")
-      t.path.tap { t.close! }
-    end
-
-    before do
-      FileUtils.mkdir_p(File.join(jruby_home, "lib"))
-      FileUtils.touch(File.join(jruby_home, "lib", "jruby.jar"))
-    end
-    after { FileUtils.rm_rf jruby_home }
-
-    it "should add jruby.jar to the bootclasspath" do
-      with_environment "JRUBY_HOME" => jruby_home do
-        jruby_launcher_args("").should include("-Xbootclasspath/a:#{jruby_home}/lib/jruby.jar")
-      end
-    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
-end

data/pkg/jruby-launcher-1.0.15-java/spec/spec_helper.rb

@@ -1,81 +0,0 @@
-require 'rspec'
-require 'rbconfig'
-require 'fileutils'
-
-if defined?(JRUBY_VERSION)
-  require 'jruby'
-  JRuby.runtime.instance_config.run_ruby_in_process = false
-end
-
-module JRubyLauncherHelper
-  JRUBY_EXE = ''
-  WINDOWS = RbConfig::CONFIG['target_os'] =~ /mswin/
-
-  def self.check_executable_built
-    exe = File.expand_path("../../jruby", __FILE__) + RbConfig::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)
-    `#{JRUBY_EXE} #{args}`
-  end
-
-  def jruby_launcher_args(args)
-    jruby_launcher("-Xcommand #{args}").split("\n")
-  end
-
-  def last_exit_code
-    $?.exitstatus
-  end
-
-  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|
-      prev_env[k] = ENV[k] if ENV.has_key?(k)
-      ENV[k] = v
-    end
-    begin
-      yield
-    ensure
-      pairs.keys.each {|k| ENV.delete(k)}
-      ENV.update(prev_env)
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.before(:all) do
-    JRubyLauncherHelper.check_executable_built
-    # clear environment for better control
-    ENV.delete("JAVA_HOME")
-    ENV.delete("JRUBY_HOME")
-    ENV.delete("JAVA_OPTS")
-    ENV.delete("JRUBY_OPTS")
-    ENV.delete("CLASSPATH")
-    ENV.delete("JAVA_ENCODING")
-  end
-  config.include(JRubyLauncherHelper)
-end