Skip to content

Commit

Permalink
;make: remove old site building stuff
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
simonmichael committed Sep 16, 2019
1 parent 4b3103c commit 68c770a
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions Makefile
Expand Up @@ -11,7 +11,6 @@
# - profiterole (hackage/stackage, simplifies profiles) # - profiterole (hackage/stackage, simplifies profiles)
# - profiteur (hackage/stackage, renders profiles as html) # - profiteur (hackage/stackage, renders profiles as html)
# - hpack (hackage/stackage, generates cabal files from package.yaml files) # - hpack (hackage/stackage, generates cabal files from package.yaml files)
# - site/hakyll-std/hakyll-std (generic site-building hakyll script)
# - perl # - perl
# #
# Kinds of hledger builds: # Kinds of hledger builds:
Expand Down Expand Up @@ -162,10 +161,6 @@ MANUALGENFILES:= \
COMMANDHELPFILES:= \ COMMANDHELPFILES:= \
hledger/Hledger/Cli/Commands/*.md \ hledger/Hledger/Cli/Commands/*.md \


# site/*.md includes website source files and generated web manual files
# WEBDOCFILES:= \
# site/*.md \
WEBCODEFILES:= \ WEBCODEFILES:= \
hledger-web/templates/* \ hledger-web/templates/* \
hledger-web/static/*.js \ hledger-web/static/*.js \
Expand All @@ -176,7 +171,6 @@ DOCSOURCEFILES:= \
CONTRIBUTING.md \ CONTRIBUTING.md \
$(MANUALSOURCEFILES) \ $(MANUALSOURCEFILES) \
$(COMMANDHELPFILES) \ $(COMMANDHELPFILES) \
site/*.md \


# # file(s) which require recompilation for a build to have an up-to-date version string # # file(s) which require recompilation for a build to have an up-to-date version string
# VERSIONSOURCEFILE=hledger/Hledger/Cli/Version.hs # VERSIONSOURCEFILE=hledger/Hledger/Cli/Version.hs
Expand Down Expand Up @@ -737,13 +731,9 @@ haddock: \
# # cd site/api && \ # # cd site/api && \
# # hoogle --convert=main.txt --output=default.hoo # # hoogle --convert=main.txt --output=default.hoo


site-live: Shake \ site-watch: Shake
$(call def-help,site-live, update the local website html when source files are saved ) $(call def-help,site-watch, open a browser on the website (in ./site) and rerender/reload when manuals or site content changes )
ls $(DOCSOURCEFILES) | entr ./Shake website (ls $(DOCSOURCEFILES) | entr ./Shake manuals) &

site-watch:
$(call def-help,site-watch, open a browser on the website (in ./site) and rerender & reload the page when source files change )
make site-live &
make -C site html-watch make -C site html-watch


# This rule, for updating the live hledger.org site, gets called by: # This rule, for updating the live hledger.org site, gets called by:
Expand All @@ -753,7 +743,7 @@ site-watch:
# /etc/github-post-receive.conf # /etc/github-post-receive.conf
# 2. cron, nightly. Config: /etc/crontab # 2. cron, nightly. Config: /etc/crontab
# 3. manually (make site). # 3. manually (make site).
# This must use the existing Shake executable without rebuilding it, # This uses the existing Shake executable without rebuilding it,
# as we don't want to immediately execute new code from any collaborator. # as we don't want to immediately execute new code from any collaborator.
.PHONY: site .PHONY: site
site: \ site: \
Expand All @@ -762,10 +752,8 @@ site: \
&& echo 'Please run "make Shake" first (manual compilation of Shake.hs is required)' \ && echo 'Please run "make Shake" first (manual compilation of Shake.hs is required)' \
|| ( \ || ( \
echo; \ echo; \
./Shake hledgerorg -VV; \
make -C site html; \ make -C site html; \
) 2>&1 | tee -a site.log ) 2>&1 | tee -a site.log
# ^ running both shake and sphinx for now


############################################################################### ###############################################################################
$(call def-help-subheading,RELEASING:) $(call def-help-subheading,RELEASING:)
Expand Down

0 comments on commit 68c770a

Please sign in to comment.