Revision 4461
Added by Aaron Marcuse-Kubitza over 12 years ago
| inputs/input.Makefile | ||
|---|---|---|
| 193 | 193 |
rm_schema: _always |
| 194 | 194 |
echo 'DROP SCHEMA IF EXISTS "$(datasrc)" CASCADE;'|$(psqlAsBien) |
| 195 | 195 |
|
| 196 |
logInstall = $(if $(log),$(if $(quiet),&>,2>&1|tee )$(1)install.log.sql) |
|
| 196 |
logInstall = $(if $(log),$(if $(quiet),&>,2>&1|tee )$(1)logs/install.log.sql)
|
|
| 197 | 197 |
|
| 198 | 198 |
# Must come before %/install to override it |
| 199 | 199 |
sql/install: $(dbExports) |
| ... | ... | |
| 237 | 237 |
$(if $(isRef),$(exportHeader),$(if $(nonXml),$(import_install_))) |
| 238 | 238 |
import_install_ = (prefix=; . $(bin)/vegbien_dest; "time" nice -n +5\ |
| 239 | 239 |
env schema=$(datasrc) table=$* has_row_num=$(hasRowNum) $(bin)/csv2db\ |
| 240 |
$(catSrcs) $(call logInstall,$*/logs/))
|
|
| 240 |
$(catSrcs) $(call logInstall,$*/)) |
|
| 241 | 241 |
|
| 242 | 242 |
##### Maps building |
| 243 | 243 |
|
Also available in: Unified diff
input.Makefile: Staging tables installation: Store install logs for full-DB exports in new logs subdir of main dir. This also fixes a bug where the install log itself was considered a DB export, because its extension was .log.sql.