ngx-export-distribution 0.5.4.0 → 0.5.4.1
raw patch · 4 files changed
+28/−12 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- Changelog.md +6/−0
- NgxExport/Distribution.hs +2/−1
- ngx-export-distribution.cabal +1/−1
- nhm-tool.hs +19/−10
Changelog.md view
@@ -1,3 +1,9 @@+### 0.5.4.1++- *nhm-tool*: add a new target *make config* in generated *Makefile*: this+ should make rebuilds faster, introduce variables *GHC* and *CABAL* for+ commands *ghc* and *cabal*.+ ### 0.5.4.0 - *nhm-tool*: command *init* now generates file *hie.yaml* for using with
NgxExport/Distribution.hs view
@@ -303,7 +303,8 @@ -- -- > $ make clean ----- or, to additionally delete the GHC environment file and the built artifact,+-- or, to additionally delete the GHC environment file, the Cabal build+-- directory, and the built artifact, -- -- > $ make clean-all --
ngx-export-distribution.cabal view
@@ -1,5 +1,5 @@ name: ngx-export-distribution-version: 0.5.4.0+version: 0.5.4.1 synopsis: Build custom libraries for Nginx Haskell module description: Build custom libraries for <https://github.com/lyokha/nginx-haskell-module Nginx Haskell module>.
nhm-tool.hs view
@@ -517,25 +517,31 @@ \DYNHIOBJS := $(SRC:.hs=.dyn_hi)\n\ \STUBS := $(SRC:.hs=_stub.h)\n\ \\n\- \GHCVER := $(shell ghc --numeric-version)\n\+ \GHC := ghc\n\+ \CABAL := cabal\n\+ \GHCVER := $(shell $(GHC) --numeric-version)\n\ \GHCENV := .ghc.environment.$(MACHINE)-$(KERNEL)-$(GHCVER)\n\ \DEPLIBS := $(MACHINE)-$(KERNEL)-ghc-$(GHCVER)\n\ \BUILDDIR := dist-nhm\n\+ \SETUPCONFIG := $(BUILDDIR)/setup-config\n\ \\n\- \.PHONY: all env clean\n\+ \.PHONY: all env config install clean clean-all\n\ \\n\ \all: $(DISTR)\n\ \\n\ \env: $(GHCENV)\n\ \\n\+ \config: $(SETUPCONFIG)\n\+ \\n\ \$(GHCENV): cabal.project $(PKGNAME).cabal\n\- \\tcabal install --builddir=\"$(BUILDDIR)\" --lib --only-dependencies \\\n\+ \\t$(CABAL) install --builddir=\"$(BUILDDIR)\" --lib --only-dependencies \+ \\\\n\ \\t --package-env .\n\ \\tsed -i 's/\\(^package-id \\)/--\\1/' $(GHCENV)\n", updatePath, "\t$(NHMTOOL) deps $(PKGNAME) -d \"$(BUILDDIR)\" >> $(GHCENV)\n\ \\n\- \$(DISTR): $(GHCENV) $(SRC)\n",+ \$(SETUPCONFIG): $(GHCENV)\n", updatePath, "\trunhaskell --ghc-arg=-package=base \\\n\ \\t --ghc-arg=-package=$(PKGDISTR) Setup.hs configure \\\n\@@ -546,8 +552,11 @@ \\t `'\\(-\\([0-9]\\+\\.\\)*[0-9]\\+\\($$\\|-.*\\)\\)/'` \\\n\ \\t `'--dependency=\\1=\\1\\2/p' \\\n\ \\t $(GHCENV)) \\\n\- \\t --prefix=$(PREFIX); \\\n\- \\trunhaskell --ghc-arg=-package=base \\\n\+ \\t --prefix=$(PREFIX)\n\+ \\n\+ \$(DISTR): $(SETUPCONFIG) $(SRC)\n",+ updatePath,+ "\trunhaskell --ghc-arg=-package=base \\\n\ \\t --ghc-arg=-package=$(PKGDISTR) Setup.hs build \\\n\ \\t --builddir=\"$(BUILDDIR)\" \\\n\ \\t --ghc-options=\"$(SRC) -o $(LIB) $(LINKRTS)\"\n\@@ -557,20 +566,20 @@ \\ttar xf $(DISTR) -C $(PREFIX) --no-same-owner\n\ \\n\ \clean:\n\- \\trm -rf $(BUILDDIR) $(DEPLIBS)\n\+ \\trm -rf $(DEPLIBS)\n\ \\trm -f $(OBJS) $(HIOBJS) $(DYNOBJS) $(DYNHIOBJS) $(STUBS)\n\ \\trm -f $(LIB)\n\ \\n\ \clean-all: clean\n\+ \\trm -rf $(BUILDDIR)\n\ \\trm -f $(GHCENV) $(DISTR)\n" ] where updatePath = "\tif test \"$(NHMTOOL)\" = nhm-tool && ! command -v nhm-tool \ \>/dev/null; \\\n\ \\tthen \\\n\- \\t PATH=$$(dirname \\\n\- \\t $$(cabal list-bin $(PKGDISTR) \- \--builddir=\"$(BUILDDIR)\")):$$PATH; \\\n\+ \\t PATH=$$(dirname $$($(CABAL) list-bin $(PKGDISTR) \\\n\+ \\t --builddir=\"$(BUILDDIR)\")):$$PATH; \\\n\ \\tfi; \\\n" projectHs :: InitData -> Text