@@ -60,9 +60,9 @@ install:
6060 (cd "."; autoreconf -i);
6161 fi
6262 - rm -f cabal.project.freeze
63− - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
64− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
65− - rm -rf "."/.ghc.environment.* "."/dist
63+ - cabal build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
64+ - cabal build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
65+ - rm -rf "."/.ghc.environment.* "."/dist-newstyle
6666 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
6767
6868# Here starts the actual work to be performed for the package under test;
@@ -70,26 +70,26 @@ install:
7070script:
7171 # test that source-distributions can be generated
7272 - (cd "."; cabal sdist)
73− - mv "."/dist/generic-lens-*.tar.gz ${DISTDIR}/
73+ - mv "."/dist-newstyle/sdist/generic-lens-*.tar.gz ${DISTDIR}/
7474 - cd ${DISTDIR}
7575 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
7676 - "echo 'packages: generic-lens-*/*.cabal' > cabal.project"
7777 - "echo 'write-ghc-environment-files: always' >> cabal.project"
7878 # this builds all libraries and executables (without tests/benchmarks)
79− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
79+ - cabal build -w ${HC} --disable-tests --disable-benchmarks all
8080
8181 # Build with installed constraints for packages in global-db
8282 - if $INSTALLED; then
83− echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh;
83+ echo cabal build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh;
8484 else echo "Not building with installed constraints"; fi
8585
8686 # build & run tests, build benchmarks
87− - cabal new-build -w ${HC} ${TEST} ${BENCH} all
88− - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi
87+ - cabal build -w ${HC} ${TEST} ${BENCH} all
88+ - if [ "x$TEST" = "x--enable-tests" ]; then cabal test -w ${HC} ${TEST} all; fi
8989
9090 # haddock
9191 - rm -rf ./dist-newstyle
92− - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
92+ - if $HADDOCK; then cabal haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
9393
9494# REGENDATA ["generic-lens.cabal"]
9595# EOF