Skip to content

Commit 89d7fee

Browse files
committed
BLD Convert build system to use hpack
This is much less verbose than cabal, so no need for m4.
1 parent 7cf0fe0 commit 89d7fee

File tree

6 files changed

+221
-226
lines changed

6 files changed

+221
-226
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ ngless-partials/
2323
NGLess/Dependencies/bwa_data.c
2424
NGLess/Dependencies/samtools_data.c
2525
NGLess/Dependencies/megahit_data.c
26-
/NGLess.cabal
26+
NGLess.cabal

AUTHORS

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Luis Pedro Coelho <[email protected]>
2+
Paulo Monteiro <[email protected]>
3+
Renato Alves <[email protected]>
4+

Makefile

+6-9
Original file line numberDiff line numberDiff line change
@@ -79,32 +79,29 @@ reqfonts = $(addprefix $(HTML_FONTS_DIR)/, $(FONTFILES))
7979

8080
all: ngless
8181

82-
NGLess.cabal: NGLess.cabal.m4
83-
m4 $< > $@
84-
85-
ngless: NGLess.cabal
82+
ngless:
8683
stack build $(STACKOPTS)
8784

8885
modules:
8986
cd Modules && $(MAKE)
9087

91-
static: NGLess.cabal $(NGLESS_EMBEDDED_TARGET)
88+
static: $(NGLESS_EMBEDDED_TARGET)
9289
stack build $(STACKOPTS) --ghc-options='-fPIC' --force-dirty --flag NGLess:embed
9390

94-
fast: NGLess.cabal
91+
fast:
9592
stack build $(STACKOPTS) --ghc-options=-O0
9693

9794
dist: ngless-${VERSION}.tar.gz
9895

99-
check: NGLess.cabal
96+
check:
10097
stack test $(STACKOPTS)
10198

102-
fastcheck: NGLess.cabal
99+
fastcheck:
103100
stack test $(STACKOPTS) --ghc-options=-O0
104101
# Synonym
105102
tests: check
106103

107-
bench: NGLess.cabal
104+
bench:
108105
stack bench $(STACKOPTS)
109106

110107
profile:

NGLess.cabal.m4

-215
This file was deleted.

NGLess/Utils/FindModules.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ listKnownModules = do
2121
-- Go up the directory stack until you find "NGLess.cabal.m4"
2222
cwd <- getCurrentDirectory
2323
let parents = fmap joinPath . tails $ splitDirectories cwd
24-
Just startpoint <- findM (doesFileExist . (</> "NGLess.cabal.m4")) parents
24+
Just startpoint <- findM (doesFileExist . (</> "stack.yaml")) parents
2525
mapMaybe asModName <$> listDirectory (startpoint </> "Modules")
2626

2727

0 commit comments

Comments
 (0)