[Javapathfinder-devel] javapathfinder/bin jpf,1.5,1.6 jpf-dot,1.3,1.4 jpf-dot.bat,1.1.1.1,1.2 jpf.bat,1.1.1.1,1.2

[pcm <pcm...@us...>]

Update of /cvsroot/javapathfinder/javapathfinder/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13039/bin

Modified Files:
	jpf jpf-dot jpf-dot.bat jpf.bat 
Log Message:
* some more script fixes (*.bat) NOT tested yet

* improvised check for unknown '-' options prior to starting the VM. NOTE - this
requires all known options to be consumed (nullified) before this is done, so the
check should be the very last thing before the Search is set off



Index: jpf-dot.bat
===================================================================
RCS file: /cvsroot/javapathfinder/javapathfinder/bin/jpf-dot.bat,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jpf-dot.bat	26 Apr 2005 19:43:03 -0000	1.1.1.1
+++ jpf-dot.bat	11 May 2005 18:05:34 -0000	1.2
@@ -1,3 +1,7 @@
+REM
+REM overly simplified batch file to start JPF from a command prompt
+REM
+
 @echo off
 
 REM Set the JPF_HOME directory
@@ -14,15 +18,16 @@
 set CP=%CP%;%JPF_HOME%\build\test
 
 REM Otherwise, we look for the jar (binary distributions)
-set CP=%CP%;%JPF_HOME%\lib\jpf.jar
+set %CP%;%JPF_HOME%\lib\jpf.jar
 
 REM And these are the external libs we use at runtime
-set CP=%CP%;%JPF_HOME%\lib\xercesImpl.jar
-set CP=%CP%;%JPF_HOME%\lib\xmlParserAPIs.jar
+REM (include the CLASSPATH first, in case somebody wants to use specific versions)
+set CP=%CP%;%CLASSPATH%
+
 set CP=%CP%;%JPF_HOME%\lib\bcel.jar
-set CP=%CP%;%JPF_HOME%\lib\md5-twmacinta.jar
-set CP=%CP%;%JPF_HOME%\lib\edu.jar
-set CP=%CP%;%JPF_HOME%\lib\scale.jar
+set CP=%CP%;%JPF_HOME%\lib\fast-MD5.jar
+set CP=%CP%;%JPF_HOME%\lib\xercesImpl.jar
+set CP=%CP%;%JPF_HOME%\lib\xml-apis.jar
 
 REM our standard native peer environment
 REM * For our source distribution.
@@ -35,13 +40,10 @@
 set CP=%CP%;%JPF_HOME%\examples
 set CP=%CP%;%JPF_HOME%\build\examples
 
-REM JPF boot class path
-set BCP=%JPF_HOME%\build\env\jpf;%JPF_HOME%\lib\env_jpf.jar
-
-REM JVM flags
 set JVM_FLAGS=-Xmx1536m
 
+
 REM StateSpaceDot tool options
 set SSDO=-show-source -transition-numbers
 
-java %JVM_FLAGS% -classpath "%CP%" gov.nasa.jpf.tools.StateSpaceDot %SSDO% -jpf-bootclasspath "%BCP%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+java %JVM_FLAGS% -classpath "%CP%" gov.nasa.jpf.tools.StateSpaceDot %SSDO% %1 %2 %3 %4 %5 %6 %7 %8 %9

Index: jpf.bat
===================================================================
RCS file: /cvsroot/javapathfinder/javapathfinder/bin/jpf.bat,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jpf.bat	26 Apr 2005 19:43:03 -0000	1.1.1.1
+++ jpf.bat	11 May 2005 18:05:34 -0000	1.2
@@ -1,3 +1,7 @@
+REM
+REM overly simplified batch file to start JPF from a command prompt
+REM
+
 @echo off
 
 REM Set the JPF_HOME directory
@@ -14,15 +18,16 @@
 set CP=%CP%;%JPF_HOME%\build\test
 
 REM Otherwise, we look for the jar (binary distributions)
-set CP=%CP%;%JPF_HOME%\lib\jpf.jar
+set %CP%;%JPF_HOME%\lib\jpf.jar
 
 REM And these are the external libs we use at runtime
-set CP=%CP%;%JPF_HOME%\lib\xercesImpl.jar
-set CP=%CP%;%JPF_HOME%\lib\xmlParserAPIs.jar
+REM (include the CLASSPATH first, in case somebody wants to use specific versions)
+set CP=%CP%;%CLASSPATH%
+
 set CP=%CP%;%JPF_HOME%\lib\bcel.jar
-set CP=%CP%;%JPF_HOME%\lib\md5-twmacinta.jar
-set CP=%CP%;%JPF_HOME%\lib\edu.jar
-set CP=%CP%;%JPF_HOME%\lib\scale.jar
+set CP=%CP%;%JPF_HOME%\lib\fast-MD5.jar
+set CP=%CP%;%JPF_HOME%\lib\xercesImpl.jar
+set CP=%CP%;%JPF_HOME%\lib\xml-apis.jar
 
 REM our standard native peer environment
 REM * For our source distribution.
@@ -35,8 +40,6 @@
 set CP=%CP%;%JPF_HOME%\examples
 set CP=%CP%;%JPF_HOME%\build\examples
 
-set BCP=%JPF_HOME%\build\env\jpf;%JPF_HOME%\lib\env_jpf.jar
-
 set JVM_FLAGS=-Xmx1536m
 
-java %JVM_FLAGS% -classpath "%CP%" gov.nasa.jpf.JPF -jpf-bootclasspath "%BCP%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+java %JVM_FLAGS% -classpath "%CP%" gov.nasa.jpf.JPF %1 %2 %3 %4 %5 %6 %7 %8 %9

Index: jpf-dot
===================================================================
RCS file: /cvsroot/javapathfinder/javapathfinder/bin/jpf-dot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jpf-dot	11 May 2005 01:18:06 -0000	1.3
+++ jpf-dot	11 May 2005 18:05:34 -0000	1.4
@@ -63,4 +63,4 @@
   SSDOT_FLAGS="-show-source -transition-numbers"
 fi
 
-java $JVM_FLAGS -classpath "$CP" gov.nasa.jpf.tools.StateSpaceDot "$SSDOT_FLAGS" $@
+java $JVM_FLAGS -classpath "$CP" gov.nasa.jpf.tools.StateSpaceDot $SSDOT_FLAGS $@

Index: jpf
===================================================================
RCS file: /cvsroot/javapathfinder/javapathfinder/bin/jpf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jpf	11 May 2005 01:18:06 -0000	1.5
+++ jpf	11 May 2005 18:05:34 -0000	1.6
@@ -55,5 +55,4 @@
   JVM_FLAGS="-Xmx1024m"
 fi
 
-java $JVM_FLAGS -classpath "$CP" gov.nasa.jpf.JPF  "$@"
-
+java $JVM_FLAGS -classpath "$CP" gov.nasa.jpf.JPF $@