CONFIG_BASE_VERSION for R3.16.0.1

Add testBasic to check basic op symantics.
Add anon namespace to hide symbols other than MAIN(epicsAtomicTest).
Replace using namespace with using for individual functions.
For RTEMS skip the tests using threads as the use of
RTEMS_NO_TIMESLICE prevents them from being meaningful

README

@@ -2,14 +2,14 @@
 EPICS Base - the central core of a control system toolkit
 ---------------------------------------------------------
 
-Copyright (c) 1991-2003 The University of Chicago, as Operator
-of Argonne National Laboratory.
+Copyright UChicago Argonne LLC, as Operator of Argonne
+National Laboratory.
 Copyright (c) 1991-2003 The Regents of the University of
 California, as Operator of Los Alamos National Laboratory.
 
-EPICS Base Versions 3.13.7 and higher are distributed
-subject to a Software License Agreement found in the
-file LICENSE that is included with this distribution.
+EPICS Base is distributed subject to a Software License
+Agreement found in the file LICENSE that is included with
+this distribution.
 
 ---------------------------------------------------------
 

configure/CONFIG

@@ -14,17 +14,17 @@
 #
 
 ifneq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
-EPICS_BASE = $(INSTALL_LOCATION)
-CONFIG = $(TOP)/configure
-BASE_TOP=YES
+  EPICS_BASE = $(INSTALL_LOCATION)
+  CONFIG = $(TOP)/configure
+  BASE_TOP=YES
 else
-CONFIG ?= $(EPICS_BASE)/configure
+  CONFIG ?= $(EPICS_BASE)/configure
 endif
 
 # Provide a default if the user hasn't set EPICS_HOST_ARCH
 ifeq ($(origin EPICS_HOST_ARCH), undefined)
-# NB: Must use a simply expanded variable here for performance:
-EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
+  # NB: We use a simply expanded variable here for performance:
+  EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
 endif
 #
 
@@ -32,8 +32,8 @@ endif
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).Common
 ifdef T_A
--include $(CONFIG)/RELEASE.Common.$(T_A)
--include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+  -include $(CONFIG)/RELEASE.Common.$(T_A)
+  -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 endif
 
 include $(CONFIG)/CONFIG_COMMON
@@ -56,58 +56,64 @@ include $(CONFIG)/CONFIG_BASE_VERSION
 include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
 
+RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
+
+
 ifdef T_A
 
-#  Cross compile specific definitions
-#
-ifneq ($(EPICS_HOST_ARCH),$(T_A))
-include $(CONFIG)/CONFIG.CrossCommon
-endif
+  #  Cross compile specific definitions
+  #
+  ifneq ($(EPICS_HOST_ARCH),$(T_A))
+    include $(CONFIG)/CONFIG.CrossCommon
+  endif
 
-#  Target architecture specific definitions
-#
--include $(CONFIG)/os/CONFIG.Common.$(T_A)
+  #  Target architecture specific definitions
+  #
+  -include $(CONFIG)/os/CONFIG.Common.$(T_A)
 
-#  Host-Target architecture specific definitions
-#
--include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
+  #  Host-Target architecture specific definitions
+  #
+  -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
 
-#  RELEASE file specific definitions
-#
-ifneq ($(CONFIG),$(TOP)/configure)
--include $(CONFIG)/CONFIG_APP_INCLUDE
-endif
+  #  RELEASE file specific definitions
+  #
+  ifneq ($(CONFIG),$(TOP)/configure)
+    -include $(CONFIG)/CONFIG_APP_INCLUDE
+  endif
+
+  #  Site specific target and host-target definitions
+  #
+  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
+  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
+endif # ifdef T_A
 
-#  Site specific target and host-target definitions
-#
--include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
--include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
 
 # Include <top>/cfg/CONFIG* definitions from tops defined in RELEASE* files
 #
 ifneq ($(CONFIG),$(TOP)/configure)
-RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
-RELEASE_CFG_CONFIGS = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/cfg/CONFIG*))
-ifneq ($(RELEASE_CFG_CONFIGS),)
-include $(RELEASE_CFG_CONFIGS)
-endif
+  RELEASE_TOPS_REVERSE := $(shell \
+      $(PERL) -e '$$,=" ";print reverse @ARGV' $(RELEASE_TOPS))
+  RELEASE_CFG_CONFIGS = $(foreach top, $(RELEASE_TOPS_REVERSE), \
+      $(wildcard $($(top))/cfg/CONFIG*))
+  ifneq ($(RELEASE_CFG_CONFIGS),)
+    include $(RELEASE_CFG_CONFIGS)
+  endif
 endif
 
 # Include $(INSTALL_CFG)/CONFIG* definitions
 #
 TOP_CFG_CONFIGS = $(wildcard $(INSTALL_CFG)/CONFIG*)
 ifneq ($(TOP_CFG_CONFIGS),)
-include $(TOP_CFG_CONFIGS)
+  include $(TOP_CFG_CONFIGS)
 endif
 
-endif # ifdef T_A
-
 #  User specific definitions
 #
 -include $(HOME)/configure/CONFIG_USER
 -include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH)
 ifdef T_A
--include $(HOME)/configure/CONFIG_USER.Common.$(T_A)
--include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH).$(T_A)
+  -include $(HOME)/configure/CONFIG_USER.Common.$(T_A)
+  -include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH).$(T_A)
 endif
 

configure/CONFIG_ADDONS

@@ -26,7 +26,6 @@
 #    USR_CFLAGS    C flags
 #    USR_CXXFLAGS  C++ flags
 #    USR_CPPFLAGS  c preprocesser flags
-#    INC           include-files to install
 #    SRCS          source files for building libraries and prods
 #    USR_SRCS      source files for building libraries and prods
 #    PROD_SRCS     source files for building prods

configure/CONFIG_APP_INCLUDE

@@ -1,25 +1,35 @@
-export TOP
-export IOCAPPS
+#*************************************************************************
+# Copyright (c) 2013 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
+#*************************************************************************
+#
+#  $Revision-Id$
+#
 
-RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
+export TOP
 
 ifneq ($(RELEASE_TOPS),)
 
 define  RELEASE_FLAGS_template
   export $(1)
-  $(1)_HOST_BIN = $$(strip $$($(1)))/bin/$$(EPICS_HOST_ARCH)
-  $(1)_HOST_LIB = $$(strip $$($(1)))/lib/$$(EPICS_HOST_ARCH)
-  $(1)_BIN = $$(wildcard $$(strip $$($(1)))/bin/$$(T_A))
-  $(1)_LIB = $$(wildcard $$(strip $$($(1)))/lib/$$(T_A))
+  $(1)_HOST_BIN = $$(strip $$($(1)))/bin/$(EPICS_HOST_ARCH)
+  $(1)_HOST_LIB = $$(strip $$($(1)))/lib/$(EPICS_HOST_ARCH)
+  $(1)_BIN = $$(wildcard $$(strip $$($(1)))/bin/$(T_A))
+  $(1)_LIB = $$(wildcard $$(strip $$($(1)))/lib/$(T_A))
   SHRLIB_SEARCH_DIRS += $$($(1)_LIB)
-  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/compiler/$$(CMPLR_CLASS)))
-  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$$(OS_CLASS)))
+  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/compiler/$(CMPLR_CLASS)))
+  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$(OS_CLASS)))
   RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include))
   RELEASE_DBD_DIRS += $$(wildcard $$(strip $$($(1)))/dbd)
   RELEASE_DB_DIRS += $$(wildcard $$(strip $$($(1)))/db)
-  RELEASE_PERL_MODULE_DIRS += $$(wildcard $$($(1)_LIB)/perl)
+  RELEASE_PERL_MODULE_DIRS += $$(wildcard $$(strip $$($(1)))/lib/perl)
 endef
-$(foreach top, $(RELEASE_TOPS), $(eval $(call RELEASE_FLAGS_template,$(top)) ))
+$(foreach top, $(RELEASE_TOPS), \
+    $(eval $(call RELEASE_FLAGS_template,$(top))))
 
 endif
 

configure/CONFIG_BASE

@@ -3,28 +3,27 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
 #---------------------------------------------------------------
-# Epics base directories
+# EPICS Base directories
 
 EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
 EPICS_BASE_HOST_LIB = $(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)
 ifdef T_A
-EPICS_BASE_LIB      = $(EPICS_BASE)/lib/$(T_A)
-EPICS_BASE_BIN      = $(EPICS_BASE)/bin/$(T_A)
+  EPICS_BASE_LIB    = $(EPICS_BASE)/lib/$(T_A)
+  EPICS_BASE_BIN    = $(EPICS_BASE)/bin/$(T_A)
 endif
 
 #---------------------------------------------------------------
-# Epics base Ioc libraries 
+# EPICS Base Ioc libraries 
 
 EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com 
 
 #---------------------------------------------------------------
-# Epics base Host libraries 
+# EPICS Base Host libraries 
 
 EPICS_BASE_HOST_LIBS += cas gdd
 EPICS_BASE_HOST_LIBS += ca Com
@@ -33,41 +32,44 @@ EPICS_BASE_HOST_LIBS += ca Com
 # Version number for base shared libraries (and win32 products)
 
 ifdef BASE_TOP
-SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
-PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
+  # Unix lib.so.<v.r.m>  Darwin lib.<v.r.m>.dylib
+  SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
+  # Windows only allows 2 levels of version numbering
+  PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
 endif # BASE_TOP
 
 #---------------------------------------------------------------
 # Base c preprocessor flags
 
-BASE_CPPFLAGS = 
-
 # osithread default stack
 OSITHREAD_USE_DEFAULT_STACK = NO
 OSITHREAD_DEFAULT_STACK_FLAGS_YES = -DOSITHREAD_USE_DEFAULT_STACK
-OSITHREAD_DEFAULT_STACK_FLAGS_NO =
-BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
+
+BASE_CPPFLAGS = $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
 
 #---------------------------------------------------------------
 # Where to find the installed build tools
+#   Windows does not like commands with relative paths starting ../
+#   but the Perl scripts in TOP/src/tools are OK
 
-TOOLS = $(EPICS_BASE_HOST_BIN)
+TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
+FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
 
 #---------------------------------------------------------------
-# Epics base build tools and tool flags
+# EPICS Base build tools and tool flags
 
-MAKEBPT                    = $(call PATH_FILTER, $(TOOLS)/makeBpt$(HOSTEXE))
+MAKEBPT                    = $(TOOLS)/makeBpt$(HOSTEXE)
 DBEXPAND                   = $(PERL) $(TOOLS)/dbdExpand.pl
 DBTORECORDTYPEH            = $(PERL) $(TOOLS)/dbdToRecordtypeH.pl
 DBTOMENUH                  = $(PERL) $(TOOLS)/dbdToMenuH.pl
 REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl
-CONVERTRELEASE             = $(PERL) $(TOOLS)/convertRelease.pl
+CONVERTRELEASE             = $(PERL) $(call FIND_TOOL,convertRelease.pl)
 FULLPATHNAME               = $(PERL) $(TOOLS)/fullPathName.pl
+GENVERSIONHEADER           = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG)
 
-#-------------------------------------------------------
+#---------------------------------------------------------------
 # tools for installing libraries and products
-INSTALL_QUIETLY := $(if $(findstring s,$(MAKEFLAGS)),-q,)
-INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(INSTALL_QUIETLY)
+INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(QUIET_FLAG)
 INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
@@ -77,40 +79,14 @@ MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
 REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
 
 #---------------------------------------------------------------
-# private versions of lex/yacc from EPICS
-EYACC = $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE))
-ELEX = $(call PATH_FILTER, $(TOOLS)/e_flex$(HOSTEXE)) -S$(EPICS_BASE)/include/flex.skel.static
+# Our versions of lex (flex) and yacc (antelope)
+EYACC = $(TOOLS)/antelope$(HOSTEXE)
+ELEX = $(TOOLS)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
 
 YACC  = $(EYACC)
 LEX   = $(ELEX)
 
 #---------------------------------------------------------------
-# External tools and tool flags - must be in path or defined in application
-
-ifndef ADL2DL
-ADL2DL = adl2dl
-endif
-
-# sch2edif compiler and flags
-SCH2EDIF = sch2edif
-SCH2EDIF_PATH =
-SCH2EDIF_SYSFLAGS = -n -ap -p.+..+$(SCH2EDIF_PATH)+$(CAPFAST_TEMPLATES)/sym+
-SCH2EDIF_FLAGS =
- 
-# e2db and flags
-#    - again there is an assumption where edb.def is installed.
-ifndef E2DB
-E2DB = e2db
-endif
-E2DB_SYSFLAGS = -ate -d $(CAPFAST_TEMPLATES)/edb.def
-E2DB_FLAGS =
-
-ifndef DBST
-DBST = dbst
-endif
-
-ifndef MSI
-MSI = $(EPICS_BASE_HOST_BIN)/msi
-endif
-
+# The 3.15 version of msi supports new options
 
+MSI3_15 = $(EPICS_BASE_HOST_BIN)/msi

configure/CONFIG_BASE_VERSION

@@ -17,23 +17,34 @@
 # EPICS_SITE_VERSION is defined in CONFIG_SITE for sites that want a local
 # version number to be included in the reported version string.
 
-# In 3.15 we still define BASE_3_14 so "ifdef BASE_3_14" means
-# 3.14 or later, but "ifeq ($(BASE_3_14),YES)" means 3.14 only.
+# We define BASE_3_14 and BASE_3_15 as NO and BASE_3_16 as YES, so
+#   ifdef BASE_3_14
+#       true for 3.14 or later
+#   ifdef BASE_3_15
+#       true for 3.15 or later
+#   ifeq ($(BASE_3_14),YES)
+#       true for 3.14.x only
+#   ifeq ($(BASE_3_15),YES)
+#       true for 3.15 only
+#   ifeq ($(BASE_3_16),YES)
+#       true for 3.16 only.
+
 BASE_3_14 = NO
-BASE_3_15 = YES
+BASE_3_15 = NO
+BASE_3_16 = YES
 
 # EPICS_VERSION must be a number >0 and <256
 EPICS_VERSION = 3
 
 # EPICS_REVISION must be a number >=0 and <256 
-EPICS_REVISION = 15
+EPICS_REVISION = 16
 
 # EPICS_MODIFICATION must be a number >=0 and <256 
 EPICS_MODIFICATION = 0
 
-# EPICS_PATCH_LEVEL must be a number  (win32 resource file requirement)
+# EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 2
+EPICS_PATCH_LEVEL = 1
 
 # This will end in -DEV between official releases
 #EPICS_DEV_SNAPSHOT=-DEV

configure/CONFIG_COMMON

@@ -40,10 +40,6 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL = perl -CSD
 
-#-------------------------------------------------------
-# dbst based database optimization default
-DB_OPT = NO
-
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
@@ -85,6 +81,7 @@ IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 # Make echo output - suppress echoing if make's '-s' flag is set
 NOP = :
 ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -177,7 +174,7 @@ LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(L
 LIBRARY_LD_OBJS = $(USR_OBJLIBS) $(LIB_OBJLIBS) $(TARGET_OBJS) $(LIBRARY_OBJS)
 
 #--------------------------------------------------
-# WIN95/NT resource files
+# Windows resource files
 
 TARGET_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $($*_RCS))),)
 
@@ -187,11 +184,6 @@ PROD_LD_RESS = $(TARGET_RESS) $(PROD_RESS)
 LIBRARY_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS))),)
 LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)
 
-#--------------------------------------------------
-# WIN95/NT source browser
-PROD_BAF = $(addsuffix $(BAF), $(basename $(PROD)))
-LIB_BAF=$(addsuffix $(BAF),$(basename $(LIBRARY)))
-
 #--------------------------------------------------
 # C preprocessor, compiler, and linker flag defaults
 
@@ -219,6 +211,16 @@ USR_CPPFLAGS =
 USR_DBDFLAGS =
 USR_ARFLAGS =
 
+# Variables to be set only on the command-line:
+# CMD_INCLUDES =
+# CMD_CFLAGS =
+# CMD_CXXFLAGS =
+# CMD_LDFLAGS =
+# CMD_CPPFLAGS =
+# CMD_DBFLAGS =
+# CMD_DBDFLAGS =
+# CMD_ARFLAGS =
+
 # Debug specific options
 DEBUG_CPPFLAGS =
 DEBUG_CFLAGS =
@@ -277,32 +279,35 @@ RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 # Flags
 
 INCLUDES = -I. $(SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
- $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $($(BUILD_CLASS)_INCLUDES)
+ $(TARGET_INCLUDES) $(USR_INCLUDES) $(CMD_INCLUDES) $(OP_SYS_INCLUDES)\
+ $($(BUILD_CLASS)_INCLUDES)
 
-CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
- $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
- $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
+CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS)\
+ $(DEBUG_CFLAGS) $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS)\
+ $(USR_CFLAGS) $(CMD_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS)\
+ $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS)\
- $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS)\
- $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
+CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS)\
+ $(DEBUG_CXXFLAGS) $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)\
+ $(USR_CXXFLAGS) $(CMD_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS)\
+ $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
- $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $($(BUILD_CLASS)_LDFLAGS)\
- $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
+ $(POSIX_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS)\
+ $($(BUILD_CLASS)_LDFLAGS) $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
-LDLIBS = \
- $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS) $(GNU_LDLIBS_$(GNU))
+LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)\
+ $(GNU_LDLIBS_$(GNU))
 
-CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\
- $(OPT_CPPFLAGS) $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS)\
- $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
- $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
+CPPFLAGS = $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
+ $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS)\
+ $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
+ $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
 #--------------------------------------------------
 # ar definition default
 ARFLAGS =
-ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
+ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $(CMD_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
 
 #--------------------------------------------------
 # 'Munch' link-edit
@@ -319,7 +324,6 @@ LEXOPT += -I
 #--------------------------------------------------
 # Build compile line here
 
-PATH_FILTER = $(1)
 COMPILE.c   = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
 COMPILE.cpp = $(CCC) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
 
@@ -327,12 +331,20 @@ COMPILE.cpp = $(CCC) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
 # C preprocessor command
 PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
 
+#--------------------------------------------------
+# genVersion header defaults
+
+# C macro name
+GENVERSIONMACRO = VCSVERSION
+# C macro default value (empty to use date+time)
+GENVERSIONDEFAULT =
+
 #--------------------------------------------------
 # Header dependency file generation
 
 HDEPENDS_METHOD = MKMF
 
-HDEPENDS_MKMFFLAGS = -m $*$(DEP) $(subst -I,,$(INCLUDES)) $@
+HDEPENDS_MKMFFLAGS = -m $*$(DEP) $(INCLUDES) $@
 HDEPENDS_MKMF.c   = $(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDS_MKMFFLAGS)
 HDEPENDS_MKMF.cpp = $(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDS_MKMFFLAGS)
 
@@ -351,6 +363,11 @@ TARGET_SRCS = $(foreach name, \
 SRC_FILES = $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(TARGET_SRCS)
 HDEPENDS_FILES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES))))
 
+#--------------------------------------------------
+# Deprecated and no longer used in Base
+
+PATH_FILTER = $(1)$(warning PATH_FILTER is deprecated; used for $(1))
+
 #---------------------------------------------------------------
 # Names of installed items
 #

configure/CONFIG_SITE

