For base 7.0.8 we'd like to try to merge the PCDS and accelerator branches and do a single release. As of right now, there are 3 branches for each release:
Branch
Description
X.X.X-0.branch
Basic changes to base required to get it building
X.X.X-1.branch
Basic changes + accelerator specific changes to base
X.X.X-2.branch
Basic changes + PCDS specific changes to base
Maintaining 3 individual branches for each version is a bit of a headache (at least in my opinion). If we could merge the versions of base, it'd be easier for TID to maintain and reduce the divergence of branches when fixes/features are retroactively applied.
Meeting Mar. 20th, 2024
Skip ThorlabsWFS toolchain for now (PCDS). These IOCs are not very common and can stay using an old version of base for now
Test compile with -fabi-compat flags? Maybe some hackery could be done to get these building?
Skip old RTEMS 4.9.4 versions (PCDS). Toolchain doesn't work anyways.
Certain site-specific config changes can be kept in CONFIG_SITE.local
Do we want to track this in git? Generate it with epics-update?
PCDS only has 1 source code change over accelerator, we can probably merge it or figure something else out.
Maintaining 3 individual branches for each version is a bit of a headache (at least in my opinion). If we could merge the versions of base, it'd be easier for TID to maintain and reduce the divergence of branches when fixes/features are retroactively applied.
Meeting Mar. 20th, 2024