motiejus/wm
1
Fork 0
Code Releases Activity

update Makefile

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-05-20 22:14:54 +03:00 committed by Motiejus Jakštys
parent 402f823f99
commit 6c9b5e2460
2 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile
View File

@ -1,15 +1,10 @@
OSM ?= lithuania-latest.osm.pbf # River selector (GNU Awk syntax) to refresh-rivers target.
RIVERFILTER = Visinčia|Šalčia|Nemunas RIVERFILTER = Visinčia|Šalčia|Nemunas
SLIDES = slides-2021-03-29.pdf
# Max figure size (in meters) is when it's width is TEXTWIDTH_CM on scale 1:25k # Max figure size (in meters) is when it's width is TEXTWIDTH_CM on scale 1:25k
SCALEDWIDTH = $(shell awk '/^TEXTWIDTH_CM/{print 25000/100*$$3}' layer2img.py) SCALEDWIDTH = $(shell awk '/^TEXTWIDTH_CM/{print 25000/100*$$3}' layer2img.py)
##############################################################################
# These variables have to come before first use due to how macros are expanded
##############################################################################
ARCHIVABLES = $(filter-out slides-2021-03-29.txt,$(shell git ls-files .)) ARCHIVABLES = $(filter-out slides-2021-03-29.txt,$(shell git ls-files .))
SLIDES = slides-2021-03-29.pdf
LISTINGS = aggregate-rivers.sql wm.sql extract-and-generate LISTINGS = aggregate-rivers.sql wm.sql extract-and-generate
@ -268,12 +263,9 @@ mj-msc.pdf: mj-msc.tex version.inc.tex vars.inc.tex bib.bib \
$(LISTINGS) $(addsuffix .pdf,$(FIGURES)) $(addsuffix .pdf,$(RIVERS)) $(LISTINGS) $(addsuffix .pdf,$(FIGURES)) $(addsuffix .pdf,$(RIVERS))
latexmk -shell-escape -pdf $< latexmk -shell-escape -pdf $<
############################ ###################################
# Report's test dependencies # Report's DB and test dependencies
############################ ###################################
.PHONY: allfigs
allfigs: $(addsuffix .pdf,$(FIGURES)) $(addsuffix .pdf,$(RIVERS))
.faux_db_pre: db init.sql .faux_db_pre: db init.sql
bash db start bash db start
@ -318,18 +310,7 @@ slides-2021-03-29.pdf: slides-2021-03-29.txt
dump-debug_wm.sql.xz: dump-debug_wm.sql.xz:
docker exec -ti wm-mj pg_dump -Uosm osm -t wm_devug | xz -v > $@ docker exec -ti wm-mj pg_dump -Uosm osm -t wm_devug | xz -v > $@
release.zip: mj-msc.tex mj-msc.bbl version.inc.tex vars.inc.tex \ mj-msc-gray.pdf: mj-msc.pdf ## Gray version, to inspect monochrome output
$(addsuffix .pdf,$(FIGURES)) $(addsuffix .pdf,$(RIVERS)) \
$(shell git ls-files .)
-rm $@
mkdir -p .tmp; touch .tmp/editorial-version
zip $@ $^
zip $@ -j .tmp/editorial-version
mj-msc.bbl: mj-msc.tex bib.bib
biber mj-msc
mj-msc-gray.pdf: mj-msc.pdf
gs \ gs \
-sOutputFile=$@ \ -sOutputFile=$@ \
-sDEVICE=pdfwrite \ -sDEVICE=pdfwrite \
@ -359,7 +340,7 @@ clean-tables: ## Remove tables created during unit or rivers tests
.PHONY: help .PHONY: help
help: ## Print this help message help: ## Print this help message
@awk -F':.*?## ' '/^[a-z0-9.-]*: *.*## */{printf "%-18s %s\n",$$1,$$2}' \ @awk -F':.*?## ' '/^[a-z0-9.-]*: *.*## */{printf "%-18s %s\n",$$1,$$2}' \
$(MAKEFILE_LIST) $(MAKEFILE_LIST) | sort
.PHONY: wc .PHONY: wc
wc: mj-msc.pdf wc: mj-msc.pdf

9
README.md
View File

@ -40,13 +40,14 @@ Running
``` ```
# make help # make help
mj-msc-full.pdf Thesis for publishing
test Unit tests (fast)
test-rivers Rivers tests (slow)
refresh-rivers Refresh river data from national datasets
clean Clean the current working directory clean Clean the current working directory
clean-tables Remove tables created during unit or rivers tests clean-tables Remove tables created during unit or rivers tests
help Print this help message help Print this help message
mj-msc-full.pdf Thesis for publishing
mj-msc-gray.pdf Gray version, to inspect monochrome output
refresh-rivers Refresh river data from national datasets
test-rivers Rivers tests (slow)
test Unit tests (fast)
``` ```
To execute the algorithm, run: To execute the algorithm, run: