Skip to content

Commit ea3c22d

Browse files
committed
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.
1 parent 7bf78de commit ea3c22d

File tree

7 files changed

+1641
-7
lines changed

7 files changed

+1641
-7
lines changed

CHANGES

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-----------------------------------------------------------------------------
2+
1.19.7
3+
* Manually generate Parser.hs using Makefile and check it into the repo,
4+
to fix bootstrapping problems with cabal sandboxes & new-build
5+
16
-----------------------------------------------------------------------------
27
1.19.5
38
* fixes for GHC 7.10

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
TOP = ..
2-
include $(TOP)/mk/boilerplate.mk
3-
4-
SUBDIRS = src templates doc
5-
6-
include $(TOP)/mk/target.mk
1+
HAPPY=happy
2+
HAPPYFLAGS=-agc
73

4+
GEN = src/Parser.hs src/AttrGrammarParser.hs
85

6+
all : $(GEN)
97

8+
src/%.hs : src/boot/%.ly
9+
$(HAPPY) $(HAPPYFLAGS) $< -o $@
1010

happy.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: happy
2-
version: 1.19.6
2+
version: 1.19.7
33
license: BSD2
44
license-file: LICENSE
55
copyright: (c) Andy Gill, Simon Marlow

0 commit comments

Comments
 (0)