@@ -23,6 +23,7 @@
 #	darwin-x86             (Intel based Apple running OSX)
 #	freebsd-x86            (GNU compiler used for host builds)
 #	freebsd-x86_64         (GNU compiler used for host builds)
+#	linux-arm              (GNU compiler used for host builds)
 #	linux-ppc              (GNU compiler used for host builds)
 #	linux-ppc64            (GNU compiler used for host builds)
 #	linux-x86              (GNU compiler used for host builds)
@@ -37,10 +38,13 @@
 #	solaris-x86_64-gnu     (GNU compiler used for host builds)
 #	win32-x86              (MS Visual C++ compiler used for host builds)
 #	win32-x86-mingw        (MinGW compiler used for host builds)
+#	win32-x86-static       (MS Visual C++ compiler used for host builds)
 #	windows-x64            (MS Visual C++ compiler used for host builds)
 #	windows-x64-mingw      (MinGW compiler used for host builds)
+#	windows-x64-static     (MS Visual C++ compiler used for host builds)
 
 #  Debugging builds:
+#	linux-arm-debug        (GNU compiler used for host builds)
 #	linux-x86-debug        (GNU compiler with -g option for host builds)
 #	linux-x86_64-debug     (GNU compiler with -g option for host builds)
 #	solaris-sparc-debug    (sun compiler no optimization,-g for debugging info)
@@ -57,13 +61,13 @@
 #
 #  Currently Supporting:
 
-#       ios-arm
-#       ios-386
+#       ios-arm                 (darwin-x86 host)
+#       ios-386                 (darwin-x86 host)
 #       linux-386               (linux-x86 host)
 #       linux-486               (linux-x86 host)
 #       linux-586               (linux-x86 host)
 #       linux-686               (linux-x86 host)
-#       linux-arm               (linux-x86 host)
+#       linux-arm               (linux-x86 or -x86_64 host)
 #       linux-arm_eb            (linux-x86 host)
 #       linux-arm_el            (linux-x86 host)
 #       linux-athlon            (linux-x86 host)
@@ -98,6 +102,7 @@
 #       RTEMS-pc386
 #       RTEMS-psim
 #       RTEMS-uC5282
+#       win32-x86-mingw         (linux-x86 or -x86_64 host)
 #
 
 # Which target architectures to cross-compile for.
@@ -147,7 +152,7 @@ CROSS_WARN=YES
 
 # Use POSIX thread priority scheduling (if available).
 #  Must be either YES or NO
-USE_POSIX_THREAD_PRIORITY_SCHEDULING = NO
+USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES
 
 # Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools.

configure/CONFIG_SITE_ENV

@@ -30,23 +30,23 @@
 #	local timezone info for vxWorks and RTEMS IOCs.  The format is
 #	    <name>::<minutesWest>:<start daylight>:<end daylight>
 #	where the start and end are mmddhh - that is month,day,hour
-#	e.g. for ANL in 2010: EPICS_TIMEZONE=CUS::360:031402:110702
+#	e.g. for ANL in 2015: EPICS_TIMEZONE=CST/CDT::360:030802:110102
 #
-#	DST for 2011  US: Mar 13 - Nov 06
-#	              EU: Mar 27 - Oct 30
-#	DST for 2012  US: Mar 11 - Nov 04
-#	              EU: Mar 25 - Oct 28
-#	DST for 2013  US: Mar 10 - Nov 03
-#	              EU: Mar 31 - Oct 27
-#	DST for 2014  US: Mar 09 - Nov 02
-#	              EU: Mar 30 - Oct 26
 #	DST for 2015  US: Mar 08 - Nov 01
 #	              EU: Mar 29 - Oct 25
-#	(see: http://www.worldtimezone.org/daylight.html)
+#	DST for 2016  US: Mar 13 - Nov 06
+#	              EU: Mar 27 - Oct 30
+#	DST for 2017  US: Mar 12 - Nov 05
+#	              EU: Mar 26 - Oct 29
+#	DST for 2018  US: Mar 11 - Nov 04
+#	              EU: Mar 25 - Oct 28
+#	DST for 2019  US: Mar 10 - Nov 03
+#	              EU: Mar 31 - Oct 27
+#	(see: http://www.timeanddate.com/time/map/)
 #
-# These values are for 2011:
-EPICS_TIMEZONE=CUS::360:031302:110602
-#EPICS_TIMEZONE=MET::-60:032702:103002
+# These values are for 2015:
+EPICS_TIMEZONE=CST/CDT::360:030802:110102
+#EPICS_TIMEZONE=CET/CEST::-60:032902:102502
 
 # EPICS_TS_NTP_INET
 #	NTP time server ip address.  Uses boot host if not set.
@@ -57,8 +57,11 @@ EPICS_TS_NTP_INET=
 #	Prompt string
 # IOCSH_HISTSIZE
 #	Number of lines of command history to keep.
+# IOCSH_HISTEDIT_DISABLE
+# 	Prevents use of readline or equivalent if defined.
 IOCSH_PS1="epics> "
 IOCSH_HISTSIZE=50
+IOCSH_HISTEDIT_DISABLE=
 
 # Log Server:
 # EPICS_IOC_LOG_INET 

configure/RULES.Db

@@ -8,10 +8,12 @@
 #*************************************************************************
 #RULES.Db
 
-# Set db substitutions file suffix
+# Set db substitutions and template file suffixes
 SUBST_SUFFIX ?= .substitutions
+TEMPL_SUFFIX ?= .template
 
-#####################################################  vpath
+#---------------------------------------------------------------
+# vpath
 
 vpath %.pm $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.pod $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
@@ -19,27 +21,30 @@ vpath %.dbd $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.db $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %.vdb $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %$(SUBST_SUFFIX) $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
-vpath %.template $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
+vpath %$(TEMPL_SUFFIX) $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath bpt%.data $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath %.acf $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath %.acs $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 
-##################################################### dbflags dbdflags
+#---------------------------------------------------------------
+# dbflags dbdflags
 
 DBD_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DBD) $(RELEASE_DBD_DIRS)
 DB_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DB) $(RELEASE_DB_DIRS)
 
-DBDFLAGS = $(USR_DBDFLAGS) $(addprefix -I,$(DBD_SEARCH_DIRS))
-DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) $(addprefix -I,$(DB_SEARCH_DIRS))
-REGRDDFLAGS = $(DBDFLAGS) $($*_REGRDDFLAGS) $(USR_REGRDDFLAGS)
+DBDFLAGS = $(USR_DBDFLAGS) $(CMD_DBDFLAGS) $(addprefix -I,$(DBD_SEARCH_DIRS))
+DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) $(CMD_DBFLAGS) $(addprefix -I,$(DB_SEARCH_DIRS))
+REGRDDFLAGS = $(DBDFLAGS) $($*_REGRDDFLAGS) $(USR_REGRDDFLAGS) $(CMD_REGRDDFLAGS)
 
-##################################################### Targets
+#---------------------------------------------------------------
+# Targets
 
 # ---------------------------------------------------
 # To allow os specific dbd files AND have the -j option work properly,
 
-CROSS_TARGET_OS_TYPES = $(sort $(foreach target,  \
-    $(EPICS_HOST_ARCH) $(CROSS_COMPILER_TARGET_ARCHS),$(firstword $(subst -, ,$(target)))))
+CROSS_TARGET_OS_TYPES = $(sort $(foreach target, \
+    $(EPICS_HOST_ARCH) $(CROSS_COMPILER_TARGET_ARCHS), \
+    $(firstword $(subst -, ,$(target)))))
 DBD += $(foreach type, $(CROSS_TARGET_OS_TYPES), $(DBD_$(type)))
 
 # Users add os specific dbd files to a Makefile as follows
