"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Makefile" between
pandoc-2.17.1.tar.gz and pandoc-2.17.1.1.tar.gz

About: Pandoc converts files from one markup format into another.

Makefile  (pandoc-2.17.1):Makefile  (pandoc-2.17.1.1)
skipping to change at line 24 skipping to change at line 24
BASELINECMD=--baseline $(BASELINE) BASELINECMD=--baseline $(BASELINE)
endif endif
GHCOPTS=-fdiagnostics-color=always -j4 +RTS -A8m -RTS GHCOPTS=-fdiagnostics-color=always -j4 +RTS -A8m -RTS
WEBSITE=../../web/pandoc.org WEBSITE=../../web/pandoc.org
REVISION?=1 REVISION?=1
# For gauge: # For gauge:
# BENCHARGS?=--small --ci=0.90 --match=pattern $(PATTERN) # BENCHARGS?=--small --ci=0.90 --match=pattern $(PATTERN)
# For tasty-bench: # For tasty-bench:
BENCHARGS?=--csv bench_$(TIMESTAMP).csv $(BASELINECMD) --timeout=6 +RTS -T --non moving-gc -RTS $(if $(PATTERN),--pattern "$(PATTERN)",) BENCHARGS?=--csv bench_$(TIMESTAMP).csv $(BASELINECMD) --timeout=6 +RTS -T --non moving-gc -RTS $(if $(PATTERN),--pattern "$(PATTERN)",)
quick: # Note: to accept current results of golden tests,
# make test TESTARGS='--accept'
quick: ## build & test with stack, no optimizations
stack install --ghc-options='$(GHCOPTS)' --system-ghc --flag 'pandoc:embe d_data_files' --fast --test --test-arguments='-j4 --hide-successes --ansi-tricks =false $(TESTARGS)' stack install --ghc-options='$(GHCOPTS)' --system-ghc --flag 'pandoc:embe d_data_files' --fast --test --test-arguments='-j4 --hide-successes --ansi-tricks =false $(TESTARGS)'
quick-cabal: quick-cabal: ## build & test with stack, no optimizations
cabal v2-build -j8 --ghc-options '$(GHCOPTS)' --disable-optimization --en able-tests cabal v2-build -j8 --ghc-options '$(GHCOPTS)' --disable-optimization --en able-tests
cabal v2-test --disable-optimization --test-options="--hide-successes --a nsi-tricks=false $(TESTARGS)" cabal v2-test --disable-optimization --test-options="--hide-successes --a nsi-tricks=false $(TESTARGS)"
echo "Path to built executable:" && cabal exec -- sh -c 'command -v pando c' | sed -e 's!x/pandoc/build!x/pandoc/noopt/build!' echo "Path to built executable:" && cabal exec -- sh -c 'command -v pando c' | sed -e 's!x/pandoc/build!x/pandoc/noopt/build!'
full-cabal: full: ## build with stack, including benchmarks, trypandoc
cabal v2-configure . --ghc-options '$(GHCOPTS)' --flags '+embed_data_file
s +trypandoc' --enable-tests --enable-benchmarks
cabal v2-build . --disable-optimization
cabal v2-run test-pandoc --disable-optimization -- --hide-successes --ans
i-tricks=false $(TESTARGS)
full:
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 $(GHCOPT S)' 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 $(GHCOPT S)'
ghci: ghci: ## start ghci session
stack ghci --flag 'pandoc:embed_data_files' stack ghci --flag 'pandoc:embed_data_files'
haddock: haddock: ## build haddocks
stack haddock stack haddock
check: check-cabal checkdocs check: check-cabal checkdocs ## prerelease checks
cabal check # check cabal file cabal check # check cabal file
cabal outdated # check cabal dependencies cabal outdated # check cabal dependencies
stack-lint-extra-deps # check that stack.yaml dependencies are up to date stack-lint-extra-deps # check that stack.yaml dependencies are up to date
! grep 'git:' stack.yaml # use only released versions ! grep 'git:' stack.yaml # use only released versions
! grep 'git:' cabal.project # use only released versions ! grep 'git:' cabal.project # use only released versions
check-cabal: git-files.txt sdist-files.txt check-cabal: git-files.txt sdist-files.txt
@echo "Checking to see if all committed test/data files are in sdist." @echo "Checking to see if all committed test/data files are in sdist."
diff -u $^ diff -u $^
checkdocs: checkdocs:
@echo "Checking for tabs in manual." @echo "Checking for tabs in manual."
! grep -q -n -e "\t" MANUAL.txt changelog.md ! grep -q -n -e "\t" MANUAL.txt changelog.md
# Note: to accept current results of golden tests, ghcid: ## run ghcid/stack
# make test TESTARGS='--accept'
test:
stack test --flag 'pandoc:embed_data_files' --fast --test-arguments='-j4
--hide-successes --ansi-tricks=false $(TESTARGS)' --ghc-options '$(GHCOPTS)'
ghcid:
ghcid -c "stack repl --flag 'pandoc:embed_data_files'" ghcid -c "stack repl --flag 'pandoc:embed_data_files'"
ghcid-test: ghcid-test: ## run ghcid/stack with tests
ghcid -c "stack repl --ghc-options=-XNoImplicitPrelude --flag 'pandoc:emb ed_data_files' --ghci-options=-fobject-code pandoc:lib pandoc:test-pandoc" ghcid -c "stack repl --ghc-options=-XNoImplicitPrelude --flag 'pandoc:emb ed_data_files' --ghci-options=-fobject-code pandoc:lib pandoc:test-pandoc"
bench: bench: ## build and run benchmarks
stack bench \ stack bench \
--ghc-options '$(GHCOPTS)' \ --ghc-options '$(GHCOPTS)' \
--benchmark-arguments='$(BENCHARGS)' 2>&1 | \ --benchmark-arguments='$(BENCHARGS)' 2>&1 | \
tee "bench_latest.txt" tee "bench_latest.txt"
reformat: reformat: ## reformat with stylish-haskell
for f in $(SOURCEFILES); do echo $$f; stylish-haskell -i $$f ; done for f in $(SOURCEFILES); do echo $$f; stylish-haskell -i $$f ; done
lint: hlint fix_spacing lint: hlint fix_spacing ## run linters
hlint: hlint: ## run hlint
for f in $(SOURCEFILES); do echo $$f; hlint --verbose --refactor --refact or-options='-s -o -' $$f; done for f in $(SOURCEFILES); do echo $$f; hlint --verbose --refactor --refact or-options='-s -o -' $$f; done
fix_spacing: fix_spacing: ## Fix trailing newlines and spaces
# Fix trailing newlines and spaces at ends of lines
for f in $(SOURCEFILES); do printf '%s\n' "`cat $$f`" | sed -e 's/ *$$// ' > $$f.tmp; mv $$f.tmp $$f; done for f in $(SOURCEFILES); do printf '%s\n' "`cat $$f`" | sed -e 's/ *$$// ' > $$f.tmp; mv $$f.tmp $$f; done
changes_github: changes_github: ## copy this release's changes in gfm
pandoc --filter tools/extract-changes.hs changelog.md -t gfm --wrap=none --template tools/changes_template.html | sed -e 's/\\#/#/g' | pbcopy pandoc --filter tools/extract-changes.hs changelog.md -t gfm --wrap=none --template tools/changes_template.html | sed -e 's/\\#/#/g' | pbcopy
dist: man/pandoc.1 debpkg: ## create linux package
cabal sdist
rm -rf "pandoc-${version}"
tar xvzf dist/pandoc-${version}.tar.gz
cd pandoc-${version}
stack setup && stack test && cd .. && rm -rf "pandoc-${version}"
debpkg:
docker run -v `pwd`:/mnt \ docker run -v `pwd`:/mnt \
-v `pwd`/linux/artifacts:/artifacts \ -v `pwd`/linux/artifacts:/artifacts \
--user $(id -u):$(id -g) \ --user $(id -u):$(id -g) \
-e REVISION=$(REVISION) \ -e REVISION=$(REVISION) \
-w /mnt \ -w /mnt \
--memory=0 \ --memory=0 \
--rm \ --rm \
$(DOCKERIMAGE) \ $(DOCKERIMAGE) \
bash \ bash \
/mnt/linux/make_artifacts.sh 2>&1 > docker.log /mnt/linux/make_artifacts.sh 2>&1 > docker.log
skipping to change at line 125 skipping to change at line 109
--include-before-body man/pandoc.1.before \ --include-before-body man/pandoc.1.before \
--include-after-body man/pandoc.1.after \ --include-after-body man/pandoc.1.after \
--metadata author="" \ --metadata author="" \
--variable footer="pandoc $(version)" \ --variable footer="pandoc $(version)" \
-o $@ -o $@
README.md: README.template MANUAL.txt tools/update-readme.lua README.md: README.template MANUAL.txt tools/update-readme.lua
pandoc --lua-filter tools/update-readme.lua \ pandoc --lua-filter tools/update-readme.lua \
--reference-location=section -t gfm $< -o $@ --reference-location=section -t gfm $< -o $@
download_stats: download_stats: ## print download stats from GitHub releases
curl https://api.github.com/repos/jgm/pandoc/releases | \ curl https://api.github.com/repos/jgm/pandoc/releases | \
jq -r '.[] | .assets | .[] | "\(.download_count)\t\(.name)"' jq -r '.[] | .assets | .[] | "\(.download_count)\t\(.name)"'
pandoc-templates: pandoc-templates: ## update pandoc-templates repo
rm ../pandoc-templates/default.* ; \ rm ../pandoc-templates/default.* ; \
cp data/templates/* ../pandoc-templates/ ; \ cp data/templates/* ../pandoc-templates/ ; \
pushd ../pandoc-templates/ && \ pushd ../pandoc-templates/ && \
git add * && \ git add * && \
git commit -m "Updated templates for pandoc $(version)" && \ git commit -m "Updated templates for pandoc $(version)" && \
popd popd
trypandoc: trypandoc: ## build trypandoc on server
ssh -t macfarlane 'cd src/pandoc && git pull && cabal update && cabal ins tall -ftrypandoc -fembed_data_files --install-method=copy --overwrite-policy=alw ays && cd trypandoc && sudo make install' ssh -t macfarlane 'cd src/pandoc && git pull && cabal update && cabal ins tall -ftrypandoc -fembed_data_files --install-method=copy --overwrite-policy=alw ays && cd trypandoc && sudo make install'
update-website: update-website: ## update website and upload
make -C $(WEBSITE) update make -C $(WEBSITE) update
make -C $(WEBSITE) make -C $(WEBSITE)
make -C $(WEBSITE) upload make -C $(WEBSITE) upload
clean: clean: ## clean up
stack clean stack clean
sdist-files.txt: .FORCE sdist-files.txt: .FORCE
cabal sdist --list-only | sed 's/\.\///' | grep '^\(test\|data\)\/' | sor t > $@ cabal sdist --list-only | sed 's/\.\///' | grep '^\(test\|data\)\/' | sor t > $@
git-files.txt: .FORCE git-files.txt: .FORCE
git ls-tree -r --name-only HEAD | grep '^\(test\|data\)\/' | sort > $@ git ls-tree -r --name-only HEAD | grep '^\(test\|data\)\/' | sort > $@
.PHONY: .FORCE deps quick full haddock install clean test bench changes_github d .PHONY: help
ist prof download_stats reformat lint weigh doc/lua-filters.md pandoc-templates help: ## Display this help
trypandoc update-website debpkg checkdocs ghcid ghci fix_spacing hlint check che @grep -E '^[ a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN
ck-cabal check {FS = ":.*?## "}; {printf "%-30s %s\n", $$1, $$2}'
.PHONY: .FORCE deps quick haddock install clean test bench changes_github downlo
ad_stats reformat lint weigh pandoc-templates trypandoc update-website debpkg ch
eckdocs ghcid ghci fix_spacing hlint check check-cabal check
 End of changes. 21 change blocks. 
41 lines changed or deleted 22 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)