[Nice-commit] Nice/bin niceclasspath.bat,NONE,1.1 nicec.bat,1.14,1.15

[<bo...@us...>]

Update of /cvsroot/nice/Nice/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8613/bin

Modified Files:
	nicec.bat 
Added Files:
	niceclasspath.bat 
Log Message:
Factored out the search for nice.jar on windows (arjan).


--- NEW FILE: niceclasspath.bat ---
rem -- This is a utility to determine the location of the nice.jar file
rem -- which is needed by several Nice utilities (nicec, nicedoc, ...).

rem -- do we have a nice environment variable?
for %%x in (%NICE%) do goto gotNiceEnvVar

rem -- try some standard places

set NICEPATH=c:\nice
if exist %NICEPATH%\nice.jar goto end

set NICEPATH="c:\Program Files\nice"
if exist %NICEPATH%\nice.jar goto end

set NICEPATH=c:\programs\nice
if exist %NICEPATH%\nice.jar goto end

set NICEPATH=d:\nice
if exist %NICEPATH%\nice.jar goto end

set NICEPATH="d:\Program Files\nice"
if exist %NICEPATH%\nice.jar goto end

set NICEPATH=d:\programs\nice
if exist %NICEPATH%\nice.jar goto end

goto error

:envError
echo Could not find the file: %NICE%\nice.jar
echo The NICE environment variable is not pointing to the right directory!

:error
echo You must set the NICE environment variable to point to the directory you've installed nice in e.g.
echo set NICE=C:\programs\nice	echo (note: do not add a ';' at the end)
echo You can do it by modifying Autoexec.bat or in the system settings.
set NICEPATH=
goto end

:gotNiceEnvVar
if not exist %NICE%\nice.jar goto envError
set NICEPATH=%NICE%

:end
Index: nicec.bat
===================================================================
RCS file: /cvsroot/nice/Nice/bin/nicec.bat,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** nicec.bat	9 Feb 2004 13:05:34 -0000	1.14
--- nicec.bat	16 Feb 2004 13:52:57 -0000	1.15
***************
*** 8,51 ****
  rem ---------------------------------------------------------------------------
  
  
! rem -- do we have a nice environment variable?
! for %%x in (%NICE%) do goto gotNiceEnvVar
! 
! rem -- try some standard places
! 
! set NICEPATH=c:\nice
! if exist %NICEPATH%\nice.jar goto gotNice
! 
! set NICEPATH="c:\Program Files\nice"
! if exist %NICEPATH%\nice.jar goto gotNice
! 
! set NICEPATH=c:\programs\nice
! if exist %NICEPATH%\nice.jar goto gotNice
! 
! set NICEPATH=d:\nice
! if exist %NICEPATH%\nice.jar goto gotNice
! 
! set NICEPATH="d:\Program Files\nice"
! if exist %NICEPATH%\nice.jar goto gotNice
! 
! set NICEPATH=d:\programs\nice
! if exist %NICEPATH%\nice.jar goto gotNice
! 
! goto error
! 
! :envError
! echo Could not find the file: %NICE%\nice.jar
! echo The NICE environment variable is not pointing to the right directory!
  
- :error
- echo You must set the NICE environment variable to point to the directory you've installed nice in e.g.
- echo set NICE=C:\programs\nice	echo (note: do not add a ';' at the end)
- echo You can do it by modifying Autoexec.bat or in the system settings.
  goto end
  
- :gotNiceEnvVar
- if not exist %NICE%\nice.jar goto envError
- set NICEPATH=%NICE%
- 
  :gotNice
  java -classpath %NICEPATH%\nice.jar;%CLASSPATH% nice.tools.compiler.console.fun --runtime=%NICEPATH%\nice.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
--- 8,17 ----
  rem ---------------------------------------------------------------------------
  
+ call niceclasspath
  
! for %%x in (%NICEPATH%) do goto gotNice
  
  goto end
  
  :gotNice
  java -classpath %NICEPATH%\nice.jar;%CLASSPATH% nice.tools.compiler.console.fun --runtime=%NICEPATH%\nice.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
***************
*** 53,61 ****
  :end
  rem -- clean up a bit
! set NICEPATH=
! 
! rem Setting for Emacs so that it will treat the file as a DOS file whatever
! rem OS it is running on. Please keep this.
! rem Local variables:
! rem coding:dos
! rem End:
--- 19,21 ----
  :end
  rem -- clean up a bit
! set NICEPATH=
\ No newline at end of file