@@ -86,31 +91,28 @@ SOURCE_DB_bbb = $(foreach dir, $(GENERIC_SRC_DIRS), $(SOURCE_DB_aaa)  )
 SOURCE_DB_aaa = $(addsuffix /$(file), $(dir) )
 
 COMMONS = $(COMMON_DIR)/*.dbd $(COMMON_DIR)/*.db $(COMMON_DIR)/*.h \
-          $(COMMON_DIR)/*$(SUBST_SUFFIX) $(COMMON_DIR)/*.template
+          $(COMMON_DIR)/*$(SUBST_SUFFIX) $(COMMON_DIR)/*$(TEMPL_SUFFIX)
 
 # Remove trailing numbers (to 99) on stem
-TEMPLATE1=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(patsubst %4,%, \
-          $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
-          $*))))))))))
-TEMPLATE2=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(patsubst %4,%, \
-          $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
-          $(TEMPLATE1)))))))))))
-TEMPLATE3=$(addsuffix .template,$(addprefix ../,$(TEMPLATE2)))
-TEMPLATE_FILENAME=$(firstword $(wildcard $($*_TEMPLATE) $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
-
-# dbst based database optimization
-ifeq '$(DB_OPT)' 'YES'
-RAW=.raw
-DBS = $(filter %.db,$(DB)) $(addsuffix $(RAW),$(filter %.db,$(DB)))
-COMMON_DBS = $(addprefix $(COMMON_DIR)/,$(DBS))
-endif
+TEMPLATE1 = $(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%, \
+            $(patsubst %4,%,$(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%, \
+            $(patsubst %8,%,$(patsubst %9,%,$*))))))))))
+TEMPLATE2 = $(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%, \
+            $(patsubst %4,%,$(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%, \
+            $(patsubst %8,%,$(patsubst %9,%,$(TEMPLATE1)))))))))))
+TEMPLATE3 = $(addsuffix $(TEMPL_SUFFIX),$(addprefix ../,$(TEMPLATE2)))
+TEMPLATE_FILENAME = $(firstword $(wildcard $($*_TEMPLATE) \
+            $(addprefix ../,$($*_TEMPLATE)) ../$*$(TEMPL_SUFFIX) $(TEMPLATE3) \
+            ../template))
 
 INSTALL_DB_INSTALLS = $(addprefix $(INSTALL_DB)/,$(notdir $(DB_INSTALLS)))
 INSTALL_DBD_INSTALLS = $(addprefix $(INSTALL_DBD)/,$(notdir $(DBD_INSTALLS)))
 
 COMMONDEP_TARGET = $(COMMON_DIR)/$(basename $@)
 
-#####################################################  acf files
+#---------------------------------------------------------------
+# acf files
+
 # An access security configuration file, *.acf, can be created from
 # an *.acs file (has format of acf file plus #include "filename" lines)
 
@@ -123,7 +125,8 @@ ACF_INCLUDES = -I. $(TARGET_INCLUDES) $(USR_INCLUDES)\
 ACFDEPENDS_CMD = $(MKMF) -m $@ $(ACF_INCLUDES) $(COMMONDEP_TARGET) $<
 ACF_CMD = $(CPP) $(ACF_CPPFLAGS) $(ACF_INCLUDES) $< > $@
 
-#####################################################  dependancies
+#---------------------------------------------------------------
+# dependencies
 
 HINC += $(addsuffix .h,$(DBDINC_NAME))
 COMMON_DBDINC += $(addprefix $(COMMON_DIR)/,$(HINC))
@@ -133,12 +136,12 @@ DBDDEPENDS_FILES += $(addsuffix $(DEP),$(HINC) \
                     $(patsubst $(COMMON_DIR)/%,%, \
                     $(filter-out $(COMMON_DIR)/bpt%.dbd,$(COMMON_DBDS))))
 
-##################################################### 
+#---------------------------------------------------------------
 
 ifndef T_A
 
 DEP = .d
-TEMPLATE3+=$(addsuffix .template, $(TEMPLATE2))
+TEMPLATE3 += $(addsuffix $(TEMPL_SUFFIX), $(TEMPLATE2))
 
 COMMON_DIR = .
 INSTALL_DBDS =
@@ -151,21 +154,15 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += browse
 ACTIONS += runtests tapfiles
 
-actionArchTargets = $(foreach x, $(ACTIONS),\ $(foreach arch,$(BUILD_ARCHS), $(x)$(DIVIDER)$(arch)))
+actionArchTargets = $(foreach action, $(ACTIONS), \
+    $(foreach arch, $(BUILD_ARCHS), $(action)$(DIVIDER)$(arch)))
+cleanArchTargets = $(foreach arch, $(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 
-cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 -include $(TOP)/configure/CONFIG_APP_INCLUDE
 
 all: install
-ifeq ($(EPICS_HOST_ARCH),$T_A)
-host: install
-else
-# Do nothing
-host:
-endif
 
 install: buildInstall
 
@@ -173,20 +170,30 @@ buildInstall : build
 
 rebuild: clean install
 
-.PHONY: all host $(ACTIONS)
+.PHONY: all $(ACTIONS)
 
 $(actionArchTargets) $(BUILD_ARCHS): install
 $(cleanArchTargets): clean
 
 .PHONY: $(BUILD_ARCHS) $(actionArchTargets) $(cleanArchTargets)
 
-endif # T_A defined
+else
+  # T_A is defined
+  ifeq ($(EPICS_HOST_ARCH),$(T_A))
+    host: install
+  else
+    host:
+  endif
+
+  .PHONY: host
+endif # T_A
 
 ifneq (,$(strip $(DBDDEPENDS_FILES)))
 -include $(DBDDEPENDS_FILES)
 endif
 
-#####################################################  build dependancies, clean rule
+#---------------------------------------------------------------
+# build dependancies, clean rule
 
 inc : $(COMMON_INC) $(INSTALL_INC)
 
@@ -206,7 +213,8 @@ db_clean :
 
 realclean: clean
 
-##################################################### Dependency files
+#---------------------------------------------------------------
+# Dependency files
 
 %Record.h$(DEP): $(COMMON_DIR)/%Record.dbd
 	@$(RM) $@
@@ -233,10 +241,14 @@ menu%.h$(DEP): menu%.dbd
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
+menu%.h$(DEP): ../menu%.dbd
+	@$(RM) $@
+	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
+	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
+
 %.dbd$(DEP): %.dbd.pod
 	@$(RM) $@
-	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
-	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
+	@echo "$(COMMONDEP_TARGET): ../Makefile" > $@
 
 %.dbd$(DEP): %Include.dbd
 	@$(RM) $@
@@ -253,25 +265,21 @@ menu%.h$(DEP): menu%.dbd
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $($*_DBD) > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%.db$(RAW)$(DEP): %$(SUBST_SUFFIX)
+%.db$(DEP): %$(SUBST_SUFFIX)
 	@$(RM) $@
-	$(MKMF) -m$@ $(DBFLAGS) $(COMMONDEP_TARGET) $< $(TEMPLATE_FILENAME)
-	@echo "$(COMMONDEP_TARGET): $(TEMPLATE_FILENAME)" >> $@
-	@echo "$@: $(TEMPLATE_FILENAME)" >> $@
+	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) -S$< $(TEMPLATE_FILENAME) > $@
 
-%.db$(RAW)$(DEP): ../%$(SUBST_SUFFIX)
+%.db$(DEP): ../%$(SUBST_SUFFIX)
 	@$(RM) $@
-	$(MKMF) -m$@ $(DBFLAGS) $(COMMONDEP_TARGET) $< $(TEMPLATE_FILENAME)
-	@echo "$(COMMONDEP_TARGET): $(TEMPLATE_FILENAME)" >> $@
-	@echo "$@: $(TEMPLATE_FILENAME)" >> $@
+	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) -S$< $(TEMPLATE_FILENAME) > $@
 
-%.db$(RAW)$(DEP): %.template
+%.db$(DEP): %$(TEMPL_SUFFIX)
 	@$(RM) $@
-	$(MKMF) -m$@ $(DBFLAGS) $(COMMONDEP_TARGET) $<
+	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 
-%.db$(RAW)$(DEP): ../%.template
+%.db$(DEP): ../%$(TEMPL_SUFFIX)
 	@$(RM) $@
-	$(MKMF) -m$@ $(DBFLAGS) $(COMMONDEP_TARGET) $<
+	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 
 %.acf$(DEP): %.acs
 	@$(RM) $@
@@ -281,14 +289,10 @@ menu%.h$(DEP): menu%.dbd
 	@$(RM) $@
 	@$(ACFDEPENDS_CMD)
 
-##################################################### CapFast filter
+.PRECIOUS: %$(DEP)
 
-$(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS) 
-	@$(RM) $@
-	@if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi
-	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) -o $@  $<
-
-##################################################### Substitution files
+#---------------------------------------------------------------
+# Substitution files
 
 #  WARNING: CREATESUBSTITUTIONS script needs output dir on command line
 
@@ -300,34 +304,30 @@ $(COMMON_DIR)/%$(SUBST_SUFFIX):
 endif
 
 $(INSTALL_DB)/%$(SUBST_SUFFIX): %$(SUBST_SUFFIX)
-	$(ECHO) "Installing db file $@"
+	$(ECHO) "Installing substitution file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_DB)/%$(SUBST_SUFFIX): ../%$(SUBST_SUFFIX)
-	$(ECHO) "Installing db file $@"
+	$(ECHO) "Installing substitution file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PRECIOUS: $(COMMON_DIR)/%$(SUBST_SUFFIX)
 
-##################################################### Template files
+#---------------------------------------------------------------
+# Template files
 
-$(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf 
-	@$(RM) $@
-	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $@.VAR $<
-	@$(REPLACEVAR) < $@.VAR > $@
-	@$(RM) $@.VAR
-
-$(INSTALL_DB)/%.template: %.template
-	$(ECHO) "Installing db file $@"
+$(INSTALL_DB)/%$(TEMPL_SUFFIX): %$(TEMPL_SUFFIX)
+	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_DB)/%.template: ../%.template
-	$(ECHO) "Installing db file $@"
+$(INSTALL_DB)/%$(TEMPL_SUFFIX): ../%$(TEMPL_SUFFIX)
+	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-.PRECIOUS: $(COMMON_DIR)/%.template
+.PRECIOUS: $(COMMON_DIR)/%$(TEMPL_SUFFIX)
 
-##################################################### INC files
+#---------------------------------------------------------------
+# INC files
 
 $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
 	@$(RM) $(notdir $@)
@@ -361,7 +361,8 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd
 
 .PRECIOUS: $(COMMON_DIR)/%.h
 
-##################################################### DBD files
+#---------------------------------------------------------------
+# DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data
 	@$(RM) $(notdir $@)
@@ -370,7 +371,7 @@ $(COMMON_DIR)/bpt%.dbd: bpt%.data
 
 $(COMMON_DIR)/%.dbd: %.dbd.pod
 	@$(RM) $(notdir $@)
-	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podRemove.pl -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/%.dbd: %Include.dbd
@@ -422,9 +423,10 @@ $$(INSTALL_DBD)/$$(notdir $(1)) : $(1)
 endef
 $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 
-.PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%Include.dbd
+.PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%.dbd
 
-##################################################### HTML files
+#---------------------------------------------------------------
+# HTML files
 
 $(COMMON_DIR)/%.html: %.dbd.pod $(TOOLS)/dbdToHtml.pl
 	@$(RM) $(notdir $@)
@@ -443,41 +445,48 @@ $(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
 
 $(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
+	@$(MKDIR) $(dir $@)
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.html: ../%.pl $(TOOLS)/podToHtml.pl
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
 .PRECIOUS: $(COMMON_DIR)/%.html %.html
 
-##################################################### DB files
+#---------------------------------------------------------------
+# DB files
 
-$(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf 
+$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.edf 
 	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $*.VAR $<
 	@$(REPLACEVAR) < $*.VAR > $@
 	@$(RM) $*.VAR
 
-$(COMMON_DIR)/%.db$(RAW): %$(SUBST_SUFFIX)
+$(COMMON_DIR)/%.db: %$(SUBST_SUFFIX)
 	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
-	@$(RM) $@ $*.tmp
-	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > $*.tmp
-	$(MV) $*.tmp $@
+	@$(RM) $(notdir $@)
+	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) -S$< $(TEMPLATE_FILENAME)
+	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db$(RAW): ../%$(SUBST_SUFFIX)
+$(COMMON_DIR)/%.db: ../%$(SUBST_SUFFIX)
 	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
-	@$(RM) $@ $*.tmp
-	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > $*.tmp
-	$(MV) $*.tmp $@
+	@$(RM) $(notdir $@)
+	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) -S$< $(TEMPLATE_FILENAME)
+	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db$(RAW): %.template
+$(COMMON_DIR)/%.db: %$(TEMPL_SUFFIX)
 	$(ECHO) "Inflating database from $<"
-	@$(RM) $@ $*.tmp
-	$(MSI) $(DBFLAGS) $< > $*.tmp
-	$(MV) $*.tmp $@
+	@$(RM) $(notdir $@)
+	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db$(RAW): ../%.template
+$(COMMON_DIR)/%.db: ../%$(TEMPL_SUFFIX)
 	$(ECHO) "Inflating database from $<"
-	@$(RM) $@ $*.tmp
-	$(MSI) $(DBFLAGS) $< > $*.tmp
-	$(MV) $*.tmp $@
+	@$(RM) $(notdir $@)
+	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/%.acf: %.acs
 	$(ECHO) "Creating acf file $@"
@@ -491,30 +500,13 @@ $(COMMON_DIR)/%.acf: ../%.acs
 
 .PRECIOUS: $(COMMON_DIR)/%.acf
 
-# dbst based database optimization
-ifeq '$(DB_OPT)' 'YES'
-
-$(COMMON_DIR)/%.db$(RAW): ../%.db
-	@$(RM) $@
-	$(CP) $< $@
-
-$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
-	$(ECHO) "Optimizing database $@"
-	@$(RM) $@
-	$(DBST) . $< -d > $@
-
-.PRECIOUS: $(COMMON_DIR)/%.db
-.PRECIOUS: $(DB:%=$(COMMON_DIR)/%$(RAW))
-else
-
 $(INSTALL_DB)/%: %
-	$(ECHO) "Installing db file $@"
+	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_DB)/%: ../%
-	$(ECHO) "Installing db file $@"
+	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
-endif
 
 $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
 	$(ECHO) "Installing created db file $@"
@@ -530,8 +522,8 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 .PRECIOUS: $(COMMON_DIR)/%.edf
 .PRECIOUS: $(COMMON_DBS)
 
-##################################################### register record,device,driver support
-
+#---------------------------------------------------------------
+# register record,device,driver support
 
 %_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd
 	@$(RM) $@
@@ -547,4 +539,3 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
 
-##################################################### END OF FILE

configure/RULES.ioc

@@ -18,16 +18,17 @@ ifeq ($(filter $(ARCH),$(BUILD_ARCHS)),$(ARCH))
     buildInstall$(DIVIDER)$(ARCH) buildInstall: $(TARGETS)
 
     clean$(DIVIDER)$(ARCH) clean:
-	$(RM) cdCommands envPaths dllPath.bat
+	$(RM) cdCommands envPaths dllPath.bat relPaths.sh
 else
     buildInstall$(DIVIDER)$(ARCH) buildInstall:
     clean$(DIVIDER)$(ARCH) clean:
 endif
 
-cdCommands envPaths dllPath.bat: $(wildcard $(TOP)/configure/RELEASE*) \
+cdCommands envPaths dllPath.bat relPaths.sh: \
+    $(wildcard $(TOP)/configure/RELEASE*) \
     $(wildcard $(TOP)/configure/CONFIG_SITE*) $(INSTALL_BIN)
 	$(CONVERTRELEASE) -a $(ARCH) -t $(IOCS_APPL_TOP) $@
 
 realclean:
-	$(RM) cdCommands envPaths dllPath.bat
+	$(RM) cdCommands envPaths dllPath.bat relPaths.sh
 

configure/RULES_ARCHS

@@ -17,57 +17,54 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += browse
 ACTIONS += runtests tapfiles
-#ACTIONS += rebuild
 
-actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
-archPart = $(word 2, $(subst $(DIVIDER), ,$@))
+actionArchTargets = $(foreach action, $(ACTIONS), \
+    $(addprefix $(action)$(DIVIDER), $(BUILD_ARCHS)))
 
-actionArchTargets = $(foreach x, $(ACTIONS),\
-		$(foreach arch,$(BUILD_ARCHS), $(x)$(DIVIDER)$(arch)))
+cleanArchTargets = $(addprefix clean$(DIVIDER), $(BUILD_ARCHS))
 
-cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
+buildDirs = $(addprefix O., $(BUILD_ARCHS))
 
-buildDirs = $(addprefix O.,$(BUILD_ARCHS))
+# Include <top>/cfg/DIR_RULES* files from tops defined in RELEASE* files
+# Do this here so they can add ACTIONS
+#
+RELEASE_CFG_DIR_RULES = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/cfg/DIR_RULES*))
+ifneq ($(RELEASE_CFG_DIR_RULES),)
+  include $(RELEASE_CFG_DIR_RULES)
+endif
 
-#*************************************************************************
-# Create epics_host_arch dependancies for GNU make -j option
-# Only works with GNU make 3.81 or later (uses eval function)
+# Create EPICS_HOST_ARCH dependancies for GNU make -j option.
 # Needed in dirs where EPICS_HOST_ARCH build creates a tool used in 
 # cross arch builds
 
 CROSS_ARCHS += $(CROSS1) $(CROSS2)
 
 define DEP_template
-$(2): $$(EPICS_HOST_ARCH)
-$(1)$$(DIVIDER)$(2): $(1)$$(DIVIDER)$$(EPICS_HOST_ARCH) O.$(2)
+  $(2) : $(EPICS_HOST_ARCH)
+  $(1)$(DIVIDER)$(2) : $(1)$(DIVIDER)$(EPICS_HOST_ARCH) O.$(2)
 endef
-
-ifeq ($(MAKE_VERSION),3.81)
-   $(foreach action, $(ACTIONS), $(foreach arch,\
-      $(CROSS_ARCHS),$(eval $(call DEP_template,$(action),$(arch)))))
-else
-ifeq ($(findstring j,$(MAKEFLAGS)),j)
-   $(foreach action, $(ACTIONS), $(foreach arch,\
-      $(CROSS_ARCHS),$(eval $(call DEP_template,$(action),$(arch)))))
-endif
-endif
-#*************************************************************************
+$(foreach action, $(ACTIONS), \
+    $(foreach arch, $(CROSS_ARCHS), \
+        $(eval $(call DEP_template,$(action),$(arch)))))
 
 # Allows rebuild to work with parallel builds option, -j.
 ifeq (rebuild,$(filter rebuild,$(MAKECMDGOALS)))
-$(buildDirs) O.Common : clean
-rebuild: install
+  $(buildDirs) O.Common : clean
+  rebuild : install
 endif
 
+archPart = $(word 2, $(subst $(DIVIDER), ,$@))
+actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
 $(actionArchTargets) : $(buildDirs) O.Common
-	$(MAKE) -C O.$(archPart) -f ../Makefile TOP=$(TOP)/.. T_A=$(archPart) $(actionPart)
+	$(MAKE) -C O.$(archPart) -f ../Makefile TOP=$(TOP)/.. \
+	    T_A=$(archPart) $(actionPart)
 
 $(BUILD_ARCHS) : % : O.% O.Common
 	$(MAKE) -C O.$@ -f ../Makefile TOP=$(TOP)/.. T_A=$@
 
-$(ACTIONS):%: $(foreach arch, $(BUILD_ARCHS), %$(DIVIDER)$(arch))
+$(ACTIONS) : % : $(foreach arch, $(BUILD_ARCHS), %$(DIVIDER)$(arch))
 
 $(buildDirs):
 	$(PERL) $(TOOLS)/makeMakefile.pl $@ $(TOP)/..
@@ -75,24 +72,27 @@ $(buildDirs):
 O.Common:
 	$(MKDIR) O.Common
 
+# Clean rules
 #
-# special clean rule
-#
-clean : archs_common_clean
+clean: archsCommonClean
 
-archs_common_clean :
-	$(RMDIR) $(addprefix O.,$(BUILD_ARCHS)) O.Common
+archsCommonClean:
+	$(RMDIR) $(buildDirs) O.Common
 
-archclean :
-	$(RMDIR) $(addprefix O.,$(BUILD_ARCHS))
+archclean:
+	$(RMDIR) $(buildDirs)
 
-$(cleanArchTargets) :
+$(cleanArchTargets):
 	$(RMDIR) O.$(archPart)
 
-realclean :
+realclean:
 	$(RMDIR) O.*
 
 .PHONY : $(actionArchTargets)
 .PHONY : $(cleanArchTargets)
-.PHONY : $(BUILD_ARCHS) rebuild arch_common_clean
+.PHONY : $(BUILD_ARCHS) rebuild archsCommonClean
 .PHONY : $(ACTIONS) clean realclean archclean host all
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_BUILD

@@ -81,6 +81,8 @@ else
 host:
 endif
 
+-include $(CONFIG)/RULES_FILE_TYPE
+
 -include $(CONFIG)/RULES.Db
 
 #---------------------------------------------------------------
@@ -94,7 +96,7 @@ include $(CONFIG)/RULES_TARGET
 # Read dependency files
 
 ifneq (,$(strip $(HDEPENDS_FILES)))
-$(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): $(COMMON_INC)
+$(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): | $(COMMON_INC)
 -include $(HDEPENDS_FILES)
 endif
 
@@ -122,8 +124,6 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \
   $(LOADABLE_SHRLIBNAME) $(INSTALL_LOADABLE_SHRLIBS)
 
 
--include $(CONFIG)/RULES_FILE_TYPE
-
 #	Main targets
 
 install: buildInstall 
@@ -166,20 +166,9 @@ build_clean:
 ifdef RES
 	@$(RM) *$(RES)
 endif
-ifdef BAF
-	@$(RM) $(PROD_BAF) $(LIB_BAF)
-endif
-ifdef BOF
-	@$(RM) *$(BOF)
-endif
-
-# WIN95/NT source browser
-#ifdef BAF
-browse: $(LIB_BAF) $(PROD_BAF)
-#endif
 
 $(DIRECTORY_TARGETS) :
-	$(MKDIR) -p $@
+	$(MKDIR) $@
 
 $(PRODNAME): $(INSTALL_LIB_INSTALLS)
 
@@ -226,29 +215,24 @@ $(TESTPRODNAME) $(PRODNAME): %$(EXE):
 %.o : %.cc
 %.o : %.cpp
 
-%$(OBJ): %.c $(COMMON_INC) $(INSTALL_INC)
+# Include files are order-only prerequisites for compilation:
+%$(OBJ): %.c | $(COMMON_INC) $(INSTALL_INC)
 	@$(RM) $@
 	$(COMPILE.c) -c $<
 
-%$(OBJ): %.cc $(COMMON_INC) $(INSTALL_INC)
+%$(OBJ): %.cc | $(COMMON_INC) $(INSTALL_INC)
 	@$(RM) $@
 	$(COMPILE.cpp) -c $<
 
-%$(OBJ): %.cpp $(COMMON_INC) $(INSTALL_INC)
+%$(OBJ): %.cpp | $(COMMON_INC) $(INSTALL_INC)
 	@$(RM) $@
 	$(COMPILE.cpp) -c $<
 
-# WIN95/NT resource compiler
+# Windows resource compiler
 %$(RES): %.rc
 	@$(RM) $@
 	$(RCCMD)
 
-# WIN95/NT source browser
-%.bsc: %.sbr
-	$(ECHO) "building source browser archive $@"
-	@$(RM) $@
-	$(BAFCMD) $<
-
 YACCOPT ?= $($*_YACCOPT)
 #
 # rename the y.tab.h file only if we
@@ -271,22 +255,12 @@ YACCOPT ?= $($*_YACCOPT)
 	@$(RM) $@
 	$(MV) $*.yy.c $@
 
-# WIN95/NT source browser
-ifdef BAF
-
-$(LIB_BAF): $(addsuffix $(BOF),$(basename $(LIBRARY_LD_OBJS)))
-	$(ECHO) "Building source browser archive $@"
-	@$(RM) $@
-	$(BAFCMD) $^
-
-endif
-
 #---------------------------------------------------------------
 # Libraries, shared/DLL and stubs
 
 $(LIBNAME) $(TESTLIBNAME): $(LIBRARY_OBJS)
 
-$(LIBNAME) $(TESTLIBNAME): $(LIB_PREFIX)%$(LIB_SUFFIX):
+$(filter-out $(DLLSTUB_LIBNAME) $(TESTDLLSTUB_LIBNAME), $(LIBNAME) $(TESTLIBNAME)): $(LIB_PREFIX)%$(LIB_SUFFIX):
 	@$(RM) $@
 	$(ARCMD)
 ifneq ($(strip $(RANLIB)),)
@@ -296,11 +270,13 @@ endif # RANLIB
 $(SHRLIBNAME) $(DLLSTUB_LIBNAME) $(TESTSHRLIBNAME) $(TESTDLLSTUB_LIBNAME): \
     $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
 
+$(DLLSTUB_LIBNAME): $(SHRLIBNAME);
 $(SHRLIBNAME): $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
+$(TESTDLLSTUB_LIBNAME): $(TESTSHRLIBNAME);
 $(TESTSHRLIBNAME): $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
@@ -324,7 +300,7 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(NM) $<  > $@
 
-%_ctdt.c: %.nm
+%_ctdt.c: %.nm $(TOOLS)/munch.pl
 	@$(RM) $@
 	$(PERL) $(TOOLS)/munch.pl -o $@ $<
 
@@ -332,9 +308,12 @@ $(MUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
 	@$(RM) $@
 	$(MUNCH_CMD)
 
-$(OBJLIB_MUNCHNAME): %.munch: %_ctdt$(OBJ) %$(OBJ)
+#---------------------------------------------------------------
+# GeSys modules for RTEMS
+$(MODNAME): %$(MODEXT): %$(EXE)
+	@echo "Building module $@"
 	@$(RM) $@
-	$(MUNCH_CMD)
+	$(LINK.mod)
 
 #---------------------------------------------------------------
 # Automated testing
@@ -354,7 +333,7 @@ tapfiles: $(TESTSCRIPTS) $(TAPFILES)
 
 # A .tap file is the output from running the associated test script
 %.tap: %.t
-	-HARNESS_ACTIVE=1 $(PERL) $< > $@
+	-$(PERL) $< -tap > $@
 
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
@@ -363,10 +342,18 @@ tapfiles: $(TESTSCRIPTS) $(TAPFILES)
 
 # Test programs (.t files) must be written in Perl.
 # Generate a perl program to exec the real test binary.
-%.t: %$(EXE)
+%.t: %$(EXE) $(TOOLS)/makeTestfile.pl
 	@$(RM) $@
 	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
 
+#---------------------------------------------------------------
+# Generate header with version number from VCS
+
+ifneq ($(GENVERSION),)
+$(COMMON_DIR)/$(GENVERSION): FORCE
+	$(GENVERSIONHEADER) -t $(TOP) -N $(GENVERSIONMACRO) -V "$(GENVERSIONDEFAULT)" $@
+endif
+
 #---------------------------------------------------------------
 # Install rules for BIN_INSTALLS and LIB_INSTALLS
 
@@ -500,7 +487,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all host inc build install clean rebuild buildInstall build_clean
-.PHONY: runtests tapfiles checkRelease warnRelease noCheckRelease
+.PHONY: runtests tapfiles checkRelease warnRelease noCheckRelease FORCE
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/RULES_DIRS

@@ -15,28 +15,32 @@ ARCHS += $(BUILD_ARCHS)
 ACTIONS += inc build install buildInstall clean realclean archclean
 ACTIONS += runtests tapfiles
 
-dirPart = $(join $(dir $@), $(word 1, $(subst $(DIVIDER), ,$(notdir $@))))
-
-actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$(notdir $@))), \
- $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$(notdir $@))))) 
-
 dirActionArchTargets = $(foreach dir, $(DIRS), \
-                       $(foreach action, $(ACTIONS),\
-                       $(foreach arch, $(ARCHS), \
-                       $(dir)$(DIVIDER)$(action)$(DIVIDER)$(arch))))
+    $(foreach action, $(ACTIONS), \
+        $(foreach arch, $(ARCHS), \
+            $(dir)$(DIVIDER)$(action)$(DIVIDER)$(arch))))
 dirArchTargets += $(foreach dir, $(DIRS), \
-                  $(foreach arch, $(ARCHS),\
-                  $(dir)$(DIVIDER)$(arch)))
+    $(foreach arch, $(ARCHS), \
+        $(dir)$(DIVIDER)$(arch)))
 dirActionTargets += $(foreach dir, $(DIRS), \
-                    $(foreach action, $(ACTIONS),\
-                    $(dir)$(DIVIDER)$(action)))
-actionArchTargets = $(foreach action, $(ACTIONS),\
-                    $(foreach arch, $(ARCHS), \
-                    $(action)$(DIVIDER)$(arch)))
+    $(foreach action, $(ACTIONS), \
+        $(dir)$(DIVIDER)$(action)))
+actionArchTargets = $(foreach action, $(ACTIONS), \
+    $(foreach arch, $(ARCHS), \
+        $(action)$(DIVIDER)$(arch)))
 
 all: install
 host: install$(DIVIDER)$(EPICS_HOST_ARCH)
 
+# Include <top>/cfg/DIR_RULES* files from tops defined in RELEASE* files
+# Do this here so they can add ACTIONS
+#
+RELEASE_CFG_DIR_RULES = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/cfg/DIR_RULES*))
+ifneq ($(RELEASE_CFG_DIR_RULES),)
+  include $(RELEASE_CFG_DIR_RULES)
+endif
+
 # Allows rebuild to work with parallel builds option, -j.
 ifeq (rebuild,$(filter rebuild,$(MAKECMDGOALS)))
 $(foreach dir, $(DIRS), $(dir)$(DIVIDER)install): \
@@ -49,30 +53,42 @@ endif
 define DEP_template1
 $(1): $$($(1)_DEPEND_DIRS)
 endef
-$(foreach dir, $(DIRS),$(eval $(call DEP_template1,$(dir))))
+$(foreach dir, $(DIRS), \
+    $(eval $(call DEP_template1,$(dir))))
 
 define DEP_template2
-$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
+$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS), \
+    $$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
 endef
-$(foreach action, $(ACTIONS), $(foreach dir, $(DIRS),$(eval $(call DEP_template2,$(dir),$(action)))))
+$(foreach action, $(ACTIONS), \
+    $(foreach dir, $(DIRS), \
+        $(eval $(call DEP_template2,$(dir),$(action)))))
 
 define DEP_template3
-$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
+$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS), \
+    $$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
 endef
-$(foreach arch, $(ARCHS), $(foreach dir, $(DIRS),$(eval $(call DEP_template3,$(dir),$(arch)))))
+$(foreach arch, $(ARCHS), \
+    $(foreach dir, $(DIRS), \
+        $(eval $(call DEP_template3,$(dir),$(arch)))))
 
 define DEP_template4
-$(1)$$(DIVIDER)$(2)$$(DIVIDER)$(3) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2)$$(DIVIDER)$(3),$$(ddir)))
+$(1)$$(DIVIDER)$(2)$$(DIVIDER)$(3) : $$(foreach ddir, $$($(1)_DEPEND_DIRS), \
+    $$(addsuffix $$(DIVIDER)$(2)$$(DIVIDER)$(3),$$(ddir)))
 endef
-$(foreach arch, $(ARCHS), $(foreach action, $(ACTIONS), $(foreach dir, $(DIRS), \
-              $(eval $(call DEP_template4,$(dir),$(action),$(arch))))))
-
+$(foreach arch, $(ARCHS), \
+    $(foreach action, $(ACTIONS), \
+        $(foreach dir, $(DIRS), \
+            $(eval $(call DEP_template4,$(dir),$(action),$(arch))))))
 
+dirPart = $(join $(dir $@), $(word 1, $(subst $(DIVIDER), ,$(notdir $@))))
+actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$(notdir $@))), \
+   $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$(notdir $@))))) 
 $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
 	$(MAKE) -C $(dirPart) $(actionArchPart)
 
 $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
-	$(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
+    $(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
 
 .PHONY : $(DIRS) all host rebuild
 .PHONY : $(ARCHS) $(ACTIONS)
@@ -80,3 +96,7 @@ $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
 .PHONY : $(dirActionArchTargets)
 .PHONY : $(actionArchTargets)
 
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_EXPAND

@@ -2,6 +2,9 @@
 
 vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)
 
+#---------------------------------------------------------------
+# Variable expansion
+
 # Default settings
 EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl
 
@@ -24,3 +27,39 @@ expand_clean:
 	@$(RM) $(EXPANDED)
 
 .PHONY : expand_clean
+
+#---------------------------------------------------------------
+# Assemblies (files assembled from snippets)
+
+ASSEMBLE_TOOL ?= $(PERL) $(TOOLS)/assembleSnippets.pl
+
+define COMMON_ASSEMBLY_template
+$1_SNIPPETS += $$(foreach dir, .. $$(SRC_DIRS), \
+    $$(wildcard $$(dir)/$$($1_PATTERN)))
+$(COMMON_DIR)/$1: $$($1_SNIPPETS)
+	$(ECHO) "Assembling common file $$@ from snippets"
+	@$(RM) $1
+	$(ASSEMBLE_TOOL) -o $1 $$^
+	@$(MV) $1 $$@
+endef
+$(foreach asy, $(COMMON_ASSEMBLIES), \
+    $(eval $(call COMMON_ASSEMBLY_template,$(strip $(asy)))))
+
+define ASSEMBLY_template
+$1_SNIPPETS += $$(foreach dir, .. $$(SRC_DIRS), \
+    $$(wildcard $$(dir)/$$($1_PATTERN)))
+$1: $$($1_SNIPPETS)
+	$(ECHO) "Assembling file $$@ from snippets"
+	@$(RM) $$@
+	$(ASSEMBLE_TOOL) -o $$@ $$^
+endef
+$(foreach asy, $(ASSEMBLIES), \
+    $(eval $(call ASSEMBLY_template,$(strip $(asy)))))
+
+define ASSEMBLY_DEP_template
+$1$(DEP):
+	@echo $1: > $$@
+endef
+$(foreach asy, $(sort $(COMMON_ASSEMBLIES) $(ASSEMBLIES)), \
+    $(eval $(call ASSEMBLY_DEP_template,$(strip $(asy)))))
+

configure/RULES_FILE_TYPE

@@ -6,27 +6,27 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+#
 # $Revision-Id$
 #
 
-#---------------------------------------------------------------
-# Include <top>/configure/RULES_BUILD definitions from tops defined in RELEASE* files
+# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files
 #
-RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/configure/RULES_BUILD))
+RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/configure/RULES_BUILD))
 ifneq ($(RELEASE_RULES_BUILDS),)
   include $(RELEASE_RULES_BUILDS)
 endif
 
-#---------------------------------------------------------------
-# Include <top>/cfg/RULES* definitions from tops defined in RELEASE* files
+# Include <top>/cfg/RULES* files from tops defined in RELEASE* files
 #
-RELEASE_CFG_RULES = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/cfg/RULES*))
+RELEASE_CFG_RULES = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/cfg/RULES*))
 ifneq ($(RELEASE_CFG_RULES),)
   include $(RELEASE_CFG_RULES)
 endif
 
-#---------------------------------------------------------------
-# If this is not BASE then include TOP/configure/RULES_BUILD definitions
+# If this is not BASE then include <TOP>/configure/RULES_BUILD
 #
 ifeq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
 TOP_RULES_BUILDS = $(wildcard $(TOP)/configure/RULES_BUILD)
@@ -35,40 +35,42 @@ ifneq ($(TOP_RULES_BUILDS),)
 endif
 endif
 
-#---------------------------------------------
-# Include our own $(INSTALL_CFG)/RULES* definitions
+# Include our own $(INSTALL_CFG)/RULES* files
 #
 TOP_CFG_RULES = $(wildcard $(INSTALL_CFG)/RULES*)
 ifneq ($(TOP_CFG_RULES),)
   include $(TOP_CFG_RULES)
 endif
 
-#---------------------------------------------------------------
-
+# Rules to install each FILE_TYPE
+#
 define FILE_TYPE_template
-
-$(1) += $$(if $$(strip $$($(1)_$$(OS_CLASS))),$$(subst -nil-,,$$($(1)_$$(OS_CLASS))), $$($(1)_DEFAULT))
-
+$(1) += $$(if $$(strip $$($(1)_$(OS_CLASS))), \
+    $$(subst -nil-,,$$($(1)_$(OS_CLASS))), \
+    $$($(1)_DEFAULT))
 INSTALLS_$(1) = $$($(1):%=$$(INSTALL_$(1))/%)
 
 $$(INSTALL_$(1))/%: ../%
 	$(ECHO) "Installing $(1) file $$@"
 	@$$(INSTALL) -d -m  $$(INSTALL_PERMISSIONS) $$< $$(dir $$@)
-
 $$(INSTALL_$(1))/%: %
 	$(ECHO) "Installing $(1) file $$@"
 	@$$(INSTALL) -d -m  $$(INSTALL_PERMISSIONS) $$< $$(dir $$@)
 
-buildInstall : $$(INSTALLS_$(1))
-
+buildInstall: $$(INSTALLS_$(1))
 endef
+$(foreach type, $(FILE_TYPE), \
+    $(eval $(call FILE_TYPE_template,$(strip $(type)))))
 
-$(foreach type, $(FILE_TYPE),$(eval $(call FILE_TYPE_template,$(strip $(type)))))
-#---------------------------------------------
-
+# Cleaning FILE_TYPE files
+#
 clean: file_type_clean
 
 file_type_clean:
 	@$(RM) $(foreach type, $(FILE_TYPE), $($(type)))
 
 .PHONY : file_type_clean
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_TOP

@@ -4,17 +4,17 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 #
-#  $Revision-Id$
+# $Revision-Id$
 #
 
 include $(CONFIG)/RULES_DIRS
 
 distclean: realclean cvsclean realuninstall
 
-CVSCLEAN=$(firstword $(wildcard $(TOOLS)/cvsclean.pl $(TOP)/src/tools/cvsclean.pl))
+CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
 cvsclean:
 	$(PERL) $(CVSCLEAN)
 
@@ -22,16 +22,14 @@ realuninstall: uninstallDirs
 	$(RMDIR) $(INSTALL_LOCATION_BIN)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)
 
-UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)
-UNINSTALL_DIRS += $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB)
-UNINSTALL_DIRS += $(DIRECTORY_TARGETS)
+UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
+    $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB) $(DIRECTORY_TARGETS)
 uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
 
 uninstall: archuninstall uninstallDirs
 
-archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
-	@$(MAKE) -f Makefile cleandirs
+archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) | cleandirs
 
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
 uninstall$(DIVIDER)%:
@@ -39,14 +37,14 @@ uninstall$(DIVIDER)%:
 	$(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart)
 
 cleandirs:
+	@$(NOP)
 ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
 	$(RMDIR) $(INSTALL_LOCATION_BIN)
 endif
 ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)
 endif
-	@echo
-# The echo above stops a "nothing to be done for cleandirs" message
+
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."
@@ -82,3 +80,10 @@ help:
 .PHONY: cleandirs distclean cvsclean realuninstall archuninstall uninstallDirs
 .PHONY: uninstall help
 
+# Include <top>/cfg/TOP_RULES* files from tops defined in RELEASE* files
+#
+RELEASE_CFG_TOP_RULES = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/cfg/TOP_RULES*))
+ifneq ($(RELEASE_CFG_TOP_RULES),)
+  include $(RELEASE_CFG_TOP_RULES)
+endif

configure/os/CONFIG.Common.RTEMS

@@ -49,27 +49,31 @@ RANLIB := $(RTEMS_TOOLS)/bin/$(RANLIB)
 VALID_BUILDS = Ioc
 
 #--------------------------------------------------
-# The RTEMS Makefiles redefine several macros, so we have to go
-# through the following contortions to get the EPICS flags back.
-CFLAGS = $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
- $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
- $(CODE_CFLAGS) $(STATIC_CFLAGS)  $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
+# The RTEMS Makefiles redefine several macros, so we have to
+# reset them to the proper EPICS values, from CONFIG_COMMON
+CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS)\
+ $(DEBUG_CFLAGS) $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS)\
+ $(USR_CFLAGS) $(CMD_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS)\
+ $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-CXXFLAGS = $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
- $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
- $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS)\
- $(LIBRARY_SRC_CFLAGS)
+CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS)\
+ $(DEBUG_CXXFLAGS) $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)\
+ $(USR_CXXFLAGS) $(CMD_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS)\
+ $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
- $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)\
- $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
+ $(POSIX_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS)\
+ $($(BUILD_CLASS)_LDFLAGS) $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
-LDLIBS = \
- $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)
+LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)\
+ $(GNU_LDLIBS_$(GNU))
 
-CPPFLAGS += $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\
-$(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
- $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
+CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
+ $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS)\
+ $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
+ $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
+
+ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
 
 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way
@@ -81,6 +85,8 @@ OPT_CXXFLAGS_YES = $(CFLAGS_OPTIMIZE_V)
 OPT_CFLAGS_NO    = $(CFLAGS_DEBUG_V)
 OPT_CXXFLAGS_NO  = $(CFLAGS_DEBUG_V)
 
+MODEXT=.obj
+
 #--------------------------------------------------
 # operating system class (include/os/<os_class>)
 OS_CLASS = RTEMS
@@ -95,6 +101,42 @@ OP_SYS_LDFLAGS += $(CPU_CFLAGS) -u Init \
                  $(PROJECT_RELEASE)/lib/no-signal.rel \
                  $(PROJECT_RELEASE)/lib/no-rtmon.rel
 
+MOD_SYS_LDFLAGS += $(CPU_CFLAGS) -Wl,-r -nostdlib
+
+# Do not link against libraries which are part of the Generic Image
+GESYS_LIBS += -lgcc
+GESYS_LIBS += -lc -lm -lrtemscpu -lrtemsbsp -lrtems++ -lbspExt
+GESYS_LIBS += -lcexp -ltecla_r -lspencer_regexp -lpmelf -lpmbfd
+GESYS_LIBS += -lnfs -ltelnetd -lrtems-gdb-stub
+
+# While not part of the Generic Image it provides symbols which
+# would conflict.
+GESYS_LIBS += -lrtemsCom
+
+#--------------------------------------------------
+# Options for building GeSys loadable objects
+
+MODNAME_YES = $(PRODNAME:%$(EXE)=%$(MODEXT))
+MODNAME += $(MODNAME_$(USE_GESYS))
+PRODTARGETS += $(MODNAME)
+BIN_INSTALLS += $(MODNAME)
+
+# changes to LDFLAGS in CONFIG_COMMON and LINK.cpp in CONFIG.Common.UnixCommon
+# should be reflected here with the following exceptions
+#
+# replace OP_SYS_LDFLAGS with MOD_SYS_LDFLAGS
+# replace PROD_LDLIBS with MOD_LDLIBS
+# remove STATIC_LDFLAGS
+
+MOD_LDLIBS = $(filter-out $(GESYS_LIBS),$(PROD_LDLIBS))
+
+MOD_LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
+ $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(MOD_SYS_LDFLAGS) $($(BUILD_CLASS)_LDFLAGS)\
+ $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
+
+LINK.mod = $(CCC) -o $@ $(PRODDIR_LDFLAGS) $(MOD_LDFLAGS)
+LINK.mod += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(MOD_LDLIBS)
+
 #--------------------------------------------------
 # RTEMS has neither shared libraries nor dynamic loading
 STATIC_BUILD=YES

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -1,5 +1,5 @@
 #
-# CONFIG.Common.RTEMS-mvme3100
+# CONFIG.Common.RTEMS-mvme2100
 # $Revision-Id$
 # Author: W. Eric Norum <wenorum@lbl.gov>
 #

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -22,4 +22,6 @@ define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef
 
+OP_SYS_LDLIBS += -lbspExt
+
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-pc386

@@ -12,7 +12,7 @@ MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
-	$(PROJECT_RELEASE)/build-tools/bin2boot $@ 0x00097E00 \
+	$(BIN2BOOT) $@ 0x00097E00 \
 		$(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 temp.bin 0x00100000 0
 	rm -f temp.bin
 endef

configure/os/CONFIG.Common.cygwin-x86

@@ -26,14 +26,14 @@ POSIX_LDLIBS += -lpthread
 ARCH_DEP_CFLAGS += -m32
 ARCH_DEP_LDFLAGS += -m32
 
-# Compiler defines _X86_ 1
-# Compiler defines __MSVCRT__ 1
+# 32-bit compiler defines _X86_ 1
 # Compiler defines __CYGWIN__ 1
-# Compiler defines __CYGWIN32__ 1
+# 32-bit compiler defines __CYGWIN32__ 1
 # Compiler defines __unix__ 1
 # Compiler defines __unix 1
 # Compiler defines unix 1
 
+# This macro now deprecated, use __CYGWIN__ in the future
 OP_SYS_CPPFLAGS += -DCYGWIN32
 
 EXE = .exe

configure/os/CONFIG.Common.ios-x86

@@ -13,10 +13,5 @@ IOS_PLATFORM = iPhoneSimulator
 OP_SYS_CFLAGS += -mios-simulator-version-min=$(IOS_DEPLOYMENT_TARGET)
 OP_SYS_LDFLAGS += -mios-simulator-version-min=$(IOS_DEPLOYMENT_TARGET)
 
-#
-# Architecture-specific information
-#
-ARCH_CLASS = i386
-
 # Include definitions common to all iOS targets
 include $(CONFIG)/os/CONFIG.Common.iosCommon

configure/os/CONFIG.Common.iosCommon

@@ -25,7 +25,7 @@ OS_CLASS = iOS
 #--------------------------------------------------
 # GNU and SDK directories
 GNU_DIR = $(PLATFORM_DIR)/Developer/usr
-SDK_DIR = $(PLATFORM_DIR)/Developer/SDKs/$(IOS_PLATFORM)$(IOS_VERSION).sdk
+SDK_DIR = $(PLATFORM_DIR)/Developer/SDKs/$(IOS_PLATFORM).sdk
 
 #-------------------------------------------------------
 # Build architecture flags
@@ -64,7 +64,7 @@ CC_CLANG  = clang
 CCC_CLANG = clang++
 CMPLR_CLASS_CLANG = clang
 
-CMPLR_CLASS = $(CMPLR_CLASS_$(COMPLER))
+CMPLR_CLASS = $(CMPLR_CLASS_$(COMPILER))
 
 # Convert the iOS platform to lowercase for passing to xcrun's sdk parameter
 XCRUN_SDK_BASE = $(shell echo $(IOS_PLATFORM) | tr A-Z a-z)

configure/os/CONFIG.Common.linux-arm

@@ -1,9 +1,7 @@
 # CONFIG.Common.linux-arm
 #
-# This file is maintained by the build community.
-#
 # Definitions for linux-arm target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-arm
+# Override these settings in CONFIG_SITE.Common.linux-arm
 #-------------------------------------------------------
 
 # Include definitions common to all Linux targets
@@ -11,26 +9,3 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
 ARCH_CLASS = arm
 
-ifeq ($(BUILD_CLASS),CROSS)
-    VALID_BUILDS = Ioc
-    GNU_TARGET = arm-linux
-
-    # prefix of compiler tools
-    CMPLR_SUFFIX =
-    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
-
-    # Provide a link-time path for shared libraries
-    SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
-    SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
-
-    # Provide a link-time path for products
-    PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
-    PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
-
-    # Provide a link-time path for readline 
-    RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib
-    RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-    RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-    RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-
-endif

configure/os/CONFIG.Common.linux-arm-debug

@@ -0,0 +1,13 @@
+# CONFIG.Common.linux-arm-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-arm with debug compiler flags
+# Override these settings in CONFIG_SITE.Common.linux-arm-debug
+#-------------------------------------------------------
+
+# Include definitions common to all linux-arm target archs
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+
+HOST_OPT=NO

configure/os/CONFIG.Common.linux-x86_64

@@ -12,9 +12,11 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
 ARCH_CLASS = x86_64
 
+ARCH_DEP_CFLAGS = $(GNU_TUNE_CFLAGS)
 ARCH_DEP_CPPFLAGS += -D_X86_64_
-ARCH_DEP_CFLAGS += -m64
-ARCH_DEP_LDFLAGS += -m64
+
+OP_SYS_CFLAGS += -m64
+OP_SYS_LDFLAGS += -m64
 
 # If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
 # e.g. x86_64-redhat-linux-gcc, put a GNU_TARGET definition in

configure/os/CONFIG.Common.vxWorksCommon

@@ -1,10 +1,9 @@
 # CONFIG.Common.vxWorksCommon
 #
 # $Revision-Id$
-# This file is maintained by the build community.
 #
 # Definitions for vxWorks target archs
-# Sites may override these definitions in CONFIG_SITE.Common.vxWorksCommon
+# Override these definitions in CONFIG_SITE.Common.vxWorksCommon
 # or CONFIG_SITE.<host>.vxWorksCommon
 #-------------------------------------------------------
 
@@ -66,8 +65,6 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
 
 # These are needed for vxWorks 6.x; the GNU toolset version number
 # is in the path to the compiler tools:
-VX_GNU_VERSION_5.4 = 2.95
-VX_GNU_VERSION_5.5 = 2.96
 VX_GNU_VERSION_6.0 = 3.3.2
 VX_GNU_VERSION_6.1 = 3.3.2
 VX_GNU_VERSION_6.2 = 3.3.2
@@ -83,30 +80,21 @@ VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
 
 #--------------------------------------------------
-# Fix WIND_BASE for vxWorks 6.x on linux
-# NB: We know the value of WIND_HOST_TYPE here, but not VXWORKS_VERSION
+# Fix old Linux WIND_HOST_TYPE
 ifeq ($(WIND_HOST_TYPE),x86-linux)
-  WIND_HOST_TYPE_5 = x86-linux
-  WIND_HOST_TYPE_6 = x86-linux2
-  WIND_HOST_TYPE = $(WIND_HOST_TYPE_$(VXWORKS_MAJOR_VERSION))
+  WIND_HOST_TYPE = x86-linux2
 endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR_5 = $(WIND_BASE)
-VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
-VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
+VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
 
-VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
-GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
 
 #--------------------------------------------------
 # vxWorks GNU directories
 
-GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
-GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
 
 #--------------------------------------------------
 # Wind River moved nm out of GNU_BIN in some versions
@@ -126,9 +114,7 @@ NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
 
 #--------------------------------------------------
 # A linker script is essential for munching from vxWorks 6.6 onwards
-# (i.e. with versions that use gcc 4.1.2 or later).  It can be used
-# with any vxWorks 5 or 6 version, but apparently should not be used
-# when compiling for 68K (which isn't supported in vxWorks 6 anyway)
+# (i.e. with versions that use gcc 4.1.2 or later).
 MUNCH_LDFLAGS_6 = -T $(VX_DIR)/target/h/tool/gnu/ldscripts/link.OUT
 MUNCH_LDFLAGS = $(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION))
 
@@ -143,11 +129,10 @@ export TOOL_FAMILY = GNU
 OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
 OP_SYS_CFLAGS += -fno-builtin
 
-# Fix for vxWorks 5 headers that use macros defined in vxWorks.h but
+# Fix for vxWorks headers that use macros defined in vxWorks.h but
 # which don't actually include vxWorks.h themselves, for example the
 # target/h/sys/stat.h file which uses ULONG.  This also stops dbDefs.h
-# from defining the OFFSET macro, which generates lots of warnings in
-# both vxWorks 5 and 6.
+# from defining the OFFSET macro, which generates lots of warnings.
 OP_SYS_INCLUDE_CPPFLAGS += -include $(VX_DIR)/target/h/vxWorks.h
 
 #--------------------------------------------------
@@ -160,7 +145,6 @@ OPT_CXXFLAGS_YES = -O2
 CODE_CFLAGS =
 #
 # For vxWorks versions before 6.3 we need this g++ compiler flag
-CODE_CXXFLAGS_5 = -fno-implicit-templates
 CODE_CXXFLAGS_6.0 = -fno-implicit-templates
 CODE_CXXFLAGS_6.1 = -fno-implicit-templates
 CODE_CXXFLAGS_6.2 = -fno-implicit-templates

configure/os/CONFIG.Common.win32-x86-mingw

@@ -36,6 +36,7 @@ ARCH_DEP_LDFLAGS += -m32
 OP_SYS_CPPFLAGS = -D_MINGW
 
 EXE = .exe
+RES = .coff
 
 # Use .o for static object files, .obj for shared library object files
 OBJ_NO  = .o

configure/os/CONFIG.UnixCommon.Common

@@ -11,7 +11,7 @@
 CP = cp
 MV = mv
 RM = rm -f
-MKDIR = mkdir
+MKDIR = mkdir -p
 RMDIR = rm -rf
 CAT = cat
 

configure/os/CONFIG.cygwin-x86.linux-arm

@@ -0,0 +1,33 @@
+# CONFIG.cygwin-x86.linux-arm
+#
+# Definitions for cywgin-x86 host - linux-arm target builds
+# Override these settings in CONFIG_SITE.cygwin-x86.linux-arm
+#-------------------------------------------------------
+
+VALID_BUILDS = Ioc
+GNU_TARGET = arm-linux
+
+# prefix of compiler tools
+CMPLR_SUFFIX =
+CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+
+# Provide a link-time path for shared libraries
+SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
+
+# Provide a link-time path for products
+PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
+
+# Provide a link-time path for readline 
+RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib
+RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+
+# Library flags
+STATIC_LDFLAGS_YES= -Wl,-Bstatic
+STATIC_LDFLAGS_NO= 
+STATIC_LDLIBS_YES= -Wl,-Bdynamic
+STATIC_LDLIBS_NO= 
+

configure/os/CONFIG.cygwin-x86_64.linux-arm

@@ -0,0 +1,7 @@
+# CONFIG.cygwin-x86_64.linux-arm
+#
+# Definitions for cygwin-x86_64 host - linux-arkm targets
+# Override these settings in CONFIG_SITE.cygwin-x86_64.linux-arm
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.cygwin-x86.linux-arm

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -68,13 +68,12 @@ GNU = NO
 #
 # Darwin shared libraries
 #
-SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
 SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
-       -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
-       -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \
-       -current_version $(SHRLIB_VERSION)
+    -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
+    $(addprefix -compatibility_version , $(SHRLIB_VERSION)) \
+    $(addprefix -current_version , $(SHRLIB_VERSION))
 SHRLIB_SUFFIX_BASE = .dylib
-SHRLIB_SUFFIX = .$(SHRLIB_VERSION)$(SHRLIB_SUFFIX_BASE)
+SHRLIB_SUFFIX = $(addprefix ., $(SHRLIB_VERSION))$(SHRLIB_SUFFIX_BASE)
 
 LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined suppress
 

configure/os/CONFIG.linux-386.Common

@@ -10,4 +10,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-486.Common

@@ -10,4 +10,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-586.Common

@@ -10,4 +10,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-686.Common

@@ -10,4 +10,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-arm-debug.Common

@@ -0,0 +1,12 @@
+# CONFIG.linux-arm-debug.Common
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-arm-debug host builds
+# Override these settings in CONFIG_SITE.linux-arm-debug.Common
+#-------------------------------------------------------
+
+#Include definitions common to linux-arm hosts
+include $(CONFIG)/os/CONFIG.linux-arm.Common
+

configure/os/CONFIG.linux-arm-debug.linux-arm-debug

@@ -0,0 +1,14 @@
+# CONFIG.linux-arm-debug.linux-arm-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-arm-debug host and target build
+# Override these settings in CONFIG_SITE.linux-arm-debug.linux-arm-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-arm.linux-arm
+
+# Removes -O optimization and adds -g compile option
+HOST_OPT=NO
+

configure/os/CONFIG.linux-arm.linux-arm-debug

@@ -0,0 +1,15 @@
+# CONFIG.linux-arm.linux-arm-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-arm host - linux-arm-debug target build
+# Override these settings in CONFIG_SITE.linux-arm.linux-arm-debug
+#-------------------------------------------------------
+
+-include $(CONFIG)/os/CONFIG.linux-arm.linux-arm
+-include $(CONFIG)/os/CONFIG_SITE.Common.linux-arm
+-include $(CONFIG)/os/CONFIG_SITE.linux-arm.linux-arm
+
+BUILD_CLASS=HOST
+HOST_OPT=NO

configure/os/CONFIG.linux-x86.Common

@@ -10,4 +10,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-x86.linux-arm

@@ -1,10 +1,31 @@
 # CONFIG.linux-x86.linux-arm
 #
 # Definitions for linux-x86 host - linux-arm target builds
-# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-arm
+# Override these settings in CONFIG_SITE.linux-x86.linux-arm
 #-------------------------------------------------------
 
-# Copied from x86.x86
+VALID_BUILDS = Ioc
+GNU_TARGET = arm-linux
+
+# prefix of compiler tools
+CMPLR_SUFFIX =
+CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+
+# Provide a link-time path for shared libraries
+SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
+
+# Provide a link-time path for products
+PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
+
+# Provide a link-time path for readline 
+RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib
+RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+
+# Library flags
 STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO= 
 STATIC_LDLIBS_YES= -Wl,-Bdynamic

configure/os/CONFIG.linux-x86.linux-arm-debug

@@ -0,0 +1,9 @@
+# CONFIG.linux-x86.linux-arm-debug
+#
+# Definitions for linux-x86 host - linux-arm-debug target builds
+# Override these settings in CONFIG_SITE.linux-x86.linux-arm-debug
+#-------------------------------------------------------
+
+# Include definitions for linux-arm targets
+include $(CONFIG)/os/CONFIG.linux-x86.linux-arm
+

configure/os/CONFIG.linux-x86.win32-x86-mingw

@@ -7,19 +7,18 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-RES = .coff
+# Add resource compiler
 RCCMD = $(GNU_BIN)/$(CMPLR_PREFIX)windres$(CMPLR_SUFFIX) $(INCLUDES) $< $@
 
-# No -fPIC avoids "-fPIC ignored for target (all code is position independent)"
+# Remove -fPIC flags, add out-implib
 SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS = -shared \
     -Wl,--out-implib,$(DLLSTUB_PREFIX)$*$(DLLSTUB_SUFFIX)
 LOADABLE_SHRLIB_LDFLAGS = -shared \
     -Wl,--out-implib,$(DLLSTUB_PREFIX)$*$(DLLSTUB_SUFFIX)
 
-# Override linking with gcc library from CONFIG.gnuCommon
+# Don't link with gcc library
 GNU_LDLIBS_YES =
 
 # Link with winsock2
 OP_SYS_LDLIBS = -lws2_32
-

configure/os/CONFIG.linux-x86.windows-x64-mingw

@@ -0,0 +1,28 @@
+# CONFIG.linux-x86.windows-x64-mingw
+#
+# Definitions for linux-x86 host windows-x64-mingw target builds
+# Override these definitions in CONFIG_SITE.linux-x86.windows-x64-mingw
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+# Add resource compiler
+RCCMD = $(GNU_BIN)/$(CMPLR_PREFIX)windres$(CMPLR_SUFFIX) $(INCLUDES) $< $@
+
+# Remove -fPIC flags, add out-implib
+SHRLIB_CFLAGS =
+SHRLIB_LDFLAGS = -shared \
+    -Wl,--out-implib,$(DLLSTUB_PREFIX)$*$(DLLSTUB_SUFFIX)
+LOADABLE_SHRLIB_LDFLAGS = -shared \
+    -Wl,--out-implib,$(DLLSTUB_PREFIX)$*$(DLLSTUB_SUFFIX)
+
+# No need to explicitly link with gcc library
+GNU_LDLIBS_YES =
+
+# Link with winsock2
+OP_SYS_LDLIBS = -lws2_32
+
+# Use static compiler-support libraries
+OP_SYS_LDFLAGS += -static-libgcc -static-libstdc++
+# There is no compiler flag for static libwinpthread

configure/os/CONFIG.linux-x86_64.Common

@@ -10,4 +10,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-x86_64.linux-arm

@@ -0,0 +1,8 @@
+# CONFIG.linux-x86_64.linux-arm
+#
+# Definitions for linux-x86_64 host - linux-arm target builds
+# Sites may override these definitions in CONFIG_SITE.linux-x86_64.linux-arm
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-arm
+

configure/os/CONFIG.linux-x86_64.linux-arm-debug

@@ -0,0 +1,8 @@
+# CONFIG.linux-x86_64.linux-arm-debug
+#
+# Definitions for linux-x86_64 host - linux-arm-debug target builds
+# Override these settings in CONFIG_SITE.linux-x86_64.linux-arm-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-arm
+

configure/os/CONFIG.linux-x86_64.windows-x64-mingw

@@ -0,0 +1,9 @@
+# CONFIG.linux-x86_64.windows-x64-mingw
+#
+# Definitions for linux-x86_64 host windows-x64-mingw target builds
+# Override these definitions in CONFIG_SITE.linux-x86_64.windows-x64-mingw
+#-------------------------------------------------------
+
+# Settings as for the linux-x86 host architecture
+include $(CONFIG)/os/CONFIG.linux-x86.windows-x64-mingw
+

configure/os/CONFIG.solaris-sparc64.Common

@@ -3,7 +3,7 @@
 # $Revision-Id$
 # This file is maintained by the build community.
 #
-# Definitions for solaris-sparc Sun compiler host builds
+# Definitions for solaris-sparc64 Sun compiler host builds
 # Sites may override these definitions in CONFIG_SITE.solaris-sparc64.Common
 #-------------------------------------------------------
 

configure/os/CONFIG.solaris-sparc64.solaris-sparc64

@@ -3,7 +3,7 @@
 # $Revision-Id$
 # This file is maintained by the build community.
 #
-# Definitions for solaris-sparc Sun compiler host - solaris-sparc Sun compiler target builds
+# Definitions for solaris-sparc64 compiler host - solaris-sparc64 compiler target builds
 # Sites may override these definitions in CONFIG_SITE.solaris-sparc64.solaris-sparc64
 #-------------------------------------------------------
 

configure/os/CONFIG.solarisCommon.solarisCommon

@@ -3,8 +3,8 @@
 # $Revision-Id$
 # This file is maintained by the build community.
 #
-# Definitions for solaris-sparc host - solaris-sparc target build
-# Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc
+# Definitions for solaris host - solaris target build
+# Sites may override these definitions in CONFIG_SITE.solarisCommon.solarisCommon
 #-------------------------------------------------------
 
 CMPLR_CLASS = solStudio

configure/os/CONFIG.win32-x86-mingw.Common

@@ -10,9 +10,6 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-# convert UNIX path to native path
-PATH_FILTER = $(subst /,\\,$(1))
-
 CP = $(PERL) -MExtUtils::Command -e cp
 MV = $(PERL) -MExtUtils::Command -e mv
 RM = $(PERL) -MExtUtils::Command -e rm_f

configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw

@@ -9,24 +9,29 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
+# Undo various things set by CONFIG.gnuCommon
+
 CMPLR_PREFIX =
 
+# Remove $(GNU_BIN)/ path
 CC  = $(CMPLR_PREFIX)gcc
 CCC = $(CMPLR_PREFIX)g++
 AR  = $(CMPLR_PREFIX)ar -rc
 LD  = $(CMPLR_PREFIX)ld -r
 RANLIB = $(CMPLR_PREFIX)ranlib
-RES = .coff
+
+# Add resource compiler
 RCCMD = $(CMPLR_PREFIX)windres $(INCLUDES) $< $@
 
-# No -fPIC avoids "-fPIC ignored for target (all code is position independent)"
+# Remove -fPIC flags, add out-implib
 SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS = -shared \
     -Wl,--out-implib,$(DLLSTUB_PREFIX)$*$(DLLSTUB_SUFFIX)
 LOADABLE_SHRLIB_LDFLAGS = -shared \
     -Wl,--out-implib,$(DLLSTUB_PREFIX)$*$(DLLSTUB_SUFFIX)
 
-# Override linking with gcc library from CONFIG.gnuCommon
+# Don't link with gcc library
 GNU_LDLIBS_YES =
 
+# Link with winsock2
 OP_SYS_LDLIBS = -lws2_32

configure/os/CONFIG.win32-x86.Common

@@ -7,9 +7,6 @@
 # Sites may override these definitions in CONFIG_SITE.win32-x86.Common
 #-------------------------------------------------------
 
-# convert UNIX path to native path
-PATH_FILTER = $(subst /,\\,$(1))
-
 CP = $(PERL) -MExtUtils::Command -e cp
 MV = $(PERL) -MExtUtils::Command -e mv
 RM = $(PERL) -MExtUtils::Command -e rm_f

configure/os/CONFIG.win32-x86.win32-x86

@@ -21,8 +21,6 @@ RCCMD = rc -l 0x409 $(INCLUDES) -fo $@ $<
 
 ARCMD = lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)
 
-BAFCMD = bscmake -nologo -o $@
-
 #
 # Configure OS vendor C compiler
 CC = cl
@@ -130,6 +128,7 @@ RANLIB=
 # -LTCG whole program optimization
 # -incremental:no full linking
 # -fixed:no generate relocatable code
+# -version:<major>.<minor> - only 2 components allowed, 0-65535 each
 # -debug generate debugging info
 LINK_OPT_FLAGS_YES = -LTCG -incremental:no -opt:ref \
     -release $(PROD_VERSION:%=-version:%)
@@ -150,8 +149,6 @@ WIN32=1
 EXE=.exe
 OBJ=.obj
 RES=.res
-BAF=.bsc
-BOF=.sbr
 
 #       Problem: MS Visual C++ does not recognize  *.cc as C++ source,
 #       so we do C++ compiles using the global flag -TP 
@@ -164,10 +161,10 @@ OP_SYS_CXXFLAGS = $(COMPILER_CXXFLAGS)
 #
 #	Files and flags needed to link DLLs (used in RULES_BUILD)
 #
+WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) \
+ $(USR_LDFLAGS) $(CMD_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
 
-WIN32_DLLFLAGS = -subsystem:windows -dll \
-    $(OPT_LDFLAGS) $(USR_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
-
+#
 # specify dll .def file only if it exists
 #
 DLL_DEF_FLAG = $(addprefix -def:,$(wildcard ../$(addsuffix .def,$*)))

configure/os/CONFIG.win32-x86.windows-x64

@@ -10,19 +10,9 @@
 -include $(CONFIG)/os/CONFIG.Common.win32-x86
 -include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
 
-ARCH_DEP_CPPFLAGS += /favor:blend
-#ARCH_DEP_CPPFLAGS += /Wp64
-
-#	/favor:blend	both AMD64 and INTEL64
-#	/favor:AMD64
-#	/favor:INTEL64 (new value)
-#	/favor:EN64T   (old value)
-
 OPT_LDFLAGS += /MACHINE:X64
 
 #	/MACHINE:X64
 #	/MACHINE:IA64  (Itanium)
 #	/MACHINE:X86
 
-#The following option does not work
-#ARCH_DEP_CPPFLAGS += /env x64

configure/os/CONFIG.windows-x64.windows-x64

@@ -9,14 +9,6 @@
 
 -include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
 
-ARCH_DEP_CPPFLAGS += /favor:blend
-#ARCH_DEP_CPPFLAGS += /Wp64
-
-#	/favor:blend	both AMD64 and INTEL64
-#	/favor:AMD64
-#	/favor:INTEL64 (new value)
-#	/favor:EN64T   (old value)
-
 OPT_LDFLAGS += /MACHINE:X64
 
 #	/MACHINE:X64

configure/os/CONFIG.windows-x64.windows-x64-debug

@@ -0,0 +1,12 @@
+# CONFIG.windows-x64.windows-x64-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for windows-x64 compiler host - windows-x64 debug compiler target builds
+# Sites may override these definitions in CONFIG_SITE.windows-x64.windows-x64-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+HOST_OPT=NO

configure/os/CONFIG_SITE.Common.RTEMS

@@ -1,17 +1,26 @@
+# CONFIG_SITE.Common.RTEMS
+#
+# $Revision-Id$
 #
 # Site-specific information for all RTEMS targets
-#
 #-------------------------------------------------------
 
 # Where to find RTEMS
 #
+# APS:
 RTEMS_VERSION = 4.10.2
-RTEMS_BASE = /usr/local/rtems/rtems-$(RTEMS_VERSION)
+RTEMS_BASE = /usr/local/vw/rtems/rtems-$(RTEMS_VERSION)
 
 # Cross-compile toolchain in $(RTEMS_TOOLS)/bin
 #
 RTEMS_TOOLS = $(RTEMS_BASE)
 
+# Link Generic System loadable objects instead of full executable.
+#
+# A GeSys object is similar to a shared library.  It can be (un)loaded
+# at runtime by the Generic System loader which is available as a
+# patch against RTEMS.
+USE_GESYS = NO
 
 # If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC
 # network configuration you must uncomment and specify your Internet

configure/os/CONFIG_SITE.Common.cygwin-x86_64

@@ -12,3 +12,11 @@
 # Uncomment the following line if readline has problems
 #LDLIBS_READLINE = -lreadline -lcurses
 
+
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+

configure/os/CONFIG_SITE.Common.ios-arm

@@ -16,11 +16,12 @@
 #
 #   Xcode 4.5 dropped support for the ARMv6.
 #
-#   ARMv8 (arm64) devices: iPhone 5S
-#   ARMv7s devices: iPhone 5 and 5C, iPad Gen 4
-#   ARMv7 devices: iPhone 3GS, 4 and 4S, iPod Touch Gen 3 to 5
-#                  iPad Gen 1 to 3, iPad Mini, Apple TV Gen 2 and 3
-#   ARMv6 devices: iPhone 1 and 3G, iPod Touch Gen 1 and 2
+#   arm64 devices:  iPhone 5S, 6 and 6 Plus, iPad Air Gen 1 and 2,
+#                   iPad Mini Gen 2 and 3
+#   armv7s devices: iPhone 5 and 5C, iPad Gen 4
+#   armv7 devices:  iPhone 3GS, 4 and 4S, iPod Touch Gen 3 to 5
+#                   iPad Gen 1 to 3, iPad Mini, Apple TV Gen 2 and 3
+#   armv6 devices:  iPhone 1 and 3G, iPod Touch Gen 1 and 2
 
 #ARCH_CLASS = arm64
 #ARCH_CLASS = armv7s arm64

configure/os/CONFIG_SITE.Common.ios-x86

@@ -0,0 +1,18 @@
+# CONFIG_SITE.Common.ios-x86
+#
+# $Revision-Id$
+#
+# Site-specific settings for ios-x86 target builds
+#-------------------------------------------------------
+
+# Which x86 instruction set(s) to generate code for:
+#   The iPhone Simulator now supports both 32-bit and 64-bit
+#   instruction sets since the iPhone 6 uses a 64-bit CPU.
+#
+#   Apple's compilers can build for multiple architectures,
+#   generating a Universal binary.  This is larger and takes
+#   longer to compile, but runs efficiently on all devices.
+
+#ARCH_CLASS = i386
+ARCH_CLASS = i386 x86_64
+#ARCH_CLASS = x86_64

configure/os/CONFIG_SITE.Common.iosCommon

@@ -5,17 +5,6 @@
 # Site-specific settings for Apple iOS builds
 #-------------------------------------------------------
 
-# iOS SDK Version number (not the XCode version).
-# We haven't tested our current build rules on the older
-# versions of either XCode or the iOS SDK, be warned!
-
-#IOS_VERSION = 5.0
-#IOS_VERSION = 5.1
-#IOS_VERSION = 6.0
-#IOS_VERSION = 6.1
-#IOS_VERSION = 7.0
-IOS_VERSION = 8.0
-
 # Minimum version of iOS the executables must run on.
 # Earlier versions may work, if XCode supports them.
 
@@ -23,8 +12,13 @@ IOS_VERSION = 8.0
 #IOS_DEPLOYMENT_TARGET = 5.1
 #IOS_DEPLOYMENT_TARGET = 6.0
 #IOS_DEPLOYMENT_TARGET = 6.1
-IOS_DEPLOYMENT_TARGET = 7.0
-#IOS_DEPLOYMENT_TARGET = 8.0
+#IOS_DEPLOYMENT_TARGET = 7.0
+#IOS_DEPLOYMENT_TARGET = 7.1
+IOS_DEPLOYMENT_TARGET = 8.0
+#IOS_DEPLOYMENT_TARGET = 8.1
+
+# Older versions of Xcode may require this SDK_DIR definition
+#SDK_DIR = $(PLATFORM_DIR)/Developer/SDKs/$(IOS_PLATFORM)$(IOS_DEPLOYMENT_TARGET).sdk
 
 
 # Which compiler to use:

configure/os/CONFIG_SITE.Common.linux-arm

@@ -0,0 +1,41 @@
+# CONFIG_SITE.Common.linux-arm
+#
+# $Revision-Id$
+#
+# Site Specific definitions for all linux-arm targets
+#-------------------------------------------------------
+
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
+# shared libraries will be found automatically.  However if the .so
+# files are installed at a different path to their compile-time path
+# then in order to be found at runtime do one of these:
+# a) LD_LIBRARY_PATH must include the full absolute pathname to
+#    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
+#    executables.
+# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which 
+#    will add the named directory to the list contained in the executables.
+# c) Add the runtime path to /etc/ld.so.conf and run ldconfig
+#    to inform the system of the shared library location.
+
+# Depending on your version of Linux you'll want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
+
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+#COMMANDLINE_LIBRARY = READLINE
+
+# Needs -lncurses (RHEL 5 etc.):
+#COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses (older versions)
+#COMMANDLINE_LIBRARY = READLINE_CURSES
+
+
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g

configure/os/CONFIG_SITE.Common.linux-x86

@@ -12,7 +12,7 @@
 # a) LD_LIBRARY_PATH must include the full absolute pathname to
 #    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
 #    executables.
-# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which 
+# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which
 #    will add the named directory to the list contained in the executables.
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
@@ -33,6 +33,10 @@ COMMANDLINE_LIBRARY = READLINE
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
 
+# Permit access to 64-bit file-systems
+OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64
+
+
 # Uncomment the followings lines to build with CLANG instead of GCC.
 #
 #GNU         = NO
@@ -49,7 +53,6 @@ OPT_CFLAGS_YES += -g
 OPT_CXXFLAGS_YES += -g
 
 
-# Tune GNU compiler output for a specific cpu-type
-# (e.g. generic, i386, i486, i586, or i686)
+# Tune GNU compiler output for a specific 32-bit cpu-type
+# (e.g. generic, native, i386, i686, pentium2/3/4, prescott, k6, athlon etc.)
 GNU_TUNE_CFLAGS = -mtune=generic
-

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -47,3 +47,8 @@ COMMANDLINE_LIBRARY = READLINE
 # loaded into RAM when the binary is loaded.
 OPT_CFLAGS_YES += -g
 OPT_CXXFLAGS_YES += -g
+
+
+# Tune GNU compiler output for a specific 64-bit cpu-type
+# (e.g. generic, native, core2, nocona, k8, opteron, athlon64, barcelona etc.)
+GNU_TUNE_CFLAGS = -mtune=generic

configure/os/CONFIG_SITE.Common.linux-xscale_be

@@ -1,9 +1,12 @@
 # CONFIG_SITE.Common.linux-xscale_be
 #
+# $Revision-Id$
+#
 # Site specific definitions for linux-xscale_be target builds.
 #-------------------------------------------------------
 
 # Set GNU_DIR to point to directory containing the tool-chain
 
-GNU_DIR = /usr/local/xscale_be
+# APS:
+GNU_DIR = /usr/local/vw/xscale_be
 

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -1,25 +1,17 @@
 # CONFIG_SITE.Common.vxWorksCommon
 #
 # Site specific definitions for vxWorks target builds.
-# Only the local epics system manager should modify this file
 
 # Compiler options can vary with the vxWorks version number, so we
-# need to know that.  However don't include any third-level digits
-# (e.g. the .2 in 5.5.2) because we don't need them.
+# need to know that.  Do not include any third-level digits.
 
-# Note: vxWorks 5.4.x (Tornado 2.0.x) is not supported
+# Note: vxWorks 5.4.x and 5.5.x (Tornado 2.x) are not supported.
+# VxWorks 6.0 through 6.5 use older, untested versions of GCC.
 
-VXWORKS_VERSION = 5.5
-#VXWORKS_VERSION = 6.0
-#VXWORKS_VERSION = 6.1
-#VXWORKS_VERSION = 6.2
-#VXWORKS_VERSION = 6.3
-#VXWORKS_VERSION = 6.4
-#VXWORKS_VERSION = 6.5
 #VXWORKS_VERSION = 6.6
 #VXWORKS_VERSION = 6.7
 #VXWORKS_VERSION = 6.8
-#VXWORKS_VERSION = 6.9
+VXWORKS_VERSION = 6.9
 
 
 # Sites may override the following path for a particular host
@@ -27,10 +19,8 @@ VXWORKS_VERSION = 5.5
 # CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
 
 # WIND_BASE is where you installed the Wind River software.
-# Under vxWorks 6.x this is *not* the same as the old VX_DIR setting
 
-WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
 
 
@@ -39,9 +29,9 @@ WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
 #WORKBENCH_VERSION = 2.6
 #WORKBENCH_VERSION = 3.0
 #WORKBENCH_VERSION = 3.2
-#WORKBENCH_VERSION = 3.3
+WORKBENCH_VERSION = 3.3
 
 
 # Utilities Version number, required from vxWorks 6.8 and later
 
-#UTILITIES_VERSION = 1.0
+UTILITIES_VERSION = 1.0

configure/os/CONFIG_SITE.Common.win32-x86-mingw

@@ -4,7 +4,6 @@
 #
 # Site Specific definitions for win32-x86-mingw target
 
-# If readline is not installed comment the following line
-# to omit command-line editing and history support
+# If readline is available uncomment the following line
+# to enable command-line editing and history support
 #COMMANDLINE_LIBRARY = READLINE
-

configure/os/CONFIG_SITE.Common.windows-x64-static

@@ -0,0 +1,11 @@
+# CONFIG_SITE.Common.windows-x64-static
+#
+# $Revision-Id$
+#
+# Site Specific definitions for windows-x64-static target
+# Only the local epics system manager should modify this file
+
+# 64-bit Visual Studio 2010 builds fail when built optimized.
+# If you are using a newer version you can try removing this:
+HOST_OPT = NO
+

configure/os/CONFIG_SITE.cygwin-x86.Common

@@ -6,5 +6,5 @@
 # Site override definitions for cygwin-x86 host builds
 #-------------------------------------------------------
  
-#CROSS_COMPILER_TARGET_ARCHS =
+#CROSS_COMPILER_TARGET_ARCHS = linux-arm
 

configure/os/CONFIG_SITE.cygwin-x86.linux-arm

@@ -0,0 +1,16 @@
+# CONFIG_SITE.cygwin-x86.linux-arm
+#
+# $Revision-Id$
+#
+# Site specific definitions for cygwin-x86 host - linux-arm target builds
+#-------------------------------------------------------
+
+# Tools install path
+GNU_DIR = /usr/local/arm-linux
+
+# GNU crosscompiler target name
+GNU_TARGET = arm-linux
+
+STATIC_BUILD = YES
+SHARED_LIBRARIES = NO
+

configure/os/CONFIG_SITE.cygwin-x86_64.linux-arm

@@ -0,0 +1,16 @@
+# CONFIG_SITE.cygwin-x86_64.linux-arm
+#
+# $Revision-Id$
+#
+# Site specific definitions for cygwin-x86_64 host - linux-arm target builds
+#-------------------------------------------------------
+
+# Tools install path
+GNU_DIR = /usr/local/arm-linux
+
+# GNU crosscompiler target name
+GNU_TARGET = arm-linux
+
+STATIC_BUILD = YES
+SHARED_LIBRARIES = NO
+

configure/os/CONFIG_SITE.linux-arm-debug.linux-arm-debug

@@ -0,0 +1,13 @@
+# CONFIG_SITE.linux-arm-debug.linux-arm-debug
+#
+# $Revision-Id$
+#
+# Site specific overrides for linux-arm-debug host and target builds
+#-------------------------------------------------------
+
+#Prepares the object code to collect data for profiling with prof. 
+#PROFILE=YES
+
+#Compiles for profiling with the gprof profiler.
+#GPROF=YES
+

configure/os/CONFIG_SITE.linux-x86-debug.linux-x86-debug

@@ -1,3 +1,9 @@
+# CONFIG_SITE.linux-x86-debug.linux-x86-debug
+#
+# $Revision-Id$
+#
+# Site specific overrides for linux-x86-debug host and target builds
+#-------------------------------------------------------
 
 #Prepares the object code to collect data for profiling with prof. 
 #PROFILE=YES

configure/os/CONFIG_SITE.linux-x86.linux-arm

@@ -1,4 +1,4 @@
-#  CONFIG_SITE.linux-x86.linux-arm
+# CONFIG_SITE.linux-x86.linux-arm
 #
 # $Revision-Id$
 #
@@ -8,7 +8,8 @@
 # Tools install path
 #GNU_DIR = /home/targetOS/linux-arm/host/x86-linux/gcc_3.3.3
 
-GNU_DIR = /net/phoebus/vw/zynq-2011.09
+# APS:
+GNU_DIR = /usr/local/vw/zynq-2011.09
 
 # GNU crosscompiler target name
 GNU_TARGET = arm-xilinx-linux-gnueabi

configure/os/CONFIG_SITE.linux-x86.linux-arm-debug

@@ -0,0 +1,9 @@
+# CONFIG_SITE.linux-x86.linux-arm-debug
+#
+# $Revision-Id$
+#
+# Site specific settings for linux-x86 host - linux-arm-debug target builds
+#-------------------------------------------------------
+
+# Inherit settings from linux-arm
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-arm

configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw

@@ -4,8 +4,8 @@
 #-------------------------------------------------------
 
 # Early versions of the MinGW cross-build tools can only build
-# static (non-DLL) libraries. The version of gcc 4.6.3 for Ubuntu
-# succeeds, but Fedora's 4.4.6 does not and needs these uncommented:
+# static (non-DLL) libraries. For example RHEL's cross-gcc 4.4.6
+# needs these uncommented, cross-gcc 4.6.3 for Ubuntu does not:
 SHARED_LIBRARIES = NO
 STATIC_BUILD = YES
 
@@ -18,4 +18,5 @@ STATIC_BUILD = YES
 #CMPLR_PREFIX = i686-w64-mingw32-
 # RHEL:
 CMPLR_PREFIX = i686-pc-mingw32-
-
+# Debian?
+#CMPLR_PREFIX = i586-mingw32msvc-

configure/os/CONFIG_SITE.linux-x86.windows-x64-mingw

@@ -0,0 +1,20 @@
+# CONFIG_SITE.linux-x86.windows-x64-mingw
+#
+# Configuration for linux-x86 host windows-x64-mingw target builds
+#-------------------------------------------------------
+
+# Early versions of the MinGW cross-build tools can only build
+# static (non-DLL) libraries. For example RHEL's cross-gcc 4.4.6
+# needs these uncommented, cross-gcc 4.6.3 for Ubuntu does not:
+#SHARED_LIBRARIES = NO
+#STATIC_BUILD = YES
+
+# The cross-build tools are in $(GNU_DIR)/bin
+# Default is /usr
+#GNU_DIR = /usr/local
+
+# Different distribution cross-build packages use different prefixes:
+# Ubuntu:
+#CMPLR_PREFIX = i686-w64-mingw32-
+# RHEL:
+CMPLR_PREFIX = x86_64-w64-mingw32-

configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug

@@ -2,10 +2,8 @@
 #
 # $Revision-Id$
 #
-# Site specific override definitions for solaris-sparc host builds
-# Only the local epics system manager should modify this file
-
-
+# Site specific overrides for linux-x86_64 host and target builds
+#-------------------------------------------------------
 
 #Prepares the object code to collect data for profiling with prof. 
 #PROFILE=YES

configure/os/CONFIG_SITE.linux-x86_64.linux-arm

@@ -0,0 +1,9 @@
+# CONFIG_SITE.linux-x86_64.linux-arm
+#
+# $Revision-Id$
+#
+# Site specific settings for linux-x86_64 host - linux-arm target builds
+#-------------------------------------------------------
+
+# Inherit setting from linux-x86
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-arm

configure/os/CONFIG_SITE.linux-x86_64.linux-arm-debug

@@ -0,0 +1,9 @@
+# CONFIG_SITE.linux-x86_64.linux-arm-debug
+#
+# $Revision-Id$
+#
+# Site specific settings for linux-x86_64 host - linux-arm-debug target builds
+#-------------------------------------------------------
+
+# Inherit settings from linux-arm
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-arm

configure/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw

@@ -0,0 +1,8 @@
+# CONFIG_SITE.linux-x86_64.windows-x64-mingw
+#
+# Configuration for linux-x86_64 host windows-x64-mingw target builds
+#-------------------------------------------------------
+
+# Inherit from the linux-x86 host architecture
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.windows-x64-mingw
+

configure/os/CONFIG_SITE.win32-x86-mingw.win32-x86-mingw

@@ -3,15 +3,9 @@
 # $Revision-Id$
 #
 # Site Specific definitions for win32-x86-mingw target
-# Only the local epics system manager should modify this file
 
+# The MinGW bin directory must be in your path.
 
-# Uncomment the following settings for MinGW_w32 releases
-# <MinGW directory>/bin should be in your path
-#CMPLR_PREFIX=i686-w64-mingw32-
-#CC = $(CMPLR_PREFIX)gcc
-#CCC = $(CMPLR_PREFIX)g++
-#AR = $(CMPLR_PREFIX)ar -rc
-#LD = $(CMPLR_PREFIX)ld -r
-#RANLIB = $(CMPLR_PREFIX)ranlib
-
+# Set the compiler prefix for your MinGW installation
+#CMPLR_PREFIX = i686-w64-mingw32-
+#CMPLR_PREFIX = i586-mingw32msvc-

documentation/KnownProblems.html

@@ -4,30 +4,36 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>Known Problems in R3.15.0.2</title>
+  <title>Known Problems in R3.16.0.1</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS Base R3.15.0.2: Known Problems</h1>
+<h1 style="text-align: center">EPICS Base R3.16.0.1: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-3.15.0.2 tree. Download them, then use the GNU Patch program as
+base-3.16.0.1 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.15.0.2</b>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.16.0.1</b>
 % <b>patch -p0 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
 
-<p>The following significant problems have been reported with this
-version of EPICS Base:</p>
+<p>The following problems were known by the developers at the time of this
+release:</p>
 
 <ul>
-  <li>64-bit Windows builds may not work with some tool-sets, the code in
-    <tt>src/legacy/gdd</tt> is not comptible with the LLP64 model that Windows
-    uses for its 64-bit ABI.</li>
-  <li>The <tt>-x</tt> option to the softIoc program loads a standard database
-    that is supposed to be able to exit the running IOC. In this release that
-    causes an assertion failure which prints a stack trace and suspends the
-    program wihout exiting.</li>
+
+<!-- Items added after release should be formatted thusly:
+  <li>YYYY-MM-DD: Description of problem
+    ...</li>
+-->
+
+  <li>IOCs running on some versions of Cygwin may display warnings at iocInit
+    about duplicate EPICS CA Address list entries. These warnings might be due
+    to a bug in Cygwin; they are benign and can be ignored.</li>
+
+  <li>64-bit Windows builds of the CAS library may not work with some compilers.
+    The code in <tt>src/legacy/gdd</tt> is incompatible with the LLP64 model
+    that Windows uses for its 64-bit ABI.</li>
 
 </ul>
 

documentation/README.1st

@@ -1,24 +1,24 @@
                            Installation Instructions
 
-                          EPICS Base Release 3.15.0.2
+                           EPICS Base Release 3.16.0
 
    --------------------------------------------------------------------------
 
   Table of Contents
 
-     * What is EPICS base?
-     * What is new in this release?
-     * Copyright
-     * Supported platforms
-     * Supported compilers
-     * Software requirements
-     * Host system storage requirements
-     * Documentation
-     * Directory Structure
-     * Build related components
-     * Building EPICS base (Unix and Win32)
-     * Example application and extension
-     * Multiple host platforms
+     * What is EPICS base?
+     * What is new in this release?
+     * Copyright
+     * Supported platforms
+     * Supported compilers
+     * Software requirements
+     * Host system storage requirements
+     * Documentation
+     * Directory Structure
+     * Build related components
+     * Building EPICS base (Unix and Win32)
+     * Example application and extension
+     * Multiple host platforms
 
    --------------------------------------------------------------------------
 
@@ -85,30 +85,30 @@
      as processes on the host platform.
 
      vxWorks
-     You must have vxWorks 5.5.x or 6.x installed if any of your target
-     systems are vxWorks systems; the C++ compiler for vxWorks 5.4 is now too
-     old to support. The vxWorks installation provides the cross-compiler and
-     header files needed to build for these targets. The absolute path to and
-     the version number of the vxWorks installation must be set in the
+     You must have vxWorks 6 installed if any of your target systems are
+     vxWorks systems; the C++ compilers for vxWorks 5.x are now too old to
+     support. The vxWorks installation provides the cross-compiler and header
+     files needed to build for these targets. The absolute path to and the
+     version number of the vxWorks installation must be set in the
      base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
      target-specific overrides.
 
-     Consult the vxWorks 5.x or vxWorks 6.x EPICS web pages about and the
-     vxWorks documentation for information about configuring your vxWorks
-     operating system for use with EPICS.
+     Consult the vxWorks 6.x EPICS web pages and the vxWorks documentation
+     for information about configuring your vxWorks operating system for use
+     with EPICS.
 
      RTEMS
      For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or
      later.
 
      GNU readline or Tecla library
-     GNU readline and Tecla librararies can be used by the IOC shell to
-     provide command line editing and command line history recall and edit.
-     GNU readline (or Tecla library) must be installed on your target system
-     when COMMANDLINE_LIBRARY is set to READLINE (or TECLA) for that target.
-     EPICS (EPICS shell) is the default specified in CONFIG_COMMON. A
-     READLINE override is defined for linux-x86 in the EPICS distribution.
-     Comment out COMMANDLINE_LIBRARY=READLINE in
+     GNU readline and Tecla libraries can be used by the IOC shell to provide
+     command line editing and command line history recall and edit. GNU
+     readline (or Tecla library) must be installed on your target system when
+     COMMANDLINE_LIBRARY is set to READLINE (or TECLA) for that target. EPICS
+     (EPICS shell) is the default specified in CONFIG_COMMON. A READLINE
+     override is defined for linux-x86 in the EPICS distribution. Comment out
+     COMMANDLINE_LIBRARY=READLINE in
      configure/os/CONFIG_SITE.Common.linux-x86 if readline is not installed
      on linux-x86. Command-line editing and history will then be those
      supplied by the os. On vxWorks the ledLib command-line input library is
@@ -125,7 +125,7 @@
 
      EPICS documentation is available through the EPICS website at Argonne.
 
-     Release specific documenataion can also be found in the
+     Release specific documentation can also be found in the
      base/documentation directory of the distribution.
 
   Directory Structure
@@ -135,7 +135,7 @@
          base                    Root directory of the base distribution
          base/configure          Operating system independent build config files
          base/configure/os       Operating system dependent build config files
-         base/documentation      Distributation documentation
+         base/documentation      Distribution documentation
          base/src                Source code in various subdirectories
          base/startup            Scripts for setting up path and environment
 
@@ -156,7 +156,7 @@
 
   Build related components
 
-    base/documentation/README* files
+    base/documentation directory - contains setup, build, and install documents
 
          README.1st           Instructions for setup and building epics base
          README.html          html version of README.1st
@@ -185,7 +185,7 @@
          CONFIG_COMMON         Definitions common to all builds
          CONFIG_ENV            Definitions of EPICS environment variables
          CONFIG_FILE_TYPE
-         CONFIG_SITE           Site specific make defintions
+         CONFIG_SITE           Site specific make definitions
          CONFIG_SITE_ENV       Site defaults for EPICS environment variables
          MAKEFILE              Installs CONFIG* RULES* creates
          RELEASE               Location of external products

documentation/README.html

@@ -9,7 +9,7 @@
 <BODY>
 <CENTER>
 <H1>Installation Instructions</H1>
-<H2>EPICS Base Release 3.15.0.2</H2><BR>
+<H2>EPICS Base Release 3.16.0</H2><BR>
 </CENTER>
 <HR>
 <H3> Table of Contents</H3>
@@ -90,24 +90,23 @@
  as processes on the host platform.</P>
 
 <P><B>vxWorks</B><BR>
- You must have vxWorks 5.5.x or 6.x installed if any of your target systems are
- vxWorks systems; the C++ compiler for vxWorks 5.4 is now too old to support.
- The vxWorks installation provides the cross-compiler and header files needed to
+ You must have vxWorks 6 installed if any of your target systems are vxWorks
+ systems; the C++ compilers for vxWorks 5.x are now too old to support. The
+ vxWorks installation provides the cross-compiler and header files needed to
  build for these targets. The absolute path to and the version number of the
  vxWorks installation must be set in the
  base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
  target-specific overrides.</P>
 
-<P>Consult the <a href="http://www.aps.anl.gov/epics/base/tornado.php">vxWorks
- 5.x</a> or <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks
- 6.x</a> EPICS web pages about and the vxWorks documentation for information
+<P>Consult the <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks
+ 6.x</a> EPICS web pages and the vxWorks documentation for information
  about configuring your vxWorks operating system for use with EPICS.</P>
 
 <P><B>RTEMS</B><BR>
  For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or later.</P>
 
 <P><B>GNU readline or Tecla library</B><BR>
- GNU readline and Tecla librararies can be used by the IOC shell to
+ GNU readline and Tecla libraries can be used by the IOC shell to
  provide command line editing and command line history recall and edit.
  GNU readline (or Tecla library) must be installed on your target system
  when COMMANDLINE_LIBRARY is set to READLINE (or TECLA) for that target.
@@ -130,7 +129,7 @@
 <H3><A NAME="0_0_8"> Documentation</A></H3>
 <BLOCKQUOTE>EPICS documentation is available through the
  <a href="http://www.aps.anl.gov/epics/">EPICS website</a> at Argonne.
- <P>Release specific documenataion can also be found in the base/documentation
+ <P>Release specific documentation can also be found in the base/documentation
  directory of the distribution.</BLOCKQUOTE>
 
 <H3><A NAME="0_0_10"> Directory Structure</A></H3>
@@ -140,7 +139,7 @@
         base                    Root directory of the base distribution
         base/configure          Operating system independent build config files
         base/configure/os       Operating system dependent build config files
-        base/documentation      Distributation documentation
+        base/documentation      Distribution documentation
         base/src                Source code in various subdirectories
         base/startup            Scripts for setting up path and environment
 </PRE>
@@ -165,7 +164,8 @@
 <H3><A NAME="0_0_11"> Build related components</A></H3>
 <BLOCKQUOTE>
 
-<H4>base/documentation/README* files</H4>
+<H4>base/documentation directory - contains setup, build, and install
+ documents</H4>
  <PRE>
         README.1st           Instructions for setup and building epics base
         README.html          html version of README.1st
@@ -196,7 +196,7 @@
         CONFIG_COMMON         Definitions common to all builds
         CONFIG_ENV            Definitions of EPICS environment variables
         CONFIG_FILE_TYPE      
-        CONFIG_SITE           Site specific make defintions
+        CONFIG_SITE           Site specific make definitions
         CONFIG_SITE_ENV       Site defaults for EPICS environment variables
         MAKEFILE              Installs CONFIG* RULES* creates
         RELEASE               Location of external products

documentation/ReleaseChecklist.html

@@ -39,7 +39,7 @@
 </blockquote>
 
 <p>This document describes the procedures and provides a checklist of tasks
-that should be performed when creating new releases of EPICS Base.</p>
+that should be performed when creating production releases of EPICS Base.</p>
 
 <h3>The Release Process</h3>
 
@@ -60,11 +60,8 @@ responsible for these tasks in the past and are expected to continue in the
 relevent roles unless the Release Manager designates otherwise:</p>
 
 <dl>
-  <dt><strong>Release Manager</strong> (Andrew Johnson)</dt>
-    <dd>Responsible for the release</dd>
-  <dt><strong>Configuration Manager</strong> (Janet Anderson)</dt>
-    <dd>Responsible for committing version number updates and for
-      creating tarfiles</dd>
+  <dt><strong>Release Manager</strong> (Ralph Lange)</dt>
+    <dd>Responsible for managing and tagging the release</dd>
   <dt><strong>Platform Developers</strong></dt>
     <dd>Responsible for individual operating system platforms</dd>
   <dt><strong>Application Developers</strong></dt>
@@ -134,42 +131,42 @@ relevent roles unless the Release Manager designates otherwise:</p>
       </tr>
     <tr>
       <td>&nbsp;</td>
-      <td>Configuration Manager</td>
+      <td>Release Manager</td>
       <td>Edit and commit changes to the EPICS version number file
         configure/CONFIG_BASE_VERSION.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
-      <td>Configuration Manager</td>
+      <td>Release Manager</td>
       <td>Tag the module in Bazaar, using these tag conventions:
         <ul>
           <li>
-            <tt>R3.15.1-pre<i>n</i></tt>
+            <tt>R3.16.1-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R3.15.1-rc<i>n</i></tt>
+            <tt>R3.16.1-rc<i>n</i></tt>
             &mdash; release candidate tag, note the <tt>rc</tt> is now
             lower-case</li>
         </ul>
         <blockquote><tt>
-          cd ~/base/mirror-3.15<br />
-          bzr tag R3.15.1-rc<i>n</i>
+          cd ~/base/mirror-3.16<br />
+          bzr tag R3.16.1-rc<i>n</i>
           </tt></blockquote>
         </td>
       </tr>
     <tr>
       <td>&nbsp;</td>
-      <td>Configuration Manager</td>
+      <td>Release Manager</td>
       <td>Export the tagged version into a tarfile. Note that this command
         generates a gzipped tarfile directly from the repository:
         <blockquote><tt>
           cd ~/base<br />
           bzr export --keywords=publish
-          --root=base-3.15.1-rc<i>n</i>
-          -r tag:R3.15.1-rc<i>n</i>
-          baseR3.15.1-rc<i>n</i>.tar.gz
-          mirror-3.15
+            --root=base-3.16.1-rc<i>n</i>
+            -r tag:R3.16.1-rc<i>n</i>
+            base-3.16.1-rc<i>n</i>.tar.gz
+            mirror-3.16
           </tt></blockquote>
         This requires that the Bazaar keywords plugin is installed and
         configured properly.
@@ -177,14 +174,15 @@ relevent roles unless the Release Manager designates otherwise:</p>
       </tr>
     <tr>
       <td>&nbsp;</td>
-      <td>Configuration Manager</td>
+      <td>Release Manager</td>
       <td>Test the tarfile by extracting its contents and building it on at
         least one supported platform.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
-      <td>Configuration Manager</td>
-      <td>Copy the tar file to the Base download area of the website.</td>
+      <td>Website Manager</td>
+      <td>If necessary recreate the tarfile following the instructions above.
+        Copy the tar file to the Base download area of the website</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -223,13 +221,6 @@ relevent roles unless the Release Manager designates otherwise:</p>
       <td>Run the CA client side regression tests on all available host
         platforms.</td>
       </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Platform Developers</td>
-      <td>Build and run the
-        <a href="https://launchpad.net/epics-base-tests">epics-base-tests</a>
-        suite on all available platforms.</td>
-      </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Platform Developers</td>
@@ -279,32 +270,32 @@ relevent roles unless the Release Manager designates otherwise:</p>
       </tr>
     <tr>
       <td>&nbsp;</td>
-      <td>Configuration Manager</td>
+      <td>Release Manager</td>
       <td>Edit and commit changes to the EPICS version number file
         configure/CONFIG_BASE_VERSION.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
-      <td>Configuration Manager</td>
+      <td>Release Manager</td>
       <td>Tag the module in Bazaar:
         <blockquote><tt>
-          cd ~/base/mirror-3.15<br />
-          bzr tag R3.15.1</i>
+          cd ~/base/mirror-3.16<br />
+          bzr tag R3.16.1</i>
           </tt></blockquote>
         </td>
       </tr>
     <tr>
       <td>&nbsp;</td>
-      <td>Configuration Manager</td>
+      <td>Release Manager</td>
       <td>Export the tagged version into a tarfile. Note that this command
         generates a gzipped tarfile directly from the repository:
         <blockquote><tt>
           cd ~/base<br />
           bzr export --keywords=publish
-          --root=base-3.15.1
-          -r tag:R3.15.1
-          baseR3.15.1.tar.gz
-          mirror-3.15
+            --root=base-3.16.1
+            -r tag:R3.16.1
+            base-3.16.1.tar.gz
+            mirror-3.16
           </tt></blockquote>
         This requires that the Bazaar keywords plugin is installed and
         configured properly.
@@ -312,7 +303,7 @@ relevent roles unless the Release Manager designates otherwise:</p>
       </tr>
     <tr>
       <td>&nbsp;</td>
-      <td>Configuration Manager</td>
+      <td>Release Manager</td>
       <td>Test the tar file by extracting its contents and building it on at
         least one supported platform</td>
       </tr>
@@ -321,8 +312,9 @@ relevent roles unless the Release Manager designates otherwise:</p>
       </tr>
     <tr>
       <td>&nbsp;</td>
-      <td>Configuration Manager</td>
-      <td>Copy the tar file to the Base download area of the website</td>
+      <td>Website Manager</td>
+      <td>If necessary recreate the tarfile following the instructions above.
+        Copy the tar file to the Base download area of the website</td>
       </tr>
     <tr>
       <td>&nbsp;</td>

src/ca/client/addrList.h

@@ -22,7 +22,7 @@ extern "C" {
 epicsShareFunc void epicsShareAPI configureChannelAccessAddressList 
     ( struct ELLLIST *pList, SOCKET sock, unsigned short port );
 
-epicsShareFunc void epicsShareAPI addAddrToChannelAccessAddressList 
+epicsShareFunc int epicsShareAPI addAddrToChannelAccessAddressList
     ( struct ELLLIST *pList, const ENV_PARAM *pEnv, 
     unsigned short port, int ignoreNonDefaultPort );
 

src/ca/client/iocinf.cpp

@@ -73,7 +73,7 @@ static char *getToken ( const char **ppString, char *pBuf, unsigned bufSIze )
 /*
  * addAddrToChannelAccessAddressList ()
  */
