Re: Base 3.14.12.5-rc1 Available

[Benjamin Franksen <benjamin.franksen@helmholtz-berlin.de>]

On Monday 09 March 2015 15:07:10 Andrew Johnson wrote:
> The first Release Candidate version of the next EPICS Base-3.14.12.5
> release is now available for download from the Base R3.14.12 or the
> Base Downloads web-pages.
>   http://www.aps.anl.gov/epics/base/R3-14/12.php
>
> This is a patch release, containing all of the Known Problems fixes
> and a number of other minor (backwards-compatible) enhancements to
> 3.14.12, mostly to the build system. Please read the Release Notes
> linked from the above web-page for details of the significant
> changes.
>
> Please report problems with this version to tech-talk as soon as
> possible. If no major issues are discovered in the next two weeks
> Base-3.14.12.5 will be released on March 23rd.

I have just seen that with 3.14.12.5-rc1, when make is invoked in the
top-level directory of an application, cfg/TOP_RULES* are active (so
this part works) but corresponding cfg/CONFIG* files are not included.

It is clear why this is so: in configure/CONFIG at the place where
RELEASE_CFG_CONFIGS is defined and gets included, we are inside an
"ifdef T_A". This is clearly wrong: the whole CONFIG include stuff must
be moved below the endif T_A. The attached patch fixes that.

Cheers
Ben
--
"Make it so they have to reboot after every typo." ― Scott Adams

________________________________

Helmholtz-Zentrum Berlin für Materialien und Energie GmbH

Mitglied der Hermann von Helmholtz-Gemeinschaft Deutscher Forschungszentren e.V.

Aufsichtsrat: Vorsitzender Prof. Dr. Dr. h.c. mult. Joachim Treusch, stv. Vorsitzende Dr. Beatrix Vierkorn-Rudolph
Geschäftsführung: Prof. Dr. Anke Rita Kaysser-Pyzalla, Thomas Frederking

Sitz Berlin, AG Charlottenburg, 89 HRB 5583

Postadresse:
Hahn-Meitner-Platz 1
D-14109 Berlin

http://www.helmholtz-berlin.de

patch 8f49291e12c9320ca53583f80dece3f75c6f0d6b
Author: Ben Franksen <benjamin.franksen@helmholtz-berlin.de>
Date:   Thu Mar 19 14:04:31 CET 2015
  * Fix: moved CONFIG includes out of the ifdef T_A block
diff -rN -u old-R3-14-12-5-rc1-bessy1+BII-032/configure/CONFIG new-R3-14-12-5-rc1-bessy1+BII-032/configure/CONFIG
--- old-R3-14-12-5-rc1-bessy1+BII-032/configure/CONFIG	2015-03-19 14:07:06.547420081 +0100
+++ new-R3-14-12-5-rc1-bessy1+BII-032/configure/CONFIG	2015-03-19 14:07:06.547420081 +0100
@@ -87,6 +87,8 @@
 -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
 
+endif # ifdef T_A
+
 # Include <top>/cfg/CONFIG* definitions from tops defined in RELEASE* files
 #
 ifneq ($(CONFIG),$(TOP)/configure)
@@ -106,8 +108,6 @@
 include $(TOP_CFG_CONFIGS)
 endif
 
-endif # ifdef T_A
-
 #  User specific definitions
 #
 -include $(HOME)/configure/CONFIG_USER