From 64272a3cd5f5351a31a8c09d6192f07cd27ac2c0 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Mon, 24 Nov 2008 20:30:23 +0000 Subject: [PATCH] Configuration files updated from R3-14-10 makeBaseApp. --- configure/CONFIG | 39 ++++++++++++++++++++++++++++----------- configure/CONFIG_APP | 21 --------------------- configure/CONFIG_SITE | 30 ++++++++++++++++++++++++++++++ configure/Makefile | 10 ++++++---- configure/RULES | 5 +++-- configure/RULES.ioc | 2 +- configure/RULES.iocBoot | 4 ---- configure/RULES_DIRS | 2 +- configure/RULES_TOP | 2 +- 9 files changed, 70 insertions(+), 45 deletions(-) delete mode 100644 configure/CONFIG_APP create mode 100644 configure/CONFIG_SITE delete mode 100644 configure/RULES.iocBoot diff --git a/configure/CONFIG b/configure/CONFIG index bf5e617f..ae1e38dc 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -1,13 +1,30 @@ -#CONFIG -include $(TOP)/configure/CONFIG_APP -# Add any changes to make definitions here +# CONFIG -#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 +# You might want to change this to some shared set of rules, e.g. +# RULES=/path/to/epics/support/modules/rules/x-y +RULES=$(EPICS_BASE) + +include $(TOP)/configure/RELEASE +-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH) +-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common +ifdef T_A +-include $(TOP)/configure/RELEASE.Common.$(T_A) +-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A) +endif + +CONFIG=$(RULES)/configure +include $(CONFIG)/CONFIG + +# Override for definition in base +INSTALL_LOCATION = $(TOP) +include $(TOP)/configure/CONFIG_SITE +-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH) +-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common + +ifdef T_A + -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A) + -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) + + -include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE +endif -# Use this when your IOC and the host use different paths -# to access the application. Typically this will be -# used with the Microsoft FTP server or with NFS mounts. Use -# is indicated by failure of the cdCommands script on -# vxWorks. You must rebuild in the iocBoot directory -# before this takes effect. -#IOCS_APPL_TOP = diff --git a/configure/CONFIG_APP b/configure/CONFIG_APP deleted file mode 100644 index b1f4ba11..00000000 --- a/configure/CONFIG_APP +++ /dev/null @@ -1,21 +0,0 @@ -# CONFIG_APP - -include $(TOP)/configure/RELEASE --include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH) --include $(TOP)/configure/RELEASE.Common.$(T_A) --include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A) - -CONFIG=$(EPICS_BASE)/configure -include $(CONFIG)/CONFIG - -INSTALL_LOCATION = $(TOP) -ifdef INSTALL_LOCATION_APP -INSTALL_LOCATION = $(INSTALL_LOCATION_APP) -endif - -ifdef T_A --include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE -endif - -# dbst based database optimization (default: NO) -DB_OPT = NO diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE new file mode 100644 index 00000000..066d65b2 --- /dev/null +++ b/configure/CONFIG_SITE @@ -0,0 +1,30 @@ +# CONFIG_SITE + +# Make any application-specific changes to the EPICS build +# configuration variables in this file. +# +# Host/target specific settings can be specified in files named +# CONFIG_SITE.$(EPICS_HOST_ARCH).Common +# CONFIG_SITE.Common.$(T_A) +# CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) + +ifeq ($(EPICS_HOST_ARCH),vl-linux-x86) +CROSS_COMPILER_TARGET_ARCHS = RTEMS-uC5282 +endif + +# Set this when you only want to compile this application +# for a subset of the cross-compiled target architectures +# that Base is built for. +#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 + +# Set this when your IOC and the host use different paths +# to access the application. This will be needed to boot +# from a Microsoft FTP server or with some NFS mounts. +# You must rebuild in the iocBoot directory for this to +# take effect. +#IOCS_APPL_TOP = + +# If you don't want to install into $(TOP) then +# define INSTALL_LOCATION here +#INSTALL_LOCATION= + diff --git a/configure/Makefile b/configure/Makefile index 03177469..ade29a7e 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -1,11 +1,13 @@ -# Makefile - TOP=.. include $(TOP)/configure/CONFIG -# Set the following to NO to disable consistency checking of -# the support applications defined in $(TOP)/configure/RELEASE +# CHECK_RELEASE controls the consistency checking of the support +# applications defined in the $(TOP)/configure/RELEASE* files. +# Normally CHECK_RELEASE should be set to YES. +# Set CHECK_RELEASE to NO to disable checking completely. +# Set CHECK_RELEASE to WARN to perform consistency checking, +# but continue the build even if conflicts are found. CHECK_RELEASE = YES TARGETS = $(CONFIG_TARGETS) diff --git a/configure/RULES b/configure/RULES index ffee54a7..6d56e14e 100644 --- a/configure/RULES +++ b/configure/RULES @@ -1,5 +1,6 @@ -#CONFIG -include $(EPICS_BASE)/configure/RULES +# RULES + +include $(CONFIG)/RULES # Library should be rebuilt because LIBOBJS may have changed. $(LIBNAME): ../Makefile diff --git a/configure/RULES.ioc b/configure/RULES.ioc index 5ba10130..901987c6 100644 --- a/configure/RULES.ioc +++ b/configure/RULES.ioc @@ -1,2 +1,2 @@ #RULES.ioc -include $(EPICS_BASE)/configure/RULES.ioc +include $(CONFIG)/RULES.ioc diff --git a/configure/RULES.iocBoot b/configure/RULES.iocBoot deleted file mode 100644 index bb7c780f..00000000 --- a/configure/RULES.iocBoot +++ /dev/null @@ -1,4 +0,0 @@ -#RULES.iocBoot -DIRS += $(wildcard ioc*) -DIRS += $(wildcard as*) -include $(EPICS_BASE)/configure/RULES_DIRS diff --git a/configure/RULES_DIRS b/configure/RULES_DIRS index 804faee5..3ba269dc 100644 --- a/configure/RULES_DIRS +++ b/configure/RULES_DIRS @@ -1,2 +1,2 @@ #RULES_DIRS -include $(EPICS_BASE)/configure/RULES_DIRS +include $(CONFIG)/RULES_DIRS diff --git a/configure/RULES_TOP b/configure/RULES_TOP index 0620f08f..d09d668d 100644 --- a/configure/RULES_TOP +++ b/configure/RULES_TOP @@ -1,3 +1,3 @@ #RULES_TOP -include $(EPICS_BASE)/configure/RULES_TOP +include $(CONFIG)/RULES_TOP