Fix for JRUBY-3867: Nailgun not supported in Windows bat files

Thanks to Dave Ray for the patch!

Author: headius

bin/_jrubyvmopts.bat

@@ -14,6 +14,8 @@ set _VM_OPTS=
 set _RUBY_OPTS=
 set _DFLT_VM_OPTS=%JAVA_OPTS%
 set _JAVA_VM=-client
+set _JAVA_CLASS=org.jruby.Main
+set _JRUBY_BOOTCP_OPTS=-Xbootclasspath/a:"%JRUBY_CP%"
 
 set SAFE_JAVA_HOME=%JAVA_HOME:(=^^(%
 set SAFE_JAVA_HOME=%SAFE_JAVA_HOME:)=^^)%
@@ -89,6 +91,24 @@ if ["%_CMP%"] == ["--1.8"] (
   goto :jvmarg
 )
 
+if ["%_CMP%"] == ["--ng-server"] (
+  set _JAVA_CLASS=com.martiansoftware.nailgun.NGServer
+  set _JAVA_VM=-server
+  rem Nailgun server fails if -Xbootclasspath is used, so we remove it here.
+  rem In com.martiansoftware.nailgun.AliasManager's constructor, 
+  rem getResourceAsStream("com/martiansoftware/nailgun/builtins/builtins.properties")
+  rem returns null, which is not handled, crashing the server. Removing
+  rem -Xbootclasspath for some reason fixes the getResourceAsStream() call.
+  set _JRUBY_BOOTCP_OPTS=
+  goto :vmoptsNext
+)
+
+if ["%_CMP%"] == ["--ng"] (
+  set _NAILGUN_CLIENT=true
+  goto :vmoptsNext
+)
+
+
 rem now unescape _D, _S and _Q
 set _CMP=%_CMP:_D="%
 set _CMP=%_CMP:_S='%

bin/jruby.bat

@@ -13,7 +13,13 @@ IF EXIST "%~dp0_jrubyvars.bat" (set FULL_PATH=%~dp0) ELSE (set FULL_PATH=%~dp$PA
 
 call "%FULL_PATH%_jrubyvars.bat" %*
 
-if %JRUBY_BAT_ERROR%==0 "%_STARTJAVA%" %_VM_OPTS% -Xbootclasspath/a:"%JRUBY_CP%" -classpath "%CP%;%CLASSPATH%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% %_RUBY_OPTS%
+if %JRUBY_BAT_ERROR%==0 (
+  if "%_NAILGUN_CLIENT%" == "" (
+     "%_STARTJAVA%" %_VM_OPTS% %_JRUBY_BOOTCP_OPTS% -classpath "%CP%;%CLASSPATH%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat %_JAVA_CLASS% %JRUBY_OPTS% %_RUBY_OPTS%
+  ) else (
+     "%JRUBY_HOME%\tool\nailgun\ng.exe" org.jruby.util.NailMain %JRUBY_OPTS% %_RUBY_OPTS%
+  )
+)
 set E=%ERRORLEVEL%
 
 call "%FULL_PATH%_jrubycleanup"