Implement option to get dartagnan version (#662)

- Implement option to get dartagnan version
- Update version in pom files (missing from last release)
- Rename assume method to eager in svcomp script

---------

Signed-off-by: Hernan Ponce de Leon <[email protected]>
Co-authored-by: Hernan Ponce de Leon <[email protected]>

Dartagnan-SVCOMP.sh

@@ -1,14 +1,12 @@
 #!/bin/bash
 
-version=4.0.0
-
 if [ $# -eq 0 ]; then
     echo "No input file supplied"
     exit 0
 fi
 
 if [ $1 == "-v" ] || [ $1 == "--version" ]; then
-    echo $version
+    cmd="java -jar dartagnan/target/dartagnan.jar --version"
 else
     if [ $1 == "-witness" ]; then
         witness="--validate="$2
@@ -35,6 +33,6 @@ else
         skip_assertions_of_type=""
     fi
 
-    cmd="java -jar svcomp/target/svcomp.jar --method=assume --encoding.integers=true $skip_assertions_of_type --svcomp.step=5 --svcomp.umax=27 cat/svcomp.cat --svcomp.property="$propertypath" "$programpath" "$witness
-    $cmd
-fi
+    cmd="java -jar svcomp/target/svcomp.jar --method=eager --encoding.integers=true $skip_assertions_of_type --svcomp.step=5 --svcomp.umax=27 cat/svcomp.cat --svcomp.property="$propertypath" "$programpath" "$witness
+fi
+$cmd

dartagnan/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.dat3m</groupId>
         <artifactId>dat3m</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
     </parent>
     <artifactId>dartagnan</artifactId>
     <packaging>jar</packaging>
@@ -42,6 +42,11 @@
             <artifactId>log4j-core</artifactId>
             <version>${log4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>3.3.9</version>
+        </dependency>
 
         <!-- Z3 dependency (OS independent) -->
         <dependency>

dartagnan/src/main/java/com/dat3m/dartagnan/Dartagnan.java

@@ -28,6 +28,7 @@
 import com.google.common.collect.ImmutableSet;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.sosy_lab.common.ShutdownManager;
 import org.sosy_lab.common.configuration.Configuration;
 import org.sosy_lab.common.configuration.InvalidConfigurationException;
@@ -41,6 +42,7 @@
 import org.sosy_lab.java_smt.api.SolverException;
 
 import java.io.File;
+import java.io.FileReader;
 import java.math.BigInteger;
 import java.util.*;
 
@@ -51,7 +53,7 @@
 import static com.dat3m.dartagnan.configuration.OptionNames.TARGET;
 import static com.dat3m.dartagnan.configuration.Property.*;
 import static com.dat3m.dartagnan.program.analysis.SyntacticContextAnalysis.*;
-import static com.dat3m.dartagnan.utils.GitInfo.CreateGitInfo;
+import static com.dat3m.dartagnan.utils.GitInfo.*;
 import static com.dat3m.dartagnan.utils.Result.*;
 import static com.dat3m.dartagnan.utils.visualization.ExecutionGraphVisualizer.generateGraphvizFile;
 import static java.lang.Boolean.FALSE;
@@ -72,12 +74,22 @@ private Dartagnan(Configuration config) throws InvalidConfigurationException {
 
     public static void main(String[] args) throws Exception {
 
+        initGitInfo();
+
         if (Arrays.asList(args).contains("--help")) {
             collectOptions();
             return;
         }
 
-        CreateGitInfo();
+        if (Arrays.asList(args).contains("--version")) {
+            final MavenXpp3Reader mvnReader = new MavenXpp3Reader();
+            final FileReader fileReader = new FileReader(System.getenv("DAT3M_HOME") + "/pom.xml");
+            final String version = String.format("%s (commit %s)", mvnReader.read(fileReader).getVersion(), getGitId());
+            System.out.println(version);
+            return;
+        }
+
+        logGitInfo();
 
         String[] argKeyword = Arrays.stream(args)
                 .filter(s -> s.startsWith("-"))

dartagnan/src/main/java/com/dat3m/dartagnan/utils/GitInfo.java

@@ -11,19 +11,28 @@
 
 public class GitInfo {
 
-	private static final Logger logger = LogManager.getLogger(Dartagnan.class);  
+    private static final Logger logger = LogManager.getLogger(GitInfo.class);
 
-	static Properties properties = new Properties();
-	
-	public static void CreateGitInfo() throws IOException {
-       try (InputStream is = Dartagnan.class.getClassLoader()
+    static Properties properties = new Properties();
+
+    public static void initGitInfo() throws IOException {
+        try (InputStream is = Dartagnan.class.getClassLoader()
                 .getResourceAsStream("git.properties")) {
-		   if (is == null) {
-			   return;
-		   }
-		   properties.load(is);
-		   logger.info("Git branch: " + properties.getProperty("git.branch"));
-		   logger.info("Git commit ID: " + properties.getProperty("git.commit.id"));
+            if (is == null) {
+                logger.warn("Failed to load git.properties");
+                return;
+            }
+            properties.load(is);
         }
-	}	
+    }
+
+    public static void logGitInfo() {
+        logger.info("Git branch: " + properties.getProperty("git.branch", "unknown"));
+        logger.info("Git commit ID: " + properties.getProperty("git.commit.id", "unknown"));
+    }
+
+    public static String getGitId() {
+        return properties.getProperty("git.commit.id", "unknown");
+    }
+
 }

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.dat3m</groupId>
     <artifactId>dat3m</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <packaging>pom</packaging>
 
     <url>https://github.com/hernanponcedeleon/Dat3M</url>

svcomp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.dat3m</groupId>
         <artifactId>dat3m</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
     </parent>
     <artifactId>svcomp</artifactId>
     <packaging>jar</packaging>

ui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.dat3m</groupId>
         <artifactId>dat3m</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
     </parent>
     <artifactId>ui</artifactId>
     <packaging>jar</packaging>