Project

General

Profile

« Previous | Next » 

Revision 10024

bugfix: inputs/Makefile: upload, download: need to exclude files in .rsync_ignore, so that large local-only files, such as inputs/GBIF/raw_occurrence_record_plants/table*.tsv, do not have to be synced before `make inputs/upload` can complete (the corresponding .gz gets extracted instead); and deleted temp files in inputs/VegBIEN/TWiki/, such as active sessions, are not added back to the live copy on vegbiendev. previously, fixing this required extracting the rsync command run by `make inputs/upload`, etc. and manually editing it to exclude the applicable .rsync_ignore files, each time `make inputs/upload`, etc. was run (including before every column-based import).

View differences:

inputs/Makefile
3 3
subMake += --makefile=../input.Makefile
4 4

  
5 5

  
6
# Paths
7
bin := ../bin
8

  
6 9
##### SVN
7 10

  
8 11
# Adds a new datasource
......
13 16

  
14 17
##### Input data
15 18

  
16
rsyncSrcs := $(rsync) --include="/*/" --exclude="/*/*/test*.xml*"\
17
--exclude="/**/logs/install.log.sql" --include="/*/**" --exclude="**"
18

  
19 19
upload: _always
20
	$(rsyncSrcs) $(local) $(remote)
20
	$(bin)/sync_upload './**'
21 21
download: _always
22
	$(rsyncSrcs) $(remote) $(local)
22
	swap=1 $(bin)/sync_upload './**'
23 23

  
24 24
##### Import logs
25 25

  

Also available in: Unified diff