Project

General

Profile

« Previous | Next » 

Revision 4122

View differences:

inputs/input.Makefile
114 114
anyMap := $(srcMap) $(viaMap) $(fullViaMap) $(directMap)
115 115

  
116 116
anyTest = src/$*/test.%
117
srcsOnly = $(filter-out $(anyMap) $(anyTest),$(1))
117
srcsOnly = $(filter-out $(anyMap) $(anyTest) src/%/logs,$(1))
118 118

  
119 119
via := Veg+
120 120

  
......
164 164
	$(if $(isCsv),$(import_install_))
165 165
import_install_ = (prefix=; . $(bin)/vegbien_dest; "time" nice -n +5\
166 166
env schema=$(datasrc) table=$* $(bin)/csv2db $(catSrcs)\
167
$(if $(log),$(if $(quiet),&>,2>&1|tee )import/install-$*.log.sql))
167
$(if $(log),$(if $(quiet),&>,2>&1|tee )src/$*/logs/install.log.sql))
168 168

  
169 169
##### Maps building
170 170

  
......
259 259
profileOnly = -env profile_to=/dev/fd/3 $(map2db) 3>&1 1>&2|\
260 260
$(bin)/profile_stats /dev/fd/0
261 261

  
262
log_ = import/$*$(if $(n),.n=$(n),).$(date).log.sql
262
log_ = src/$*/logs/$(if $(n),n=$(n).,)$(date).log.sql
263 263
trace = $(log_:.log.sql=.trace)
264 264
import = -$(if $(profileTest),$(profileOnly),(set -x; "time" env commit=1\
265 265
$(if $(profile),profile_to=$(trace)) $(map2db)) $(if $(log),\
......
275 275

  
276 276
##### Log files from import
277 277

  
278
logs := $(wildcard import/*.log.sql import/*.trace)
278
logs := $(wildcard src/*/logs/*.log.sql src/*/logs/*.trace)
279 279

  
280 280
rm_logs: _always
281 281
	$(RM) $(logs)
......
375 375

  
376 376
##### Documentation
377 377

  
378
steps = $(selfMake) -s import test=1 by_col=1 verbosity=2 n=100\
378
steps = $(selfMake) -s import-$* test=1 by_col=1 verbosity=2 n=100\
379 379
2>&1|$(bin)/debug2redmine >$@
380 380

  
381
import/steps.by_col.sql: _always
381
src/%/logs/steps.by_col.log.sql: _always
382 382
	+$(steps)
inputs/Makefile
21 21

  
22 22
##### Import logs
23 23

  
24
rsyncLogs := $(rsync) --include="/*/" --include="/*/import/"\
25
--exclude="/*/import/install-*.log.sql" --include="/*/import/*.log.sql"\
26
--exclude="**"
24
rsyncLogs := $(rsync) --include="/*/" --include="/*/src/" --include="/*/src/*/"\
25
--include="/*/src/*/logs/" --exclude="/*/src/*/logs/install-*.log.sql"\
26
--include="/*/src/*/logs/*.log.sql" --exclude="**"
27 27

  
28 28
download-logs: _always
29 29
	$(rsyncLogs) $(remote) $(local)
README.TXT
174 174

  
175 175
Documentation:
176 176
    To generate a Redmine-formatted list of steps for column-based import:
177
        make inputs/QMOR/import/steps.by_col.sql
177
        make inputs/QMOR/src/specimens/logs/steps.by_col.log.sql
178 178

  
179 179
General:
180 180
    To see a program's description, read its top-of-file comment

Also available in: Unified diff