jruby-launcher 1.1.1-java → 1.1.2-java

data/argparser.h

@@ -1,78 +1,78 @@
-/*
- * Copyright 2009-2012 JRuby Team (www.jruby.org).
- */
-
-
-#ifndef _ARGPARSER_H_
-#define _ARGPARSER_H_
-
-#include <string>
-#include <list>
-#include <set>
-
-class ArgParser {
-protected:
-    static const char *REQ_JAVA_VERSION;
-    static const char *HELP_MSG;
-
-    static const char *OPT_JDK_HOME;
-    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;
-
-    static const char *OPT_JFFI_PATH;
-    static const char *OPT_JRUBY_SHELL;
-    static const char *OPT_JRUBY_SCRIPT;
-
-    static const char *MAIN_CLASS;
-    static const char *DEFAULT_EXECUTABLE;
-
-public:
-    ArgParser();
-    virtual ~ArgParser();
-    bool parseArgs(int argc, char *argv[]);
-    void appendToHelp(const char *msg);
-    std::string* buildCommandLine(int argc, char* argv[]);
-
-protected:
-    ArgParser(const ArgParser& orig);
-
-    bool initPlatformDir();
-    void prepareOptions();
-    void setupMaxHeapAndStack(std::list<std::string> userOptions);
-    void addEnvVarToOptions(std::list<std::string> & optionsList, const char * envvar);
-    void constructClassPath();
-    void constructBootClassPath();
-    void addFilesToClassPath(const char *dir, const char *subdir, const char *pattern);
-    void addToClassPath(const char *path, bool onlyIfExists = false);
-    void addToBootClassPath(const char *path, bool onlyIfExists = false);
-    void addJarsToClassPathFrom(const char *dir);
-    void addOptionsToCommandLine(std::list<std::string> & commandLine);
-    bool endsWith(const std::string &string, const std::string &end);
-
-protected:
-    bool separateProcess;
-    bool nailgunClient;
-    bool noBootClassPath;
-    bool printCommandLine;
-    std::string platformDir;
-    std::string bootclass;
-    std::string jdkhome;
-    std::string cpBefore;
-    std::string cpExplicit;
-    std::string cpAfter;
-    std::string nextAction;
-
-    std::list<std::string> javaOptions;
-    std::set<std::string> addedToCP;
-    std::string classPath;
-    std::string bootClassPath;
-    std::set<std::string> addedToBootCP;
-    std::string appendHelp;
-    std::list<std::string> progArgs;
-};
-
-#endif // ! _ARGPARSER_H_
+/*
+ * Copyright 2009-2012 JRuby Team (www.jruby.org).
+ */
+
+
+#ifndef _ARGPARSER_H_
+#define _ARGPARSER_H_
+
+#include <string>
+#include <list>
+#include <set>
+
+class ArgParser {
+protected:
+    static const char *REQ_JAVA_VERSION;
+    static const char *HELP_MSG;
+
+    static const char *OPT_JDK_HOME;
+    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;
+
+    static const char *OPT_JFFI_PATH;
+    static const char *OPT_JRUBY_SHELL;
+    static const char *OPT_JRUBY_SCRIPT;
+
+    static const char *MAIN_CLASS;
+    static const char *DEFAULT_EXECUTABLE;
+
+public:
+    ArgParser();
+    virtual ~ArgParser();
+    bool parseArgs(int argc, char *argv[]);
+    void appendToHelp(const char *msg);
+    std::string* buildCommandLine(int argc, char* argv[]);
+
+protected:
+    ArgParser(const ArgParser& orig);
+
+    bool initPlatformDir();
+    void prepareOptions();
+    void setupMaxHeapAndStack(std::list<std::string> userOptions);
+    void addEnvVarToOptions(std::list<std::string> & optionsList, const char * envvar);
+    void constructClassPath();
+    void constructBootClassPath();
+    void addFilesToClassPath(const char *dir, const char *subdir, const char *pattern);
+    void addToClassPath(const char *path, bool onlyIfExists = false);
+    void addToBootClassPath(const char *path, bool onlyIfExists = false);
+    void addJarsToClassPathFrom(const char *dir);
+    void addOptionsToCommandLine(std::list<std::string> & commandLine);
+    bool endsWith(const std::string &string, const std::string &end);
+
+protected:
+    bool separateProcess;
+    bool nailgunClient;
+    bool noBootClassPath;
+    bool printCommandLine;
+    std::string platformDir;
+    std::string bootclass;
+    std::string jdkhome;
+    std::string cpBefore;
+    std::string cpExplicit;
+    std::string cpAfter;
+    std::string nextAction;
+
+    std::list<std::string> javaOptions;
+    std::set<std::string> addedToCP;
+    std::string classPath;
+    std::string bootClassPath;
+    std::set<std::string> addedToBootCP;
+    std::string appendHelp;
+    std::list<std::string> progArgs;
+};
+
+#endif // ! _ARGPARSER_H_

