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

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

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

Modified Files:
	jpf jpf-dot jpf-dot.bat jpf.bat 
Log Message:
* added Config support for an alternate lookup dir, which should be used when JPF doesn't
find a property file in the current dir, and before it tries to load the properties from
resources. The dir is initialized from the +jpf.basedir=<dir> option, which is in turn
now automatically set when using the bin/jpf script. This should make it easier to run
JPF from within Eclipse, but outside its root dir (e.g. from where the application code
resides)

* hot fixed the BFSearch MJIEnv problem (ThreadInfo(ThreadData) ctor). THIS IS NOT YET
THE REAL SOLUTION, since we want to get away from static references, but it buys us time
to do the proper refactoring.


Index: jpf-dot.bat
===================================================================
RCS file: /cvsroot/javapathfinder/javapathfinder/bin/jpf-dot.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jpf-dot.bat	11 May 2005 18:05:34 -0000	1.2
+++ jpf-dot.bat	12 May 2005 06:25:31 -0000	1.3
@@ -46,4 +46,4 @@
 REM StateSpaceDot tool options
 set SSDO=-show-source -transition-numbers
 
-java %JVM_FLAGS% -classpath "%CP%" gov.nasa.jpf.tools.StateSpaceDot %SSDO% %1 %2 %3 %4 %5 %6 %7 %8 %9
+java %JVM_FLAGS% -classpath "%CP%" gov.nasa.jpf.tools.StateSpaceDot +jpf.basedir="%JPF_HOME%" %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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jpf.bat	11 May 2005 18:05:34 -0000	1.2
+++ jpf.bat	12 May 2005 06:25:31 -0000	1.3
@@ -42,4 +42,4 @@
 
 set JVM_FLAGS=-Xmx1536m
 
-java %JVM_FLAGS% -classpath "%CP%" gov.nasa.jpf.JPF %1 %2 %3 %4 %5 %6 %7 %8 %9
+java %JVM_FLAGS% -classpath "%CP%" gov.nasa.jpf.JPF +jpf.basedir="%JPF_HOME%" %1 %2 %3 %4 %5 %6 %7 %8 %9

Index: jpf-dot
===================================================================
RCS file: /cvsroot/javapathfinder/javapathfinder/bin/jpf-dot,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jpf-dot	11 May 2005 18:05:34 -0000	1.4
+++ jpf-dot	12 May 2005 06:25:31 -0000	1.5
@@ -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 +jpf.basedir="$JPF_HOME" $SSDOT_FLAGS $@

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