starlitcanopy/simple-sql-parser
1
Fork 0
Code Activity

small updates for latest packages, cabal and ghc

Browse source
This commit is contained in:
Jake Wheat 2019-07-05 19:19:10 +01:00
parent 372dcf91cc
commit 908a8156e2
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -6,14 +6,14 @@
.PHONY : init .PHONY : init
init : init :
cabal sandbox init cabal v1-sandbox init
cabal install happy cabal v1-install happy
cabal install --only-dependencies --enable-tests cabal v1-install --only-dependencies --enable-tests
cabal configure --enable-tests cabal v1-configure --enable-tests
.PHONY : build .PHONY : build
build : build :
cabal build cabal v1-build
.PHONY : test .PHONY : test
test : build test : build
@ -25,7 +25,7 @@ website :
.PHONY : clean .PHONY : clean
clean : clean :
cabal clean cabal v1-clean
cabal sandbox delete cabal v1-sandbox delete
rm -Rf build/ rm -Rf build/

8
simple-sql-parser.cabal
View file

@ -56,7 +56,7 @@ Test-Suite Tests
parsec >=3.1 && <3.2, parsec >=3.1 && <3.2,
mtl >=2.1 && <2.3, mtl >=2.1 && <2.3,
pretty >= 1.1 && < 1.2, pretty >= 1.1 && < 1.2,
tasty >= 1.1 && < 1.2, tasty >= 1.1 && < 1.3,
tasty-hunit >= 0.9 && < 0.11 tasty-hunit >= 0.9 && < 0.11
Other-Modules: Language.SQL.SimpleSQL.Pretty, Other-Modules: Language.SQL.SimpleSQL.Pretty,
@ -99,7 +99,7 @@ executable SimpleSqlParserTool
parsec >=3.1 && <3.2, parsec >=3.1 && <3.2,
mtl >=2.1 && <2.3, mtl >=2.1 && <2.3,
pretty >= 1.1 && < 1.2, pretty >= 1.1 && < 1.2,
pretty-show >= 1.6 && < 1.9 pretty-show >= 1.6 && < 1.10
other-extensions: TupleSections,DeriveDataTypeable other-extensions: TupleSections,DeriveDataTypeable
default-language: Haskell2010 default-language: Haskell2010
ghc-options: -Wall ghc-options: -Wall
@ -115,8 +115,8 @@ executable Fixity
parsec >=3.1 && <3.2, parsec >=3.1 && <3.2,
mtl >=2.1 && <2.3, mtl >=2.1 && <2.3,
pretty >= 1.1 && < 1.2, pretty >= 1.1 && < 1.2,
pretty-show >= 1.6 && < 1.9, pretty-show >= 1.6 && < 1.10,
tasty >= 1.1 && < 1.2, tasty >= 1.1 && < 1.3,
tasty-hunit >= 0.9 && < 0.11 tasty-hunit >= 0.9 && < 0.11
other-extensions: TupleSections,DeriveDataTypeable other-extensions: TupleSections,DeriveDataTypeable

2
website/make_website.sh
View file

@ -22,7 +22,7 @@ asciidoctor website/supported_sql.asciidoc -o - | runhaskell website/AddLinks.lh
# tpch sql file # tpch sql file
# pandoc src/tpch.sql -s --highlight-style kate -o tpch.sql.html # pandoc src/tpch.sql -s --highlight-style kate -o tpch.sql.html
# rendered test cases # rendered test cases
runhaskell -package-db=.cabal-sandbox/x86_64-linux-ghc-7.10.3-packages.conf.d -i:tools website/RenderTestCases.lhs > build/test_cases.asciidoc runhaskell -package-db=.cabal-sandbox/x86_64-linux-ghc-8.6.5-packages.conf.d -i:tools website/RenderTestCases.lhs > build/test_cases.asciidoc
#pandoc --from=markdown --to=html build/test_cases.asciidoc -o build/test_cases.html -c main.css '--title=simple-sql-parser examples/test cases' --toc #pandoc --from=markdown --to=html build/test_cases.asciidoc -o build/test_cases.html -c main.css '--title=simple-sql-parser examples/test cases' --toc
asciidoctor build/test_cases.asciidoc -o - | \ asciidoctor build/test_cases.asciidoc -o - | \