data/extconf.rb

@@ -1,7 +1,7 @@
-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}
+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/inc/Makefile-conf.mk

@@ -1,76 +1,76 @@
-# Environment
-MKDIR=mkdir
-CP=cp
-CCADMIN=CCadmin
-RANLIB=ranlib
-CC=gcc
-CCC=g++
-CXX=g++
-
-# Windows (mingw)?
-ifneq (,$(findstring mingw, $(CONF)))
-MINGW := true
-endif
-
-# Macros
-ifndef CND_PLATFORM
-CND_PLATFORM=$(shell uname -s)
-endif
-
-# Include project Makefile
-include Makefile
-
-# Object Directory
-OBJECTDIR=build/${CONF}/${CND_PLATFORM}
-
-# Object Files
-OBJECTFILES = ${OBJECTDIR}/argparser.o		\
-	      ${OBJECTDIR}/utilsfuncs.o		\
-	      ${OBJECTDIR}/ng.o			\
-	      ${OBJECTDIR}/strlcpy.o	\
-	      ${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
-INCLUDES += "-I${JAVA_INCLUDE}/win32"
-else
-OBJECTFILES += ${OBJECTDIR}/unixlauncher.o
-endif
-
-CFLAGS += -O2 -Wall $(INCLUDES)
-CCFLAGS = $(CFLAGS)
-CXXFLAGS = $(CFLAGS)
-
-# Compiler Flags
-ifeq (mingw,$(CONF))
-CFLAGS += -m32 -s
-endif
-ifeq (mingw64,$(CONF))
-CFLAGS += -m64 -s
-endif
-
-# Resources
-WINDRES = windres
-
-# Link Libraries and Options
-LDLIBSOPTIONS = -lstdc++
-
-ifdef MINGW
-LDLIBSOPTIONS += -lws2_32 -static-libgcc -Wl,--enable-auto-import -Wl,-Bstatic -Wl,-Bdynamic -static
-PROGRAM = jruby.dll
-else
-PROGRAM = jruby
-endif
-
-ifneq (,$(findstring SunOS,$(CND_PLATFORM)))
-CFLAGS += -D__SUNOS__
-LDLIBSOPTIONS += -lsocket -lnsl
-endif
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+
+# Windows (mingw)?
+ifneq (,$(findstring mingw, $(CONF)))
+MINGW := true
+endif
+
+# Macros
+ifndef CND_PLATFORM
+CND_PLATFORM=$(shell uname -s)
+endif
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/${CONF}/${CND_PLATFORM}
+
+# Object Files
+OBJECTFILES = ${OBJECTDIR}/argparser.o		\
+	      ${OBJECTDIR}/utilsfuncs.o		\
+	      ${OBJECTDIR}/ng.o			\
+	      ${OBJECTDIR}/strlcpy.o	\
+	      ${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
+INCLUDES += "-I${JAVA_INCLUDE}/win32"
+else
+OBJECTFILES += ${OBJECTDIR}/unixlauncher.o
+endif
+
+CFLAGS += -O2 -Wall $(INCLUDES)
+CCFLAGS = $(CFLAGS)
+CXXFLAGS = $(CFLAGS)
+
+# Compiler Flags
+ifeq (mingw,$(CONF))
+CFLAGS += -m32 -s
+endif
+ifeq (mingw64,$(CONF))
+CFLAGS += -m64 -s
+endif
+
+# Resources
+WINDRES = windres
+
+# Link Libraries and Options
+LDLIBSOPTIONS = -lstdc++
+
+ifdef MINGW
+LDLIBSOPTIONS += -lws2_32 -static-libgcc -Wl,--enable-auto-import -Wl,-Bstatic -Wl,-Bdynamic -static
+PROGRAM = jruby.dll
+else
+PROGRAM = jruby
+endif
+
+ifneq (,$(findstring SunOS,$(CND_PLATFORM)))
+CFLAGS += -D__SUNOS__
+LDLIBSOPTIONS += -lsocket -lnsl
+endif

data/inc/Makefile-impl.mk

@@ -1,107 +1,107 @@
-# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
-# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
-# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
-# and .clean-reqprojects-conf unless SUB has the value 'no'
-SUB_no=NO
-SUBPROJECTS=${SUB_${SUB}}
-BUILD_SUBPROJECTS_=.build-subprojects
-BUILD_SUBPROJECTS_NO=
-BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
-CLEAN_SUBPROJECTS_=.clean-subprojects
-CLEAN_SUBPROJECTS_NO=
-CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
-
-
-# Project Name
-PROJECTNAME=jruby-launcher
-
-# Active Configuration
-DEFAULTCONF=mingw
-CONF=${DEFAULTCONF}
-
-# All Configurations
-ALLCONFS=mingw mingw64 unix
-
-# build
-.build-impl: .build-pre .validate-impl .depcheck-impl
-	@#echo "=> Running $@... Configuration=$(CONF)"
-	${MAKE} -f inc/Makefile-rules.mk CONF=$(CONF) SUBPROJECTS=${SUBPROJECTS} .build-conf
-
-
-# clean
-.clean-impl: .clean-pre .depcheck-impl
-	@#echo "=> Running $@... Configuration=$(CONF)"
-	${MAKE} -f inc/Makefile-rules.mk CONF=$(CONF) SUBPROJECTS=${SUBPROJECTS} .clean-conf
-
-
-# clobber 
-.clobber-impl: .clobber-pre .depcheck-impl
-	@#echo "=> Running $@..."
-	for CONF in ${ALLCONFS}; \
-	do \
-	    ${MAKE} -f inc/Makefile-rules.mk CONF=$(CONF) SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
-	done
-
-# all 
-.all-impl: .all-pre .depcheck-impl
-	@#echo "=> Running $@..."
-	for CONF in ${ALLCONFS}; \
-	do \
-	    ${MAKE} -f inc/Makefile-rules.mk CONF=$(CONF) SUBPROJECTS=${SUBPROJECTS} .build-conf; \
-	done
-
-# configuration validation (currently only needed on mingw/windows)
-.validate-impl:
-	@if [ $(CONF) = mingw -a ! "$$JAVA_HOME" ]; \
-	then \
-	    echo ""; \
-	    echo "Error: JAVA_HOME not set. Please make sure you have a JVM installed"; \
-	    echo "and JAVA_HOME pointing to it."; \
-	    echo "Current directory: " `pwd`; \
-	    echo ""; \
-	    exit 1; \
-	fi
-
-# dependency checking support
-.depcheck-impl:
-	@echo "# This code depends on make tool being used" >.dep.inc
-	@if [ -n "${MAKE_VERSION}" ]; then \
-	    echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \
-	    echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \
-	    echo "include \$${DEPFILES}" >>.dep.inc; \
-	    echo "endif" >>.dep.inc; \
-	else \
-	    echo ".KEEP_STATE:" >>.dep.inc; \
-	    echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \
-	fi
-
-# help
-.help-impl: .help-pre
-	@echo "This makefile supports the following configurations:"
-	@echo "    ${ALLCONFS}"
-	@echo ""
-	@echo "and the following targets:"
-	@echo "    build  (default target)"
-	@echo "    clean"
-	@echo "    clobber"
-	@echo "    all"
-	@echo "    help"
-	@echo ""
-	@echo "Makefile Usage:"
-	@echo "    make [CONF=<CONFIGURATION>] [SUB=no] build"
-	@echo "    make [CONF=<CONFIGURATION>] [SUB=no] clean"
-	@echo "    make [SUB=no] clobber"
-	@echo "    make [SUB=no] all"
-	@echo "    make help"
-	@echo ""
-	@echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
-	@echo "    also build subprojects."
-	@echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
-	@echo "    also clean subprojects."
-	@echo "Target 'clobber' will remove all built files from all configurations and,"
-	@echo "    unless 'SUB=no', also from subprojects."
-	@echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
-	@echo "    also build subprojects."
-	@echo "Target 'help' prints this message."
-	@echo ""
-
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=jruby-launcher
+
+# Active Configuration
+DEFAULTCONF=mingw
+CONF=${DEFAULTCONF}
+
+# All Configurations
+ALLCONFS=mingw mingw64 unix
+
+# build
+.build-impl: .build-pre .validate-impl .depcheck-impl
+	@#echo "=> Running $@... Configuration=$(CONF)"
+	${MAKE} -f inc/Makefile-rules.mk CONF=$(CONF) SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .clean-pre .depcheck-impl
+	@#echo "=> Running $@... Configuration=$(CONF)"
+	${MAKE} -f inc/Makefile-rules.mk CONF=$(CONF) SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber 
+.clobber-impl: .clobber-pre .depcheck-impl
+	@#echo "=> Running $@..."
+	for CONF in ${ALLCONFS}; \
+	do \
+	    ${MAKE} -f inc/Makefile-rules.mk CONF=$(CONF) SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+	done
+
+# all 
+.all-impl: .all-pre .depcheck-impl
+	@#echo "=> Running $@..."
+	for CONF in ${ALLCONFS}; \
+	do \
+	    ${MAKE} -f inc/Makefile-rules.mk CONF=$(CONF) SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+	done
+
+# configuration validation (currently only needed on mingw/windows)
+.validate-impl:
+	@if [ $(CONF) = mingw -a ! "$$JAVA_HOME" ]; \
+	then \
+	    echo ""; \
+	    echo "Error: JAVA_HOME not set. Please make sure you have a JVM installed"; \
+	    echo "and JAVA_HOME pointing to it."; \
+	    echo "Current directory: " `pwd`; \
+	    echo ""; \
+	    exit 1; \
+	fi
+
+# dependency checking support
+.depcheck-impl:
+	@echo "# This code depends on make tool being used" >.dep.inc
+	@if [ -n "${MAKE_VERSION}" ]; then \
+	    echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \
+	    echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \
+	    echo "include \$${DEPFILES}" >>.dep.inc; \
+	    echo "endif" >>.dep.inc; \
+	else \
+	    echo ".KEEP_STATE:" >>.dep.inc; \
+	    echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \
+	fi
+
+# help
+.help-impl: .help-pre
+	@echo "This makefile supports the following configurations:"
+	@echo "    ${ALLCONFS}"
+	@echo ""
+	@echo "and the following targets:"
+	@echo "    build  (default target)"
+	@echo "    clean"
+	@echo "    clobber"
+	@echo "    all"
+	@echo "    help"
+	@echo ""
+	@echo "Makefile Usage:"
+	@echo "    make [CONF=<CONFIGURATION>] [SUB=no] build"
+	@echo "    make [CONF=<CONFIGURATION>] [SUB=no] clean"
+	@echo "    make [SUB=no] clobber"
+	@echo "    make [SUB=no] all"
+	@echo "    make help"
+	@echo ""
+	@echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+	@echo "    also build subprojects."
+	@echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+	@echo "    also clean subprojects."
+	@echo "Target 'clobber' will remove all built files from all configurations and,"
+	@echo "    unless 'SUB=no', also from subprojects."
+	@echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+	@echo "    also build subprojects."
+	@echo "Target 'help' prints this message."
+	@echo ""
+