Use simple launcher script wrapper for Unix

Author: mrnoname1000

inc/Makefile-conf.mk

@@ -21,22 +21,24 @@ include Makefile
 OBJECTDIR=build/${CONF}/${CND_PLATFORM}
 
 # Object Files
-OBJECTFILES = ${OBJECTDIR}/argparser.o		\
-	      ${OBJECTDIR}/utilsfuncs.o		\
-	      ${OBJECTDIR}/ng.o			\
-	      ${OBJECTDIR}/strlcpy.o	\
-	      ${OBJECTDIR}/jrubyexe.o
+OBJECTFILES = ${OBJECTDIR}/jrubyexe.o
 
 ifdef JAVA_HOME
 JAVA_INCLUDE = $(subst \,/,${JAVA_HOME})/include
 INCLUDES = "-I${JAVA_INCLUDE}"
 endif
 
 ifdef MINGW
-OBJECTFILES += ${OBJECTDIR}/utilsfuncswin.o	\
-	       ${OBJECTDIR}/platformlauncher.o	\
-	       ${OBJECTDIR}/jvmlauncher.o	\
-	       ${OBJECTDIR}/jruby.o
+OBJECTFILES += 
+# Object Files
+OBJECTFILES = ${OBJECTDIR}/argparser.o		\
+	          ${OBJECTDIR}/utilsfuncs.o		\
+	          ${OBJECTDIR}/ng.o			\
+	          ${OBJECTDIR}/strlcpy.o	\
+	          ${OBJECTDIR}/utilsfuncswin.o	\
+	          ${OBJECTDIR}/platformlauncher.o	\
+	          ${OBJECTDIR}/jvmlauncher.o	\
+	          ${OBJECTDIR}/jruby.o
 INCLUDES += "-I${JAVA_INCLUDE}/win32"
 else
 OBJECTFILES += ${OBJECTDIR}/unixlauncher.o

jrubyexe.cpp

@@ -50,18 +50,18 @@ const char *CON_ATTACH_MSG =
     "*WARNING*: The non-console JRubyW launcher is forced to attach to console.\n"
     "This may cause unexpected behavior of CMD console. Use:\n"
     "    start /wait jrubyw.exe -Xconsole attach [args]\n";
+
+#include "utilsfuncs.h"
 #endif  // JRUBYW
 #else
 #include "unixlauncher.h"
 #endif  // WIN32
 
-#include "utilsfuncs.h"
-
 
 int main(int argc, char *argv[], char* envp[]) {
+#ifdef WIN32
     checkLoggingArg(argc, argv, true);
 
-#ifdef WIN32
 #ifdef JRUBYW
     if (!isConsoleAttached()) {
         logMsg("Console is not attached, assume WINDOW mode");
@@ -78,7 +78,6 @@ int main(int argc, char *argv[], char* envp[]) {
     return loader.start("jruby.dll", argc - 1, argv + 1, argv[0]);
 
 #else  // !WIN32
-    UnixLauncher launcher;
-    return launcher.run(argc, argv, envp);
+    return unixlauncher_run(argc, argv, envp);
 #endif  // WIN32
 }

jruby.c renamed to unixlauncher.c

@@ -13,7 +13,7 @@
 static const char script_name[] = "jruby.sh";
 
 
-char *which(const char *const executable) {
+static char *which(const char *const executable) {
     const size_t exe_length = strlen(executable);
     char *exe_path = NULL;
     size_t exe_path_size = 0;
@@ -71,7 +71,7 @@ char *which(const char *const executable) {
 }
 
 
-int main(int argc, char *argv[]) {
+int unixlauncher_run(int argc, char *argv[], char *envp[]) {
     if (argc == 0 || argv[0][0] == '\0') {
         fputs("Error: No executable provided!", stderr);
         return 2;

unixlauncher.cpp

@@ -1,22 +1,20 @@
 /*
- * Copyright 2009-2010 JRuby Team (www.jruby.org).
+ * Copyright 2009-2025 JRuby Team (www.jruby.org).
  */
 
 
 #ifndef _UNIXLAUNCHER_H_
 #define _UNIXLAUNCHER_H_
 
-#include "argparser.h"
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
-class UnixLauncher : public ArgParser {
-public:
-    UnixLauncher();
-    virtual ~UnixLauncher();
+int unixlauncher_run(int argc, char *argv[], char *envp[]);
 
-    int run(int argc, char* argv[], char* envp[]);
-
-private:
-    UnixLauncher(const UnixLauncher& orig);
-};
+#ifdef __cplusplus
+}
+#endif
 
 #endif // ! _UNIXLAUNCHER_H_