-extern "C" void epicsShareAPI addAddrToChannelAccessAddressList 
+extern "C" int epicsShareAPI addAddrToChannelAccessAddressList
     ( ELLLIST *pList, const ENV_PARAM *pEnv, 
     unsigned short port, int ignoreNonDefaultPort )
 {
@@ -82,11 +82,11 @@ extern "C" void epicsShareAPI addAddrToChannelAccessAddressList
     const char *pToken;
     struct sockaddr_in addr;
     char buf[32u]; /* large enough to hold an IP address */
-    int status;
+    int status, ret = -1;
 
     pStr = envGetConfigParamPtr (pEnv);
     if (!pStr) {
-        return;
+        return ret;
     }
 
     while ( ( pToken = getToken (&pStr, buf, sizeof (buf) ) ) ) {
@@ -104,7 +104,7 @@ extern "C" void epicsShareAPI addAddrToChannelAccessAddressList
         pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
         if (pNewNode==NULL) {
             fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
-            return;
+            break;
         }
 
         pNewNode->addr.ia = addr;
@@ -113,9 +113,10 @@ extern "C" void epicsShareAPI addAddrToChannelAccessAddressList
 		 * LOCK applied externally
 		 */
         ellAdd (pList, &pNewNode->node);
+        ret = 0; /* success if anything is added to the list */
     }
 
-    return;
+    return ret;
 }
 
 /*

src/ca/client/perl/CA.pm

@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-my $version = '0.5';
+my $version = '0.6';
 
 
 package CA;
@@ -95,8 +95,8 @@ CA - Perl 5 interface to EPICS Channel Access
         } else {
             printf "    Value:         %g\n", $data->{value};
             printf "    Severity:      %s\n", $data->{severity};
-            printf "    Timestamp:     %d.%09d\n",
-                $data->{stamp}, $data->{stamp_fraction};
+            printf "    Timestamp:     %.6f\n",
+                $data->{stamp} + $data->{stamp_fraction};
         }
     }
 
@@ -235,7 +235,7 @@ C<die> with an exception object in the callback and catch that using C<eval> in
 the main thread are not likely to succeed and will probably result in a crash. 
 Callbacks should not perform any operations that would block for more than a
 fraction of a second as this will hold up network communications with the
-relevent server and could cause the Perl program and/or the Channel Access
+relevant server and could cause the Perl program and/or the Channel Access
 server to crash.  Calling C<< CA->pend_event >> from within a callback is not
 permitted by the underlying Channel Access library.
 
@@ -291,7 +291,7 @@ apply to the callback subroutine as described in C<get_callback> above.
 
 =item put_acks( I<SEVR>, I<SUB> )
 
-Applications that need to ackowledge alarms by doing a C<ca_put()> with type
+Applications that need to acknowledge alarms by doing a C<ca_put()> with type
 C<DBR_PUT_ACKS> can do so using the C<put_acks> method.  The severity argument
 may be provided as an integer from zero through three or as a string containing
 one of the corresponding EPICS severity names C<NO_ALARM>, C<MINOR>, C<MAJOR> or
@@ -316,6 +316,19 @@ channel; see the C<new> constructor for details.  If I<SUB> is C<undef> any
 existing handler is removed, otherwise the new subroutine will be used for all
 future connection events on this channel.
 
+
+=item change_access_rights_event( I<SUB> )
+
+This method replaces, adds or cancels an access rights handler subroutine for
+the channel, which will be called if the client's right to read from or write
+to the channel changes. If I<SUB> is C<undef> any existing handler is removed,
+otherwise the new subroutine will be used for all future rights change events
+on this channel.
+
+The arguments passed to I<SUB> are the channel object and a pair of scalar
+values for read and write permissions respectively, that are true when the
+access is permitted, false when it is not.
+
 =back
 
 
@@ -325,11 +338,12 @@ The data provided to a callback function registered with either C<get_callback>
 or C<create_subscription> can be a scalar value or a reference to an array or a
 hash, depending on the data type that was used for the data transfer.  If the
 request was for a single item of one of the basic data types, the data argument
-will be a perl scalar that holds the value directly.  If the request was for
+will be a Perl scalar that holds the value directly.  If the request was for
 multiple items of one of the basic types, the data argument will be a reference
 to an array holding the data.  There is one exception though; if the data type
 requested was for an array of C<DBF_CHAR> values that array will be represented
-as a single Perl string contining all the characters before the first zero byte.
+as a single Perl string containing all the characters before the first zero
+byte.
 
 If the request was for one of the compound data types, the data argument will be
 a reference to a hash with keys as described below.  Keys that are not classed
@@ -355,7 +369,7 @@ widened from the original type used to request or subscribe for the data.
 The number of elements in the data returned by the server.  If the data type is
 C<DBF_CHAR> the value given for C<COUNT> is the number of bytes (including any
 trailing zeros) returned by the server, although the value field is given as a
-Perl string contining all the characters before the first zero byte.
+Perl string containing all the characters before the first zero byte.
 
 =back
 
@@ -417,7 +431,7 @@ Present only when I<TYPE> is C<DBR_GR_ENUM> or C<DBR_CTRL_ENUM>.
 =item stamp
 
 The process variable timestamp, converted to a local C<time_t>.  This value is
-suitable for passing to the perl C<localtime> or C<gmtime> functions.
+suitable for passing to the Perl C<localtime> or C<gmtime> functions.
 
 Present only when I<TYPE> is C<DBR_TIME_yyy>.
 
@@ -620,15 +634,15 @@ passing C<undef> as the subroutine reference.
 
 Errors in using the library will be indicated by the module throwing an
 exception, i.e. calling C<croak()> with an appropriate error message.  These
-exceptions can be caught using the standard Parl C<eval {}> statement and
+exceptions can be caught using the standard Perl C<eval {}> statement and
 testing the C<$@> variable afterwards; if not caught, they will cause the
 running program to C<die> with an appropriate error message pointing to the
 program line that called the C<CA> library.
 
-Errors messages reported by the underlying CA client library all start with the
+Error messages reported by the underlying CA client library all start with the
 string C<ECA_> and the remainder of the symbol for the associated CA error
 number, and are followed after a space-hyphen-space by a human-readable message
-describing the error.  Errors that are detected by the perl interface layer do
+describing the error.  Errors that are detected by the Perl interface layer do
 not follow this pattern, but are still printable strings.
 
 
@@ -636,9 +650,9 @@ not follow this pattern, but are still printable strings.
 
 =over
 
-=item [1] R3.14 Channel Access Reference Manual by Jeffrey O. Hill
+=item [1] R3.15 Channel Access Reference Manual by Jeffrey O. Hill
 
-L<http://www.aps.anl.gov/epics/base/R3-14/12-docs/CAref.html>
+L<http://www.aps.anl.gov/epics/base/R3-15/2-docs/CAref.html>
 
 =back
 

src/ca/client/perl/Cap5.xs

@@ -519,6 +519,46 @@ void CA_change_connection_event(SV *ca_ref, SV *sub) {
     }
 }
 
+/* CA::replace_access_rights_event($ca_ref, \$sub) */
+
+static
+void rights_handler(struct access_rights_handler_args arha) {
+    CA_channel *pch = ca_puser(arha.chid);
+
+    PERL_SET_CONTEXT(p5_ctx);
+    {
+        dSP;
+
+        SvSetSV(ERRSV, &PL_sv_undef);
+
+        PUSHMARK(SP);
+        XPUSHs(pch->chan_ref);
+        XPUSHs(arha.ar.read_access ? &PL_sv_yes : &PL_sv_no);
+        XPUSHs(arha.ar.write_access ? &PL_sv_yes : &PL_sv_no);
+        PUTBACK;
+
+        call_sv(pch->rights_sub, G_EVAL | G_VOID | G_DISCARD | G_KEEPERR);
+
+        if (SvTRUE(ERRSV))
+            croak(NULL);
+    }
+}
+
+void CA_replace_access_rights_event(SV *ca_ref, SV *sub) {
+    CA_channel *pch = (CA_channel *)SvIV(SvRV(ca_ref));
+    caArh *handler = &rights_handler;
+    int status;
+
+    if (! replace_handler(sub, &pch->rights_sub, (long *)&handler))
+        return;
+
+    status = ca_replace_access_rights_event(pch->chan, handler);
+
+    if (status != ECA_NORMAL) {
+        croak("%s", get_error_msg(status));
+    }
+}
+
 
 /* CA::put($ca_ref, @values) */
 
@@ -914,16 +954,18 @@ SV * CA_create_subscription(SV *ca_ref, const char *mask_str, SV *sub, ...) {
 
             dbr_text_to_type(treq, type);
             if (type < 0) {
-                croak_msg = "Unknown data type";
+                croak_msg = "Unknown CA data type";
                 goto exit_croak;
             }
             if (type == DBR_PUT_ACKT ||
                 type == DBR_PUT_ACKS) {
                 croak_msg = "DBR_PUT_ACK types are write-only";
                 goto exit_croak;
-            } else if (type == DBR_CLASS_NAME ||
+            } else if (type == DBR_GR_ENUM ||
+                type == DBR_CTRL_ENUM ||
+                type == DBR_CLASS_NAME ||
                 type == DBR_STSACK_STRING)
-                /* These break the dbr_type_is macros */ ;
+                /* These above types are supported */ ;
             else if (dbr_type_is_SHORT(type))
                 type += (DBR_LONG - DBR_SHORT);
             else if (dbr_type_is_FLOAT(type))
@@ -1265,6 +1307,11 @@ CA_change_connection_event (ca_ref, sub)
 	SV *	ca_ref
 	SV *	sub
 
+void
+CA_replace_access_rights_event (ca_ref, sub)
+	SV *	ca_ref
+	SV *	sub
+
 void
 CA_put (ca_ref, val, ...)
 	SV *	ca_ref

src/ca/client/perl/Makefile

@@ -8,27 +8,24 @@
 TOP=../../../..
 include $(TOP)/configure/CONFIG
 
-
-# Use hdepends command (not GNU compiler flags)
-# to generate header file dependancies for Darwin.
-# Darwin has multiple -arch compiler flags.
+# Special settings for Darwin:
 ifeq ($(OS_CLASS),Darwin)
-HDEPENDS_METHOD = MKMF
-endif
+  # Use hdepends command (not GNU compiler flags)
+  # to generate header file dependancies for Darwin.
+  # Darwin has multiple -arch compiler flags.
+  HDEPENDS_METHOD = MKMF
 
-ifneq ($(findstring darwin,$(T_A)),)
   # Perl loadable libraries on Darwin have funny names
   LOADABLE_SHRLIB_PREFIX =
-  LOADABLE_SHRLIB_SUFFIX = .bundle
+  LOADABLE_SHRLIB_SUFFIX = .$(shell $(PERL) ../perlConfig.pl dlext)
 endif
 
 PERL_VERSION = $(shell $(PERL) ../perlConfig.pl version)
 PERL_ARCHNAME = $(shell $(PERL) ../perlConfig.pl archname)
 PERL_ARCHPATH = $(PERL_VERSION)/$(PERL_ARCHNAME)
 
-ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
-ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),)
-  # Doesn't build on WIN32
+ifeq ($(T_A),$(EPICS_HOST_ARCH))                 # No cross-builds (wrong Perl!)
+ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),) # Doesn't build on WIN32
   LOADABLE_LIBRARY_HOST = Cap5
 
   PERL_SCRIPTS += cainfo.pl
