Merge pull request #478 from AmpersandTarski/development

prepare new release

README.md

@@ -1,6 +1,7 @@
 # Ampersand 
 
 [![Build Status](https://travis-ci.org/AmpersandTarski/Ampersand.svg?branch=master)](https://travis-ci.org/AmpersandTarski/Ampersand)
+[![Build status](https://ci.appveyor.com/api/projects/status/ai0pwvb7corwkjjm?svg=true)](https://ci.appveyor.com/project/hanjoosten/ampersand)
 [![Release](https://img.shields.io/github/release/AmpersandTarski/Ampersand.svg)](https://github.com/AmpersandTarski/Ampersand/releases)
 
 ## Recent activity 

ReleaseNotes.md

@@ -1,7 +1,16 @@
 # Release notes of Ampersand
 
-## unreleased changes 
-
+## v3.6.0 (8 july 2016)
+  * [Issue #406](https://github.com/AmpersandTarski/Ampersand/issues/406) Minor changes on syntax of INTERFACE statement. 
+  * [Issue #438](https://github.com/AmpersandTarski/Ampersand/issues/438) New switch: --include
+  * [Issue #438](https://github.com/AmpersandTarski/Ampersand/issues/438) Enhancement: Introduction of a configuration file. A sample configuration file is generated when you use the switch --sampleConfigFile. To use a config file, use the switch --config=MyConfig.yaml
+  * [Issue #468](https://github.com/AmpersandTarski/Ampersand/issues/468) Enhancement: default configuration file (when it exists)
+  * Enhancement: From now on, all text values read from .xlsx files are trimmed (leading and trailing spaces are removed), unless the switch --do-not-trim-cellvalues is given. [Issue #414](https://github.com/AmpersandTarski/Ampersand/issues/414)
+  * More automation on releasing Ampersand.
+  * Frontend: Options in frontend navbar now can be defined for certain roles only (e.g. the installer and excelimporter).
+  * [Issue #103](https://github.com/AmpersandTarski/Ampersand/issues/103) Fix overlap by multiple rows in navbar
+  * [Issue #423] Database is automatically installed when it does not exists yet (first time use)
+
 ## v3.5.2 (10 juni 2016)
   * Work on meatgrinder (still experimental!)
   * Bug fix: Issue with SQL query [Issue #152](https://github.com/AmpersandTarski/Ampersand/issues/152)

ampersand.cabal

@@ -1,5 +1,5 @@
 name:           ampersand
-version:        3.5.2
+version:        3.6.0
 author:         Stef Joosten
 maintainer:     [email protected]
 synopsis:       Toolsuite for automated design of business processes.
@@ -56,6 +56,8 @@ executable ampersand
                      text == 1.2.*,
                      time == 1.5.*,
                      utf8-string == 1.0.*,
+                     yaml == 0.8.17.*,
+                     yaml-config == 0.4.*,
                      xlsx == 0.2.1.*,
                      zlib == 0.6.*
 
@@ -152,7 +154,6 @@ executable ampersand
                      Database.Design.Ampersand.Prototype.PHP,
                      Database.Design.Ampersand.Prototype.ProtoUtil,
                      Database.Design.Ampersand.Prototype.ValidateSQL,
-                     Paths_ampersand,
                      Database.Design.Ampersand.Output.ToJSON.MySQLInstaller,
                      Database.Design.Ampersand.Output.ToJSON.Settings,
                      Database.Design.Ampersand.Output.ToJSON.Relations,
@@ -174,6 +175,7 @@ Test-Suite regression-test
                      conduit-extra == 1.1.13.*,
                      conduit-combinators == 1.0.3.*,
                      yaml == 0.8.17.*,
+                     yaml-config == 0.4.*,
                      process == 1.2.*,
                      transformers == 0.4.*,
                      directory == 1.2.*,
@@ -230,8 +232,7 @@ Test-Suite regression-test
                      Database.Design.Ampersand.Misc,
                      Database.Design.Ampersand.Misc.Explain,
                      Database.Design.Ampersand.Misc.Languages,
-                     Database.Design.Ampersand.Prototype.StaticFiles_Generated,
-                     Paths_ampersand
+                     Database.Design.Ampersand.Prototype.StaticFiles_Generated
 
 Test-Suite ampersand-test
   type:              exitcode-stdio-1.0
@@ -261,6 +262,8 @@ Test-Suite ampersand-test
                      utf8-string == 1.0.*,
                      wl-pprint == 1.2.*,
                      xlsx == 0.2.1.*,
+                     yaml == 0.8.17.*,
+                     yaml-config == 0.4.*,
                      zlib == 0.6.*
   other-modules:
                      Database.Design.Ampersand.Misc.Options,
@@ -335,5 +338,4 @@ Test-Suite ampersand-test
                      Database.Design.Ampersand.Misc,
                      Database.Design.Ampersand.Misc.Explain,
                      Database.Design.Ampersand.Misc.Languages,
-                     Database.Design.Ampersand.Prototype.StaticFiles_Generated,
-                     Paths_ampersand
+                     Database.Design.Ampersand.Prototype.StaticFiles_Generated

appveyor.yml

@@ -0,0 +1,56 @@
+################################################
+# This file has been made according to the work of
+# Noon van der Silk. Thanks Noon!
+# https://silky.github.io/posts/2016-01-05-build-windows-haskell-app-with-stack-and-appveyor.html
+################################################
+
+# Disable the standard build process which would use MSBuild:
+build: off
+
+cache:
+- "c:\\sr" # stack root, short paths == fewer problems
+clone_folder: "c:\\stack"
+environment:
+  global:
+    STACK_ROOT: "c:\\sr"
+
+# obtain the stack executable, and also perform a small hack which
+# converts ssh-based git submodules to https-based ones, that 
+# can be cloned without needing to mess about with ssh keys.
+before_build:
+- curl -sS -ostack.zip -L --insecure http://www.stackage.org/stack/windows-i386
+- 7z x stack.zip stack.exe
+
+# prevent AppVeyor from building when it sees a new tag (later
+# in this script we end up making a new tag when we push a release)
+skip_tags: true
+
+# perform the typical stack build, and also install the 
+# ampersand.exe file that we will mark as an artifact
+build_script:
+# Suppress output from stack setup, as there is a lot and it's not necessary.
+- stack setup --no-terminal > nul
+- stack build --only-snapshot --no-terminal
+- stack --local-bin-path . install ampersand
+# Set a magical environment variable
+- cmd: for /f %%i in ('stack exec -- ampersand -v') do set AMPERSAND_VERSION=%%i
+
+# mark the file(s) as an artifact; this means AppVeyor will hang on to it after the build completes:
+artifacts:
+- path: ampersand.exe
+
+# Auto-deploy
+# specify that, for each build that completes, AppVeyor should push
+# a release with the right tag to the GitHub releases page! 
+# (Note: probably we would want to be a bit more 
+# elaborate about when we push to the releases page; making sure 
+# that we include proper release notes, etc.)
+deploy:
+  - provider: GitHub
+    tag: '$(AMPERSAND_VERSION)'
+    release: '$(AMPERSAND_VERSION)'
+    auth_token:
+      secure: B9wxH2Me3jIbEn9xlvIY9SEWdELRgKMtEZeQZmJQm5wMGjp4YF4wQmAHCy3ofTJG
+    artifact: ampersand.exe
+    on:
+      branch: master

src/Database/Design/Ampersand/ADL1/Expression.hs

@@ -97,7 +97,7 @@ notCpl (ECpl e) = e
 notCpl e = ECpl e
 
 isCpl :: Expression -> Bool
-isCpl (ECpl{}) = True
+isCpl ECpl{} = True
 isCpl _ = False
 
 isPos :: Expression -> Bool