From 6a479035167092737e9c0b5fe61da302740923aa Mon Sep 17 00:00:00 2001
From: Anton Ekblad <anton@ekblad.cc>
Date: Wed, 8 May 2019 17:49:22 +0200
Subject: [PATCH] Fix travis build.

---
 .travis.yml                 |  8 ++++++--
 Makefile                    | 23 +++++++++++++----------
 selda-json/selda-json.cabal |  1 -
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 52bc8774..6c16ff77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,11 @@ install:
    fi
  - travis_retry cabal update -v
  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- - cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v ./selda ./selda-sqlite ./selda-postgresql ./selda-tests > installplan.txt
+ - cp ./README.md ./selda/README.md
+ - make license
+ - make travis-pgconnectinfo
+ - cabal v2-run selda-changelog md
+ - cabal v2-install --only-dependencies --dry -v ./selda ./selda-sqlite ./selda-postgresql ./selda-json ./selda-tests > installplan.txt
  - sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt
 
 # check whether current requested install-plan matches cached package-db snapshot
@@ -59,7 +63,7 @@ install:
      echo "cabal build-cache MISS";
      rm -rf $HOME/.cabsnap;
      mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
-     cabal install --only-dependencies --enable-tests --enable-benchmarks ./selda ./selda-sqlite ./selda-postgresql ./selda-tests;
+     cabal v2-install --only-dependencies ./selda ./selda-sqlite ./selda-postgresql ./selda-json ./selda-tests;
    fi
 
 # snapshot package-db on cache miss
diff --git a/Makefile b/Makefile
index 4bf31150..5637ce1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGES=selda selda-sqlite selda-postgresql selda-json
-.PHONY: help build license deps travischeck haddock check test selda pgtest sqlite postgres repl upload-selda upload
+.PHONY: help build license deps travischeck haddock check test selda pgtest sqlite postgres repl upload-selda upload travis-pgconnectinfo
 
 help:
 	@echo "Available targets:"
@@ -19,13 +19,20 @@ help:
 
 build: selda sqlite postgres json
 
-travischeck:
+travis-pgconnectinfo:
 	echo '{-# LANGUAGE OverloadedStrings #-}' > selda-tests/PGConnectInfo.hs
 	echo 'module PGConnectInfo where' >> selda-tests/PGConnectInfo.hs
 	echo 'import Database.Selda.PostgreSQL' >> selda-tests/PGConnectInfo.hs
 	echo 'pgConnectInfo = ("test" `on` "localhost"){pgUsername = Just "postgres"}'  >> selda-tests/PGConnectInfo.hs
+
+travischeck: travis-pgconnectinfo
 	make check
 
+license:
+	for package in $(PACKAGES) ; do \
+		cp -f ./LICENSE ./$$package/LICENSE ; \
+	done
+
 haddock:
 	cabal v2-haddock $(PACKAGES)
 
@@ -52,24 +59,20 @@ pgtest: selda postgres
 	cd ./selda-tests && cabal v2-configure --enable-tests -fpostgres
 	cd ./selda-tests && cabal v2-test
 
-selda:
-	cp -f LICENSE ./selda/LICENSE
+selda: license
 	cp -f README.md ./selda/README.md
 	cabal v2-build selda
 	make tags ; true
 
-json:
-	cp -f LICENSE ./selda/LICENSE
+json: license
 	cabal v2-build selda-json
 	make tags ; true
 
-sqlite:
-	cp -f LICENSE ./selda-sqlite/LICENSE
+sqlite: license
 	cabal v2-build selda-sqlite
 	make tags ; true
 
-postgres:
-	cp -f LICENSE ./selda-postgresql/LICENSE
+postgres: license
 	cabal v2-build selda-postgresql
 	make tags ; true
 
diff --git a/selda-json/selda-json.cabal b/selda-json/selda-json.cabal
index 88123651..92dc6110 100644
--- a/selda-json/selda-json.cabal
+++ b/selda-json/selda-json.cabal
@@ -12,7 +12,6 @@ maintainer:          anton@ekblad.cc
 -- copyright:
 category:            Database
 build-type:          Simple
-extra-source-files:  CHANGELOG.md
 
 library
   exposed-modules: