Hi Andrew and Janet
there is one remaining problem with the order of includes in the build
rules for 3.14.12.5: configure/RULES_BUILD includes RULES_FILE_TYPE
(which in turn includes the cfg/RULES* from modules in the RELEASE file)
*after* including RULES.Db and RULES_JAVA. This makes it impossible to
override (pattern) rules in one of these files. Instead,
$(CONFIG)/RULES_FILE_TYPE should be included first.
I attached a patch (against 3.14.12.5) that fixes the include order.
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 1f84224299796bb003280225d4930c9f61af83f3
Author: Ben Franksen <[email protected]>
Date: Fri Jun 12 14:16:12 CEST 2015
* Fix: order of includes in configure/RULES_BUILD
diff -rN -u old-R3-14-12-5-bessy1+BII-001/configure/RULES_BUILD new-R3-14-12-5-bessy1+BII-001/configure/RULES_BUILD
--- old-R3-14-12-5-bessy1+BII-001/configure/RULES_BUILD 2015-06-12 14:17:07.403312397 +0200
+++ new-R3-14-12-5-bessy1+BII-001/configure/RULES_BUILD 2015-06-12 14:17:07.403312397 +0200
@@ -69,6 +69,8 @@
all: install
+-include $(CONFIG)/RULES_FILE_TYPE
+
-include $(CONFIG)/RULES.Db
-include $(CONFIG)/RULES_JAVA
@@ -110,8 +112,6 @@
$(INSTALL_LIBS): $(INSTALL_SHRLIBS) $(INSTALL_DLL_LINK_LIBS) $(INSTALL_LOADABLE_SHRLIBS)
--include $(CONFIG)/RULES_FILE_TYPE
-
# Main targets
install: buildInstall
- Replies:
- Re: Order of includes in build rules (base 3.14) Benjamin Franksen
- Re: Order of includes in build rules (base 3.14) Andrew Johnson
- Navigate by Date:
- Prev:
Re: Base development meetings Andrew Johnson
- Next:
Build failed in Jenkins: epics-base-3.15-mac #40 APS Jenkins
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
<2015>
2016
2017
2018
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Re: Base development meetings Michael Davidsaver
- Next:
Re: Order of includes in build rules (base 3.14) Benjamin Franksen
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
<2015>
2016
2017
2018
2019
2020
2021
2022
2023
2024
|