Skip to content

Commit 3c65c44

Browse files
nicksiegernicksieger
committed
Eliminate redundancy in .bat files; auto-detect JRUBY_HOME better on windows; add whatever is in JRUBY_HOME/lib/*.jar
git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@3072 961051c9-f516-0410-bf72-c9f7e237a7b7
1 parent 9fcb4b6 commit 3c65c44

11 files changed

Lines changed: 122 additions & 692 deletions

‎bin/_jrubycleanup.bat‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
@echo off
2+
3+
rem ----- Restore Environment Variables ---------------------------------------
4+
5+
:cleanup
6+
set JRUBY_BASE=%_JRUBY_BASE%
7+
set _JRUBY_BASE=
8+
set JRUBY_HOME=%_JRUBY_HOME%
9+
set _JRUBY_HOME=
10+
set CLASSPATH=%_CLASSPATH%
11+
set _CLASSPATH=
12+
set CP=%_CP%
13+
set JAVA_COMMAND=%_JAVA_COMMAND%
14+
set _LIBJARS=
15+
set _RUNJAVA=
16+
set _STARTJAVA=
17+
set _JAVA_COMMAND=
18+
:finish
19+
exit /b %E%

‎bin/_jrubysetcp.bat‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@echo off
2+
if not "%CP%" == "" goto add
3+
4+
set CP=%1
5+
goto done
6+
7+
:add
8+
set CP=%CP%;%1
9+
10+
:done

‎bin/_jrubyvars.bat‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
@echo off
2+
rem Environment Variable Prequisites:
3+
rem
4+
rem JRUBY_BASE (Optional) Base directory for resolving dynamic portions
5+
rem of a JRuby installation. If not present, resolves to
6+
rem the same directory that JRUBY_HOME points to.
7+
rem
8+
rem JRUBY_HOME (Optional) May point at your JRuby "build" directory.
9+
rem If not present, the current working directory is assumed.
10+
rem
11+
rem JRUBY_OPTS (Optional) Default JRuby command line args.
12+
rem
13+
rem JAVA_HOME Must point at your Java Development Kit installation.
14+
rem
15+
16+
rem ----- Save Environment Variables That May Change --------------------------
17+
18+
set _JRUBY_BASE=%JRUBY_BASE%
19+
set _JRUBY_HOME=%JRUBY_HOME%
20+
set _CLASSPATH=%CLASSPATH%
21+
set _CP=%CP%
22+
23+
24+
rem ----- Verify and Set Required Environment Variables -----------------------
25+
26+
if not "%JAVA_HOME%" == "" goto gotJava
27+
echo You must set JAVA_HOME to point at your Java Development Kit installation
28+
goto cleanup
29+
:gotJava
30+
31+
if not "%JRUBY_HOME%" == "" goto gotHome
32+
set JRUBY_HOME=%~dp0..
33+
:gotHome
34+
35+
if not "%JRUBY_BASE%" == "" goto gotBase
36+
set JRUBY_BASE=%JRUBY_HOME%
37+
:gotBase
38+
39+
40+
rem ----- Prepare Appropriate Java Execution Commands -------------------------
41+
42+
if not "%JAVA_COMMAND%" == "" goto gotCommand
43+
set _JAVA_COMMAND=%JAVA_COMMAND%
44+
set JAVA_COMMAND=java
45+
:gotCommand
46+
47+
if not "%OS%" == "Windows_NT" goto noTitle
48+
rem set _STARTJAVA=start "JRuby" "%JAVA_HOME%\bin\java"
49+
set _STARTJAVA="%JAVA_HOME%\bin\%JAVA_COMMAND%"
50+
goto gotTitle
51+
:noTitle
52+
rem set _STARTJAVA=start "%JAVA_HOME%\bin\java"
53+
set _STARTJAVA="%JAVA_HOME%\bin\%JAVA_COMMAND%"
54+
:gotTitle
55+
56+
set _RUNJAVA="%JAVA_HOME%\bin\java"
57+
rem ----- Set Up The Runtime Classpath ----------------------------------------
58+
59+
for /r %JRUBY_HOME%\lib %%i in (*.jar) do @call %~dp0_jrubysetcp %%i
60+
61+
if not "%CLASSPATH%" == "" goto gotCP
62+
set CLASSPATH=%CP%
63+
goto doneCP
64+
:gotCP
65+
set CLASSPATH=%CP%;%CLASSPATH%
66+
:doneCP
67+
68+
rem echo Using JRUBY_BASE: %JRUBY_BASE%
69+
rem echo Using JRUBY_HOME: %JRUBY_HOME%
70+
rem echo Using CLASSPATH: %CLASSPATH%
71+
rem echo Using JAVA_HOME: %JAVA_HOME%
72+
rem echo Using Args: %*

‎bin/gem.bat‎

Lines changed: 2 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,9 @@
11
@echo off
22
rem ---------------------------------------------------------------------------
3-
rem jruby.bat - Start Script for the JRuby Interpreter
4-
rem
5-
rem Environment Variable Prequisites:
6-
rem
7-
rem JRUBY_BASE (Optional) Base directory for resolving dynamic portions
8-
rem of a JRuby installation. If not present, resolves to
9-
rem the same directory that JRUBY_HOME points to.
10-
rem
11-
rem JRUBY_HOME (Optional) May point at your JRuby "build" directory.
12-
rem If not present, the current working directory is assumed.
13-
rem
14-
rem JRUBY_OPTS (Optional) Default JRuby command line args.
15-
rem
16-
rem JAVA_HOME Must point at your Java Development Kit installation.
17-
rem
18-
rem ---------------------------------------------------------------------------
19-
20-
21-
rem ----- Save Environment Variables That May Change --------------------------
22-
23-
set _JRUBY_BASE=%JRUBY_BASE%
24-
set _JRUBY_HOME=%JRUBY_HOME%
25-
set _CLASSPATH=%CLASSPATH%
26-
set _CP=%CP%
27-
28-
29-
rem ----- Verify and Set Required Environment Variables -----------------------
30-
31-
if not "%JAVA_HOME%" == "" goto gotJava
32-
echo You must set JAVA_HOME to point at your Java Development Kit installation
33-
goto cleanup
34-
:gotJava
35-
36-
if not "%JRUBY_HOME%" == "" goto gotHome
37-
set JRUBY_HOME=.
38-
if exist "%JRUBY_HOME%\lib\jruby.jar" goto okHome
39-
set JRUBY_HOME=..
40-
:gotHome
41-
if exist "%JRUBY_HOME%\lib\jruby.jar" goto okHome
42-
echo Cannot find jruby.jar in %JRUBY_HOME%\lib
43-
echo Please check your JRUBY_HOME setting
44-
goto cleanup
45-
:okHome
46-
47-
if not "%JRUBY_BASE%" == "" goto gotBase
48-
set JRUBY_BASE=%JRUBY_HOME%
49-
:gotBase
503

51-
52-
rem ----- Prepare Appropriate Java Execution Commands -------------------------
53-
54-
if not "%OS%" == "Windows_NT" goto noTitle
55-
rem set _STARTJAVA=start "JRuby" "%JAVA_HOME%\bin\java"
56-
set _STARTJAVA="%JAVA_HOME%\bin\java"
57-
goto gotTitle
58-
:noTitle
59-
rem set _STARTJAVA=start "%JAVA_HOME%\bin\java"
60-
set _STARTJAVA="%JAVA_HOME%\bin\java"
61-
:gotTitle
62-
63-
set _RUNJAVA="%JAVA_HOME%\bin\java"
64-
rem ----- Set Up The Runtime Classpath ----------------------------------------
65-
66-
set CP=%JRUBY_HOME%\lib\jruby.jar;%JRUBY_HOME%\lib\asm-2.2.3.jar;%JRUBY_HOME%\lib\asm-commons-2.2.3.jar
67-
68-
if not "%CLASSPATH%" == "" goto gotCP
69-
set CLASSPATH=%CP%
70-
goto doneCP
71-
:gotCP
72-
set CLASSPATH=%CP%;%CLASSPATH%
73-
:doneCP
74-
75-
rem echo Using JRUBY_BASE: %JRUBY_BASE%
76-
rem echo Using JRUBY_HOME: %JRUBY_HOME%
77-
rem echo Using CLASSPATH: %CLASSPATH%
78-
rem echo Using JAVA_HOME: %JAVA_HOME%
79-
rem echo Using Args: %*
80-
81-
rem ----- Execute The Requested Command ---------------------------------------
4+
call %~dp0_jrubyvars
825

836
%_STARTJAVA% -Xmx256m -ea -cp "%CLASSPATH%" -Djruby.base="%JRUBY_BASE%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\gem" %*
847
set E=%ERRORLEVEL%
858

86-
rem ----- Restore Environment Variables ---------------------------------------
87-
88-
:cleanup
89-
set JRUBY_BASE=%_JRUBY_BASE%
90-
set _JRUBY_BASE=
91-
set JRUBY_HOME=%_JRUBY_HOME%
92-
set _JRUBY_HOME=
93-
set CLASSPATH=%_CLASSPATH%
94-
set _CLASSPATH=
95-
set CP=%_CP%
96-
set _LIBJARS=
97-
set _RUNJAVA=
98-
set _STARTJAVA=
99-
:finish
100-
exit /b %E%
9+
call %~dp0_jrubycleanup

‎bin/gem_mirror.bat‎

Lines changed: 2 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,8 @@
11
@echo off
22
rem ---------------------------------------------------------------------------
3-
rem jruby.bat - Start Script for the JRuby Interpreter
4-
rem
5-
rem Environment Variable Prequisites:
6-
rem
7-
rem JRUBY_BASE (Optional) Base directory for resolving dynamic portions
8-
rem of a JRuby installation. If not present, resolves to
9-
rem the same directory that JRUBY_HOME points to.
10-
rem
11-
rem JRUBY_HOME (Optional) May point at your JRuby "build" directory.
12-
rem If not present, the current working directory is assumed.
13-
rem
14-
rem JRUBY_OPTS (Optional) Default JRuby command line args.
15-
rem
16-
rem JAVA_HOME Must point at your Java Development Kit installation.
17-
rem
18-
rem ---------------------------------------------------------------------------
19-
20-
21-
rem ----- Save Environment Variables That May Change --------------------------
22-
23-
set _JRUBY_BASE=%JRUBY_BASE%
24-
set _JRUBY_HOME=%JRUBY_HOME%
25-
set _CLASSPATH=%CLASSPATH%
26-
set _CP=%CP%
27-
28-
29-
rem ----- Verify and Set Required Environment Variables -----------------------
30-
31-
if not "%JAVA_HOME%" == "" goto gotJava
32-
echo You must set JAVA_HOME to point at your Java Development Kit installation
33-
goto cleanup
34-
:gotJava
35-
36-
if not "%JRUBY_HOME%" == "" goto gotHome
37-
set JRUBY_HOME=.
38-
if exist "%JRUBY_HOME%\lib\jruby.jar" goto okHome
39-
set JRUBY_HOME=..
40-
:gotHome
41-
if exist "%JRUBY_HOME%\lib\jruby.jar" goto okHome
42-
echo Cannot find jruby.jar in %JRUBY_HOME%\lib
43-
echo Please check your JRUBY_HOME setting
44-
goto cleanup
45-
:okHome
46-
47-
if not "%JRUBY_BASE%" == "" goto gotBase
48-
set JRUBY_BASE=%JRUBY_HOME%
49-
:gotBase
50-
51-
52-
rem ----- Prepare Appropriate Java Execution Commands -------------------------
53-
54-
if not "%OS%" == "Windows_NT" goto noTitle
55-
rem set _STARTJAVA=start "JRuby" "%JAVA_HOME%\bin\java"
56-
set _STARTJAVA="%JAVA_HOME%\bin\java"
57-
goto gotTitle
58-
:noTitle
59-
rem set _STARTJAVA=start "%JAVA_HOME%\bin\java"
60-
set _STARTJAVA="%JAVA_HOME%\bin\java"
61-
:gotTitle
62-
63-
set _RUNJAVA="%JAVA_HOME%\bin\java"
64-
rem ----- Set Up The Runtime Classpath ----------------------------------------
65-
66-
set CP=%JRUBY_HOME%\lib\jruby.jar;%JRUBY_HOME%\lib\asm-2.2.3.jar;%JRUBY_HOME%\lib\asm-commons-2.2.3.jar
67-
68-
if not "%CLASSPATH%" == "" goto gotCP
69-
set CLASSPATH=%CP%
70-
goto doneCP
71-
:gotCP
72-
set CLASSPATH=%CP%;%CLASSPATH%
73-
:doneCP
74-
75-
rem echo Using JRUBY_BASE: %JRUBY_BASE%
76-
rem echo Using JRUBY_HOME: %JRUBY_HOME%
77-
rem echo Using CLASSPATH: %CLASSPATH%
78-
rem echo Using JAVA_HOME: %JAVA_HOME%
79-
rem echo Using Args: %*
80-
81-
rem ----- Execute The Requested Command ---------------------------------------
3+
call %~dp0_jrubyvars
824

835
%_STARTJAVA% -Xmx256m -ea -cp "%CLASSPATH%" -Djruby.base="%JRUBY_BASE%" -Djruby.home="%JRUBY_HOME%" -Djruby.lib="%JRUBY_HOME%\lib" -Djruby.shell="cmd.exe" -Djruby.script=jruby.bat org.jruby.Main %JRUBY_OPTS% "%JRUBY_HOME%\bin\gem_mirror" %*
846
set E=%ERRORLEVEL%
857

86-
rem ----- Restore Environment Variables ---------------------------------------
87-
88-
:cleanup
89-
set JRUBY_BASE=%_JRUBY_BASE%
90-
set _JRUBY_BASE=
91-
set JRUBY_HOME=%_JRUBY_HOME%
92-
set _JRUBY_HOME=
93-
set CLASSPATH=%_CLASSPATH%
94-
set _CLASSPATH=
95-
set CP=%_CP%
96-
set _LIBJARS=
97-
set _RUNJAVA=
98-
set _STARTJAVA=
99-
:finish
100-
exit /b %E%
8+
call %~dp0_jrubycleanup

0 commit comments

Comments
 (0)