Fix for JRUBY-2720, only put JRuby jar in boot classpath, leaving others on normal classpath.

git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@7085 961051c9-f516-0410-bf72-c9f7e237a7b7

Author: headius

bin/_jrubycleanup.bat

@@ -6,7 +6,9 @@ rem ----- Restore Environment Variables ---------------------------------------
 set CLASSPATH=%_CLASSPATH%
 set _CLASSPATH=
 set CP=%_CP%
+set JRUBY_CP=%_JRUBY_CP%
 set _CP=
+set _JRUBY_CP=
 set JAVA_COMMAND=%_JAVA_COMMAND%
 set _LIBJARS=
 set _RUNJAVA=

bin/_jrubyvars.bat

@@ -10,6 +10,7 @@ rem ----- Save Environment Variables That May Change --------------------------
 
 set _CLASSPATH=%CLASSPATH%
 set _CP=%CP%
+set _JRUBY_CP=%JRUBY_CP%
 set JRUBY_BAT_ERROR=0
 
 rem ----- Verify and Set Required Environment Variables -----------------------
@@ -42,13 +43,29 @@ rem ----- Set up the VM options
 call "%~dp0_jrubyvmopts" %*
 set _RUNJAVA="%JAVA_HOME%\bin\java"
 
-rem ----- Set Up The Runtime Classpath ----------------------------------------
+rem ----- Set Up The Boot Classpath ----------------------------------------
+
+for %%i in ("%JRUBY_HOME%\lib\jruby*.jar") do @call :setjrubycp %%i
+
+rem ----- Set Up The System Classpath ----------------------------------------
 
 for %%i in ("%JRUBY_HOME%\lib\*.jar") do @call :setcp %%i
 
 goto :EOF
 
-rem Setcp subroutine
+rem setcp subroutine
+:setcp
+if not "%JRUBY_CP%" == "" goto add
+
+set JRUBY_CP=%*
+goto :EOF
+
+:add
+set JRUBY_CP=%JRUBY_CP%;%*
+
+goto :EOF
+
+rem setjrubycp subroutine
 :setcp
 if not "%CP%" == "" goto add
 

bin/jruby

@@ -52,15 +52,30 @@ fi
 
 JRUBY_SHELL=/bin/sh
 
+# ----- Set Up The Boot Classpath -------------------------------------------
+
+CP_DELIMETER=":"
+
+# add jruby jars for command-line execution
+for j in "$JRUBY_HOME"/lib/jruby*.jar; do
+    if [ "$JRUBY_CP" ]; then
+        JRUBY_CP="$JRUBY_CP$CP_DELIMETER$j"
+        else
+        JRUBY_CP="$j"
+    fi
+done
+
+if $cygwin; then
+    JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
+fi
+
 # ----- Set Up The System Classpath -------------------------------------------
 
 if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then
     # Use same classpath propagated from parent jruby
     CP=$JRUBY_PARENT_CLASSPATH
 else
-    CP_DELIMETER=":"
-
-    # add necessary jars for command-line execution
+    # add other jars in lib to CP for command-line execution
     for j in "$JRUBY_HOME"/lib/*.jar; do
         if [ "$CP" ]; then
             CP="$CP$CP_DELIMETER$j"
@@ -190,7 +205,7 @@ if [ "$VERIFY_JRUBY" != "" ]; then
       echo "Running with instrumented profiler"
   fi
 
-  $JAVA_CMD $PROFILE_ARGS $JAVA_OPTS "${java_args[@]}" -classpath "$CP$CP_DELIMETER$CLASSPATH" \
+  $JAVA_CMD $PROFILE_ARGS $JAVA_OPTS "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMETER$CP$CP_DELIMETER$CLASSPATH" \
     "-Djruby.home=$JRUBY_HOME" \
     "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
     "-Djruby.shell=$JRUBY_SHELL" \
@@ -202,7 +217,7 @@ if [ "$VERIFY_JRUBY" != "" ]; then
       cat profile.txt
   fi
 else
-  exec "$JAVA_CMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$CP" -classpath "$CLASSPATH" \
+  exec "$JAVA_CMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMETER$CLASSPATH" \
     "-Djruby.home=$JRUBY_HOME" \
     "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
     "-Djruby.shell=$JRUBY_SHELL" \

bin/jruby.bat

@@ -13,7 +13,7 @@ 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:"%CP%" -classpath "%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 "%_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%
 set E=%ERRORLEVEL%
 
 call "%FULL_PATH%_jrubycleanup"