@@ -56,10 +53,12 @@ include $(TOP)/configure/RULES
 
 ifdef T_A
   EXTUTILS = $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils
+  PERLBIN = $(shell $(PERL) ../perlConfig.pl bin)
+  XSUBPP = $(firstword $(wildcard $(PERLBIN)/xsubpp $(EXTUTILS)/xsubpp))
 
   %.c: ../%.xs
 	$(RM) $@ $@_new
-	$(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap $< > $@_new && $(MV) $@_new $@
+	$(PERL) $(XSUBPP) -typemap $(EXTUTILS)/typemap $< > $@_new && $(MV) $@_new $@
 
   $(INSTALL_PERL_MODULES)/$(PERL_ARCHPATH)/%: %
 	$(ECHO) "Installing loadable shared library $@"

src/ca/client/repeater.cpp

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
@@ -16,26 +15,6 @@
  * Author:  Jeff Hill
  * Date:    3-27-90
  *
- *  Control System Software for the GTA Project
- *
- *  Copyright 1988, 1989, the Regents of the University of California.
- *
- *  This software was produced under a U.S. Government contract
- *  (W-7405-ENG-36) at the Los Alamos National Laboratory, which is
- *  operated by the University of California for the U.S. Department
- *  of Energy.
- *
- *  Developed by the Controls and Automation Group (AT-8)
- *  Accelerator Technology Division
- *  Los Alamos National Laboratory
- *
- *  Direct inqueries to:
- *  Jeff HIll, AT-8, Mail Stop H820
- *  Los Alamos National Laboratory
- *  Los Alamos, New Mexico 87545
- *  Phone: (505) 665-1831
- *  E-mail: johill@lanl.gov
- *
  *  PURPOSE:
  *  Broadcasts fan out over the LAN, but old IP kernels do not allow
  *  two processes on the same machine to get the same broadcast
@@ -108,23 +87,24 @@ static const unsigned short PORT_ANY = 0u;
 /*
  * makeSocket()
  */
-static bool makeSocket ( unsigned short port, bool reuseAddr, SOCKET * pSock )
+static int makeSocket ( unsigned short port, bool reuseAddr, SOCKET * pSock )
 {
-    int status;
-	union {
-		struct sockaddr_in ia;
-		struct sockaddr sa;
-	} bd;
-
     SOCKET sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, 0 );     
+
     if ( sock == INVALID_SOCKET ) {
-        return false;
+	*pSock = sock;
+        return SOCKERRNO;
     }
 
     /*
      * no need to bind if unconstrained
      */
     if ( port != PORT_ANY ) {
+        int status;
+        union {
+            struct sockaddr_in ia;
+            struct sockaddr sa;
+        } bd;
 
         memset ( (char *) &bd, 0, sizeof (bd) );
         bd.ia.sin_family = AF_INET;
@@ -132,15 +112,16 @@ static bool makeSocket ( unsigned short port, bool reuseAddr, SOCKET * pSock )
         bd.ia.sin_port = htons ( port );  
         status = bind ( sock, &bd.sa, (int) sizeof(bd) );
         if ( status < 0 ) {
+            status = SOCKERRNO;
             epicsSocketDestroy ( sock );
-            return false;
+            return status;
         }
         if ( reuseAddr ) {
             epicsSocketEnableAddressReuseDuringTimeWaitState ( sock );
         }
     }
     *pSock = sock;
-    return true;
+    return 0;
 }
 
 repeaterClient::repeaterClient ( const osiSockAddr &fromIn ) :
@@ -156,10 +137,10 @@ bool repeaterClient::connect ()
 {
     int status;
 
-    if ( ! makeSocket ( PORT_ANY, false, & this->sock ) ) {
+    if ( int sockerrno = makeSocket ( PORT_ANY, false, & this->sock ) ) {
         char sockErrBuf[64];
-        epicsSocketConvertErrnoToString ( 
-            sockErrBuf, sizeof ( sockErrBuf ) );
+        epicsSocketConvertErrorToString ( 
+            sockErrBuf, sizeof ( sockErrBuf ), sockerrno );
         fprintf ( stderr, "%s: no client sock because \"%s\"\n",
                 __FILE__, sockErrBuf );
         return false;
@@ -300,20 +281,25 @@ inline bool repeaterClient::identicalPort ( const osiSockAddr &fromIn )
 bool repeaterClient::verify ()
 {
     SOCKET tmpSock;
-    bool success = makeSocket ( this->port (), false, & tmpSock );
-    if ( success ) {
+    int sockerrno = makeSocket ( this->port (), false, & tmpSock );
+
+    if ( sockerrno == SOCK_EADDRINUSE ) {
+        // Normal result, client using port
+        return true;
+    }
+
+    if ( sockerrno == 0 ) {
+        // Client went away, released port
         epicsSocketDestroy ( tmpSock );
     }
     else {
-        if ( SOCKERRNO != SOCK_EADDRINUSE ) {
-            char sockErrBuf[64];
-            epicsSocketConvertErrnoToString ( 
-                sockErrBuf, sizeof ( sockErrBuf ) );
-            fprintf ( stderr, "CA Repeater: bind test err was \"%s\"\n", 
-                sockErrBuf );
-        }
+        char sockErrBuf[64];
+        epicsSocketConvertErrorToString (
+            sockErrBuf, sizeof ( sockErrBuf ), sockerrno );
+        fprintf ( stderr, "CA Repeater: Bind test error \"%s\"\n",
+            sockErrBuf );
     }
-    return ! success;
+    return false;
 }
 
 
@@ -387,10 +373,10 @@ static void register_new_client ( osiSockAddr & from,
 
         if ( ! init ) {
             SOCKET sock;
-            if ( ! makeSocket ( PORT_ANY, true, & sock ) ) {
+            if ( int sockerrno = makeSocket ( PORT_ANY, true, & sock ) ) {
                 char sockErrBuf[64];
-                epicsSocketConvertErrnoToString ( 
-                    sockErrBuf, sizeof ( sockErrBuf ) );
+                epicsSocketConvertErrorToString ( 
+                    sockErrBuf, sizeof ( sockErrBuf ), sockerrno );
                 fprintf ( stderr, "%s: Unable to create repeater bind test socket because \"%s\"\n",
                     __FILE__, sockErrBuf );
             }
@@ -511,18 +497,18 @@ void ca_repeater ()
 
     port = envGetInetPortConfigParam ( & EPICS_CA_REPEATER_PORT,
                                        static_cast <unsigned short> (CA_REPEATER_PORT) );
-    if ( ! makeSocket ( port, true, & sock ) ) {
+    if ( int sockerrno = makeSocket ( port, true, & sock ) ) {
         /*
          * test for server was already started
          */
-        if ( SOCKERRNO == SOCK_EADDRINUSE ) {
+        if ( sockerrno == SOCK_EADDRINUSE ) {
             osiSockRelease ();
             debugPrintf ( ( "CA Repeater: exiting because a repeater is already running\n" ) );
             return;
         }
         char sockErrBuf[64];
-        epicsSocketConvertErrnoToString ( 
-            sockErrBuf, sizeof ( sockErrBuf ) );
+        epicsSocketConvertErrorToString ( 
+            sockErrBuf, sizeof ( sockErrBuf ), sockerrno );
         fprintf ( stderr, "%s: Unable to create repeater socket because \"%s\" - fatal\n",
             __FILE__, sockErrBuf );
         osiSockRelease ();

src/ca/client/repeaterSubscribeTimer.cpp

@@ -66,6 +66,8 @@ void repeaterSubscribeTimer::shutdown (
 epicsTimerNotify::expireStatus repeaterSubscribeTimer::
     expire ( const epicsTime & /* currentTime */ )
 {
+    epicsGuard < epicsMutex > guard ( this->stateMutex );
+    
     static const unsigned nTriesToMsg = 50;
     if ( this->attempts > nTriesToMsg && ! this->once ) {
         callbackManager mgr ( this->ctxNotify, this->cbMutex );
@@ -92,12 +94,15 @@ epicsTimerNotify::expireStatus repeaterSubscribeTimer::
 
 void repeaterSubscribeTimer::show ( unsigned /* level */ ) const
 {
+    epicsGuard < epicsMutex > guard ( this->stateMutex );
+    
     ::printf ( "repeater subscribe timer: attempts=%u registered=%u once=%u\n",
         this->attempts, this->registered, this->once );
 }
 
 void repeaterSubscribeTimer::confirmNotify ()
 {
+    epicsGuard < epicsMutex > guard ( this->stateMutex );
     this->registered = true;
 }
 

src/ca/client/repeaterSubscribeTimer.h

@@ -70,6 +70,7 @@ private:
     repeaterTimerNotify & iiu;
     epicsMutex & cbMutex;
     cacContextNotify & ctxNotify;
+    mutable epicsMutex stateMutex;
     unsigned attempts;
     bool registered;
     bool once;

src/ca/client/tools/tool_lib.c

@@ -59,28 +59,34 @@ capri caPriority = DEFAULT_CA_PRIORITY;  /* CA Priority */
 
 
 
-void sprint_long (char *ret, long val, IntFormatT outType)
+static void sprint_long (char *ret, dbr_long_t val, IntFormatT outType)
 {
-    long i, bit, skip=-1L;   /* used only for printing bits */
-    switch (outType) {
-    case hex: sprintf(ret, "0x%lX", val); break;
-    case oct: sprintf(ret, "0o%lo", val); break;
-    case bin:
-        for (i=31; i>=0 ; i--)
-        {
-            bit = (val>>i) & 0x1L;
-            if (skip<0 && bit)
-            {
+    if (outType == bin && val != 0) {
+        /* sprintf doesn't do binary; this code doesn't handle 0 */
+        int i, skip = -1;
+
+        for (i = 31; i >= 0; i--) {
+            int bit = (val >> i) & 1;
+
+            if (skip < 0 && bit) {
                 skip = 31 - i;          /* skip leading 0's */
                 ret[i+1] = '\0';
             }
-            if (skip >= 0)
-            {
-                ret[31-i-skip] = (bit) ? '1' : '0';
+            if (skip >= 0) {
+                ret[31-i-skip] = '0' + bit;
             }
         }
-        break;
-    default:  sprintf(ret, "%ld", val); /* decimal */
+    }
+    else {
+        const char *fmt[4] = { /* Order must match the enum IntFormatT */
+            "%ld"   /* dec */,
+            "0"     /* bin, val is 0 */,
+            "0o%lo" /* oct */,
+            "0x%lX" /* hex */
+        };
+
+        /* Formats have long modifier, pass value as a long */
+        sprintf(ret, fmt[outType], (long) val);
     }
 }
 
@@ -113,6 +119,7 @@ char *val2str (const void *v, unsigned type, int index)
         strcpy (str, "*** invalid type");
         return str;
     }
+    strcpy (str, "!!!");
 
     base_type = type % (LAST_TYPE+1);
 
@@ -160,11 +167,21 @@ char *val2str (const void *v, unsigned type, int index)
     case DBR_ENUM:
         {
             dbr_enum_t *val = (dbr_enum_t *)val_ptr;
-            if (dbr_type_is_GR(type) && !enumAsNr)
-                sprintf(str, "%s", ((struct dbr_gr_enum *)v)->strs[val[index]]);
-            else if (dbr_type_is_CTRL(type) && !enumAsNr)
-                sprintf(str, "%s", ((struct dbr_ctrl_enum *)v)->strs[val[index]]);
-            else
+            if (dbr_type_is_GR(type) && !enumAsNr) {
+                if (val[index] >= MAX_ENUM_STATES)
+                    sprintf(str, "Illegal Value (%d)", val[index]);
+                else if (val[index] >= ((struct dbr_gr_enum *)v)->no_str)
+                    sprintf(str, "Enum Index Overflow (%d)", val[index]);
+                else
+                    sprintf(str, "%s", ((struct dbr_gr_enum *)v)->strs[val[index]]);
+            } else if (dbr_type_is_CTRL(type) && !enumAsNr) {
+                if (val[index] >= MAX_ENUM_STATES)
+                    sprintf(str, "Illegal Value (%d)", val[index]);
+                else if (val[index] >= ((struct dbr_ctrl_enum *)v)->no_str)
+                    sprintf(str, "Enum Index Overflow (%d)", val[index]);
+                else
+                    sprintf(str, "%s", ((struct dbr_ctrl_enum *)v)->strs[val[index]]);
+            } else
                 sprintf(str, "%d", val[index]);
         }
     }