From 004c862b4e818f237556e6d3d4aa482b1bbdae2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= Date: Tue, 23 Jan 2018 08:29:19 +0100 Subject: [PATCH] Modular configure/RELEASE Remove the hard-coded values from RELEASE, use the local approach inspired by areaDetector. The definition of EPICS_BASE and SUPPORT is typically here: configure/RELEASE_PATHS.local The definition of modules like ASYN is here: configure/RELEASE_LIBS.local There is no need to have both files, feel free to only use one of these. --- .gitignore | 2 ++ configure/RELEASE | 49 +++++++++++------------------------------------ 2 files changed, 13 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index fae3cabb8..3bbeb321c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ O.* *.swp *BAK.adl bin/ +configure/RELEASE_LIBS.local +configure/RELEASE_PATHS.local db/ dbd/ html/ diff --git a/configure/RELEASE b/configure/RELEASE index 003d8fd64..99d147c69 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -1,42 +1,15 @@ -# RELEASE - Location of external products -# -# Note: This file will be scanned to automatically generate -# include path definitions etc. -# The order of the following declarations will be retained -# within those definitions. -# -# Note that "#!" marks lines that can be uncommented. -# -# Add your declarations here +#RELEASE Location of external products +# Run "gnumake clean uninstall install" in the application +# top directory each time this file is changed. -SUPPORT= --include $(TOP)/../configure/SUPPORT.$(EPICS_HOST_ARCH) +include $(TOP)/configure/RELEASE_PATHS.local +-include $(TOP)/configure/RELEASE_PATHS.local.$(EPICS_HOST_ARCH) +include $(TOP)/configure/RELEASE_LIBS.local +-include $(TOP)/configure/RELEASE.local -# If any motor controller communication mechanism besides the VME backplane is -# required, then ASYN must be defined. -# Recommended ASYN release: R4-23 -ASYN=$(SUPPORT)/asyn/R4-23 +#TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top +# If you don't want to install into $(TOP) then +# define INSTALL_LOCATION_APP here +#INSTALL_LOCATION_APP= -# Need the sequencer and the busy record for the MM4005 and XPS trajectory scanning -# Recommended SNCSEQ release: R2.1.16 -SNCSEQ=$(SUPPORT)/seq/seq-2-1-16 -# Recommended BUSY release: R1-6 -BUSY=$(SUPPORT)/busy/R1-6 - -# Recommended EPICS release: R3.14.12.4 -EPICS_BASE= --include $(TOP)/../configure/EPICS_BASE.$(EPICS_HOST_ARCH) - -# The following must be defined for the MXmotor device driver. -#!MX=$(SUPPORT)/mx/mx - -# The following support modules are required for the Hytec driver and for the examples in -# /motorExApp. To build examples, the top Makefile, -# /Makefile must also be edited. - -# Recommended IPAC release: R2-12 -IPAC=$(SUPPORT)/ipac/R2-12 - -# The following is only needed for the motor examples in iocBoot. -#!MOTOR=$(TOP)