Skip to content
This repository has been archived by the owner on Jul 2, 2020. It is now read-only.

Commit

Permalink
Merge tag 'choco-parsers-3.3.2' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@cprudhom
cprudhom committed Dec 18, 2015
2 parents 64bcabc + 2425f0c commit 1408421
Show file tree
Hide file tree
Showing 202 changed files with 9,144 additions and 3,640 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ out/*

*/mysql.properties
*/logback-test.xml
*/database.ini
*/__pycache__/*

dependency-reduced-pom.xml
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ There are two ways to parse and solve a fzn file with Choco3:

* ###### Java front-end

```java -cp .:choco-solver-X.Y.Z.jar:choco-parsers-X.Y.Z.jar parser.flatzinc.ChocoFZN [<options>] [<file>]```
```java -cp .:choco-solver-X.Y.Z.jar:choco-parsers-X.Y.Z.jar ChocoFZN [<options>] [<file>]```


* ###### In a terminal (shell for Linux based OS)
Expand Down
211 changes: 147 additions & 64 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,64 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>choco</groupId>

<groupId>org.choco-solver</groupId>
<artifactId>choco-parsers</artifactId>
<version>3.2.1-SNAPSHOT</version>
<version>3.3.2</version>
<packaging>jar</packaging>
<name>A FlatZinc parser for Choco3</name>

<url>https://github.com/chocoteam/choco-parsers</url>

<description>A Graphical User Interface to plug on Choco 3.
</description>
<licenses>
<license>
<name>BSD 3-Clause License</name>
<url>http://opensource.org/licenses/BSD-3-Clause</url>
</license>
</licenses>
<developers>
<developer>
<name>Charles Prud'homme</name>
<email>[email protected]</email>
<organization>TASC, INRIA Rennes, LINA CNRS UMR 6241</organization>
<organizationUrl>http://www.emn.fr/z-info/ppc/</organizationUrl>
</developer>
<developer>
<name>Jean-Guillaume Fages</name>
<email>[email protected]</email>
<organization>COSLING S.A.S.</organization>
<organizationUrl>http://www.cosling.com</organizationUrl>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<scm>
<connection>scm:git:[email protected]:chocoteam/choco-parsers.git</connection>
<url>scm:git:git://github.com/chocoteam/choco-parsers</url>
<developerConnection>scm:git:[email protected]:chocoteam/choco-parsers.git</developerConnection>
<tag>HEAD</tag>
</scm>



<prerequisites>
<maven>3.2.3</maven>
</prerequisites>

<dependencies>
<dependency>
<groupId>org.choco-solver</groupId>
<artifactId>choco-solver</artifactId>
<version>3.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.choco-solver</groupId>
<artifactId>choco-geost</artifactId>
<version>3.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand All @@ -64,14 +100,9 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
<version>1.1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>choco</groupId>
<artifactId>choco-solver</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4</artifactId>
Expand All @@ -83,43 +114,111 @@
<version>2.0.28</version>
</dependency>
</dependencies>

<distributionManagement>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>choco-releases</id>
<name>Private Maven Repository</name>
<url>file:///Volumes/choco-repo/publish/mvn/repository</url>
<layout>default</layout>
<id>sonatype</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
<uniqueVersion>true</uniqueVersion>
<id>choco-releases</id>
<name>Private Maven Repository</name>
<url>file:///Volumes/choco-repo/publish/mvn/repository</url>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<layout>default</layout>
</snapshotRepository>
</distributionManagement>

<repositories>
<repository>
<id>choco.repo</id>
<url>http://www.emn.fr/z-info/choco-repo/mvn/repository/</url>
</repository>
</repositories>


<profiles>
<profile>
<id>release</id>
<activation>
<activeByDefault>false</activeByDefault>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<configuration>
<doctitle>${project.groupId}-${project.artifactId} ${project.version} API</doctitle>
<windowtitle>${project.groupId}-${project.artifactId} ${project.version} API</windowtitle>
<!--<quiet />-->
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- We need the GPG Plugin to self-sign the jar files. A valid signature
for the jar files is a requirement for deploying to Maven Central. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.2</version>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/assembly/with-dep.xml</descriptor>
</descriptors>
<archive>
<manifest>
<mainClass>org.chocosolver.parser.flatzinc.ChocoFZN</mainClass>
</manifest>
</archive>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5</version>
<configuration>
<arguments>-DskipTests</arguments>
<tagNameFormat>@{project.artifactId}-@{project.version}</tagNameFormat>
<pushChanges>true</pushChanges>
<localCheckout>true</localCheckout>
</configuration>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -132,36 +231,20 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>3.1.0-beta1</version>
<executions>
<execution>
<phase>package</phase>
<id>process</id>
<goals>
<goal>shade</goal>
<goal>process</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<minimizeJar>true</minimizeJar>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>parser.flatzinc.ChocoFZN</mainClass>
</transformer>
</transformers>
<artifactSet>
<excludes>
<exclude>org.testng:testng</exclude>
<exclude>choco:choco-solver</exclude>
<exclude>jgrapht:jgrapht</exclude>
<exclude>dk.brics:automaton</exclude>
<exclude>org.easymock:easymock</exclude>
<!--<exclude>net.sf.trove4j:trove4j</exclude> INCLUDED because of THash being excluded with shade:minimize-->
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>ch.qos.logback:logback-core</exclude>
<exclude>ch.qos.logback:logback-classic</exclude>
</excludes>
</artifactSet>
<options>
<myoption>TRUE</myoption>
</options>
</configuration>
</execution>
</executions>
Expand Down
36 changes: 36 additions & 0 deletions src/assembly/with-dep.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>with-dependencies</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<scope>runtime</scope>
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
</dependencySet>
<dependencySet>
<outputDirectory>/</outputDirectory>
<scope>test</scope>
<includes>
<include>ch.qos.logback:*</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
<unpack>true</unpack>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>src/main/resources/logback.xml</include>
</includes>
</fileSet>
</fileSets>

</assembly>
8 changes: 8 additions & 0 deletions src/chocofzn/INSTALL
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Evaluated on Python3.4.

Required libraries:

. PyMySQL (0.6.6): https://github.com/PyMySQL/PyMySQL`
. cython (0.22): https://github.com/cython/cython
. NumPy (1.9.2): https://github.com/numpy/numpy
. PyLaTeX (0.6.1): https://github.com/JelteF/PyLaTeX
Loading

0 comments on commit 1408421

Please sign in to comment.