Check in pre-generated Parser.hs files (#88, #89)

Seems wrong to me, but it's the simplest way to fix issues with cabal sandboxes and new-build.
haskell · Jul 13, 2017 · ea3c22d · ea3c22d
1 parent 7bf78de
commit ea3c22d
Show file tree

Hide file tree

Showing 7 changed files with 1,641 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+-----------------------------------------------------------------------------
+1.19.7
+        * Manually generate Parser.hs using Makefile and check it into the repo,
+          to fix bootstrapping problems with cabal sandboxes & new-build
+
 -----------------------------------------------------------------------------
 1.19.5
         * fixes for GHC 7.10

diff --git a/Makefile b/Makefile
@@ -1,10 +1,10 @@
-TOP = ..
-include $(TOP)/mk/boilerplate.mk
-
-SUBDIRS = src templates doc
-
-include $(TOP)/mk/target.mk
+HAPPY=happy
+HAPPYFLAGS=-agc
 
+GEN = src/Parser.hs src/AttrGrammarParser.hs
 
+all : $(GEN)
 
+src/%.hs : src/boot/%.ly
+	$(HAPPY) $(HAPPYFLAGS) $< -o $@
 
diff --git a/happy.cabal b/happy.cabal
@@ -1,5 +1,5 @@
 name: happy
-version: 1.19.6
+version: 1.19.7
 license: BSD2
 license-file: LICENSE
 copyright: (c) Andy Gill, Simon Marlow