Update Travis script, again

Author: hvr

.travis.yml

@@ -1,5 +1,9 @@
-# This file has been generated by `make_travis_yml_2.hs`
-# see https://github.com/hvr/multi-ghc-travis for more information
+# This Travis job script has been generated by a script via
+#
+#   make_travis_yml_2.hs 'zlib.cabal' 'zlib1g-dev'
+#
+# For more information, see https://github.com/hvr/multi-ghc-travis
+#
 language: c
 sudo: false
 
@@ -24,57 +28,73 @@ matrix:
   include:
     - compiler: "ghc-7.0.4"
       env: TEST=--disable-tests
-      addons: {apt: {packages: [cabal-install-head,ghc-7.0.4,zlib1g-dev], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.0.4,zlib1g-dev], sources: [hvr-ghc]}}
     - compiler: "ghc-7.2.2"
       env: TEST=--disable-tests
-      addons: {apt: {packages: [cabal-install-head,ghc-7.2.2,zlib1g-dev], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.2.2,zlib1g-dev], sources: [hvr-ghc]}}
     - compiler: "ghc-7.4.2"
-    # env: CABALVER=head TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [cabal-install-head,ghc-7.4.2,zlib1g-dev], sources: [hvr-ghc]}}
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.4.2,zlib1g-dev], sources: [hvr-ghc]}}
     - compiler: "ghc-7.6.3"
-    # env: CABALVER=head TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [cabal-install-head,ghc-7.6.3,zlib1g-dev], sources: [hvr-ghc]}}
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.6.3,zlib1g-dev], sources: [hvr-ghc]}}
     - compiler: "ghc-7.8.4"
-    # env: CABALVER=head TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [cabal-install-head,ghc-7.8.4,zlib1g-dev], sources: [hvr-ghc]}}
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4,zlib1g-dev], sources: [hvr-ghc]}}
     - compiler: "ghc-7.10.3"
-    # env: CABALVER=head TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [cabal-install-head,ghc-7.10.3,zlib1g-dev], sources: [hvr-ghc]}}
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3,zlib1g-dev], sources: [hvr-ghc]}}
     - compiler: "ghc-8.0.1"
-    # env: CABALVER=head TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [cabal-install-head,ghc-8.0.1,zlib1g-dev], sources: [hvr-ghc]}}
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.1,zlib1g-dev], sources: [hvr-ghc]}}
     - compiler: "ghc-8.0.2"
-    # env: CABALVER=head TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [cabal-install-head,ghc-8.0.2,zlib1g-dev], sources: [hvr-ghc]}}
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2,zlib1g-dev], sources: [hvr-ghc]}}
     - compiler: "ghc-head"
-    # env: CABALVER=head TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [cabal-install-head,ghc-head,zlib1g-dev], sources: [hvr-ghc]}}
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head,zlib1g-dev], sources: [hvr-ghc]}}
 
   allow_failures:
     - compiler: "ghc-head"
 
 before_install:
  - HC=${CC}
  - unset CC
- - CABALVER=${CABALVER-head}
- - export PATH=/opt/ghc/bin:/opt/cabal/$CABALVER/bin:$PATH
- - PATH2=/opt/ghc/${HC/#ghc-}/bin:$PATH
+ - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
+ - PKGNAME='zlib'
 
 install:
  - cabal --version
+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
  - BENCH=${BENCH---enable-benchmarks}
  - TEST=${TEST---enable-tests}
- - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
  - travis_retry cabal update -v
  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
+ - rm -fv cabal.project.local
+ - "echo 'packages: .' > cabal.project"
+ - rm -f cabal.project.freeze
  - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2
+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2
 
 # Here starts the actual work to be performed for the package under test;
 # any command which exits with a non-zero exit code causes the build to fail.
 script:
  - if [ -f configure.ac ]; then autoreconf -i; fi
- - SRC_BASENAME=$(PATH=${PATH2} cabal info . | awk '{print $2;exit}')
+ - rm -rf dist/
+ - cabal sdist # test that a source-distribution can be generated
+ - cd dist/
+ - SRCTAR=(${PKGNAME}-*.tar.gz)
+ - SRC_BASENAME="${SRCTAR/%.tar.gz}"
+ - tar -xvf "./$SRC_BASENAME.tar.gz"
+ - cd "$SRC_BASENAME/"
+## from here on, CWD is inside the extracted source-tarball
+ - rm -fv cabal.project.local
+ - "echo 'packages: .' > cabal.project"
+ # this builds all libraries and executables (without tests/benchmarks)
+ - rm -f cabal.project.freeze
+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks
  # this builds all libraries and executables (including tests/benchmarks)
+ # - rm -rf ./dist-newstyle
  - cabal new-build -w ${HC} ${TEST} ${BENCH}
 
  # there's no 'cabal new-test' yet, so let's emulate for now
@@ -84,14 +104,5 @@ script:
    RC=true; for T in ${TESTS[@]}; do echo "== $T ==";
    if dist-newstyle/build/**/$SRC_BASENAME/**/build/$T/$T; then echo "= $T OK =";
    else echo "= $T FAILED ="; RC=false; fi; done; $RC
- - cabal sdist # test that a source-distribution can be generated
-
- # Check that the resulting source distribution can be built w/o and w tests
- - tar -C dist/ -xf dist/$SRC_BASENAME.tar.gz
- - "echo 'packages: .' > dist/$SRC_BASENAME/cabal.project"
- - cd dist/$SRC_BASENAME/
- - cabal new-build -w ${HC} --disable-tests --disable-benchmarks
- - rm -rf ./dist-newstyle
- - cabal new-build -w ${HC} ${TEST} ${BENCH}
 
 # EOF