file.encoding=ISO_8859_1 and move to proper place for windows

git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@3795 961051c9-f516-0410-bf72-c9f7e237a7b7
jruby · May 31, 2007 · 058cfc0 · 058cfc0
1 parent 82ca687
commit 058cfc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/bin/_jrubyvmopts.bat b/bin/_jrubyvmopts.bat
@@ -3,6 +3,7 @@ set _MEM=-Xmx256m
 set _STK=-Xss1024k
 set _VM_OPTS=
 set _RUBY_OPTS=
+set _DFLT_VM_OPTS=-Xverify:none -da -Dfile.encoding=ISO_8859_1
 
 :vmoptsLoop
 set _ARG=%1
@@ -31,7 +32,8 @@ shift
 goto vmoptsLoop
 
 :vmoptsDone
-set _VM_OPTS=%_VM_OPTS% %_MEM% %_STK% -Xverify:none -da
+set _VM_OPTS=%_VM_OPTS% %_MEM% %_STK% %_DFLT_VM_OPTS%
+set _DFLT_VM_OPTS=
 set _MEM=
 set _STK=
 set _ARG=

diff --git a/bin/jruby.bat b/bin/jruby.bat
@@ -6,7 +6,7 @@ rem for info on environment variables, see internal batch script _jrubyvars.bat
 
 call "%~dp0_jrubyvars" %*
 
-%_STARTJAVA% %_VM_OPTS% -cp "%CLASSPATH%" -Dfile.encoding=iso88591 -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% %_RUBY_OPTS%
+%_STARTJAVA% %_VM_OPTS% -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% %_RUBY_OPTS%
 set E=%ERRORLEVEL%
 
 call "%~dp0_jrubycleanup"