simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-09-18 17:57:11 +03:00
Code Issues Projects Releases Wiki Activity

tools: move hakyll-std into a subdirectory

Browse Source
This commit is contained in:
Simon Michael 2015-11-05 20:21:02 -08:00
parent 1f05d1c9bf
commit ed0affd486
9 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -120,7 +120,7 @@ SOURCEFILES:= \
CABALFILES:= \ CABALFILES:= \
hledger/hledger.cabal \ hledger/hledger.cabal \
hledger-*/*.cabal \ hledger-*/*.cabal \
site/hakyll-std.cabal site/hakyll-std/hakyll-std.cabal
HPACKFILES:= \ HPACKFILES:= \
hledger/package.yaml \ hledger/package.yaml \
@ -860,25 +860,25 @@ $(call def-help-subsection,DOCUMENTATION:)
# \ # \
# ) # )
site/hakyll-std: \ hakyll-std site/hakyll-std/hakyll-std: \
site/hakyll-std.hs \ site/hakyll-std/hakyll-std.hs \
site/TableOfContents.hs \ site/hakyll-std/TableOfContents.hs \
$(call def-help,hakyll-std, build a generic hakyll site builder script ) $(call def-help,hakyll-std, build a generic hakyll site builder script )
cd site; ./hakyll-std.hs >/dev/null && stack ghc hakyll-std.hs cd site/hakyll-std; ./hakyll-std.hs >/dev/null && stack ghc hakyll-std.hs
site-build: site/hakyll-std \ site-build: site/hakyll-std/hakyll-std \
$(call def-help,site-build, generate the hledger.org website with hakyll-std ) $(call def-help,site-build, generate the hledger.org website with hakyll-std )
-cd site; ./hakyll-std build -cd site; hakyll-std/hakyll-std build
site-clean: site/hakyll-std \ site-clean: site/hakyll-std/hakyll-std \
$(call def-help,site-clean, remove hakyll-generated files (& take down the website) ) #cleanolddocs $(call def-help,site-clean, remove hakyll-generated files (& take down the website) ) #cleanolddocs
-cd site; ./hakyll-std clean -cd site; hakyll-std/hakyll-std clean
# rm -rf site/_site/* # rm -rf site/_site/*
# XXX hakyll watch & preview mostly don't live-update any more # XXX hakyll watch & preview mostly don't live-update any more
site-preview: site/hakyll-std \ site-preview: site/hakyll-std/hakyll-std \
$(call def-help,site-preview, run a hakyll server to preview the website ) #site/site $(call def-help,site-preview, run a hakyll server to preview the website ) #site/site
-cd site; ./hakyll-std watch # -h hledger.org -cd site; hakyll-std/hakyll-std watch # -h hledger.org
# site-view: site \ # site-view: site \
# $(call def-help,site-view,\ # $(call def-help,site-view,\
@ -1358,7 +1358,7 @@ $(call def-help-subsection,MISCELLANEOUS:)
# XXX enable for all cabal files when hpack is a little better # XXX enable for all cabal files when hpack is a little better
# gencabalfiles: $$(CABALFILES) # gencabalfiles: $$(CABALFILES)
gencabalfiles: site/hakyll-std.cabal \ gencabalfiles: site/hakyll-std/hakyll-std.cabal \
$(call def-help,gencabalfiles, regenerate cabal files from their package.yaml definitions ) $(call def-help,gencabalfiles, regenerate cabal files from their package.yaml definitions )
%.cabal: $$(dir $$@)package.yaml \ %.cabal: $$(dir $$@)package.yaml \

5
site/README
View File

@ -1,4 +1,5 @@
Static bits of the hledger.org website. Static bits of the hledger.org website.
In some cases these are rendered to _site/* by hakyll (or hakyll-std), In some cases these are rendered to _site/* by hakyll (via the
in others they are served directly from the git working copy. hakyll-std script), in others they are served directly from the git
working copy.

0
site/LICENSE → site/hakyll-std/LICENSE
View File

0
site/Setup.hs → site/hakyll-std/Setup.hs
View File

0
site/TableOfContents.hs → site/hakyll-std/TableOfContents.hs
View File

0
site/hakyll-std.cabal → site/hakyll-std/hakyll-std.cabal
View File

0
site/hakyll-std.hs → site/hakyll-std/hakyll-std.hs
View File

0
site/package.yaml → site/hakyll-std/package.yaml
View File

4
site/stack.yaml
View File

@ -1,4 +0,0 @@
# stack.yaml for hakyll-std.
resolver: lts-3.0
flags: {}
extra-deps: