Merge pull request #173 from simonmar/fix-travis

Try to fix build by syncing with happy

Author: Ericson2314

.travis.yml

@@ -17,8 +17,8 @@ env:
 before_install:
  - sudo add-apt-repository -y ppa:hvr/ghc
  - sudo apt-get update
- - sudo apt-get install alex-3.1.7 happy-1.19.5 cabal-install-head ghc-$GHCVER
- - export PATH=/opt/cabal/head/bin:/opt/ghc/$GHCVER/bin:/opt/alex/3.1.7/bin:/opt/happy/1.19.5/bin:$PATH
+ - sudo apt-get install alex-3.1.7 happy-1.19.5 cabal-install-3.4 ghc-$GHCVER
+ - export PATH=/opt/cabal/3.4/bin:/opt/ghc/$GHCVER/bin:/opt/alex/3.1.7/bin:/opt/happy/1.19.5/bin:$PATH
 
 install:
  - cabal update

Makefile

@@ -18,13 +18,12 @@ sdist ::
 		echo "Error: Tree is not clean"; \
 		exit 1; \
 	fi
-	rm -rf dist/
 	$(HAPPY) $(HAPPY_OPTS) src/Parser.y -o src/Parser.hs
 	$(ALEX) $(ALEX_OPTS) src/Scan.x -o src/Scan.hs
 	mv src/Parser.y src/Parser.y.boot
 	mv src/Scan.x src/Scan.x.boot
-	$(CABAL) new-run gen-alex-sdist
-	$(CABAL) new-sdist
+	$(CABAL) v2-run gen-alex-sdist
+	$(CABAL) v2-sdist
 	@if [ ! -f "${SDIST_DIR}/alex-$(ALEX_VER).tar.gz" ]; then \
 		echo "Error: source tarball not found: dist/alex-$(ALEX_VER).tar.gz"; \
 		exit 1; \
@@ -43,7 +42,7 @@ sdist-test-only ::
 	rm -rf "${SDIST_DIR}/alex-$(ALEX_VER)/"
 	tar -xf "${SDIST_DIR}/alex-$(ALEX_VER).tar.gz" -C ${SDIST_DIR}/
 	echo "packages: ." > "${SDIST_DIR}/alex-$(ALEX_VER)/cabal.project"
-	cd "${SDIST_DIR}/alex-$(ALEX_VER)/" && cabal new-test --enable-tests all
+	cd "${SDIST_DIR}/alex-$(ALEX_VER)/" && cabal v2-test --enable-tests all
 	@echo ""
 	@echo "Success! ${SDIST_DIR}/alex-$(ALEX_VER).tar.gz is ready for distribution!"
 	@echo ""

test.hs

@@ -2,4 +2,3 @@ import System.Process (system)
 import System.Exit (exitWith)
 
 main = system "make -k -C tests clean all" >>= exitWith
-

tests/Makefile

@@ -12,7 +12,7 @@ ALEX=../dist/build/alex/alex
 endif
 
 # NOTE: This assumes that a working `ghc` is on $PATH; this may not necessarily be the same GHC used by `cabal` for building `alex`.
-HC=ghc
+HC = ghc
 
 # Some GHC warnings are only available from a certain version on
 # Get the GHC version
@@ -101,5 +101,3 @@ interact:
 
 debug :
 	@echo HC_OPTS=$(HC_OPTS)
-
-# EOF