Project

General

Profile

« Previous | Next » 

Revision 760

input.Makefile: Deal with core maps (the main *-VegBIEN map) whose roots are other than organisms

View differences:

inputs/input.Makefile
19 19
# Config
20 20
test_n ?= 2
21 21
tablesSort ?= plots organisms stems
22
coreMapTry ?= organisms specimens
22 23

  
23 24
+maps = $(filter maps/%,$(+_))
24 25
+in = $(filter-out maps/%,$(+_))
......
55 56

  
56 57
allViaMaps := $(filter-out maps/VegBIEN.%.csv,$(wildcard maps/*.csv))
57 58
via := $(firstword $(sort $(basename $(basename $(notdir $(allViaMaps))))))
59
coreMap := $(firstword $(wildcard\
60
$(coreMapTry:%=$(root)/mappings/$(via)-VegBIEN.%.csv)))
58 61
viaMaps := $(wildcard $(tablesSort:%=maps/$(via).%.csv))
59 62
viaMaps += $(filter-out $(viaMaps),$(wildcard maps/$(via).*.csv))
60 63
tables := $(viaMaps:maps/$(via).%.csv=%)
......
139 142
endef
140 143

  
141 144
test/$(via).xml: $(viaMaps) _always
142
	-$(call test,$(map))
143
# Don't abort tester if via test fails, because CSV output is not supported yet
145
	$(call test,$(map))
144 146
tests += test/$(via).xml
145 147

  
146 148
test/VegBIEN.xml: $(directMaps) _always
147 149
	$(call test,$(map))
148 150
tests += test/VegBIEN.xml
149 151

  
150
test/VegBIEN.2-step.xml: test/$(via).xml\
151
$(root)/mappings/$(via)-VegBIEN.organisms.csv _always
152
test/VegBIEN.2-step.xml: test/$(via).xml $(coreMap) _always
152 153
	-$(call test,$(root)/map)
153 154
# Don't abort tester if only 2-step test fails, as it's often finicky
154 155
tests += test/VegBIEN.2-step.xml

Also available in: Unified diff