Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove trypandoc Makefile.

Browse source
This commit is contained in:
John MacFarlane 2022-08-18 13:16:54 -07:00
parent d01f5e44c5
commit 60f9c8447e
3 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -26,8 +26,8 @@ quick-cabal: ## build & test with stack, no optimizations
quick: ## build & test with stack, no optimizations quick: ## build & test with stack, no optimizations
stack install --ghc-options='$(GHCOPTS)' --system-ghc --flag 'pandoc:embed_data_files' --fast --test --test-arguments='-j4 --hide-successes --ansi-tricks=false $(TESTARGS)' stack install --ghc-options='$(GHCOPTS)' --system-ghc --flag 'pandoc:embed_data_files' --fast --test --test-arguments='-j4 --hide-successes --ansi-tricks=false $(TESTARGS)'
full: ## build with stack, including benchmarks, trypandoc full: ## build with stack, including benchmarks
stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes--ansi-tricks-false' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 $(GHCOPTS)' stack install --flag 'pandoc:embed_data_files' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes--ansi-tricks-false' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 $(GHCOPTS)'
ghci: ## start ghci session ghci: ## start ghci session
stack ghci --flag 'pandoc:embed_data_files' stack ghci --flag 'pandoc:embed_data_files'
@ -133,9 +133,6 @@ pandoc-templates: ## update pandoc-templates repo
git commit -m "Updated templates for pandoc $(version)" && \ git commit -m "Updated templates for pandoc $(version)" && \
popd popd
trypandoc: ## build trypandoc on server
ssh -t macfarlane 'cd src/pandoc && git pull && cabal update && cabal install -ftrypandoc -fembed_data_files --install-method=copy --overwrite-policy=always && cd trypandoc && sudo make install'
update-website: ## update website and upload update-website: ## update website and upload
make -C $(WEBSITE) update make -C $(WEBSITE) update
make -C $(WEBSITE) make -C $(WEBSITE)
@ -154,4 +151,4 @@ git-files.txt: .FORCE
help: ## Display this help help: ## Display this help
@grep -E '^[ a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%-30s %s\n", $$1, $$2}' @grep -E '^[ a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%-30s %s\n", $$1, $$2}'
.PHONY: .FORCE deps quick haddock install clean test bench changes_github download_stats reformat lint weigh pandoc-templates trypandoc update-website debpkg checkdocs ghcid ghci fix_spacing hlint check check-cabal check .PHONY: .FORCE deps quick haddock install clean test bench changes_github download_stats reformat lint weigh pandoc-templates update-website debpkg checkdocs ghcid ghci fix_spacing hlint check check-cabal check

2
pandoc.cabal
View file

@ -206,8 +206,8 @@ extra-source-files:
man/pandoc.1.before man/pandoc.1.before
man/pandoc.1.after man/pandoc.1.after
-- trypandoc -- trypandoc
trypandoc/Makefile
trypandoc/index.html trypandoc/index.html
trypandoc/trypandoc.js
-- tests -- tests
test/bodybg.gif test/bodybg.gif
test/*.native test/*.native

14
trypandoc/Makefile
View file

@ -1,14 +0,0 @@
CGIBIN=/home/website/cgi-bin
TRYPANDOC=/home/website/pandoc.org/try/
CGI=${CGIBIN}/pandoc-server.cgi
BIN=/home/jgm/.cabal/bin/pandoc-server
install: ${CGI} ${TRYPANDOC}/index.html
${TRYPANDOC}/%: %
cp $< $@ && chown website:www-data $@ && chmod a+r $@
${CGI}: ${BIN}
cp $< $@ && chown website:www-data $@ && chmod a+rx $@
.PHONY: install