fixes to /noinfo/ description links

This commit is contained in:
Philip Sargent
2021-04-10 19:05:24 +01:00
parent f52b3d87ae
commit 900f120de1
14 changed files with 54 additions and 230 deletions

View File

@@ -1,5 +1,7 @@
# Makefile to run the various scripts needed once hg and git updates have been performed.
# This desperately needs properly revising by someone who knows both the history and also how things are done now [April 2021]
dataset_path = ../loser
surveydir_path = ../surveys
cavern_flags = -qq -s -v7
@@ -7,8 +9,8 @@ tar_flags = -cz --exclude "*/CVS" --ignore-case -f
svxtrace_cmd = ./svxtrace.py
#things needed to run this stuff
#python imaging library, freesans or arial truetype font, dump3d, cavestats
#Debian packages: python-imaging, ttf-freefont, perl, python
#python3 imaging library, freesans or arial truetype font, dump3d, cavestats
#Debian packages: python3-imaging, ttf-freefont, perl, python3
#dump3d needs to be built in configured survex sources with cd src;make dump3d
#
@@ -24,11 +26,11 @@ autogen_pages: noinfo/lengths.dat noinfo/1623-and-1626.pos noinfo/cavestats
# cavestats should be BUILT AUTOMATICALLY rather than having to be
# built manually in a survex build tree.
#indxal.htm: noinfo/CAVETAB2.CSV noinfo/all.pos noinfo/make-indxal4.pl noinfo/areapage_skeletons/*.html noinfo/lengths.dat
# python noinfo/make-areaindices.py noinfo/cavestats
# python3 noinfo/make-areaindices.py noinfo/cavestats
# cd noinfo; perl ./make-indxal4.pl -q CAVETAB2.CSV
noinfo/lengths.dat:
python noinfo/create_dplong_table.py
python3 noinfo/create_dplong_table.py
noinfo/1623-and-1626.pos: noinfo/1623-and-1626.3d
3dtopos noinfo/1623-and-1626.3d noinfo/1623-and-1626.pos
@@ -42,7 +44,7 @@ noinfo/cavestats:
folklist: folk/index.htm $(dataset_path)/1623-and-1626.svx
folk/index.htm: folk/folk.csv scripts/make-folklist.py
python scripts/make-folklist.py < folk/folk.csv > folk/index.htm
python3 scripts/make-folklist.py < folk/folk.csv > folk/index.htm
###########
@@ -56,17 +58,18 @@ folk/index.htm: folk/folk.csv scripts/make-folklist.py
# there appears to be no sensible way to run this at need.
###########
#QM files are now outo built in troggle for all caves-1623/
qmlists: 1623/204/qm.html 1623/204/atoz.html 1623/234/qm.html 1623/258/qm.html
# qmlists: 1623/204/qm.html 1623/204/atoz.html 1623/234/qm.html 1623/258/qm.html
1623/204/qm.html: 1623/204/qm.csv 1623/204/tablize-qms.pl
cd 1623/204; perl tablize-qms.pl qm.csv
# 1623/204/qm.html: 1623/204/qm.csv 1623/204/tablize-qms.pl
# cd 1623/204; perl tablize-qms.pl qm.csv
1623/234/qm.html: 1623/234/qm.csv 1623/234/tablize-qms.pl
cd 1623/234; perl tablize-qms.pl qm.csv
# 1623/234/qm.html: 1623/234/qm.csv 1623/234/tablize-qms.pl
# cd 1623/234; perl tablize-qms.pl qm.csv
1623/258/qm.html: 1623/258/qm.csv 1623/258/tablize-qms.pl
cd 1623/258; perl tablize-qms.pl qm.csv
# 1623/258/qm.html: 1623/258/qm.csv 1623/258/tablize-qms.pl
# cd 1623/258; perl tablize-qms.pl qm.csv
1623/204/atoz.html: 1623/204/glossary.csv 1623/204/make-glossary.pl
cd 1623/204; perl make-glossary.pl glossary.csv
@@ -96,8 +99,8 @@ qmlists: 1623/204/qm.html 1623/204/atoz.html 1623/234/qm.html 1623/258/qm.html
#this requires ttf-freefont package to be installed
#And dump3d from survex
prospecting_guide: 3dfiles freefont noinfo/lengths.dat
cd noinfo/prospecting_guide_scripts && python make-prospectingguide-new.py
cd noinfo/prospecting_guide_scripts && python make-prospectingguide-new.py --white
cd noinfo/prospecting_guide_scripts && python3 make-prospectingguide-new.py
cd noinfo/prospecting_guide_scripts && python3 make-prospectingguide-new.py --white
freefont: /usr/share/fonts/truetype/freefont/FreeSans.ttf
# ttf-freefont needs to be installed (or MS corefonts)
@@ -109,20 +112,20 @@ dump3d: noinfo/prospecting_guide_scripts/dump3d
# make dump3d && cp dump3d $(pwd)/noinfo/prospecting_guide_scripts/dump3d
###########
# We don't do the tarfile thing anymore
# tarfiles: noinfo/all.tgz 1623/204/surveydata.tgz 1623/234/surveydata.tgz 1623/76/surveydata.tgz
tarfiles: noinfo/all.tgz 1623/204/surveydata.tgz 1623/234/surveydata.tgz 1623/76/surveydata.tgz
# noinfo/all.tgz: noinfo/1623-and-1626.3d
# tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser
noinfo/all.tgz: noinfo/1623-and-1626.3d
tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser
# 1623/204/surveydata.tgz: 1623/204/204.3d
# tar $(tar_flags) 1623/204/surveydata.tgz -C $(dataset_path)/caves-1623/ 204
1623/204/surveydata.tgz: 1623/204/204.3d
tar $(tar_flags) 1623/204/surveydata.tgz -C $(dataset_path)/caves-1623/ 204
# 1623/234/surveydata.tgz: 1623/234/234.3d
# tar $(tar_flags) 1623/234/surveydata.tgz -C $(dataset_path)/caves-1623/ 234
1623/234/surveydata.tgz: 1623/234/234.3d
tar $(tar_flags) 1623/234/surveydata.tgz -C $(dataset_path)/caves-1623/ 234
1623/76/surveydata.tgz: 1623/76/76.3d
tar $(tar_flags) 1623/76/surveydata.tgz -C $(dataset_path)/caves-1623/ 76
# 1623/76/surveydata.tgz: 1623/76/76.3d
# tar $(tar_flags) 1623/76/surveydata.tgz -C $(dataset_path)/caves-1623/ 76
# (tarfiles depend on 3d files to avoid running the
# expensive $(shell ...) commands more than necessary.)