[Jython-checkins] CVS: jython/installer jythonc_template.win_bat,1.1,1.2 jython_template.win_bat,1.2,1.3

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/installer
In directory usw-pr-cvs1:/tmp/cvs-serv7024

Modified Files:
	jythonc_template.win_bat jython_template.win_bat 
Log Message:
Fix for "[ #484181 ] command line args in dos".

Added a loop to get all the command line arguments.



Index: jythonc_template.win_bat
===================================================================
RCS file: /cvsroot/jython/jython/installer/jythonc_template.win_bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** jythonc_template.win_bat	2000/11/24 16:58:57	1.1
--- jythonc_template.win_bat	2001/11/26 08:38:16	1.2
***************
*** 2,4 ****
  REM This file generated by Jython installer
  REM Created on XXX by @user.name@
! "@location._top_@\jython" "@location._top_@\Tools\jythonc\jythonc.py" %1 %2 %3 %4 %5 %6 %7 %8 %9
--- 2,13 ----
  REM This file generated by Jython installer
  REM Created on XXX by @user.name@
! 
! set ARGS=
! :loop
! if [%1] == [] goto end
!         set ARGS=%ARGS% %1
!         shift
!         goto loop
! :end
! 
! "@location._top_@\jython" "@location._top_@\Tools\jythonc\jythonc.py" %ARGS%

Index: jython_template.win_bat
===================================================================
RCS file: /cvsroot/jython/jython/installer/jython_template.win_bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** jython_template.win_bat	2000/12/25 10:58:33	1.2
--- jython_template.win_bat	2001/11/26 08:38:16	1.3
***************
*** 5,12 ****
  rem set JAVA_HOME=@java.home@
  
  @if...@ja...ndor=Microsoft Corp.@
! @jvm@ "/d:python.home=@location._top_@" "/d:python.packages.fakepath=@location._top_@\jython.jar" /cp:p "@location._top_@\jython.jar" @classname@ %1 %2 %3 %4 %5 %6 %7 %8 %9
  @endif@
  @if...@ja...ndor=Microsoft Corp.@
! "@jvm@" "-Dpython.home=@location._top_@" -classpath "@location._top_@\jython.jar;%CLASSPATH%" @classname@ %1 %2 %3 %4 %5 %6 %7 %8 %9
  @endif@
--- 5,21 ----
  rem set JAVA_HOME=@java.home@
  
+ set ARGS=
+ 
+ :loop
+ if [%1] == [] goto end
+         set ARGS=%ARGS% %1
+         shift
+         goto loop
+ :end
+ 
  @if...@ja...ndor=Microsoft Corp.@
! @jvm@ "/d:python.home=@location._top_@" "/d:python.packages.fakepath=@location._top_@\jython.jar" /cp:p "@location._top_@\jython.jar" @classname@ %ARGS%
  @endif@
  @if...@ja...ndor=Microsoft Corp.@
! "@jvm@" "-Dpython.home=@location._top_@" -classpath "@location._top_@\jython.jar;%CLASSPATH%" @classname@ %ARGS%
  @endif@