| 46 |
46 |
psqlOpts := --set ON_ERROR_STOP=1 --quiet
|
| 47 |
47 |
psqlAsBien := $(bin)/psql_vegbien $(psqlOpts)
|
| 48 |
48 |
|
|
49 |
# SVN
|
|
50 |
addDir = $(if $(wildcard $(1)/),svn add --depth=empty $(1),svn mkdir $(1))
|
|
51 |
setSvnIgnore := svn propset svn:ignore
|
|
52 |
define addDirWithIgnore
|
|
53 |
$(addDir)
|
|
54 |
$(setSvnIgnore) $(2) $(1)
|
|
55 |
endef
|
|
56 |
|
| 49 |
57 |
##### General targets
|
| 50 |
58 |
|
| 51 |
59 |
all: _always maps ;
|
| ... | ... | |
| 65 |
73 |
|
| 66 |
74 |
##### SVN
|
| 67 |
75 |
|
| 68 |
|
svn_props: _always
|
| 69 |
|
svn propset svn:ignore $$'*.log\n*.trace\nsrc*' .
|
| 70 |
|
$(if $(wildcard maps/),svn propset svn:ignore $$'.~*' maps)
|
| 71 |
|
$(if $(wildcard src/),svn propset svn:ignore $$'*' src)
|
| 72 |
|
$(if $(wildcard test/),svn propset svn:ignore $$'*.out\n*.xml' test)
|
| 73 |
|
$(if $(wildcard verify/),svn propset svn:ignore $$'*.out' verify)
|
|
76 |
add: _always
|
|
77 |
$(call addDirWithIgnore,.,$$'')
|
|
78 |
$(call addDirWithIgnore,src,$$'*')
|
|
79 |
$(call addDirWithIgnore,maps,$$'.~*')
|
|
80 |
$(call addDirWithIgnore,import,$$'*')
|
|
81 |
$(call addDirWithIgnore,test,$$'*.out\n*.xml')
|
|
82 |
$(call addDirWithIgnore,verify,$$'*.out')
|
| 74 |
83 |
|
| 75 |
84 |
##### Installation
|
| 76 |
85 |
|
| ... | ... | |
| 162 |
171 |
|
| 163 |
172 |
ifneq ($(dbExport)$(inputFiles),)
|
| 164 |
173 |
|
| 165 |
|
log_ = $(@:-all=)$(if $(n),.n=$(n),).$(date).log
|
|
174 |
log_ = import/$*$(if $(n),.n=$(n),).$(date).log
|
| 166 |
175 |
trace = $(log_:.log=.trace)
|
| 167 |
176 |
import = -(set -x; "time" env commit=1\
|
| 168 |
177 |
$(if $(profile),profile_to=$(trace)) $(map2db)) $(if $(log),\
|
| ... | ... | |
| 170 |
179 |
# don't abort on import errors, which often relate to invalid input data
|
| 171 |
180 |
|
| 172 |
181 |
import: $(addprefix import-,$(tables)) _always ;
|
|
182 |
import/: import _always ;
|
| 173 |
183 |
|
| 174 |
184 |
import-%: maps/VegBIEN.%.csv _always
|
| 175 |
185 |
$(import)
|
| ... | ... | |
| 182 |
192 |
|
| 183 |
193 |
##### Log files from import
|
| 184 |
194 |
|
| 185 |
|
logs := $(wildcard *.log *.trace)
|
|
195 |
logs := $(wildcard import/*.log import/*.trace)
|
| 186 |
196 |
|
| 187 |
197 |
rm_logs: _always
|
| 188 |
198 |
$(RM) $(logs)
|
| ... | ... | |
| 190 |
200 |
##### Verification of import
|
| 191 |
201 |
|
| 192 |
202 |
verify: $(addprefix verify-,$(tables)) _always ;
|
|
203 |
verify/: verify _always ;
|
| 193 |
204 |
|
| 194 |
205 |
verify-%: verify/%.ref verify/%.out _always
|
| 195 |
206 |
-$(diffVerbose) $(+_)
|
| ... | ... | |
| 200 |
211 |
# don't run if verify/%.out's default do-nothing action was used
|
| 201 |
212 |
# can't use $(wildcard) because it won't recheck file after verify/%.out is run
|
| 202 |
213 |
|
| 203 |
|
define verify
|
| 204 |
|
$(mkdir)
|
| 205 |
|
"time" $(psqlAsBien) --set=datasource="'$(datasrc)'" --no-align\
|
|
214 |
verify = "time" $(psqlAsBien) --set=datasource="'$(datasrc)'" --no-align\
|
| 206 |
215 |
--field-separator=$$'\t' --pset=footer=off --pset=null=NULL <$< >$@
|
| 207 |
|
endef
|
| 208 |
216 |
|
| 209 |
217 |
verify/%.out: $(mappings)/verify.%.sql _always
|
| 210 |
218 |
$(verify)
|
input.Makefile: Moved log and trace files to new import subdir. Moved subdir-adding code from inputs/Makefile to input.Makefile.