diff options
| author | John MacFarlane <[email protected]> | 2022-08-18 13:16:54 -0700 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2022-08-18 13:16:54 -0700 |
| commit | 60f9c8447e13a43ff2965d7682409a567bedb7af (patch) | |
| tree | 1db8a0fa6317b872fad0461463716e2f6ae5d5e8 | |
| parent | d01f5e44c5aa6980f00eaabae4c519f7b4943c76 (diff) | |
Remove trypandoc Makefile.
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | pandoc.cabal | 2 | ||||
| -rw-r--r-- | trypandoc/Makefile | 14 |
3 files changed, 4 insertions, 21 deletions
@@ -26,8 +26,8 @@ quick-cabal: ## 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)' -full: ## build with stack, including benchmarks, trypandoc - 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)' +full: ## build with stack, including benchmarks + 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 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)" && \ 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 make -C $(WEBSITE) update make -C $(WEBSITE) @@ -154,4 +151,4 @@ git-files.txt: .FORCE help: ## Display this help @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 diff --git a/pandoc.cabal b/pandoc.cabal index 2385c5d10..d99e467b4 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -206,8 +206,8 @@ extra-source-files: man/pandoc.1.before man/pandoc.1.after -- trypandoc - trypandoc/Makefile trypandoc/index.html + trypandoc/trypandoc.js -- tests test/bodybg.gif test/*.native diff --git a/trypandoc/Makefile b/trypandoc/Makefile deleted file mode 100644 index 751bed904..000000000 --- a/trypandoc/Makefile +++ /dev/null @@ -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 |