Revision 4095
Added by Aaron Marcuse-Kubitza over 12 years ago
| inputs/input.Makefile | ||
|---|---|---|
| 108 | 108 |
inputFiles := $(wildcard $(exts:%=src/*.%)) |
| 109 | 109 |
|
| 110 | 110 |
srcMaps := $(wildcard maps/src.*.csv) |
| 111 |
srcRoots := $(srcMaps:maps/src.%.csv=$(mappings)/roots/%.sh) |
|
| 112 | 111 |
|
| 113 | 112 |
srcMap := maps/src.%.csv |
| 114 | 113 |
fullViaMap := maps/%.full.csv |
| 115 | 114 |
directMap := maps/VegBIEN.%.csv |
| 116 |
allViaMaps := $(filter-out $(srcMap) $(fullViaMap) $(directMap),\ |
|
| 117 |
$(wildcard maps/*.csv)) |
|
| 118 |
via := $(firstword $(sort $(basename $(basename $(notdir $(allViaMaps)))))) |
|
| 115 |
via := Veg+ |
|
| 119 | 116 |
|
| 120 |
# Look up via in src maps' roots |
|
| 121 |
ifeq ($(via),) |
|
| 122 |
ifneq ($(srcRoots),) |
|
| 123 |
via := $(firstword $(sort\ |
|
| 124 |
$(shell $(SED) -n 's/^export out_root="([0-9A-Za-z_-]+).*$$/\1/p' $(srcRoots)))) |
|
| 125 |
endif |
|
| 126 |
endif |
|
| 127 |
|
|
| 128 | 117 |
coreMap := $(mappings)/$(via)-VegBIEN.%.csv |
| 129 | 118 |
coreSelfMap := $(mappings)/$(via).self.%.csv |
| 130 | 119 |
|
Also available in: Unified diff
input.Makefile: Removed no longer used custom via maps code, so that map files no longer need a prefix (which is always the same) specifying that they map through Veg+. Veg+ thus serves as the single gateway to VegBIEN, which avoids ever again having to maintain two copies of the mappings, as was the case when DwC and VegX XPaths were separate gateways. This will assist in untying the complex mapping logic in input.Makefile from file naming conventions in mappings/, and simplify the task of grouping each map with the CSV it maps.