Commit e7a51f64 authored by Daniel Le Berre's avatar Daniel Le Berre

Fixes trivial consistency in PB reader. Added all-in-one package for sat4j-pb....

Fixes trivial consistency in PB reader. Added all-in-one package for sat4j-pb. Using tycho jdt compiler in Maven.


git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@702 ba638df5-4473-46d1-82f8-c3ae2a17a6e1
parent 33ce6c2f
......@@ -25,6 +25,12 @@
<param name="src" value="org.sat4j.pb/src/main/java" />
<param name="jarname" value="org.sat4j.pb"/>
</antcall>
<echo>Create All-In-One auto-executable package</echo>
<jar destfile="${dist}/${release}/sat4j-pb.jar" basedir="${build}" manifest="${build}/META-INF/MANIFEST.MF">
<zipgroupfileset dir="${dist}/${release}">
<include name="org.sat4j.core.jar"/>
</zipgroupfileset>
</jar>
<antcall target="zip-bundle">
<param name="package" value="pb"/>
</antcall>
......
9.9.9.token
\ No newline at end of file
${version}
......@@ -684,6 +684,8 @@ public class OPBReader2005 extends Reader implements Serializable {
try {
parse();
return solver;
} catch (ContradictionException ce) {
throw ce;
} catch (Exception e) {
String message;
......
......@@ -169,14 +169,14 @@ The aim of the SAT4J library is to provide an efficient library of SAT solvers i
<target>${javaTarget}</target>
<testSource>${testSource}</testSource>
<testTarget>${testTarget}</testTarget>
<compilerId>eclipse</compilerId>
<compilerId>jdt</compilerId>
</configuration>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
<version>1.7</version>
</dependency>
<groupId>org.sonatype.tycho</groupId>
<artifactId>tycho-compiler-jdt</artifactId>
<version>0.7.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment