From 08dc983cfc22c75a2db44be076f1f586b70b7d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=CC=88zgu=CC=88r=20Akgu=CC=88n?= Date: Sun, 23 Jun 2019 17:51:50 +0300 Subject: [PATCH] Release v2.3.0 --- CHANGELOG.md | 8 ++++++-- LICENSE | 2 +- conjure-cp.cabal | 2 +- docs/conf.py | 6 +++--- docs/installation.rst | 33 +++++++++++++++++++++++---------- 5 files changed, 34 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dca7e4a2bc..1d8127196f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,15 @@ +# v2.3.0 (2019-06-23) + +Please check [this page](https://github.com/conjure-cp/conjure/compare/v2.2.0...v2.3.0) to see a list of all changes since the previous release. + # v2.2.0 (2018-08-27) - Bug fix: Avoid generating names that are used in the input file. - Improvements to the refinement of partitions. Do not generate redundant structural constraints. -- Many more (I promise to write them soon!) +- And many more... -For now, check [this page](https://github.com/conjure-cp/conjure/compare/v2.1.0...v2.2.0) which lists all changes since the previous release. +There has been several bugfixes, performance improvements and new features in the last year. Please check [this page](https://github.com/conjure-cp/conjure/compare/v2.1.0...v2.2.0) to see a list of all changes since the previous release. # v2.1.0 (2017-08-24) diff --git a/LICENSE b/LICENSE index c410c0c767..dbcc716780 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2009-2018 Özgür Akgün +Copyright 2009-2019 Özgür Akgün School of Computer Science, University of St Andrews All rights reserved. diff --git a/conjure-cp.cabal b/conjure-cp.cabal index 7630b0d1eb..fed55c19d7 100644 --- a/conjure-cp.cabal +++ b/conjure-cp.cabal @@ -1,6 +1,6 @@ Name: conjure-cp -Version: 2.2.0 +Version: 2.3.0 Synopsis: Conjure: The Automated Constraint Modelling Tool Description: . Homepage: http://github.com/conjure-cp/conjure diff --git a/docs/conf.py b/docs/conf.py index be0e464493..a400b05851 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,7 +51,7 @@ # General information about the project. project = u'Conjure' -copyright = u'2009-2018, Özgür Akgün' +copyright = u'2009-2019, Özgür Akgün' author = u'Özgür Akgün' # The version info for the project you're documenting, acts as replacement for @@ -59,9 +59,9 @@ # built documents. # # The short X.Y version. -version = u'2.2.0' +version = u'2.3.0' # The full version, including alpha/beta/rc tags. -release = u'2.2.0' +release = u'2.3.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/installation.rst b/docs/installation.rst index d10bc5171d..3cd5811255 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -9,32 +9,42 @@ Conjure can be installed either by downloading a binary distribution, or by comp Downloading a binary -------------------- -Conjure is available as an executable binary for Linux, MacOS, and Windows. +Conjure is available as an executable binary for Linux and MacOS. If it is available for your platform, you can just `download it `_ and run it. It may be useful to save the binary under a directory that is in your search PATH, so you do not have to type the full path to the Conjure executable to run it. +For Windows, please use the Linux binaries with the +`Windows Subsystem for Linux `_. + Compiling from source --------------------- In order to compile Conjure on your computer, please download the source code from `GitHub `_. -Conjure is implemented in Haskell, it can be compiled using either `cabal-install `_ or `stack `_. - -It comes with a Makefile which will use Stack by default. -The default target in the Makefile will install Stack using the standard procedures (which involves downloading and running a script). -For more precise control, you might want to consider installing the Haskell tools beforehand instead of using the Makefile. .. code-block:: bash git clone git@github.com:conjure-cp/conjure.git cd conjure - make install + BIN_DIR=/somewhere/in/your/path make install + +Conjure is implemented in Haskell, it can be compiled using either `cabal-install `_ or `stack `_. + +It comes with a Makefile which will use Stack by default. +The default target in the Makefile will install Stack using the standard procedures (which involves downloading and running a script). +For more precise control, you might want to consider installing the Haskell tools beforehand instead of using the Makefile. Installation is known to work with -`GHC-8.0.2 `_, and -`GHC-8.2.2 `_, and -`GHC-8.4.2 `_. +`GHC-8.0.2 `_, +`GHC-8.2.2 `_, +`GHC-8.4.2 `_, and +`GHC-8.4.2 `_. +In addition, a number of supported backend solvers can be compiled using the `make solvers` target. +This target also takes a BIN_DIR environment variable to control the location of the solver executables. + +.. code-block:: bash + BIN_DIR=/somewhere/in/your/path make solvers Installing Savile Row --------------------- @@ -42,3 +52,6 @@ Installing Savile Row Since Conjure works by generating an Essence' model, Savile Row is a vital tool when using it. Savile Row can be downloaded from `its website `_. +You do not need to download Savile Row separately when you compile Conjure from source. +An up-to-date version of Savile Row is also copied next to the Conjure executable. +