Revision 1190
Added by Aaron Marcuse-Kubitza over 12 years ago
inputs/input.Makefile | ||
---|---|---|
1 | 1 |
##### Configuration |
2 | 2 |
|
3 |
nolog ?= $(test)
|
|
4 |
profile ?= $(if $(nolog),,1)
|
|
3 |
log ?= $(if $(test),,1)
|
|
4 |
profile ?= $(log)
|
|
5 | 5 |
exts ?= csv xml |
6 | 6 |
test_n ?= 2 |
7 | 7 |
tablesSort ?= plots organisms stems |
... | ... | |
128 | 128 |
|
129 | 129 |
import: _always import-all ; |
130 | 130 |
|
131 |
log = $(@:-all=)$(if $(n),.n=$(n),).$(date).log |
|
132 |
trace = $(log:.log=.trace) |
|
131 |
log_ = $(@:-all=)$(if $(n),.n=$(n),).$(date).log
|
|
132 |
trace = $(log_:.log=.trace)
|
|
133 | 133 |
import = -(set -x; "time" env commit=1 verbose=1\ |
134 |
$(if $(profile),profile_to=$(trace)) $(map2db)) $(if $(nolog),,\
|
|
135 |
$(if $(n),,>>$(log))) 2>&1$(if $(nolog),,$(if $(n),|tee -a $(log)))
|
|
134 |
$(if $(profile),profile_to=$(trace)) $(map2db)) $(if $(log),\
|
|
135 |
$(if $(n),,>>$(log_))) 2>&1$(if $(log),$(if $(n),|tee -a $(log_)))
|
|
136 | 136 |
# don't abort on import errors, which often relate to invalid input data |
137 | 137 |
|
138 | 138 |
import-all: $(addprefix import-,$(tables)) _always ; |
Also available in: Unified diff
input.Makefile: Changed option nolog to log so that options aren't specified in the negative