diff --git a/configure/RELEASE b/configure/RELEASE index c6edb9610..7665c3f78 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -7,22 +7,19 @@ # and higher are distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# RELEASE: Define location of external products -# +# RELEASE: Define location of external EPICS products + +# VX_DIR definition now in os/CONFIG_SITE.Common.vxWorksCommon +# RTEMS_BASE (and RTEMS_VERSION) now in os/CONFIG_SITE.Common.RTEMS + # NB: Settings in RELEASE files can be overridden in files named # RELEASE.$(EPICS_HOST_ARCH) +# RELEASE.Common.$(OS_CLASS)Common # RELEASE.Common.$(T_A) # RELEASE.$(EPICS_HOST_ARCH).$(T_A) -# Tornado directory -VX_DIR = /usr/local/vw/tornado202p1 -#VX_DIR = /usr/local/vw/tornado22-$(ARCH_CLASS) - -#------------------------------------------------------- -# Where to find RTEMS -RTEMS_BASE=/usr/local/rtems/rtems-4.7 -RTEMS_VERSION=4.7 - # If you don't want to install into $(TOP) dir then # define INSTALL_LOCATION here #INSTALL_LOCATION= +#INSTALL_LOCATION=/home/phoebus/JBA/install + diff --git a/configure/os/CONFIG_SITE.Common.RTEMS b/configure/os/CONFIG_SITE.Common.RTEMS index d5787baf8..99fee4bd2 100644 --- a/configure/os/CONFIG_SITE.Common.RTEMS +++ b/configure/os/CONFIG_SITE.Common.RTEMS @@ -1,8 +1,13 @@ # # Site-specific information for all RTEMS targets # +#------------------------------------------------------- +# Where to find RTEMS # +RTEMS_BASE=/usr/local/rtems/rtems-4.7 +RTEMS_VERSION=4.7 + # If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC # network configuration you must specify your Internet Domain Name here # diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon new file mode 100644 index 000000000..6c71b0f45 --- /dev/null +++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon @@ -0,0 +1,10 @@ +# CONFIG_SITE.Common.vxWorksCommon +# +# Site specific definitions for vxWorks target builds +# Only the local epics system manager should modify this file + + +# Tornado directory +VX_DIR = /usr/local/vw/tornado202p1 +#VX_DIR = /usr/local/vw/tornado22-$(ARCH_CLASS) + diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html index 4b3603883..e4be2f0fa 100644 --- a/documentation/RELEASE_NOTES.html +++ b/documentation/RELEASE_NOTES.html @@ -10,8 +10,20 @@

EPICS Base Release 3.14.8
?? ??Month?? 2005

+

Changes since 3.14.7

+

VX_DIR

+

The definition VX_DIR was removed from configure/RELEASE and moved to +configure/os/CONFIG_SITE.Common.vxWorksCommon. The configure/RELEASE* files +should contain location definitions for EPICS modules only.

+ +

RTEMS_BASE

+

The definition RTEMS_BASE (and RTEMS_VERSION) were removed from +configure/RELEASE and moved to configure/os/CONFIG_SITE.Common.RTEMS. The +configure/RELEASE* files should contain location definitions for EPICS modules +only.

+

event generator and event receiver record support

All apsEvent specific record support has been removed from base