expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2026-04-02 19:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[svn r6523] All sorts of changes, look at the diffs, I haven't got time to enumerate them all - sorry!

Browse Source
This commit is contained in:
dave
2004-09-20 23:14:09 +02:00
parent ac493250c1
commit 97ef82c8d5
95 changed files with 1640 additions and 1937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@@ -4,6 +4,7 @@ dataset_path = dataset/loser
surveydir_path = surveys
cavern_flags = -qq -s
tar_flags = -cz --exclude "*/CVS" --ignore-case -f
svxtrace_cmd = python home/cucc/bin/svxtrace.py
###########
@@ -38,16 +39,16 @@ surveytable:
3dfiles: noinfo/all.3d smkridge/204/204.3d smkridge/234/234.3d plateau/76/76.3d
noinfo/all.3d: $(shell find $(dataset_path) -name "*.svx")
noinfo/all.3d: $(shell $(svxtrace_cmd) $(dataset_path)/all)
cavern $(cavern_flags) $(dataset_path)/all -o noinfo/all.3d
smkridge/204/204.3d: $(shell find $(dataset_path)/caves/204 -name "*.svx")
smkridge/204/204.3d: $(shell $(svxtrace_cmd) $(dataset_path)/caves/204/204)
cavern $(cavern_flags) $(dataset_path)/caves/204/204 -o smkridge/204/204.3d
smkridge/234/234.3d: $(shell find $(dataset_path)/caves/234 -name "*.svx")
smkridge/234/234.3d: $(shell $(svxtrace_cmd) $(dataset_path)/caves/234/234)
cavern $(cavern_flags) $(dataset_path)/caves/234/234 -o smkridge/234/234.3d
plateau/76/76.3d: $(shell find $(dataset_path)/caves/76/ -name "*.svx")
plateau/76/76.3d: $(shell $(svxtrace_cmd) $(dataset_path)/caves/76/76)
cavern $(cavern_flags) $(dataset_path)/caves/76/76 -o plateau/76/76.3d
###########
@@ -55,16 +56,16 @@ plateau/76/76.3d: $(shell find $(dataset_path)/caves/76/ -name "*.svx")
tarfiles: noinfo/all.tgz smkridge/204/surveydata.tgz smkridge/234/surveydata.tgz plateau/76/surveydata.tgz
noinfo/all.tgz: noinfo/all.3d
tar $(tar_flags) noinfo/all.tgz $(dataset_path)
tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser
smkridge/204/surveydata.tgz: smkridge/204/204.3d
tar $(tar_flags) smkridge/204/surveydata.tgz $(dataset_path)/caves/204
tar $(tar_flags) smkridge/204/surveydata.tgz -C $(dataset_path)/caves/ 204
smkridge/234/surveydata.tgz: smkridge/234/234.3d
tar $(tar_flags) smkridge/234/surveydata.tgz $(dataset_path)/caves/234
tar $(tar_flags) smkridge/234/surveydata.tgz -C $(dataset_path)/caves/ 234
plateau/76/surveydata.tgz: plateau/76/76.3d
tar $(tar_flags) plateau/76/surveydata.tgz $(dataset_path)/caves/76
tar $(tar_flags) plateau/76/surveydata.tgz -C $(dataset_path)/caves/ 76
# (tarfiles depend on 3d files to avoid running the
# expensive $(shell ...) commands more than necessary.)
@@ -73,13 +74,16 @@ plateau/76/surveydata.tgz: plateau/76/76.3d
clean:
cut -d "," -f 6 noinfo/CAVETAB2.CSV | xargs rm -f
-cut -d "," -f 6 noinfo/CAVETAB2.CSV | sed 's/[^\/]*$$//; s/"//g' | xargs -l rmdir --ignore-fail-on-non-empty > /dev/null 2>&1
# remove empty directories
rm -f indxal.htm folk/index.htm noinfo/all.pos
rm -f noinfo/all.3d smkridge/204/204.3d smkridge/234/234.3d plateau/76/76.3d
rm -f smkridge/204/surveydata.tgz smkridge/234/surveydata.tgz noinfo/all.tgz
rm -f smkridge/204/surveydata.tgz smkridge/234/surveydata.tgz plateau/76/surveydata.tgz noinfo/all.tgz
rm -f surveys/surveytable.html
rm -f report.html
###########
report: everything
rm -f report.html
bigbro -ohtml report.html -local -fragments -failures -rec .* -ignore ".*/jnl/.*" -ignore ".*/icons/.*" -ignore ".*rdmap.*" -ignore ".*/cp/.*" -ignore ".*/surveys/.*" -ignore ".*smkridge/index.htm" index.htm
bigbro -ohtml report.html -local -fragments -failures -rec .* -ignore ".*/jnl/.*" -ignore ".*/icons/.*" -ignore ".*rdmap.*" -ignore ".*/cp/.*" -ignore ".*/surveys/.*" index.htm