Merge lp:~yrke/tapaal/tapaal-newlocateverifytapn into lp:tapaal

[Kenneth Yrke Jørgensen]

Merged branch tapaal-newlocateverifytapn

Improved search for verifytapn

Changes the serach order for verifytapn

1) Search for it to be set via env variable
2) Search the "install"/run dir for bin/verifytapn

The chagne assumes that the jar/class files are placed in lib/ and verifytapn is placed in bin
This means the bat script is no longer needed in order to run TAPAAL on windows

[Jiri Srba (srba)]

There is a problem here. The engine can be called verifytapn or verifytapn64, depending on the version. I would like to keep the different names different, so that if a user reports a bug,
we can see (Tools/Verification engines) what version is he/she using. Perhaps you can check
for both variants in the bin directory and prefer the 32 bit version of both are present?

[lp:~yrke/tapaal/tapaal-newlocateverifytapn]

551. By Kenneth Yrke Jørgensen on 2012-02-23

Verifytapn setup now also searches for 64bit version of verifyta

First tryes 32 bit, then 64 bit

[Jiri Srba (srba)]

review: Approve

[lp:~yrke/tapaal/tapaal-newlocateverifytapn]

552. By Kenneth Yrke Jørgensen on 2012-02-23

Fixed problem with UNCs on windows and now searces exe files

[Jiri Srba (srba)]

review: Approve

[Mathias Andersen (mande09)]

review: Approve

=== modified file 'src/dk/aau/cs/verification/UPPAAL/Verifyta.java'
--- src/dk/aau/cs/verification/UPPAAL/Verifyta.java	2012-02-10 15:55:28 +0000
+++ src/dk/aau/cs/verification/UPPAAL/Verifyta.java	2012-02-23 15:52:19 +0000
@@ -173,12 +173,20 @@
 		return result;
 	}
 
-	public static boolean trySetupFromEnvironmentVariable() {
-		String verifyta = System.getenv("verifyta");
+	public static boolean trySetup() {
+		
+		String verifyta = null;
+		
+		//Get from evn (overwrite other values)
+		verifyta = System.getenv("verifyta");
 		if (verifyta != null && !verifyta.equals("")) {
 			verifytapath = verifyta;
 			return true;
 		}
+		
+		//If a value is saved in conf
+		//TODO: kyrke
+		
 		return false;
 	}
 

=== modified file 'src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java'
--- src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java	2012-02-10 15:55:28 +0000
+++ src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java	2012-02-23 15:52:19 +0000
@@ -6,11 +6,16 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import net.tapaal.TAPAAL;
+
 import pipe.dataLayer.TAPNQuery.TraceOption;
 import pipe.gui.FileFinder;
 import pipe.gui.widgets.InclusionPlaces;
@@ -180,12 +185,37 @@
 		return verifytapnpath == null || verifytapnpath.equals("");
 	}
 	
-	public static boolean trySetupFromEnvironmentVariable() {
-		String verifytapn = System.getenv("verifytapn");
+	public static boolean trySetup() {
+		
+		String verifytapn = null;
+		
+		//If env is set, it overwrites the value
+		verifytapn = System.getenv("verifytapn");
 		if (verifytapn != null && !verifytapn.isEmpty()) {
 			verifytapnpath = verifytapn;
 			return true;
 		}
+		
+		//If a value is saved in conf
+		//TODO: kyrke
+		
+		//Search the installdir for verifytapn
+		File installdir = TAPAAL.getInstallDir();
+		
+		String[] paths = {"/bin/verifytapn", "/bin/verifytapn64", "/bin/verifytapn.exe", "/bin/verifytapn64.exe"};
+		for (String s : paths) {
+			File verifytapnfile = new File(installdir + s);
+			
+			if (verifytapnfile.exists()){
+
+				verifytapnpath = verifytapnfile.getAbsolutePath();
+				return true;
+
+			}
+		}
+		
+		
+		
 		return false;
 	}
 

=== modified file 'src/net/tapaal/TAPAAL.java'
--- src/net/tapaal/TAPAAL.java	2011-09-23 20:39:42 +0000
+++ src/net/tapaal/TAPAAL.java	2012-02-23 15:52:19 +0000
@@ -1,6 +1,10 @@
 package net.tapaal;
 
 import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -74,5 +78,68 @@
 		}
 
 	}
+	
+	public static File getInstallDir() {
+		
+		String str = ClassLoader.getSystemResource("TAPAAL.class").getPath();
+		
+		int placeOfJarSeperator = str.lastIndexOf('!');
+		
+		if (placeOfJarSeperator != -1){
+			// Its a jar file, lets strip the jar ending.
+			str = str.substring(0, placeOfJarSeperator);
+			
+			//Remove the name of the jar file
+			str = str.substring(0, str.lastIndexOf("/")); //Keep the last /
+			
+		} else {
+			// Its a class file, stip the name
+			str = str.replace("TAPAAL.class", "");
+		}
+		
+		try {
+			
+			//Fix as ubuntu (at least) does not set file:// from ClassLoader
+			if (!str.contains("file:/")) {
+				str = "file://" + str;
+			}
+			
+			
+			//Some magic to remove file:// and get the right seperators
+			URL url = new URL(str);
+			URI uri = url.toURI();
+			
+			// Workaround for the following bug: 
+		    // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5086147
+		    // Remove extra slashes after the scheme part.
+			
+		    if ( uri.getAuthority() != null ){
+		        try {
+		            uri = new URI( uri.toString().replace("file://", "file:////" ) );
+		        } catch ( URISyntaxException e ) {
+		            throw new IllegalArgumentException( "The specified " +
+		                "URI contains an authority, but could not be " +
+		                "normalized.", e );
+		        }
+		    }
+			
+		    File f = new File(uri);
+			str = f.getAbsolutePath();
+			
+			// Stip to base dir (exit bin dir)
+			File installdir = new File(str);
+			installdir = installdir.getParentFile();
+			
+			return installdir;
+			
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		} catch (URISyntaxException e) {
+			e.printStackTrace();
+		}
+		return null;
+
+	}
+	
 
 }

=== modified file 'src/pipe/gui/CreateGui.java'
--- src/pipe/gui/CreateGui.java	2012-02-17 19:51:28 +0000
+++ src/pipe/gui/CreateGui.java	2012-02-23 15:52:19 +0000
@@ -52,8 +52,8 @@
 
 		appGui.setVisible(true);
 		appGui.activateSelectAction();
-		Verifyta.trySetupFromEnvironmentVariable();
-		VerifyTAPN.trySetupFromEnvironmentVariable();
+		Verifyta.trySetup();
+		VerifyTAPN.trySetup();
 
 		VersionChecker versionChecker = new VersionChecker();
 		if (versionChecker.checkForNewVersion()) {