diff --git a/arrayPerformance/configure/CONFIG_SITE b/arrayPerformance/configure/CONFIG_SITE index 9e1ec9a..65cfc97 100644 --- a/arrayPerformance/configure/CONFIG_SITE +++ b/arrayPerformance/configure/CONFIG_SITE @@ -14,26 +14,11 @@ # Set CHECK_RELEASE to NO to disable checking completely. # Set CHECK_RELEASE to WARN to perform consistency checking but # continue building anyway if conflicts are found. -#CHECK_RELEASE = YES - -# 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 +CHECK_RELEASE = WARN # To install files into a location other than $(TOP) define # INSTALL_LOCATION here. #INSTALL_LOCATION= -# 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 = - -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I $(INSTALL_LOCATION)/include - --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../configure/CONFIG_SITE.local +-include $(TOP)/../../CONFIG_SITE.local diff --git a/arrayPerformance/configure/RELEASE b/arrayPerformance/configure/RELEASE index eca1885..ce1f6c9 100644 --- a/arrayPerformance/configure/RELEASE +++ b/arrayPerformance/configure/RELEASE @@ -16,8 +16,9 @@ # EPICS V4 Developers: Do not edit the locations in this file! # -# Create a file RELEASE.local pointing to your places -# for the dependencies, e.g. +# Create a file RELEASE.local pointing to your PVASRV, PVACCESS, +# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g. +# PVASRV = /path/to/epics/pvaSrvCPP # PVACCESS = /path/to/epics/pvAccessCPP # PVDATA = /path/to/epics/pvDataCPP # PVCOMMON = /path/to/epics/pvCommonCPP @@ -27,14 +28,14 @@ # use the following definitions: PVDATABASE = $(TOP)/.. --include $(TOP)/../../RELEASE.local + -include $(TOP)/../configure/RELEASE.local +-include $(TOP)/../../RELEASE.local # If you copied this example from pvDatabaseCPP to be built as a -# standalone TOP, define -# PVDATABASE = /path/to/epics/pvDatabaseCPP -# in the appropriate RELEASE[.local], -# and use the following definitions instead: +# standalone TOP, adjust and use the following definitions: + +#PVDATABASE = /path/to/epics/pvDatabaseCPP -#-include $(TOP)/../RELEASE.local #-include $(TOP)/configure/RELEASE.local +#-include $(TOP)/../RELEASE.local diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 8c7897a..7be84ea 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -14,14 +14,11 @@ # Set CHECK_RELEASE to NO to disable checking completely. # Set CHECK_RELEASE to WARN to perform consistency checking but # continue building anyway if conflicts are found. -CHECK_RELEASE = WARN +CHECK_RELEASE = YES # To install files into a location other than $(TOP) define # INSTALL_LOCATION here. #INSTALL_LOCATION= -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I $(INSTALL_LOCATION)/include - -include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG_SITE.local +-include $(TOP)/../CONFIG.local diff --git a/configure/Makefile b/configure/Makefile index 9254309..aefe673 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -6,3 +6,4 @@ TARGETS = $(CONFIG_TARGETS) CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) include $(TOP)/configure/RULES + diff --git a/configure/RELEASE b/configure/RELEASE index 7555521..77c76d7 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -18,11 +18,11 @@ # # Create a file RELEASE.local pointing to your PVASRV, PVACCESS, # PVDATA, PVCOMMON and EPICS_BASE build directories, e.g. -# PVASRV = /home/install/epicsV4/pvaSrvCPP -# PVACCESS = /home/install/epicsV4/pvAccessCPP -# PVCOMMON = /home/install/epicsV4/pvCommonCPP -# PVDATA = /home/install/epicsV4/pvDataCPP -# EPICS_BASE = /home/install/epics/base +# PVASRV = /path/to/epics/pvaSrvCPP +# PVACCESS = /path/to/epics/pvAccessCPP +# PVDATA = /path/to/epics/pvDataCPP +# PVCOMMON = /path/to/epics/pvCommonCPP +# EPICS_BASE = /path/to/epics/base -include $(TOP)/configure/RELEASE.local -include $(TOP)/../RELEASE.local diff --git a/exampleDatabase/configure/CONFIG_SITE b/exampleDatabase/configure/CONFIG_SITE index 54dfe74..65cfc97 100644 --- a/exampleDatabase/configure/CONFIG_SITE +++ b/exampleDatabase/configure/CONFIG_SITE @@ -14,27 +14,11 @@ # Set CHECK_RELEASE to NO to disable checking completely. # Set CHECK_RELEASE to WARN to perform consistency checking but # continue building anyway if conflicts are found. -#CHECK_RELEASE = YES - -# 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 +CHECK_RELEASE = WARN # To install files into a location other than $(TOP) define # INSTALL_LOCATION here. #INSTALL_LOCATION= -# 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 = - -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I $(INSTALL_LOCATION)/include - --include $(TOP)/configure/CONFIG_SITE.local -include $(TOP)/../configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../../CONFIG_SITE.local diff --git a/exampleDatabase/configure/RELEASE b/exampleDatabase/configure/RELEASE index 3b2f69f..96eed71 100644 --- a/exampleDatabase/configure/RELEASE +++ b/exampleDatabase/configure/RELEASE @@ -16,8 +16,9 @@ # EPICS V4 Developers: Do not edit the locations in this file! # -# Create a file RELEASE.local pointing to your places -# for the dependencies, e.g. +# Create a file RELEASE.local pointing to your PVASRV, PVACCESS, +# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g. +# PVASRV = /path/to/epics/pvaSrvCPP # PVACCESS = /path/to/epics/pvAccessCPP # PVDATA = /path/to/epics/pvDataCPP # PVCOMMON = /path/to/epics/pvCommonCPP @@ -26,17 +27,17 @@ # If this example is built in a directory under pvDatabaseCPP, # use the following definitions: -PVDATABASE = $(TOP)/.. PVDATABASETEST = $(TOP)/../test --include $(TOP)/../../RELEASE.local +PVDATABASE = $(TOP)/.. + -include $(TOP)/../configure/RELEASE.local +-include $(TOP)/../../RELEASE.local # If you copied this example from pvDatabaseCPP to be built as a -# standalone TOP, define -# PVDATABASE = /path/to/epics/pvDatabaseCPP -# PVDATABASETEST = /path/to/epics/pvDatabaseCPP/test -# in the appropriate RELEASE[.local], -# and use the following definitions instead: +# standalone TOP, adjust and use the following definitions: + +#PVDATABASETEST = /path/to/epics/pvDatabaseCPP/test +#PVDATABASE = /path/to/epics/pvDatabaseCPP #-include $(TOP)/../RELEASE.local #-include $(TOP)/configure/RELEASE.local diff --git a/exampleLink/configure/CONFIG_SITE b/exampleLink/configure/CONFIG_SITE index 9e1ec9a..65cfc97 100644 --- a/exampleLink/configure/CONFIG_SITE +++ b/exampleLink/configure/CONFIG_SITE @@ -14,26 +14,11 @@ # Set CHECK_RELEASE to NO to disable checking completely. # Set CHECK_RELEASE to WARN to perform consistency checking but # continue building anyway if conflicts are found. -#CHECK_RELEASE = YES - -# 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 +CHECK_RELEASE = WARN # To install files into a location other than $(TOP) define # INSTALL_LOCATION here. #INSTALL_LOCATION= -# 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 = - -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I $(INSTALL_LOCATION)/include - --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../configure/CONFIG_SITE.local +-include $(TOP)/../../CONFIG_SITE.local diff --git a/exampleLink/configure/RELEASE b/exampleLink/configure/RELEASE index 18dd963..afbbaed 100644 --- a/exampleLink/configure/RELEASE +++ b/exampleLink/configure/RELEASE @@ -16,8 +16,9 @@ # EPICS V4 Developers: Do not edit the locations in this file! # -# Create a file RELEASE.local pointing to your places -# for the dependencies, e.g. +# Create a file RELEASE.local pointing to your PVASRV, PVACCESS, +# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g. +# PVASRV = /path/to/epics/pvaSrvCPP # PVACCESS = /path/to/epics/pvAccessCPP # PVDATA = /path/to/epics/pvDataCPP # PVCOMMON = /path/to/epics/pvCommonCPP @@ -27,14 +28,14 @@ # use the following definitions: PVDATABASE = $(TOP)/.. --include $(TOP)/../../RELEASE.local + -include $(TOP)/../configure/RELEASE.local +-include $(TOP)/../../RELEASE.local # If you copied this example from pvDatabaseCPP to be built as a -# standalone TOP, define -# PVDATABASE = /path/to/epics/pvDatabaseCPP -# in the appropriate RELEASE[.local], -# and use the following definitions instead: +# standalone TOP, adjust and use the following definitions: + +#PVDATABASE = /path/to/epics/pvDatabaseCPP -#-include $(TOP)/../RELEASE.local #-include $(TOP)/configure/RELEASE.local +#-include $(TOP)/../RELEASE.local diff --git a/examplePowerSupply/configure/CONFIG_SITE b/examplePowerSupply/configure/CONFIG_SITE index 9e1ec9a..65cfc97 100644 --- a/examplePowerSupply/configure/CONFIG_SITE +++ b/examplePowerSupply/configure/CONFIG_SITE @@ -14,26 +14,11 @@ # Set CHECK_RELEASE to NO to disable checking completely. # Set CHECK_RELEASE to WARN to perform consistency checking but # continue building anyway if conflicts are found. -#CHECK_RELEASE = YES - -# 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 +CHECK_RELEASE = WARN # To install files into a location other than $(TOP) define # INSTALL_LOCATION here. #INSTALL_LOCATION= -# 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 = - -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I $(INSTALL_LOCATION)/include - --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../configure/CONFIG_SITE.local +-include $(TOP)/../../CONFIG_SITE.local diff --git a/examplePowerSupply/configure/RELEASE b/examplePowerSupply/configure/RELEASE index 3b2f69f..96eed71 100644 --- a/examplePowerSupply/configure/RELEASE +++ b/examplePowerSupply/configure/RELEASE @@ -16,8 +16,9 @@ # EPICS V4 Developers: Do not edit the locations in this file! # -# Create a file RELEASE.local pointing to your places -# for the dependencies, e.g. +# Create a file RELEASE.local pointing to your PVASRV, PVACCESS, +# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g. +# PVASRV = /path/to/epics/pvaSrvCPP # PVACCESS = /path/to/epics/pvAccessCPP # PVDATA = /path/to/epics/pvDataCPP # PVCOMMON = /path/to/epics/pvCommonCPP @@ -26,17 +27,17 @@ # If this example is built in a directory under pvDatabaseCPP, # use the following definitions: -PVDATABASE = $(TOP)/.. PVDATABASETEST = $(TOP)/../test --include $(TOP)/../../RELEASE.local +PVDATABASE = $(TOP)/.. + -include $(TOP)/../configure/RELEASE.local +-include $(TOP)/../../RELEASE.local # If you copied this example from pvDatabaseCPP to be built as a -# standalone TOP, define -# PVDATABASE = /path/to/epics/pvDatabaseCPP -# PVDATABASETEST = /path/to/epics/pvDatabaseCPP/test -# in the appropriate RELEASE[.local], -# and use the following definitions instead: +# standalone TOP, adjust and use the following definitions: + +#PVDATABASETEST = /path/to/epics/pvDatabaseCPP/test +#PVDATABASE = /path/to/epics/pvDatabaseCPP #-include $(TOP)/../RELEASE.local #-include $(TOP)/configure/RELEASE.local diff --git a/exampleServer/configure/CONFIG_SITE b/exampleServer/configure/CONFIG_SITE index 9e1ec9a..65cfc97 100644 --- a/exampleServer/configure/CONFIG_SITE +++ b/exampleServer/configure/CONFIG_SITE @@ -14,26 +14,11 @@ # Set CHECK_RELEASE to NO to disable checking completely. # Set CHECK_RELEASE to WARN to perform consistency checking but # continue building anyway if conflicts are found. -#CHECK_RELEASE = YES - -# 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 +CHECK_RELEASE = WARN # To install files into a location other than $(TOP) define # INSTALL_LOCATION here. #INSTALL_LOCATION= -# 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 = - -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I $(INSTALL_LOCATION)/include - --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../configure/CONFIG_SITE.local +-include $(TOP)/../../CONFIG_SITE.local diff --git a/exampleServer/configure/RELEASE b/exampleServer/configure/RELEASE index 18dd963..afbbaed 100644 --- a/exampleServer/configure/RELEASE +++ b/exampleServer/configure/RELEASE @@ -16,8 +16,9 @@ # EPICS V4 Developers: Do not edit the locations in this file! # -# Create a file RELEASE.local pointing to your places -# for the dependencies, e.g. +# Create a file RELEASE.local pointing to your PVASRV, PVACCESS, +# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g. +# PVASRV = /path/to/epics/pvaSrvCPP # PVACCESS = /path/to/epics/pvAccessCPP # PVDATA = /path/to/epics/pvDataCPP # PVCOMMON = /path/to/epics/pvCommonCPP @@ -27,14 +28,14 @@ # use the following definitions: PVDATABASE = $(TOP)/.. --include $(TOP)/../../RELEASE.local + -include $(TOP)/../configure/RELEASE.local +-include $(TOP)/../../RELEASE.local # If you copied this example from pvDatabaseCPP to be built as a -# standalone TOP, define -# PVDATABASE = /path/to/epics/pvDatabaseCPP -# in the appropriate RELEASE[.local], -# and use the following definitions instead: +# standalone TOP, adjust and use the following definitions: + +#PVDATABASE = /path/to/epics/pvDatabaseCPP -#-include $(TOP)/../RELEASE.local #-include $(TOP)/configure/RELEASE.local +#-include $(TOP)/../RELEASE.local diff --git a/test/configure/CONFIG_SITE b/test/configure/CONFIG_SITE index 9e1ec9a..c8bb011 100644 --- a/test/configure/CONFIG_SITE +++ b/test/configure/CONFIG_SITE @@ -14,26 +14,11 @@ # Set CHECK_RELEASE to NO to disable checking completely. # Set CHECK_RELEASE to WARN to perform consistency checking but # continue building anyway if conflicts are found. -#CHECK_RELEASE = YES - -# 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 +CHECK_RELEASE = YES # To install files into a location other than $(TOP) define # INSTALL_LOCATION here. #INSTALL_LOCATION= -# 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 = - -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I $(INSTALL_LOCATION)/include - --include $(TOP)/configure/CONFIG_SITE.local --include $(TOP)/../CONFIG.local +-include $(TOP)/../configure/CONFIG_SITE.local +-include $(TOP)/../../CONFIG.local diff --git a/test/configure/Makefile b/test/configure/Makefile index 9254309..aefe673 100644 --- a/test/configure/Makefile +++ b/test/configure/Makefile @@ -6,3 +6,4 @@ TARGETS = $(CONFIG_TARGETS) CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) include $(TOP)/configure/RULES + diff --git a/test/configure/RELEASE b/test/configure/RELEASE index 392a719..7a7db11 100644 --- a/test/configure/RELEASE +++ b/test/configure/RELEASE @@ -16,8 +16,9 @@ # EPICS V4 Developers: Do not edit the locations in this file! # -# Create a file RELEASE.local pointing to your places -# for the dependencies, e.g. +# Create a file RELEASE.local pointing to your PVASRV, PVACCESS, +# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g. +# PVASRV = /path/to/epics/pvaSrvCPP # PVACCESS = /path/to/epics/pvAccessCPP # PVDATA = /path/to/epics/pvDataCPP # PVCOMMON = /path/to/epics/pvCommonCPP @@ -27,14 +28,14 @@ # use the following definitions: PVDATABASE = $(TOP)/.. --include $(TOP)/../../RELEASE.local + -include $(TOP)/../configure/RELEASE.local +-include $(TOP)/../../RELEASE.local # If you copied these tests from pvDatabaseCPP to be built as a -# standalone TOP, define -# PVDATABASE = /path/to/epics/pvDatabaseCPP -# in the appropriate RELEASE[.local], -# and use the following definitions instead: +# standalone TOP, adjust and use the following definitions: + +#PVDATABASE = /path/to/epics/pvDatabaseCPP -#-include $(TOP)/../RELEASE.local #-include $(TOP)/configure/RELEASE.local +#-include $(TOP)/../RELEASE.local