[Nice-commit] Nice/src/nice/tools/testsuite TestNice.java,1.34,1.35

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

Update of /cvsroot/nice/Nice/src/nice/tools/testsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23799/src/nice/tools/testsuite

Modified Files:
	TestNice.java 
Log Message:
Detect automatically where the Nice runtime is.


Index: TestNice.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/testsuite/TestNice.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** TestNice.java	17 Jun 2005 09:32:39 -0000	1.34
--- TestNice.java	17 Jun 2005 11:09:51 -0000	1.35
***************
*** 194,197 ****
--- 194,200 ----
  	 */
  	static public void main(String[] args) {
+ 
+ 		_runtime = nice.tools.compiler.dispatch.getNiceRuntime();
+ 
  		if (!processArgs(args)) {
  			usage();
***************
*** 321,325 ****
  
  		// When doing native compilation, we need a jarred runtime
! 		if (_runtime == null)
  			_runtime = "share/java/nice.jar";
  	}
--- 324,328 ----
  
  		// When doing native compilation, we need a jarred runtime
! 		if (_runtime == null || ! _runtime.endsWith(".jar"))
  			_runtime = "share/java/nice.jar";
  	}
***************
*** 583,590 ****
  	static ClassLoader getClassLoader() {
  
- 		// This is normally where the compiled classes are in the dev tree.
- 		if (_runtime == null)
- 			_runtime = "classes";
- 
  		File[] dirs = { getTempFolder(), new File(getRuntime()) };
  		ClassLoader res = new nice.tools.util.DirectoryClassLoader(dirs, null);
--- 586,589 ----