Skip to content

E3-453: Remove EPICSVERSION loop

Simon Rose requested to merge e3_453_remove_epics_version_loop into master

The first loop in driver.makefile, over the EPICSVERSIONs, has been removed. Note that there are two main changes to the code that need to be done in order to accommodate this, due in general to exporting some variables on the no-longer-extant first pass:

  • The ARCH_FILTER and EXCLUDE_ARCHS code needed to be modified.
  • More seriously, the SUBS/TMPS expansion had to be rewritten. This is due to the fact that SUBS/TMPS are defined after driver.makefile is included, which were then exported to the second pass. Since we cannot do this any more, we use GNU Make's .SECONDEXPANSION and VPATH (instead of vpath) in order to find all of the database source files.

More tests have been written for both of these changes. Note that it is not possible to compare the ARCH_FILTER/EXCLUDE_ARCHS test before and after, since the very way that it was written made it difficult to test; this has also been improved.

Merge request reports