R3.14.10pre1

prototype is present in time.h so we supply our own that returns error.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 1991-2004 University of Chicago and The Regents of the
+Copyright (c) 1991-2007 UChicago Argonne LLC and The Regents of the
 University of California. All rights reserved.
 
 EPICS BASE is distributed subject to the following license conditions:

Makefile

@@ -14,10 +14,16 @@
 TOP = .
 include $(TOP)/configure/CONFIG
 
-ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
-DIRS += config config/tools
-endif
+# Bootstrap resolution: tools not installed yet
+TOOLS = $(TOP)/src/tools
+
 DIRS += configure src
+ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
+DIRS += config
+endif
+
+src_DEPEND_DIRS = configure
+config_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
 

config/CONFIG.Host.WIN32

@@ -96,13 +96,14 @@ ACC_SLIBS_NO=
 # Use of /Za would dissable DLL import/export keywords which
 # EPICS include/excludes using architecture neutral macros
 #
-# /GX support C++ exceptions
+# /EHsc support C++ exceptions
 # /GR generate RTTI information
 #
-CCC = cl /GX /GR
+CCC = cl /EHsc /GR
 CCC_NORMAL = $(CCC) /nologo /D__STDC__=0
 CCC_STRICT = $(CCC) /nologo /D__STDC__=0
 CCC_TEMPL_INST_FLAG =
+ARCH_DEP_CPPFLAGS += /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 
 #
 # /W<N> use warning level N
@@ -269,3 +270,14 @@ LINK.cc = $(WINLINK) -nologo $(LDFLAGS) -out:$@
 # Overrides for CONFIG_COMMON default
 POSIX_CPPFLAGS_YES = 
 
+#--------------------------------------------------
+# UseManifestTool.pl checks MS Visual c++ compiler version number to
+# decide whether or not to use the Manifest Tool command to embed the
+# linker created .manifest file into a library or product target.
+# useManifestTool.pl returns 0(don't use) or 1(use).
+#
+ifeq ($(shell $(PERL) $(EPICS_BASE_TOOLS)/useManifestTool.pl),1)
+MT_DLL_COMMAND = mt.exe /manifest $@.manifest "/outputresource:$@;\#2"
+MT_EXE_COMMAND = mt.exe /manifest $@.manifest "/outputresource:$@;\#1"
+endif
+

config/CONFIG.Host.cygwin-x86

@@ -7,9 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-menu(menuArrType) {
-	choice(menuArrType8_bit_integers,"8 bit integers")
-	choice(menuArrType16_bit_integers,"16 bit integers")
-	choice(menuArrType32_bit_integers,"32 bit integers")
-	choice(menuArrTypeIEEE_floating_point,"IEEE floating point")
-}
+# $Id$
+
+# cygwin-x86 is the new name for cygwin32
+-include $(EPICS_BASE)/config/CONFIG.Host.cygwin32

config/CONFIG.Host.cygwin32

@@ -20,6 +20,17 @@ include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
 
 EXE=.exe
 
+#==========================
+#These overrides remove -ansi because -ansi eliminates strdup
+GCC_ANSI = $(GCC)
+GCC_STRICT = $(GCC) -pedantic
+G++_NORMAL = $(G++) -pedantic
+G++_STRICT = $(G++) -pedantic
+
+#==========================
+#This override will eliminate warnings for old R3.13 extensions
+#GCC_WARN_YES =
+
 #==========================
 # These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
 # since OS vendor compilers ACC and CCC are not defined here for cygwin32
@@ -32,7 +43,7 @@ SHARED_LIBRARIES=NO
 #OP_SYS_INCLUDES += /usr/local/include/g++
 #==========================
  
-ARCH_DEP_CFLAGS = -DCYGWIN32 -U_WIN32
+ARCH_DEP_CPPFLAGS = -DCYGWIN32 -U_WIN32
 ARCH_DEP_LDLIBS =
 OP_SYS_LDLIBS =
 
@@ -41,7 +52,9 @@ OP_SYS_LDLIBS =
 GCC_DEP_CFLAGS = -D_REENTRANT
 G++_DEP_CFLAGS = -D_REENTRANT
 
-POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
+#POSIX_SOURCE eliminates select()
+#POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
+POSIX_CPPFLAGS_YES = -D_POSIX_THREADS -D_POSIX_TIMERS
 
 # Runtime ldflags
 RUNTIME_LIBS =$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\

config/CONFIG.Host.darwin-ppcx86

@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Darwin
+OP_SYS_CFLAGS += "-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+OP_SYS_LDFLAGS += "-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"

config/CONFIG.Host.darwin-x86

@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Darwin

config/CONFIG.Host.freebsd

@@ -0,0 +1,35 @@
+#*************************************************************************
+# Copyright (c) 2006 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 file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.freebsd
+ 
+OS_CLASS = freebsd
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+CODE_CPPFLAGS = -D_REENTRANT
+
+POSIX_CPPFLAGS = -D_POSIX_THREADS
+POSIX_LDLIBS = -lpthread
+
+# -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
+OP_SYS_CPPFLAGS += -D_BSD_SOURCE
+OP_SYS_CPPFLAGS += -Dfreebsd
+
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline -lcurses
+
+GNU_LDLIBS_YES = -lgcc_pic
+

config/CONFIG.Host.freebsd-x86

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2006 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 file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+ARCH_CLASS = x86
+
+-include $(EPICS_BASE)/config/CONFIG.Host.freebsd
+
+ARCH_DEP_CPPFLAGS += -D_X86_

config/CONFIG.Host.freebsd-x86_64

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2006 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 file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+ARCH_CLASS = x86_64
+
+-include $(EPICS_BASE)/config/CONFIG.Host.freebsd
+
+ARCH_DEP_CPPFLAGS += -D_X86_64_

config/CONFIG.Host.linux-ppc

@@ -7,18 +7,18 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#
 # $Id$
-#
 
-TOP=../..
+-include $(EPICS_BASE)/config/CONFIG.Host.Linux
 
-include $(TOP)/configure/CONFIG
+ARCH_CLASS = ppc
 
-ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
-SCRIPTS_HOST += $(subst ../,,$(wildcard ../*.pl)) 
-SCRIPTS_HOST += installEpics
-endif
+ARCH_DEP_CPPFLAGS += -D_ppc_
 
-include $(TOP)/configure/RULES
+GNU_DIR = /usr
+
+GCC = $(GNU_BIN)/gcc
+G++ = $(GNU_BIN)/g++
+
+ARCH_DEP_LDLIBS = -lgcc
 

config/CONFIG.Host.linux-x86-debug

@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Linux

config/CONFIG.Host.linux-x86_64

@@ -0,0 +1,17 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Linux
+
+ARCH_CLASS = Linux
+
+ARCH_DEP_CFLAGS = -D_X86_64_ -Dlinux
+

config/CONFIG.Host.linux-x86_64-debug

@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.linux-x86_64
+

config/CONFIG.Host.osf-alpha-gnu

@@ -0,0 +1,20 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# osf-alpha is the new name for alpha
+-include $(EPICS_BASE)/config/CONFIG.Host.alpha
+
+#==========================
+# These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
+ANSI=GCC
+CPLUSPLUS=G++
+#==========================
+

config/CONFIG.Host.solaris

@@ -71,16 +71,19 @@ POSIX_CPPFLAGS_YES += -D__EXTENSIONS__ -mt
 
 ARCH_DEP_LDFLAGS += -mt
 
-# socket and nsl needed by libca.a
+# socket and nsl needed by libca.a when SHARED_LIBRARIES = NO
 ARCH_DEP_LDLIBS += -lsocket -lnsl
 ARCH_DEP_LDLIBS += -lposix4 -lpthread
-ARCH_DEP_LDLIBS_8 = -lCrun
-ARCH_DEP_LDLIBS_9 = -lCrun
+
+ARCH_DEP_LDLIBS_8 += -lCrun -lc -lCstd
+ARCH_DEP_LDLIBS_9 += -lCrun -lc -lCstd
+ARCH_DEP_LDLIBS_10 += -lCrun -lc -lCstd
 ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
 
 #Allows R3.13 built extensions to load R3.14 shared libs
 SYS_DLL_LIBS_solaris_8 = Crun
 SYS_DLL_LIBS_solaris_9 = Crun
+SYS_DLL_LIBS_solaris_10 = Crun
 SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
 
 # Runtime ldflags

config/CONFIG.Host.solaris-sparc64

@@ -0,0 +1,18 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solaris
+
+ARCH_DEP_CFLAGS += -xarch=generic64
+ARCH_DEP_CXXFLAGS += -xarch=generic64
+ARCH_DEP_LDFLAGS += -xarch=generic64
+

config/CONFIG.Host.solaris-sparc64-gnu

@@ -0,0 +1,18 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solarisGnu
+
+ARCH_DEP_CFLAGS += -mcpu=v9 -m64
+ARCH_DEP_CXXFLAGS += -mcpu=v9 -m64
+ARCH_DEP_LDFLAGS += -mcpu=v9 -m64
+

config/CONFIG.Host.solaris-x86-gnu

@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# CONFIG.Host.solaris-x86
+# CONFIG.Host.solaris-x86-gnu
 #
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Host.solaris-x86

config/CONFIG.Host.solarisGnu

@@ -12,20 +12,7 @@
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Host.solarisGnu
 
-ARCH_CLASS = solaris
-
-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
-
-#
-# required by sun's C++ compiler
-#
-AR = ar
-_AR = $(AR) $(ARFLAGS)
-G++_AR = $(_AR)
-CCC_AR = $(CCC) -xar -o
-ARCMD = $($(CPLUSPLUS)_AR) $@
-RANLIB =
+include $(EPICS_BASE)/config/CONFIG.Host.solaris
 
 #==========================
 # These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
@@ -33,25 +20,3 @@ ANSI=GCC
 CPLUSPLUS=G++
 #==========================
 
-SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
-ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
-POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
-
-ARCH_DEP_LDFLAGS += -mt
-
-# socket and nsl needed by libca.a
-ARCH_DEP_LDLIBS += -lsocket -lnsl
-ARCH_DEP_LDLIBS += -lposix4 -lpthread
-ARCH_DEP_LDLIBS_8 = -lCrun
-ARCH_DEP_LDLIBS_9 = -lCrun
-ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
-
-#Allows R3.13 built extensions to load R3.14 shared libs
-SYS_DLL_LIBS_solaris_8 = Crun
-SYS_DLL_LIBS_solaris_9 = Crun
-SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
-
-# Runtime ldflags
-RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
- $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
-

config/CONFIG.Host.win32-x86-cygwin

@@ -0,0 +1,62 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.win32-x86-cygwin
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+EXE = .exe
+
+SHARED_LIBRARIES = NO
+ 
+ARCH_CLASS = WIN32
+
+AR = ar -rc
+ARCMD = $(AR) $@
+RANLIB = ranlib -t
+
+ANSI=GCC
+CPLUSPLUS=G++
+
+# Dont use -ansi: -ansi eliminates strdup and _tempnam
+GCC_ANSI = $(GCC)
+GCC_STRICT = $(GCC) -pedantic
+G++_NORMAL = $(G++) -pedantic
+G++_STRICT = $(G++) -pedantic
+
+# Dont use -fPIC: with -fPIC we get
+# "warning: -fPIC ignored for target (all code is position independent) "
+GCC_DEP_CFLAGS =
+G++_DEP_CFLAGS =
+
+OP_SYS_CFLAGS =
+OP_SYS_CPPFLAGS = -mno-cygwin
+OP_SYS_CXXFLAGS += -D__cplusplus
+OP_SYS_LDFLAGS += -mno-cygwin
+
+POSIX_CPPFLAGS_YES = 
+
+# With no-cygwin option:
+#       compiler defines _X86_ 1
+#       compiler defines __MSVCRT__ 1
+#       compiler defines __MINGW32__ 1
+#       compiler defines __WIN32 1
+#       compiler defines __WIN32__ 1
+#       compiler defines _WIN32 1
+#       compiler defines WIN32 1
+#       compiler defines WINNT 1
+#       compiler does not define  __unix __unix__ unix
+#       compiler does not define  __CYGWIN__ __CYGWIN32__
+
+ARCH_DEP_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+

config/CONFIG.Host.win32-x86-debug

@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.WIN32

config/CONFIG.Host.win32-x86-mingw

@@ -0,0 +1,58 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.win32-x86-mingw
+ 
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+EXE = .exe
+
+SHARED_LIBRARIES = NO
+
+ARCH_CLASS = WIN32
+
+AR = ar -rc
+ARCMD = $(AR) $@
+RANLIB = ranlib -t
+
+ANSI=GCC
+CPLUSPLUS=G++
+
+# Compiler defines _X86_ 1
+
+# Compiler defines __MSVCRT__ 1
+# Compiler defines __MINGW32__ 1
+# Compiler defines __WIN32 1
+# Compiler defines __WINNT 1
+# Compiler defines __WINNT__ 1
+# Compiler defines __WIN32__ 1
+# Compiler defines _WIN32 1
+# Compiler defines WIN32 1
+# Compiler defines WINNT 1
+# Compiler does not define  __unix __unix__ unix
+
+OP_SYS_CFLAGS =
+OP_SYS_CXXFLAGS += -D__cplusplus
+
+GCC_DEP_CFLAGS =
+G++_DEP_CFLAGS =
+
+POSIX_CPPFLAGS_YES = 
+
+ARCH_DEP_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+
+# Remove -ansi compile option for gcc (does not allow c++ type comments).
+GCC_ANSI = $(GCC)
+GCC_STRICT = $(GCC) -pedantic
+G++_NORMAL = $(G++) -pedantic
+G++_STRICT = $(G++)  -pedantic

config/CONFIG_BASE

@@ -52,6 +52,9 @@ EPICS_BASE = $(TOP)
 # EPICS include config file
 include $(EPICS_BASE)/config/CONFIG
 
+-include $(EPICS_BASE)/configure/RELEASE
+-include $(EPICS_BASE)/configure/RELEASE.$(EPICS_HOST_ARCH)
+
 ifdef INSTALL_LOCATION_BASE
 INSTALL_LOCATION = $(INSTALL_LOCATION_BASE)
 endif

config/CONFIG_BASE_VERSION

@@ -10,24 +10,6 @@
 #
 #  $Id$
 #
-#  EPICS Version information
-#
-# This file is interpreted by the Bourne Shell (MakeRelease), so spaces are
-# not allowed around the '=' signs or in unquoted values.
-#
+#  EPICS Version information now comes from configure...
 
-EPICS_VERSION=3
-EPICS_REVISION=14
-EPICS_MODIFICATION=8
-EPICS_UPDATE_NAME=
-EPICS_UPDATE_LEVEL=0
-
-EPICS_LOCAL_NAME=B
-EPICS_LOCAL_VERSION=0
-
-EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}.$(EPICS_LOCAL_NAME)$(EPICS_LOCAL_VERSION)"
-
-CVS_DATE="\$$Date$$"
-CVS_TAG="\$$Name$$"
-
-BASE_3_14=YES
+include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION

config/CONFIG_COMMON

@@ -90,7 +90,7 @@ GCC_STRICT = $(GCC) -ansi -pedantic
 GCC_TRAD = $(GCC)
 GCC_DEP_CFLAGS = -fPIC -D_REENTRANT
 
-GCC_WARN_YES = -Wall -Wtraditional -Wmissing-prototypes -Wstrict-prototypes
+GCC_WARN_YES = -Wall -Wmissing-prototypes -Wstrict-prototypes
 GCC_WARN_NO = -w
 GCC_OPT_YES = -O3
 GCC_OPT_NO = -g
@@ -244,7 +244,7 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(STATIC_LDLIBS) $(ARCH_DEP_LDLIBS)\
   $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)
 
-CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(POSIX_CPPFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(POSIX_CPPFLAGS)  $(OP_SYS_CPPFLAGS)
 
 CPPSNCFLAGS = $(INCLUDES)
 

config/CONFIG_COMPAT

@@ -21,8 +21,9 @@ ARCH_solarisNonshared = solaris-sparc-nonshared
 ARCH_solaris = solaris-sparc
 ARCH_sun4 = sun4-sparc
 ARCH_Linux = linux-x86
+ARCH_freebsd = freebsd-x86_64
 ARCH_WIN32 = win32-x86
-ARCH_hp700 = hpux-m68k
+ARCH_hp700 = hpux-parisc
 ARCH_alpha = osf-alpha
 ARCH_Borland = win32-x86-borland
 ARCH_cygwin32 = cygwin-x86

config/CONFIG_HOST_ARCH.Darwin

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.Darwin
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.Linux

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.Linux
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.alpha

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.alpha
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.cygwin-x86

@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 #*************************************************************************
 # Copyright (c) 2002 The University of Chicago, as Operator of Argonne
 #     National Laboratory.
@@ -8,25 +7,17 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+# CONFIG_HOST_ARCH.cygwin-x86
 #
-#	UNIX-mkdir in Perl
-#
-#	-p option generates full path to given dir
+# This file is maintained by the EPICS community.
 
-use File::Path;
-use Getopt::Std;
-getopt "";
+# Include definitions common to all Unix archs
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
 
-foreach $dir ( @ARGV )
-{
-	if ($opt_p)
-	{
-		mkpath ($dir) or die "Cannot make directory $dir";
-	}
-	else
-	{
-		mkdir ($dir, 0777) or die "Cannot make directory $dir";
-	}
-}
+EXE=.exe
+HOSTEXE=.exe
+
+TORNADO=YES
+
+WIND_HOST_TYPE = x86-win32
 
-# EOF mkdir.pl

config/CONFIG_HOST_ARCH.darwin-ppcx86

@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Darwin

config/CONFIG_HOST_ARCH.darwin-x86

@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Darwin

config/CONFIG_HOST_ARCH.freebsd-x86_64

@@ -0,0 +1,11 @@
+#*************************************************************************
+# Copyright (c) 2006 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 file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.hp700

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.hp700
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.linux-ppc

@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Linux
+
+WIND_HOST_TYPE = ppc-linux

config/CONFIG_HOST_ARCH.linux-x86-debug

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# linux-x86 is the new name for linux
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Linux
+
+HOST_OPT = NO

config/CONFIG_HOST_ARCH.linux-x86_64

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
+
+WIND_HOST_TYPE = x86-linux2

config/CONFIG_HOST_ARCH.linux-x86_64-debug

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.linux-x86_64
+
+HOST_OPT = NO

config/CONFIG_HOST_ARCH.sgi

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.sgi
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.solaris

@@ -8,8 +8,6 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #  CONFIG_HOST_ARCH.solaris
-#
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.solaris-sparc-debug

@@ -11,3 +11,4 @@
 
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris
 
+HOST_OPT = NO

config/CONFIG_HOST_ARCH.solaris-sparc64

@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris

config/CONFIG_HOST_ARCH.solaris-sparc64-gnu

@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+#  $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solarisGnu
+

config/CONFIG_HOST_ARCH.solaris-x86

@@ -8,8 +8,6 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #  CONFIG_HOST_ARCH.solaris-x86
-#
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.solarisGnu

@@ -1,6 +1,5 @@
 #  CONFIG_HOST_ARCH.solarisGnu
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.sun4

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.sun4
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.win32-x86-cygwin

@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 #*************************************************************************
 # Copyright (c) 2002 The University of Chicago, as Operator of Argonne
 #     National Laboratory.
@@ -8,38 +7,14 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+#  $Id$
 #
-#	UNIX-rm in Perl
+# Override values in CONFIG_SITE_HOST_ARCH.win32-x86-cygwin
 
-use File::Path;
-use File::Find;
-use Getopt::Std;
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
 
-getopt "";
+HOSTEXE=.exe
 
-foreach $arg ( @ARGV )
-{
-	next unless -e $arg;
+WIND_HOST_TYPE = x86-win32
 
-	if (-d $arg)
-	{
-		if ($opt_r and $opt_f)
-		{
-			rmtree $arg;
-		}
-		else
-		{
-			rmdir ($arg) or die "Cannot delete $arg";
-		}
-        if (-d $arg)
-        {
-            die "Failed to delete $arg";
-        }
-	}
-	else
-	{
-		unlink ($arg) or die "Cannot delete $arg";
-	}
-}
-
-# EOF rm.pl

config/CONFIG_HOST_ARCH.win32-x86-debug

@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.WIN32
+
+HOST_OPT = NO

config/CONFIG_HOST_ARCH.win32-x86-mingw

@@ -0,0 +1,29 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+#  $Id$
+#
+# Override values in CONFIG_SITE_HOST_ARCH.win32-x86-mingw
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
+
+EXE=.exe
+HOSTEXE=.exe
+
+CP   =$(PERL) $(EPICS_BASE_TOOLS)/cp.pl
+MV   =$(PERL) $(EPICS_BASE_TOOLS)/mv.pl
+RM   =$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -f
+MKDIR=$(PERL) $(EPICS_BASE_TOOLS)/mkdir.pl
+RMDIR=$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -rf
+CHMOD=echo
+ECHO=echo
+
+WIND_HOST_TYPE = x86-win32
+

config/CONFIG_SITE.Host.darwin-x86

@@ -0,0 +1,5 @@
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_SITE.Host.Darwin
+
+SHARED_LIBRARIES=NO

config/CONFIG_SITE.Host.solaris-sparc64

@@ -0,0 +1,4 @@
+# $Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG_SITE.Host.solaris

config/CONFIG_SITE.Vx.ppc604

@@ -1,3 +1,4 @@
+#  CONFIG_SITE.Vx.ppc604
 
 # APS override of tornado directory for ppc
 #VX_DIR_YES = /usr/local/vw/tornado101ppc2

config/Makefile

@@ -20,6 +20,9 @@ INSTALL_CONFIG = $(INSTALL_LOCATION)/config
 
 CONFIGS += $(subst ../,,$(wildcard ../CONFIG*))
 CONFIGS += $(subst ../,,$(wildcard ../RULES*))
+
+CONFIGS += $(subst ../,,$(wildcard ../tools/*.pl))
+
 endif
 
 include $(TOP)/configure/RULES

config/RULES.Host

@@ -427,6 +427,7 @@ else
 $(PRODNAME): $(PRODNAME_OBJS) $(PRODNAME_RESS)
 	@$(RM) $@
 	$(PRODNAME_LINKER) $(PRODNAME_OBJS) $(PRODNAME_RESS) $(LDLIBS)
+	$(MT_EXE_COMMAND)
 
 endif
 endif  # ifdef PRODNAME_SRCS
@@ -738,6 +739,7 @@ $(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS) $(LIBNAME_RESS)
 else
 $(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS) $(LIBNAME_RESS)
 	$(LINK.shrlib) $(LIBOBJS) $(DLL_LDLIBS) $(LIBNAME_RESS)
+	$(MT_DLL_COMMAND)
 
 endif
 ifdef BORLANDC

config/tools/useManifestTool.pl

@@ -0,0 +1,31 @@
+eval 'exec perl -S -w  $0 ${1+"$@"}'  # -*- Mode: perl -*-
+        if 0; 
+
+#
+# Use MS Visual C++ compiler version number to determine if
+# we want to use the Manifest Tool (status=1) or not (status=0)
+#
+# VC compiler versions >= 14.00 will have status=1
+# VC compiler versions 10.00 - 13.10 will have status=0
+# EPICS builds with older VC compilers is not supported
+#
+
+my $versionString=`cl 2>&1`;
+
+if ($versionString =~ m/Version 14./) {
+ $status=1;
+} elsif ($versionString =~ m/Version 13.10/){
+ $status=0;
+} elsif ($versionString =~ m/Version 13.0/){
+ $status=0;
+} elsif ($versionString =~ m/Version 12./){
+ $status=0;
+} elsif ($versionString =~ m/Version 11./){
+ $status=0;
+} elsif ($versionString =~ m/Version 10./){
+ $status=0;
+} else {
+ $status=1;
+}
+print "$status\n";
+exit;

configure/CONFIG

@@ -17,33 +17,43 @@
 #  Common build definitions
 #
 
-CONFIG ?= $(TOP)/configure
+ifneq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
+EPICS_BASE = $(INSTALL_LOCATION)
+CONFIG = $(TOP)/configure
+BASE_TOP=YES
+else
+CONFIG ?= $(EPICS_BASE)/configure
+endif
 
 -include $(CONFIG)/os/CONFIG_COMPAT
 
 -include $(CONFIG)/RELEASE
 -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)
 endif
 
 include $(CONFIG)/CONFIG_COMMON
+include $(CONFIG)/CONFIG_FILE_TYPE
 
 #  Base-specific build options
 #
 include $(CONFIG)/CONFIG_BASE
-include $(CONFIG)/CONFIG_BASE_VERSION
 
 #  Site-specific build options
 #
 include $(CONFIG)/CONFIG_SITE
 
+#  Version numbering
+#
+include $(CONFIG)/CONFIG_BASE_VERSION
+
 #  Host architecture specific definitions
 #
 include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
--include $(CONFIG)/O.$(T_A)/CONFIG_APP_INCLUDE
 
 ifdef T_A
 
@@ -61,6 +71,12 @@ endif
 #
 -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
 
+#  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)
@@ -68,6 +84,25 @@ endif
 
 endif
 
+# Include <top>/cfg/CONFIG* definitions from tops defined in RELEASE* files
+#
+ifneq ($(CONFIG),$(TOP)/configure)
+RELEASE_TOPS ?= $(shell $(PERL) $(TOOLS)/convertRelease.pl -T $(TOP) releaseTops )
+RELEASE_CFG_CONFIGS = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/cfg/CONFIG*))
+ifneq ($(RELEASE_CFG_CONFIGS),)
+include $(RELEASE_CFG_CONFIGS)
+endif
+endif
+
+# Include $(INSTALL_CFG)/CONFIG* definitions
+#
+ifndef T_A
+TOP_CFG_CONFIGS = $(wildcard $(INSTALL_CFG)/CONFIG*)
+ifneq ($(TOP_CFG_CONFIGS),)
+include $(TOP_CFG_CONFIGS)
+endif
+endif
+
 #  User specific definitions
 #
 -include $(HOME)/configure/CONFIG_USER

configure/CONFIG.CrossCommon

@@ -18,16 +18,14 @@ BUILD_CLASS = CROSS
 #   ifdef CROSS    looks better than  ifeq ($(BUILD_CLASS),CROSS)
 CROSS = YES
 
-GNU_TARGET_INCLUDE_DIR = $(GNU_DIR)/$(GNU_TARGET)/include
-GNU_TARGET_LIB_DIR = $(GNU_DIR)/$(GNU_TARGET)/lib
-
-export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/
+GNU_TARGET_INCLUDE_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/include)
+GNU_TARGET_LIB_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/lib)
 
 CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
 CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
 
 CMPLR_PREFIX_CROSS=$(addsuffix -,$(GNU_TARGET))
-CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASSS))
+CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASS))
 
 # All cross builds use the gnu compiler
 include $(CONFIG)/CONFIG.gnuCommon

configure/CONFIG.gnuCommon

@@ -45,10 +45,16 @@ OPT_CXXFLAGS_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 
+PIPE_CFLAGS_YES_YES = -pipe
+PIPE_CFLAGS = $(PIPE_CFLAGS_$(GCC_PIPE)_$(GNU))
+PIPE_CXXFLAGS = $(PIPE_CFLAGS)
+
 STATIC_LDFLAGS_YES = -static
 STATIC_LDFLAGS_NO =
 
 SHRLIB_CFLAGS = -fPIC
+SHRLIB_LDFLAGS =  -shared -fPIC
+LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
 
 GNU_LDLIBS_YES = -lgcc
 

configure/CONFIG_ADDONS

@@ -51,9 +51,9 @@
 #    PROD          products to build and install
 #    PROD_HOST     products to build and install
 #    PROD_IOC      products to build and install
-#    TESTPROD      products to build and install
-#    TESTPROD_HOST products to build and install
-#    TESTPROD_IOC  products to build and install
+#    TESTPROD      products to build
+#    TESTPROD_HOST products to build
+#    TESTPROD_IOC  products to build
 #    LIBRARY       products to build and install
 #    LIBRARY_HOST  products to build and install
 #    LIBRARY_IOC   products to build and install
@@ -62,6 +62,9 @@
 #    SCRIPTS       scripts and install
 #    SCRIPTS_HOST  host system scripts to install
 #    SCRIPTS_IOC   ioc system scripts to install
+#    TESTSCRIPTS       scripts
+#    TESTSCRIPTS_HOST  host system scripts
+#    TESTSCRIPTS_IOC   ioc system scripts
 #    OBJS          object files to build and install
 #    OBJS_HOST     host system object files to build and install
 #    OBJS_IOC      ioc system object files to build and install
@@ -172,8 +175,6 @@ LIB_LDFLAGS+=$(LIB_LDFLAGS_DEFAULT)
 endif
 endif
 
-#	concat specific library contents (if defined)
-#
 ifneq ($(strip $(LIBSRCS_$(OS_CLASS))),)
 LIBSRCS += $(subst -nil-,,$(LIBSRCS_$(OS_CLASS)))
 else
@@ -375,6 +376,17 @@ USR_LIBS += $(USR_LIBS_DEFAULT)
 endif
 endif
 
+#
+#	concat specific include files
+#
+ifneq ($(strip $(INC_$(OS_CLASS))),)
+INC += $(subst -nil-,,$(INC_$(OS_CLASS)))
+else
+ifdef INC_DEFAULT
+INC+=$(INC_DEFAULT)
+endif
+endif
+
 #
 #	concat specific library contents (if defined) to SYS_PROD_LIBS
 #
@@ -493,6 +505,33 @@ SCRIPTS_HOST+=$(SCRIPTS_HOST_DEFAULT)
 endif
 endif
 
+#
+#	concat specific scripts
+#
+ifneq ($(strip $(TESTSCRIPTS_$(OS_CLASS))),)
+TESTSCRIPTS += $(subst -nil-,,$(TESTSCRIPTS_$(OS_CLASS)))
+else
+ifdef TESTSCRIPTS_DEFAULT
+TESTSCRIPTS += $(TESTSCRIPTS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(TESTSCRIPTS_IOC_$(OS_CLASS))),)
+TESTSCRIPTS_IOC+=$(subst -nil-,,$(TESTSCRIPTS_IOC_$(OS_CLASS)))
+else
+ifneq (,$(strip $(TESTSCRIPTS_IOC_DEFAULT)))
+TESTSCRIPTS_IOC+=$(TESTSCRIPTS_IOC_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(TESTSCRIPTS_HOST_$(OS_CLASS))),)
+TESTSCRIPTS_HOST+=$(subst -nil-,,$(TESTSCRIPTS_HOST_$(OS_CLASS)))
+else
+ifneq (,$(strip $(TESTSCRIPTS_HOST_DEFAULT)))
+TESTSCRIPTS_HOST+=$(TESTSCRIPTS_HOST_DEFAULT)
+endif
+endif
+
 #
 #	concat specific resource files
 #

configure/CONFIG_APP_INCLUDE

@@ -0,0 +1,24 @@
+export TOP
+export IOCAPPS
+
+RELEASE_TOPS = $(shell $(PERL) $(TOOLS)/convertRelease.pl -T $(TOP) releaseTops )
+
+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 = $$(strip $$($(1)))/bin/$$(T_A)
+  $(1)_LIB = $$(strip $$($(1)))/lib/$$(T_A)
+  SHRLIB_SEARCH_DIRS += $$($(1)_LIB)
+  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$$(OS_CLASS)))
+  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include))
+  RELEASE_DBDFLAGS += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/dbd))
+  RELEASE_DBFLAGS += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/db))
+  RELEASE_PERL_MODULE_DIRS += $$(wildcard $$($(1)_LIB)/perl)
+endef
+$(foreach top, $(RELEASE_TOPS), $(eval $(call RELEASE_FLAGS_template,$(top)) ))
+
+endif
+

configure/CONFIG_BASE

@@ -8,10 +8,6 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-ifndef EPICS_BASE
-EPICS_BASE = $(INSTALL_LOCATION)
-endif
-
 #---------------------------------------------------------------
 # Epics base directories
 
@@ -25,23 +21,23 @@ endif
 #---------------------------------------------------------------
 # Epics base Ioc libraries 
 
-EPICS_BASE_IOC_LIBS += recIoc softDevIoc iocsh 
+EPICS_BASE_IOC_LIBS += recIoc softDevIoc
 EPICS_BASE_IOC_LIBS += miscIoc rsrvIoc dbtoolsIoc asIoc
 EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com 
 
 #---------------------------------------------------------------
 # Epics base Host libraries 
 
-EPICS_BASE_HOST_LIBS += cas gdd iocsh asHost dbStaticHost registryIoc
+EPICS_BASE_HOST_LIBS += cas gdd asHost dbStaticHost registryIoc
 EPICS_BASE_HOST_LIBS += ca Com
 
 #---------------------------------------------------------------
 # Version number for base shared libraries (and win32 products)
 
-ifeq ($(EPICS_BASE),$(TOP))
+ifdef BASE_TOP
 SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
 PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
-endif # EPICS_BASE
+endif # BASE_TOP
 
 #---------------------------------------------------------------
 # Base c preprocessor flags
@@ -57,22 +53,33 @@ BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
 #---------------------------------------------------------------
 # Where to find the installed build tools
 
-EPICS_BASE_TOOLS_BIN_HOST = $(EPICS_BASE_BIN)
-EPICS_BASE_TOOLS_BIN_CROSS = $(EPICS_BASE_HOST_BIN)
-EPICS_BASE_TOOLS_BIN = $(EPICS_BASE_TOOLS_BIN_$(BUILD_CLASS))
+TOOLS = $(EPICS_BASE_HOST_BIN)
 
 #---------------------------------------------------------------
 # Epics base build tools and tool flags
 
-MAKEBPT                    = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/makeBpt$(HOSTEXE))
-DBEXPAND                   = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/dbExpand$(HOSTEXE))
-DBTORECORDTYPEH            = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/dbToRecordtypeH$(HOSTEXE))
-DBTOMENUH                  = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/dbToMenuH$(HOSTEXE))
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_BASE_TOOLS_BIN)/registerRecordDeviceDriver.pl
+MAKEBPT                    = $(call PATH_FILTER, $(TOOLS)/makeBpt$(HOSTEXE))
+DBEXPAND                   = $(call PATH_FILTER, $(TOOLS)/dbExpand$(HOSTEXE))
+DBTORECORDTYPEH            = $(call PATH_FILTER, $(TOOLS)/dbToRecordtypeH$(HOSTEXE))
+DBTOMENUH                  = $(call PATH_FILTER, $(TOOLS)/dbToMenuH$(HOSTEXE))
+REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl
+CONVERTRELEASE=$(PERL) $(TOOLS)/convertRelease.pl
 
+#-------------------------------------------------------
+# tools for installing libraries and products
+INSTALL = $(PERL) $(TOOLS)/installEpics.pl
+INSTALL_PRODUCT = $(INSTALL)
+INSTALL_LIBRARY = $(INSTALL)
+
+#---------------------------------------------------------------
+# tools for making header dependancies and variable replacement
+MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
+REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
+
+#---------------------------------------------------------------
 # private versions of lex/yacc from EPICS
-EYACC = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/antelope$(HOSTEXE))
-ELEX = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/e_flex$(HOSTEXE)) -S$(EPICS_BASE)/include/flex.skel.static
+EYACC = $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE))
+ELEX = $(call PATH_FILTER, $(TOOLS)/e_flex$(HOSTEXE)) -S$(EPICS_BASE)/include/flex.skel.static
 
 YACC  = $(EYACC)
 LEX   = $(ELEX)

configure/CONFIG_BASE_VERSION

@@ -1,30 +1,50 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in 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. 
 #*************************************************************************
 #
 #  $Id$
 #
 #  EPICS Version information
 #
-# This file is interpreted by the Bourne Shell (MakeRelease), so spaces are
-# not allowed around the '=' signs or in unquoted values.
+# Only the person making an official EPICS release should make changes in
+# this file.
 #
+# EPICS_SITE_VERSION is defined in CONFIG_SITE for sites that want a local
+# version number to be included in the reported version string.
 
-EPICS_VERSION=3
-EPICS_REVISION=14
-EPICS_MODIFICATION=8
-EPICS_UPDATE_NAME=
-EPICS_UPDATE_LEVEL=0
+BASE_3_14=YES
 
-EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}"
+EPICS_VERSION = 3
+EPICS_REVISION = 14
+
+# This part may contain letters, eg 0beta1
+EPICS_MODIFICATION = 10pre1
+
+# Not included if zero
+EPICS_PATCH_LEVEL = 0
+
+# This will be -CVS or empty at an official release point
+EPICS_CVS_SNAPSHOT=
+#EPICS_CVS_SNAPSHOT=
+
+# No changes should be needed below here
+
+ifneq ($(EPICS_PATCH_LEVEL),0)
+  EPICS_PATCH_VSTRING=.$(EPICS_PATCH_LEVEL)
+endif
+
+ifneq ($(strip $(EPICS_SITE_VERSION)),)
+  EPICS_SITE_VSTRING=-$(EPICS_SITE_VERSION)
+endif
+
+EPICS_SHORT_VERSION=$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)$(EPICS_PATCH_VSTRING)
+EPICS_VERSION_NUMBER=$(EPICS_SHORT_VERSION)$(EPICS_CVS_SNAPSHOT)$(EPICS_SITE_VSTRING)
+EPICS_VERSION_STRING="EPICS Version $(EPICS_VERSION_NUMBER)"
 
 CVS_DATE="\$$Date$$"
 CVS_TAG="\$$Name$$"
-
-BASE_3_14=YES

configure/CONFIG_COMMON

@@ -16,6 +16,10 @@
 #
 # Common Configuration Information
 
+#-------------------------------------------------------
+# POSIX is OS default
+POSIX=YES
+
 #-------------------------------------------------------
 # Divider symbol
 DIVIDER = .
@@ -37,16 +41,26 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL=perl
 
+#-------------------------------------------------------
+# dbst based database optimization default
+DB_OPT = NO
+
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
 CHECK_RELEASE_NO =
+CHECK_RELEASE_WARN = warnRelease
+
+#-------------------------------------------------------
+# GNU directory
+# GNU_DIR definition is here because it is used to find
+# READLINE library even if GNU compiler is not used
+GNU_DIR = /usr
 
 #-------------------------------------------------------
 # Directories
 
-INSTALL_LOCATION            ?= $(TOP)
-TOOLS                       = $(CONFIG)/tools
+INSTALL_LOCATION            = $(TOP)
 
 INSTALL_LOCATION_LIB        = $(INSTALL_LOCATION)/lib
 INSTALL_LOCATION_BIN        = $(INSTALL_LOCATION)/bin
@@ -66,6 +80,7 @@ INSTALL_JAVA                = $(INSTALL_LOCATION)/javalib
 #Directory for OS independant build created files
 COMMON_DIR = ../O.Common
 
+#-------------------------------------------------------
 ifdef T_A
 
 INSTALL_LIB                 = $(INSTALL_LOCATION_LIB)/$(T_A)
@@ -78,8 +93,7 @@ SHRLIB_SEARCH_DIRS          = $(INSTALL_LIB)
 
 #-------------------------------------------------------
 # Ext, app, and module configure dir targets
-CONFIG_TARGETS += CONFIG_APP_INCLUDE RULES_INCLUDE
-CONFIG_INSTALLS += ../RULES_BUILD
+CONFIG_INSTALLS += ../RULES_BUILD ../RELEASE*
 
 #-------------------------------------------------------
 # Cross compile default, HOST or CROSS, CONFIG.crossCommon will override
@@ -102,26 +116,17 @@ GNU=NO
 # Prefix and suffix
 DEP=.depends
 OBJ = .
-RES = .
 CMPLR_SUFFIX=
 CMPLR_PREFIX=
-
-#-------------------------------------------------------
-# tools for installing libraries and products
-INSTALL = $(PERL) $(TOOLS)/installEpics.pl
-INSTALL_PRODUCT = $(INSTALL)
-INSTALL_LIBRARY = $(INSTALL)
-
-#---------------------------------------------------------------
-# tools for making header dependancies and variable replacement
-MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
-REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
+LIB_PREFIX=
+SHRLIB_PREFIX= $(LIB_PREFIX)
 
 #--------------------------------------------------
 # vpath directories
+POSIX_YES = os/posix
 GENERIC_SRC_DIRS = .. $(SRC_DIRS)
 OS_SRC_DIRS += . $(foreach dir, .. $(SRC_DIRS), \
-            $(dir)/os/$(OS_CLASS) $(dir)/os/posix $(dir)/os/default )
+       $(addprefix $(dir)/, os/$(OS_CLASS) $(POSIX_$(POSIX)) os/default ))
 ALL_SRC_DIRS = $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
 
 #--------------------------------------------------
@@ -129,7 +134,7 @@ ALL_SRC_DIRS = $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
 INSTALL_INCLUDES += \
        -I$(INSTALL_INCLUDE)/os/$(OS_CLASS) \
        -I$(INSTALL_INCLUDE)
-GENERIC_SRC_INCLUDES = $(addprefix -I, $(GENERIC_SRC_DIRS))
+SRC_INCLUDES = -I$(COMMON_DIR) $(addprefix -I, $(wildcard $(ALL_SRC_DIRS)))
 
 #--------------------------------------------------
 # Target filename definitions
@@ -145,7 +150,7 @@ JAR =
 #--------------------------------------------------
 # obj files
 
-TARGET_OBJS =  $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS)))
+TARGET_OBJS =  $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
 
 PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
 PROD_LD_OBJS = $(USR_OBJLIBS) $(PROD_OBJLIBS) $(TARGET_OBJS) $(PRODUCT_OBJS)
@@ -156,12 +161,12 @@ LIBRARY_LD_OBJS = $(USR_OBJLIBS) $(LIB_OBJLIBS) $(TARGET_OBJS) $(LIBRARY_OBJS)
 #--------------------------------------------------
 # WIN95/NT resource files
 
-TARGET_RESS = $(addsuffix $(RES),$(basename $($*_RCS)))
+TARGET_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $($*_RCS))),)
 
-PROD_RESS = $(addsuffix $(RES),$(basename $(RCS) $(PROD_RCS)))
+PROD_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $(RCS) $(PROD_RCS))),)
 PROD_LD_RESS = $(TARGET_RESS) $(PROD_RESS)
 
-LIBRARY_RESS = $(addsuffix $(RES),$(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS)))
+LIBRARY_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS))),)
 LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)
 
 #--------------------------------------------------
@@ -223,7 +228,7 @@ TARGET_LDFLAGS = $($*_LDFLAGS)
 # Level of ansi conformance flags
 CONFORM_CPPFLAGS = $(CONFORM_CPPFLAGS_$(CMPLR))
 CONFORM_CFLAGS = $(CONFORM_CFLAGS_$(CMPLR))
-CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(CMPLR))
+CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(CXXCMPLR))
 
 # Warnings flags
 WARN_CFLAGS = $(WARN_CFLAGS_$($(BUILD_CLASS)_WARN))
@@ -241,9 +246,15 @@ STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD))
 
 #--------------------------------------------------
 # cflags for shared library src files (from SHRLIB_CFLAGS)
-LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(LOADABLE_LIBRARY),$($(lib)_OBJS) $(LIBRARY_OBJS)))
+LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(LOADABLE_LIBRARY),$($(lib)_OBJSNAME) $(LIBRARY_OBJS)))
 LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
 
+#--------------------------------------------------
+# prefix, suffix, and ldflags for loadable shared libraries 
+TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS)
+LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX)
+LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX)
+
 #--------------------------------------------------
 # Command-line input support default
 COMMANDLINE_LIBRARY = EPICS
@@ -253,16 +264,16 @@ OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY))
 #--------------------------------------------------
 # Flags
 
-INCLUDES = -I. $(GENERIC_SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
+INCLUDES = -I. $(SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
  $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $($(BUILD_CLASS)_INCLUDES)
 
 CFLAGS = $(CONFORM_CFLAGS) $($(BUILD_CLASS)_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
- $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
+ $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
  $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-CXXFLAGS = $(CONFORM_CXXFLAGS) $($(BUILD_CLASS)_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 = $(CONFORM_CXXFLAGS) $($(BUILD_CLASS)_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)
 
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
  $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $($(BUILD_CLASS)_LDFLAGS)\
@@ -305,8 +316,7 @@ PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
 # Depends command
 
 HDEPENDS_FLAGS =
-# Use only dependancies from current top tree
-HDEPENDS_INCLUDES = $(filter .%,$(subst -I,,$(INCLUDES)))
+HDEPENDS_INCLUDES = $(subst -I,,$(INCLUDES))
 HDEPENDSFLAGS = -m $*$(DEP) $(HDEPENDS_INCLUDES) $@ $<
 HDEPENDS_CMD_YES   = -$(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)
 HDEPENDS_CMD_NO   = echo ""
@@ -344,6 +354,15 @@ INSTALL_TEMPLATE = $(addprefix $(INSTALL_TEMPLATES_SUBDIR)/, \
                    $(subst $(CONFIG),top/configure,$(TEMPLATES)))
 INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%)
 
+INSTALL_BIN_INSTALLS = $(addprefix $(INSTALL_BIN)/,$(notdir $(BIN_INSTALLS)))
+INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))
+
+#---------------------------------------------------------------
+# Installed file permissions
+BIN_PERMISSIONS = 555
+LIB_PERMISSIONS = 644
+INSTALL_PERMISSIONS = 644
+
 #---------------------------------------------------------------
 #
 # auto determine the directory paths that things are installed to

configure/CONFIG_FILE_TYPE

@@ -0,0 +1,67 @@
+#*************************************************************************
+# Copyright (c) 2006 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. 
+#*************************************************************************
+# $Id$
+#
+# Macros and rules to create a new installation file type 
+#
+
+# --------------------------------------------------------------
+# Module developers can now define a new type of file, e.g. ABC, 
+# so that files of type ABC will be installed into a directory
+# defined by INSTALL_ABC. This is done by creating a new CONFIG<name>
+# file, e.g. CONFIG_ABC, with the following lines:
+#
+#       FILE_TYPE += ABC
+#       INSTALL_ABC = $(INSTALL_LOCATION)/abc
+#
+# The INSTALL_ABC directory should be be a subdirectory of 
+# $(INSTALL_LOCATION). The file type ABC should be target
+# architecture independent (alh files, medm files, edm files).
+#
+# Optional rules necessary for files of type ABC should be put in
+# a RULES_ABC file.
+#
+# The module developer installs new CONFIG* or RULES* files
+# into the directory $(INSTALL_LOCATION)/cfg by including the 
+# following Makefile line:
+#
+#       CFG += CONFIG_ABC RULES_ABC
+# 
+# Files of type ABC are installed into INSTALL_ABC directory
+# by adding a line like the following to a Makefile.
+#
+#       ABC += <filename1> <filename2> <filename3>
+#
+# Files in $(INSTALL_LOCATION)/cfg directory are now included by
+# the base config files so the definitions and rules are available
+# for use by later src directory Makefiles in the same module or
+# by other modules with a RELEASE line pointing to the TOP of 
+# the module with RULES_ABC.
+
+FILE_TYPE += ADL
+INSTALL_ADL = $(INSTALL_LOCATION)/adl
+
+FILE_TYPE += ALH
+INSTALL_ALH = $(INSTALL_LOCATION)/alh
+
+FILE_TYPE += CFG
+INSTALL_CFG = $(INSTALL_LOCATION)/cfg
+
+FILE_TYPE += EDL
+INSTALL_EDL = $(INSTALL_LOCATION)/edl
+
+FILE_TYPE += IDL
+INSTALL_IDL = $(INSTALL_LOCATION_LIB)/idl
+
+FILE_TYPE += PERL_MODULES
+INSTALL_PERL_MODULES = $(INSTALL_LOCATION_LIB)/perl
+
+INSTALLS_CFG= $(CFG:%= $(INSTALL_CFG)/%)
+DIRECTORY_TARGETS += $(foreach type, $(FILE_TYPE),$(INSTALL_$(type)))
+

configure/CONFIG_SITE

@@ -1,36 +1,32 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in 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.
 #*************************************************************************
 #
 #  $Id$
 #
-#  CONFIG_SITE  - config file
-#	by Matthew Needes and Mike Bordua
-#
-#  This file is to be modified by the build system manager
-#	only.
+#  CONFIG_SITE  - Global site configuration file
 #
 
-
-#  The host architecture performing the build,
-#	i.e.: the arch running DCT/getrel/etc.
-#       <operating system>-<architecture>[-<alternate compiler>]
+#  The host architecture performing the build, in the form
+#       <operating system>-<architecture>[-<toolset>]
 #
 #  Currently Supporting:
-#	aix-ppc                (HP compiler used for host builds)
+#	aix-ppc                (IBM compiler used for host builds)
 #	aix-ppc-gnu            (GNU compiler used for host builds)
 #	cygwin-x86             (cygwin compiler used for host builds)
-#	darwin-ppc
+#	darwin-ppc             (PowerPC based Apple running OSX)
+#	darwin-x86             (Intel based Apple running OSX)
+#	darwin-ppcx86          (Universal binaries for both CPUs)
+#	freebsd-x86            (GNU compiler used for host builds)
+#	freebsd-x86_64         (GNU compiler used for host builds)
 #	hpux-parisc            (HP compiler used for host builds)
 #	hpux-parisc-gnu        (GNU compiler used for host builds)
 #	linux-ppc              (GNU compiler used for host builds)
-#	linux-ppc-bgl
 #	linux-x86              (GNU compiler used for host builds)
 #	linux-x86_64           (GNU compiler used for host builds)
 #	linux-x86-borland      (Borland C++ compiler used for host builds)
@@ -41,9 +37,9 @@
 #	solaris-x86            (sun compiler used for host builds)
 #	solaris-x86-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-mingw        (MinGW compiler used for host builds)
 #	win32-x86-borland      (Borland C++ compiler used for host builds)
-#	win32-x86-cygwin       (cygwin GNU compiler used for host builds)
+#	win32-x86-cygwin       (WIN32 API with cygwin GNU compiler used for host builds)
 
 #  Debugging builds 
 #	linux-x86-debug        (GNU compiler with -g option for host builds)
@@ -55,7 +51,7 @@
 #  EPICS_HOST_ARCH is a required environment variable
 #  Do not set EPICS_HOST_ARCH in this file. 
 #  Use base/startup files to set EPICS_HOST_ARCH or 
-#  set EPICS_HOST_ARCH on the GNU make command line.
+#  provide EPICS_HOST_ARCH on the GNU make command line.
 
 #  The cross-compiler architectures to build EPICS for
 #
@@ -65,7 +61,10 @@
 #       linux-586     (linux-x86 host)
 #       linux-686     (linux-x86 host)
 #       linux-athlon  (linux-x86 host)
-#       linuxRT-mvme2100  (linux-x86 host)
+#       linux-cris     (Axis GNU crosscompiler on linux-x86 host)
+#       linux-cris_v10 (Axis GNU crosscompiler on linux-x86 host)
+#       linux-cris_v32 (Axis GNU crosscompiler on linux-x86 host)
+#       linux-arm
 #       vxWorks-486
 #       vxWorks-68040
 #       vxWorks-68040lc
@@ -75,8 +74,8 @@
 #       vxWorks-ppc603_long
 #       vxWorks-ppc604
 #       vxWorks-ppc604_long
-#       vxWorks6-mv2100
-#       vxWorks6-mv5100
+#       vxWorks-ppc604_altivec
+#       vxWorks-mpc8540
 #       RTEMS-gen68360
 #       RTEMS-mcp750
 #       RTEMS-mvme167
@@ -86,8 +85,6 @@
 #       RTEMS-psim
 #       RTEMS-uC5282
 #
-#  Debugging builds 
-#       vxWorks-68040-debug
 
 # Definitions of CROSS_COMPILER_TARGET_ARCHS in
 # configure/os/CONFIG_SITE.<host>.Common files will
@@ -158,7 +155,7 @@ CROSS_WARN=YES
 #  NOTE: Set to YES only if you have existing R3.13 extensions to be
 #  built with this base
 #
-COMPAT_TOOLS_313=NO
+#COMPAT_TOOLS_313=YES
 
 #  Create and/or install files for R3.13 ioc application and extension builds?
 #  must be either YES or NO
@@ -169,8 +166,18 @@ COMPAT_TOOLS_313=NO
 COMPAT_313=NO
 
 #  Installation directory
-#Note: INSTALL_LOCATION definition moved to configure/RELEASE file
+# If you don't want to install into $(TOP) dir then
+# define INSTALL_LOCATION here
+#INSTALL_LOCATION=<fullpathname>
 
 # Use POSIX thread priority scheduling (YES or NO)
 USE_POSIX_THREAD_PRIORITY_SCHEDULING = NO
 
+#  Site version number, if set will append '-' and this string to the
+#  EPICS version number string that is reported by many tools
+EPICS_SITE_VERSION =
+
+# For GNU compiler, use pipes rather than temporary files for communication 
+# between the various stages of compilation.
+GCC_PIPE = NO
+

configure/CONFIG_SITE_ENV

@@ -33,15 +33,15 @@
 #	where the start and end are mmddhh - that is month,day,hour
 #	eg EPICS_TIMEZONE=CUS::360:033102:102802
 #
-#	DST for 2006  US: Apr  2 - Oct 29
-#	              EU: Mar 26 - Oct 29
+#	DST for 2007  US: Mar 11 - Nov 04
+#	              EU: Mar 25 - Oct 28
 #	(see: http://www.worldtimezone.org/daylight.html)
 #
 # EPICS_TS_NTP_INET
 #	NTP or Unix time server ip address.  Uses boot host if not set.
 
-EPICS_TIMEZONE=CUS::360:040202:102902
-#EPICS_TIMEZONE=MET::-60:032602:102902
+EPICS_TIMEZONE=CUS::360:031102:110402
+#EPICS_TIMEZONE=MET::-60:032502:102802
 EPICS_TS_NTP_INET=
 
 # IOC Shell:

configure/Makefile

@@ -15,6 +15,9 @@ TOP=..
 
 include $(TOP)/configure/CONFIG
 
+# Bootstrap resolution: tools not installed yet
+TOOLS = $(TOP)/src/tools
+
 CONFIGS += $(subst ../,,$(wildcard ../CONFIG*))
 CONFIGS += $(subst ../,,$(wildcard ../os/CONFIG*))
 
@@ -23,6 +26,5 @@ CONFIGS += $(subst ../,,$(wildcard ../RULES*))
 
 CONFIGS += $(subst ../,,$(wildcard ../tools/*.pl))
 
-TARGETS = CONFIG_APP_INCLUDE
-
 include $(TOP)/configure/RULES
+

configure/RELEASE

@@ -9,17 +9,13 @@
 #*************************************************************************
 # RELEASE: Define location of external EPICS products
 
+# Define INSTALL_LOCATION in CONFIG_SITE
+
 # VX_DIR definition now in os/CONFIG_SITE.Common.vxWorksCommon
 # RTEMS_BASE (and RTEMS_VERSION) now in os/CONFIG_SITE.Common.RTEMS
 
 # NB: Settings in RELEASE files can be overridden in files named
-#   RELEASE.$(EPICS_HOST_ARCH)
-#   RELEASE.Common.$(OS_CLASS)Common
+#   RELEASE.$(EPICS_HOST_ARCH).Common
 #   RELEASE.Common.$(T_A)
 #   RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 
-# If you don't want to install into $(TOP) dir then 
-# define INSTALL_LOCATION here
-#INSTALL_LOCATION=<fullpathname>
-#INSTALL_LOCATION=/home/phoebus/JBA/install
-

configure/RULES.Db

@@ -17,14 +17,16 @@ vpath %.vdb $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB))
 vpath %.substitutions $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 vpath %.template $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 vpath bpt%.data $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
+vpath %.acf $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
+vpath %.acs $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 
 ##################################################### dbdflags
 
 # dbExpand
 INSTALL_DBDFLAGS += -I $(INSTALL_LOCATION)/dbd
+INSTALL_DBFLAGS += -I $(INSTALL_LOCATION)/db
 DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS)
-DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. $(GENERIC_SRC_INCLUDES)
-DBFLAGS += -I$(COMMON_DIR)
+DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. -I.. $(INSTALL_DBFLAGS) $(RELEASE_DBFLAGS)
 
 #####################################################  Targets
 
@@ -61,7 +63,7 @@ TEMPLATE2=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(pats
           $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
           $(TEMPLATE1)))))))))))
 TEMPLATE3=$(addsuffix .template,$(addprefix ../,$(TEMPLATE2)))
-TEMPLATE_FILENAME=$(firstword $(wildcard $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
+TEMPLATE_FILENAME=$(firstword $(wildcard $($*_TEMPLATE) $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
 
 # dbst based database optimization
 ifeq '$(DB_OPT)' 'YES'
@@ -70,6 +72,22 @@ COMMON_DBS = $(addprefix $(COMMON_DIR)/,$(filter %.db,$(DB)))
 COMMON_DBS += $(addsuffix $(RAW),$(addprefix $(COMMON_DIR)/,$(filter %.db,$(DB))))
 endif
 
+INSTALL_DB_INSTALLS = $(addprefix $(INSTALL_DB)/,$(notdir $(DB_INSTALLS)))
+INSTALL_DBD_INSTALLS = $(addprefix $(INSTALL_DBD)/,$(notdir $(DBD_INSTALLS)))
+
+#####################################################  acf files
+# An access security configuration file, *.acf, can be created from
+# an *.acs file (has format of acf file plus #include "filename" lines)
+
+# flags for GNU compiler
+ACF_CPPFLAGS_YES = -undef -nostdinc
+ACF_CPPFLAGS = $(ACF_CPPFLAGS_$(GNU))
+
+ACF_INCLUDES = -I. $(TARGET_INCLUDES) $(USR_INCLUDES)\
+                $(SRC_INCLUDES) -I$(INSTALL_DB)
+ACFDEPENDS_CMD = -$(MKMF) -m $@$(DEP) $(subst -I,,$(ACF_INCLUDES)) $@ $<
+ACF_CMD = $(CPP) $(ACF_CPPFLAGS) $(ACF_INCLUDES) $< > $@
+
 #####################################################  dependancies
 
 HINC += $(addsuffix .h,$(patsubst %.h,%,$(patsubst %.db,%,$(DBDINC))))
@@ -78,7 +96,7 @@ COMMON_DBDINC += $(addprefix $(COMMON_DIR),$(HINC))
 DBDDEPENDS_FILES += $(addsuffix $(DEP),$(COMMON_DBDS) \
                     $(COMMON_DBDINC) $(COMMON_DBS))
 
-DBDDEPENDS_FLAGS = $(filter .%,$(subst -I,,$(filter-out -S%,$(DBDFLAGS))))
+DBDDEPENDS_FLAGS = $(subst -I,,$(filter-out -S%,$(DBDFLAGS)))
 DBDDEPENDS_CMD = -$(MKMF) -m $@$(DEP) $(DBDDEPENDS_FLAGS) $@ $<
 
 MAKEDBDEPENDS = $(PERL) $(TOOLS)/makeDbDepends.pl
@@ -94,7 +112,7 @@ COMMON_DBDS = $(DBD)
 COMMON_DBS = $(DB)
 COMMONS = $(DBD) $(DB)
 
--include $(TOP)/configure/O.$(EPICS_HOST_ARCH)/CONFIG_APP_INCLUDE
+-include $(TOP)/configure/CONFIG_APP_INCLUDE
 
 all:    install
 
@@ -116,27 +134,20 @@ $(DBDDEPENDS_FILES):
 
 #####################################################  build dependancies, clean rule
 
-ifneq (,$(strip $(DBD_INSTALLS)))
-buildInstall : dbdInstalls
-endif
-
-ifneq (,$(strip $(DB_INSTALLS)))
-buildInstall : dbInstalls
-endif
-
-.PHONY: dbdInstalls dbInstalls
-
 inc : $(COMMON_INC) $(INSTALL_INC)
 
 build : $(COMMON_DBDS) $(COMMON_DBS) \
 	$(INSTALL_DBDS) $(INSTALL_DBS) \
-	$(DBDDEPENDS_FILES) $(TARGETS)
+	$(DBDDEPENDS_FILES) $(TARGETS) \
+	$(INSTALL_DB_INSTALLS) $(INSTALL_DBD_INSTALLS)
 
 clean:: 
 	@$(RM) $(COMMONS) $(DBDDEPENDS_FILES)
 	@$(RM) *_registerRecordDeviceDriver.cpp
 	@$(RM) $(TARGETS)
 
+realclean: clean
+
 ##################################################### CapFast filter
 
 $(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS) 
@@ -150,13 +161,14 @@ $(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS)
 
 ifdef CREATESUBSTITUTIONS
 $(COMMON_DIR)/%.substitutions:
+	@echo "Create substitutions"
 	@$(RM) $@
-	@$(CREATESUBSTITUTIONS) $(COMMON_DIR)/$*
+	$(CREATESUBSTITUTIONS) $(COMMON_DIR)/$*
 endif
 
 $(INSTALL_DB)/%.substitutions: %.substitutions
 	@echo "Installing db file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PRECIOUS: $(COMMON_DIR)/%.substitutions
 
@@ -170,7 +182,7 @@ $(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf
 
 $(INSTALL_DB)/%.template: %.template
 	@echo "Installing db file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PRECIOUS: $(COMMON_DIR)/%.template
 
@@ -192,6 +204,8 @@ $(COMMON_DIR)/menu%.h: menu%.dbd
 	@$(RM) $@
 	$(DBTOMENUH) $< $@
 
+.PRECIOUS: $(COMMON_DIR)/%.h
+
 ##################################################### DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data 
@@ -201,6 +215,7 @@ $(COMMON_DIR)/bpt%.dbd: bpt%.data
 $(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd 
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
+	@echo "$<:../Makefile" >> $@$(DEP)
 	@echo "Expanding dbd"
 	@$(RM) $@
 	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
@@ -217,16 +232,19 @@ $(COMMON_DIR)/%Include.dbd:
 	$(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $@
 
 $(INSTALL_DBD)/%: $(COMMON_DIR)/%
-	@echo "Installing dbd file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@echo "Installing created dbd file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_DBD)/%: %
 	@echo "Installing dbd file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-dbdInstalls:  $(DBD_INSTALLS)
-	@echo "Installing $(^F)"
-	@$(INSTALL) -d -m 555 $^ $(INSTALL_DBD)
+define  DBD_INSTALLS_template
+$$(INSTALL_DBD)/$$(notdir $(1)) : $(1)
+	@echo "Installing $$@"
+	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DBD)
+endef
+$(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 
 .PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%Include.dbd
 
@@ -247,7 +265,7 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf
 
 $(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@$(RM) $@$(DEP)
-	@$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $@$(DEP)
+	$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $@$(DEP)
 	@echo "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
 	@echo "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $@
@@ -262,6 +280,15 @@ $(COMMON_DIR)/%.db$(RAW): %.template
 	$(MSI) $(DBFLAGS)  $< > msi.tmp
 	$(MV) msi.tmp $@
 
+$(COMMON_DIR)/%.acf: %.acs
+	@$(RM) $@$(DEP)
+	@$(ACFDEPENDS_CMD)
+	@echo "Creating acf file $@"
+	@$(RM) $@
+	$(ACF_CMD)
+
+.PRECIOUS: $(COMMON_DIR)/%.acf
+
 # dbst based database optimization
 ifeq '$(DB_OPT)' 'YES'
 
@@ -280,16 +307,19 @@ else
 
 $(INSTALL_DB)/%: %
 	@echo "Installing db file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 endif
 
 $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
-	@echo "Installing db file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@echo "Installing created db file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-dbInstalls:  $(DB_INSTALLS)
-	@echo "Installing $(^F)"
-	@$(INSTALL) -d -m 555 $^ $(INSTALL_DB)
+define  DB_INSTALLS_template
+$$(INSTALL_DB)/$$(notdir $(1)) : $(1)
+	@echo "Installing $$@"
+	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DB)
+endef
+$(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 
 .PRECIOUS: $(COMMON_DIR)/%.edf
 .PRECIOUS: $(COMMON_DBS)

configure/RULES.ioc

@@ -17,16 +17,15 @@ ifneq ($(findstring $(ARCH),$(BUILD_ARCHS)),)
 buildInstall: $(TARGETS)
 
 clean:
-	$(RM) cdCommands envPaths
+	$(RM) cdCommands envPaths dllPath.bat
 
 else 
 buildInstall:
 clean:
 endif
 
-envPaths cdCommands: $(wildcard $(TOP)/configure/RELEASE*) \
+cdCommands envPaths dllPath.bat: $(wildcard $(TOP)/configure/RELEASE*) \
 	$(TOP)/configure/CONFIG $(INSTALL_BIN)
-	@$(RM) $@
 ifeq ($(IOCS_APPL_TOP),)
 	$(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) $@
 else
@@ -34,5 +33,5 @@ else
 endif
 
 realclean:
-	$(RM) cdCommands envPaths
+	$(RM) cdCommands envPaths dllPath.bat
 

configure/RULES_ARCHS

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in 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. 
 #*************************************************************************
 #
 # $Id$
@@ -20,8 +19,10 @@ rebuild: clean install
 ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
-ACTIONS += buildInstall 
-ACTIONS += browse 
+ACTIONS += buildInstall
+ACTIONS += browse
+ACTIONS += runtests
+#ACTIONS += rebuild
 
 actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
@@ -33,6 +34,24 @@ cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 
 buildDirs = $(addprefix O.,$(BUILD_ARCHS))
 
+#*************************************************************************
+# Create epics_host_arch dependancies for GNU make -j option
+# Only works with GNU make 3.80 or later (uses eval function)
+# 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)
+endef
+
+$(foreach action, $(ACTIONS), $(foreach arch,\
+      $(CROSS_ARCHS),$(eval $(call DEP_template,$(action),$(arch)))))
+
+#*************************************************************************
+
 $(actionArchTargets) : $(buildDirs) O.Common
 	$(MAKE) -C O.$(archPart) -f ../Makefile TOP=$(TOP)/.. T_A=$(archPart) $(actionPart)
 
@@ -41,7 +60,7 @@ $(BUILD_ARCHS) : % : O.% O.Common
 
 $(ACTIONS):%: $(foreach arch, $(BUILD_ARCHS), %$(DIVIDER)$(arch))
 
-$(buildDirs): 
+$(buildDirs):
 	$(PERL) $(TOOLS)/makeMakefile.pl $@ $(TOP)/..
 
 O.Common:
@@ -54,13 +73,18 @@ O.Common:
 targetReleaseFiles = $(wildcard $(foreach arch, $(BUILD_ARCHS), \
 		$(TOP)/configure/RELEASE.Common.$(arch) \
 		$(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(arch)))
+
 checkReleaseTargets = $(addprefix checkRelease, $(suffix $(targetReleaseFiles)))
-
 checkRelease: $(checkReleaseTargets)
-	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) $@
-
+	$(CONVERTRELEASE) checkRelease
 $(checkReleaseTargets):checkRelease.%:
-	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) -a $* checkRelease
+	$(CONVERTRELEASE) -a $* checkRelease
+
+warnReleaseTargets = $(addprefix warnRelease, $(suffix $(targetReleaseFiles)))
+warnRelease: $(warnReleaseTargets)
+	-$(CONVERTRELEASE) checkRelease
+$(warnReleaseTargets):warnRelease.%:
+	-$(CONVERTRELEASE) -a $* checkRelease
 
 #
 # special clean rule
@@ -74,7 +98,7 @@ archclean ::
 $(cleanArchTargets) ::
 	$(RMDIR) O.$(archPart)
 
-realclean :: 
+realclean ::
 	$(RMDIR) O.*
 
 .PHONY : $(actionArchTargets)
@@ -82,4 +106,3 @@ realclean ::
 .PHONY : $(BUILD_ARCHS)
 .PHONY : $(ACTIONS) clean realclean archclean all
 .PHONY : checkRelease $(checkReleaseTargets)
-

configure/RULES_BUILD

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in 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. 
 #*************************************************************************
 # $Id$
 #
@@ -34,12 +33,16 @@ include $(CONFIG)/CONFIG_ADDONS
 #---------------------------------------------------------------
 # Set PROD, TESTPROD, OBJS, and LIBRARY
 
+SCRIPTS_HOST += $(PERL_SCRIPTS)
+# PERL_SCRIPTS are installed into existing $(INSTALL_BIN) for Host systems
+
 ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
 LIBRARY += $(LIBRARY_HOST)
 LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST)
 OBJS += $(OBJS_HOST)
 PROD += $(PROD_HOST)
 SCRIPTS += $(SCRIPTS_HOST)
+TESTSCRIPTS += $(TESTSCRIPTS_HOST)
 TESTPROD += $(TESTPROD_HOST)
 endif
 
@@ -48,6 +51,7 @@ LIBRARY += $(LIBRARY_IOC)
 OBJS += $(OBJS_IOC)
 PROD += $(PROD_IOC)
 SCRIPTS += $(SCRIPTS_IOC)
+TESTSCRIPTS += $(TESTSCRIPTS_IOC)
 TESTPROD += $(TESTPROD_IOC)
 endif
 
@@ -73,17 +77,11 @@ ifneq (,$(strip $(HDEPENDS_FILES)))
 endif
 
 #---------------------------------------------------------------
-# Create included Makefile for prod,testprod, and library targets
+# Included defines and rules for prod,testprod, and library targets
 
-ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY)))
-
-MakefileInclude: ../Makefile $(wildcard $(TOP)/configure/RELEASE*)
-	@$(RM) $@
-	@$(PERL) $(TOOLS)/makeMakefileInclude.pl $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) $@
-
--include MakefileInclude
-
-endif # PROD, TESTPROD, LIBRARY, or LOADABLE_LIBRARY defined
+#ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY)))
+include $(CONFIG)/RULES_TARGET
+#endif
 
 #---------------------------------------------------------------
 #   Products and Object libraries
@@ -99,13 +97,10 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) \
               $(DLL_LINK_LIBNAME) $(INSTALL_DLL_LINK_LIBS) \
               $(LOADABLE_SHRLIBNAME) $(INSTALL_LOADABLE_SHRLIBS)
 
-#---------------------------------------------------------------
-ifneq ($(CONFIG),$(TOP)/configure)
-RULES_TOP:=$(INSTALL_LOCATION)
--include $(TOP)/configure/RULES_BUILD
-endif
--include $(TOP)/configure/O.$(T_A)/RULES_INCLUDE
-#---------------------------------------------------------------
+$(INSTALL_LIBS): $(INSTALL_SHRLIBS)  $(INSTALL_DLL_LINK_LIBS)  $(INSTALL_LOADABLE_SHRLIBS)
+
+
+-include $(CONFIG)/RULES_FILE_TYPE
 
 #	Main targets
 
@@ -118,9 +113,9 @@ rebuild: clean install
 build : inc 
 
 build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
-	$(TARGETS)
+	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
-inc : $(COMMON_INC) $(INSTALL_INC)
+inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
 
 buildInstall : \
 	$(INSTALL_SCRIPTS) $(INSTALL_PROD) $(INSTALL_MUNCHS) \
@@ -129,24 +124,22 @@ buildInstall : \
 	$(INSTALL_DOCS) \
 	$(INSTALL_HTMLS) \
 	$(INSTALL_TEMPLATE) \
-	$(INSTALL_CONFIGS)
-
-ifdef BIN_INSTALLS
-buildInstall : binInstalls
-endif
-
-ifdef LIB_INSTALLS
-buildInstall : libInstalls
-endif
+	$(INSTALL_BIN_INSTALLS)
 
 clean::
 	@echo "Cleaning"
 	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME)\
-	$(INC) *$(RES) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
+	$(INC) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
 	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS)
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTSCRIPTS)
+ifdef RES
+	@$(RM) *$(RES)
+endif
 ifdef BAF
-	@$(RM) $(PROD_BAF) $(LIB_BAF) *$(BOF)
+	@$(RM) $(PROD_BAF) $(LIB_BAF)
+endif
+ifdef BOF
+	@$(RM) *$(BOF)
 endif
 
 # WIN95/NT source browser
@@ -161,12 +154,17 @@ $(DIRECTORY_TARGETS) :
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
 
-$(TESTPRODNAME) $(PRODNAME):%$(EXE): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
+$(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
+
+$(TESTPRODNAME) $(PRODNAME):%$(EXE):
 	@$(RM) $@
 	$(DEBUGCMD) $(LINK.cpp)
+	$(MT_EXE_COMMAND)
 
 # object libs for R3.13 vxWorks compatibility only
-$(OBJLIBNAME):%$(OBJ): $(OBJLIB_LD_OBJS)
+$(OBJLIBNAME): $(OBJLIB_LD_OBJS)
+
+$(OBJLIBNAME):%$(OBJ):
 	@$(RM) $@
 	$(OBJLIB_LINK.cpp)
 
@@ -259,24 +257,35 @@ $(LIBNAME): ../baseLIBOBJS
 endif
 
 # rule for lib (archive of object files) creation
-$(LIBNAME): $(LIB_PREFIX)%$(LIB_SUFFIX): $(LIBRARY_OBJS)
+$(LIBNAME): $(LIBRARY_OBJS)
+
+$(LIBNAME): $(LIB_PREFIX)%$(LIB_SUFFIX):
 	@$(RM) $@
 	$(ARCMD)
 ifneq ($(strip $(RANLIB)),)
 	$(RANLIB) $@
 endif # RANLIB
 
-$(DLL_LINK_LIBNAME):$(LIB_PREFIX)%.lib: $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) 
+$(DLL_LINK_LIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) 
+
+$(DLL_LINK_LIBNAME):$(SHRLIB_PREFIX)%.lib:
 	@$(RM) $@
 	$(LINK.shrlib)
+	$(MT_DLL_COMMAND)
 
-$(SHRLIBNAME):$(LIB_PREFIX)%$(SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+$(SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+
+$(SHRLIBNAME):$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
+	$(MT_DLL_COMMAND)
 
-$(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+$(LOADABLE_SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+
+$(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	@$(RM) $@
-	$(LINK.loadable_shrlib)
+	$(LINK.shrlib)
+	$(MT_DLL_COMMAND)
 
 # C++ munching for VxWorks
 %.nm : %$(EXE)
@@ -299,53 +308,64 @@ $(OBJLIB_MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(OBJ)
 	@$(RM) $@
 	$(MUNCH_CMD)
 
-# Ext, app and module rules
-RULES_INCLUDE CONFIG_APP_INCLUDE: $(wildcard $(TOP)/configure/RELEASE*)
+runtests: $(TESTSCRIPTS_$(BUILD_CLASS))
+	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
+
+# If there's a perl test script (.plt) available, use it
+%.t: ../%.plt
 	@$(RM) $@
-	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) $@
+	@$(CP) $< $@
 
-binInstalls:  $(BIN_INSTALLS)
-	@echo "Installing $(^F)"
-	@$(INSTALL) -d -m 555 $^ $(INSTALL_BIN)
+# Some versions of Test::Harness expect test programs in perl only.
+# Generate a perl program to exec the real test binary.
+%.t: %$(EXE)
+	@$(RM) $@
+	@$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
 
-libInstalls:  $(LIB_INSTALLS)
-	@echo "Installing $(^F)"
-	@$(INSTALL) -d -m 555 $^ $(INSTALL_LIB)
+#---------------------------------------------------------------
+## Install rules for BIN_INSTALLS and LIB_INSTALLS
+define  BIN_INSTALLS_template
+$$(INSTALL_BIN)/$$(notdir $(1)) : $(1)
+	@echo "Installing $$(<F)"
+	@$$(INSTALL) -d -m $$(BIN_PERMISSIONS) $$^ $$(INSTALL_BIN)
+endef
+$(foreach file, $(BIN_INSTALLS), $(eval $(call BIN_INSTALLS_template, $(file))))
+
+define  LIB_INSTALLS_template
+$$(INSTALL_LIB)/$$(notdir $(1)) : $(1)
+	@echo "Installing $$(<F)"
+	@$$(INSTALL) -d -m $$(LIB_PERMISSIONS) $$^ $$(INSTALL_LIB)
+endef
+$(foreach file, $(LIB_INSTALLS), $(eval $(call LIB_INSTALLS_template, $(file))))
+
+#---------------------------------------------------------------
 
 $(INSTALL_BIN)/%: ../os/$(OS_CLASS)/%
 	@echo "Installing os-specific script $@"
-	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
+	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)
 
 $(INSTALL_BIN)/%: %
-	@echo "Installing binary $@"
-ifdef WIN32
-ifdef BORLAND
-	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
-else
-	@$(INSTALL_PRODUCT) -d -m 555 $<* $(INSTALL_BIN)
-endif
-else
-	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
-endif
+	@echo "Installing created file $@"
+	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)
 
 $(INSTALL_BIN)/%: ../%
 	@echo "Installing script $@"
-	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
+	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)
 
 $(INSTALL_LIB)/%.a: %.a
 	@echo "Installing library $@"
-	@$(INSTALL_LIBRARY) -d -m 644 $< $(INSTALL_LIB)
+	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_LIB)
 ifneq ($(strip $(RANLIB)),)
 	$(RANLIB) $@
 endif # RANLIB
 
 $(INSTALL_LIB)/%.lib: %.lib
 	@echo "Installing library $@"
-	@$(INSTALL_LIBRARY) -d -m 644 $< $(INSTALL_LIB)
+	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_LIB)
 
 $(INSTALL_SHRLIB)/lib%: lib%
 	@echo "Installing shared library $@"
-	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
+	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_SHRLIB)
 ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst .$(SHRLIB_VERSION),,$@)
 	ln -s $< $(subst .$(SHRLIB_VERSION),,$@)
@@ -355,11 +375,11 @@ endif # SHRLIB_VERSION
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
 $(INSTALL_TCLLIB)/%: %
 	@echo "Installing Tcl library $@"
-	@$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB)
+	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 
 $(INSTALL_TCLLIB)/%: ../%
 	@echo "Installing Tcl library $@"
-	@$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB)
+	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 endif
 
 $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
@@ -376,52 +396,55 @@ endif # LOADABLE_SHRLIB_VERSION
 
 $(INSTALL_CONFIG)/%: %
 	@echo "Installing config file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_CONFIG)/%: ../%
 	@echo "Installing config file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_INCLUDE)/% : $(COMMON_DIR)/%
 	@echo "Installing generated generic include file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_INCLUDE)/% : %
 	@echo "Installing generic include file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_INCLUDE)/os/$(OS_CLASS)/% : %
 	@echo "Installing os dependent include file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_DOC)/%: %
 	@echo "Installing doc $@"
-	@$(INSTALL) -d -m 644 $< $(INSTALL_DOC)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
 
 $(INSTALL_DOC)/%: ../%
 	@echo "Installing doc $@"
-	@$(INSTALL) -d -m 644 $< $(INSTALL_DOC)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
 
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: %
 	@echo "Installing html $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
 	@echo "Installing html $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_TEMPLATES_SUBDIR)/%: ../%
 	@echo "Installing $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_TEMPLATES_SUBDIR)/%: %
 	@echo "Installing $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+
+-include $(CONFIG)/RULES_EXPAND
 
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
 
-.PHONY: all inc build install clean rebuild buildInstall binInstalls libInstalls
+.PHONY: all inc build install clean rebuild buildInstall
+.PHONY: runtests
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/RULES_DIRS

@@ -1,24 +1,24 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in 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. 
 #*************************************************************************
 #
 #  $Id$
 #
- 
+
 
 ARCHS += $(BUILD_ARCHS)
-ACTIONS += inc build install buildInstall clean realclean archclean
- 
-dirPart = $(word 1, $(subst $(DIVIDER), ,$@))
-actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$@)), \
- $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$@))))
- 
+ACTIONS += inc build install buildInstall clean realclean archclean runtests
+
+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), \
@@ -37,6 +37,30 @@ all : install
 
 rebuild : clean install
 
+# Create directory dependancies lines for GNU make -j option
+# Only works with GNU make 3.80 or later (uses eval function)
+define DEP_template1
+$(1): $$($(1)_DEPEND_DIRS)
+endef
+$(foreach dir, $(DIRS),$(eval $(call DEP_template1,$(dir))))
+
+define DEP_template2
+$(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)))))
+
+define DEP_template3
+$(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)))))
+
+define DEP_template4
+$(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))))))
+
+
 $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
 	$(MAKE) -C $(dirPart) $(actionArchPart)
 

configure/RULES_EXPAND

@@ -0,0 +1,23 @@
+# <top>/configure/RULES_EXPAND
+
+ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
+
+# Default settings
+EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl
+
+EXPANDFLAGS += -t $(INSTALL_LOCATION) -a $(T_A)
+EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS))
+
+EXPANDED = $(EXPAND:%@=%)
+
+buildInstall: $(EXPANDED)
+
+$(EXPANDED): %: ../%@
+	@echo "Expanding $< to $@"
+	@$(RM) $@
+	@$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
+
+clean::
+	$(RM) $(EXPANDED)
+
+endif

configure/RULES_FILE_TYPE

@@ -0,0 +1,73 @@
+#*************************************************************************
+# Copyright (c) 2006 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. 
+#*************************************************************************
+# $Id$
+#
+
+#---------------------------------------------------------------
+# Include <top>/configure/RULES_BUILD definitions from tops defined in RELEASE* files
+#
+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
+#
+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
+#
+ifeq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
+TOP_RULES_BUILDS = $(wildcard $(TOP)/configure/RULES_BUILD)
+ifneq ($(TOP_RULES_BUILDS),)
+  include $(TOP_RULES_BUILDS)
+endif
+endif
+
+#---------------------------------------------
+# Include existing and new $(INSTALL_CFG)/* definitions
+#
+TOP_CFG_FILES = $(sort $(wildcard $(INSTALL_CFG)/RULES*) \
+                       $(wildcard $(INSTALL_CFG)/CONFIG*) \
+                       $(addprefix $(INSTALL_CFG)/,$(CFG)))
+ifneq ($(TOP_CFG_FILES),)
+  include $(TOP_CFG_FILES)
+endif
+
+#---------------------------------------------------------------
+
+define FILE_TYPE_template
+
+$(1) += $$(if $$(strip $$($(1)_$$(ARCH_CLASS))),$$(subst -nil-,,$$($(1)_$$(ARCH_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))
+
+endef
+
+$(foreach type, $(FILE_TYPE),$(eval $(call FILE_TYPE_template,$(strip $(type)))))
+#---------------------------------------------
+
+clean::
+	@$(RM) $(foreach type, $(FILE_TYPE), $($(type)))
+

configure/RULES_JAVA

@@ -53,7 +53,6 @@ COMMON_JAVAINC += $(addprefix $(COMMON_DIR)/,$(JAVAINC))
 
 JAVACFLAGS += $(USR_JAVACFLAGS)
 CLASSES += $(subst .java,.class,$(JAVA))
-DEPJAVA += $(subst .class,.java,$(CLASSES))
 INSTALL_CLASSES = $(addprefix $(INSTALL_JAVA)/,$(CLASSES))
 
 TESTCLASSES += $(subst .java,.class,$(notdir $(TESTJAVA)))
@@ -63,7 +62,7 @@ DEPTESTJAVA += $(subst .class,.java,$(TESTCLASSES))
 #-------------------------------------------------------
 # Java jar file
 
-INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR) $(JAR_INPUT))
+INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR))
 JARMANIFEST += $(firstword $(MANIFEST) $(JAR_MANIFEST))
 JARDEPFILES += $(addprefix $(INSTALL_JAVA)/,$(subst .java,.class,$(JAVA)) $(JAR_INPUT))
 JARINPUT += $(foreach inp,$(JAR_INPUT),-C $(INSTALL_JAVA) $(subst .java,.class,$(inp)))
@@ -124,7 +123,7 @@ $(COMMON_TESTCLASSES): $(addprefix ../,$(DEPTESTJAVA))
 	@$(RM) $@
 	$(JAVACCMD) -d $(COMMON_DIR) $^
 
-$(INSTALL_CLASSES): $(addprefix ../,$(DEPJAVA))
+$(INSTALL_CLASSES): $(addprefix ../,$(JAVA))
 	@echo Creating java class files 
 	@$(RM) $@
 	$(JAVACCMD) -d $(INSTALL_JAVA) $^
@@ -141,15 +140,15 @@ $(COMMON_DIR)/%.jar: $(JARDEPFILES)
 
 $(INSTALL_JAVA)/%.jar: $(COMMON_DIR)/%.jar
 	@echo "Installing java jar file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_JAVA)/%.jar: %.jar
 	@echo "Installing java jar file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(addprefix $(INSTALL_JAVA)/, $(JARINPUT)): $(INSTALL_JAVA)/%: ../%
 	@echo "Installing jar input file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PHONY: all install buildInstall rebuild clean build inc
 

configure/RULES_OCTAVE

@@ -0,0 +1,52 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+#
+#-------------------------------------------------------
+# Octave definitions and rules
+
+ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
+
+FILE_TYPE += OCTAVE
+INSTALL_OCTAVE = $(INSTALL_LOCATION_LIB)/octave
+DIRECTORY_TARGETS += $(INSTALL_OCTAVE)
+
+ifdef T_A
+
+MKOCTFILE_FLAGS += --mex --verbose -DOCTAVE
+MKOCTFILE_FLAGS += $(RELEASE_INCLUDES) $(addprefix -L,$(SHRLIB_SEARCH_DIRS))
+
+vpath %.mex $(USR_VPATH) $(ALL_SRC_DIRS)
+vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
+
+define OCTAVES_template
+$(1) : $$($(1)_SRCS)
+endef
+$(foreach file, $(OCTAVES),$(eval $(call OCTAVES_template,$(strip $(file)))))
+
+#This clean works from O.* dirs.
+clean:: 
+	@$(RM) *.mex *.m
+
+.PRECIOUS: *.m *.mex
+
+%.mex:
+	mkoctfile $(MKOCTFILE_FLAGS) $($*_LIBS:%=-l%) $($*_SRCS)
+
+endif
+endif
+
+
+# Makefile usage:
+#  OCTAVES +=  abc.mex def.mex
+#  abc_SRCS = a1.c a2.c
+#  abc_LIBS = ca Com
+#  def_SRCS = a3.c a4.c
+#  def_LIBS = ca Com

configure/RULES_TARGET

@@ -0,0 +1,111 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+#
+#  $Id$
+#
+#  RULES_TARGET
+#
+#  This file is to be maintained by the community.
+#
+#-----------------------------------------------------------------------
+
+define TARGET_template
+$(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
+             $$(subst -nil-,,$$($(1)_$(2)_$$(OS_CLASS))), \
+             $$($(1)_$(2)_DEFAULT))
+endef
+
+$(foreach type, SRCS RCS OBJS LDFLAGS OBJLIBS LDOBJS SYS_LIBS , \
+$(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) , \
+    $(eval $(call TARGET_template,$(strip $(target)),$(type)))))
+
+#-----------------------------------------------------------------------
+
+# This define block requires GNU make 3.81
+define PROD_template
+ifeq ($$(strip $$($(1)_OBJS) $$($(1)_SRCS) $$(PRODUCT_OBJS)),)
+$(1)_OBJS = $(1)$$(OBJ)
+endif
+endef
+
+$(foreach target, $(PROD) $(TESTPROD), \
+    $(eval $(call PROD_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
+define TARGET2_template
+$(1)_LDLIBS += $$($(1)_LIBS)
+$(1)_LDLIBS += $$(if $$(strip $$($(1)_LIBS_$$(OS_CLASS))), \
+             $$(subst -nil-,,$$($(1)_LIBS_$$(OS_CLASS))), \
+             $$($(1)_LIBS_DEFAULT))
+
+$(1)_RESS = $$(if $$(RES),$$(addsuffix $$(RES),$$(basename $$($(1)_RCS))),)
+$(1)_OBJSNAME = $$(addsuffix $$(OBJ),$$(basename $$($(1)_OBJS) $$($(1)_SRCS) ))
+$(1)_DEPLIBS = $$(foreach lib, $$($(1)_LDLIBS),\
+ $$(firstword $$(wildcard $$(addsuffix /$$(LIB_PREFIX)$$(lib).*,\
+ $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))\
+ $$(addsuffix /$$(LIB_PREFIX)$$(lib)$$(LIB_SUFFIX),\
+ $$(firstword $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))))
+
+endef
+
+$(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) , \
+    $(eval $(call TARGET2_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
+define PROD2_template
+
+$(1)$$(EXE): $$($(1)_OBJSNAME) $$($(1)_RESS) $$($(1)_DEPLIBS)
+endef
+
+$(foreach target, $(PROD) $(TESTPROD), \
+    $(eval $(call PROD2_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
+define LIBRARY_template
+BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
+
+$(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS),\
+ $$(firstword $$(wildcard $$(addsuffix /$$(LIB_PREFIX)$$(lib).*,\
+ $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))\
+ $$(addsuffix /$$(LIB_PREFIX)$$(lib)$$(LIB_SUFFIX),\
+ $$(firstword $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))))
+
+$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
+$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_DEPLIBS)
+$$(LIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
+$$(LIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
+$$(LIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS)
+endef
+
+$(foreach target, $(LIBRARY), \
+    $(eval $(call LIBRARY_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
+define LOADABLE_LIBRARY_template
+LOADABLE_BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
+
+$(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS),\
+ $$(firstword $$(wildcard $$(addsuffix /$$(LIB_PREFIX)$$(lib).\*,\
+ $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))\
+ $$(addsuffix /$$(LIB_PREFIX)$$(lib)$$(LIB_SUFFIX),\
+ $$(firstword $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS)))))
+
+$$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
+$$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
+$$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS)
+endef
+
+$(foreach target, $(LOADABLE_LIBRARY), \
+    $(eval $(call LOADABLE_LIBRARY_template,$(strip $(target)))))
+

configure/RULES_TOP

@@ -16,6 +16,7 @@ include $(CONFIG)/RULES_DIRS
 UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
         $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \
         $(INSTALL_DB)
+UNINSTALL_DIRS += $(DIRECTORY_TARGETS)
 
 uninstallArchTargets = $(foreach arch,$(BUILD_ARCHS), uninstall$(DIVIDER)$(arch))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
@@ -35,8 +36,10 @@ endif
 
 distclean: realclean realuninstall
 
+CVSCLEAN=$(firstword $(wildcard $(TOOLS)/cvsclean.pl $(TOP)/src/tools/cvsclean.pl))
+
 cvsclean:
-	@$(PERL) $(TOOLS)/cvsclean.pl 
+	@$(PERL) $(CVSCLEAN) 
 
 realuninstall:
 	@$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)

configure/Sample.Makefile

@@ -197,7 +197,7 @@ PROD_VERSION =
 
 #	Scripts to install
 #
-#	If there is  both  ../$(SCRIPT) and  ../$(OS_CLASS)/$(SCRIPT),
+#	If there is  both  ../$(SCRIPTS) and  ../$(OS_CLASS)/$(SCRIPTS),
 #	the latter, system specific version will be installed!
 #
 SCRIPTS_DEFAULT = script_for_rest

configure/os/CONFIG.Common.RTEMS

@@ -18,6 +18,7 @@
 -include $(CONFIG)/os/CONFIG.Common.UnixCommon
 
 GNU_TARGET_INCLUDE_DIR =
+unexport GCC_EXEC_PREFIX
 
 #--------------------------------------------------
 # Get RTEMS_BASE definition
@@ -82,7 +83,7 @@ OS_CLASS = RTEMS
 
 #--------------------------------------------------
 # Operating system flags
-OP_SYS_LDLIBS += -lrtemsCom -lrtemscpu -lCom -lrtemsNfs -lm
+OP_SYS_LDLIBS += -lrtemsCom -lc -lrtemscpu -lCom -lnfs -lm
 OP_SYS_LDFLAGS += $(CPU_CFLAGS) -u Init \
                  $(PROJECT_RELEASE)/lib/no-dpmem.rel \
                  $(PROJECT_RELEASE)/lib/no-mp.rel \
@@ -99,8 +100,9 @@ CODE_CXXFLAGS =
 
 #--------------------------------------------------
 # RTEMS uses the inline keyword so -pedantic causes too many problems.
-CONFORM_CFLAGS_STRICT = -ansi
-CONFORM_CXXFLAGS_STRICT = -ansi
+# Using -ansi turns off lots of useful prototypes (e.g. strtok_r).
+CONFORM_CFLAGS_STRICT =
+CONFORM_CXXFLAGS_STRICT =
 
 #--------------------------------------------------
 # Command-line input support
@@ -109,4 +111,4 @@ LDLIBS_READLINE = -lreadline -lncurses
 
 #--------------------------------------------------
 # Allow site overrides
--include $(CONFIG)/os/CONFIG_SITE.Common.RTEMS
+-include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).RTEMS

configure/os/CONFIG.Common.RTEMS-at91rm9200ek

@@ -0,0 +1,13 @@
+#
+# CONFIG.Common.RTEMS-at91rm9200ek
+# Author: Ralf Hartmann
+#         BESSY
+#         Ralf.Hartmann@bessy.de
+#
+# Atmel AT91RM9200-EK evaluation kit
+# using the AT91RM9200 ARM9-based 32-bit RISC microcontroller
+#
+# All RTEMS targets use the same Makefile fragment
+#
+RTEMS_TARGET_CPU=arm
+include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -0,0 +1,38 @@
+#
+# CONFIG.Common.RTEMS-beatnik
+# A migration from Eric Norum's CONFIG.Common.RTEMS-mvme5500
+# Author: Dayle Kotturi
+#         SLAC
+#         dayle@slac.stanford.edu
+#
+# All RTEMS targets use the same Makefile fragment
+#
+override EXE=.elf
+RTEMS_TARGET_CPU = powerpc
+GNU_TARGET=powerpc-rtems
+ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
+ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
+
+MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+define MUNCH_CMD
+	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
+endef
+
+CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik
+
+include $(CONFIG)/os/CONFIG.Common.RTEMS
+RTEMSSYMS=$(PRODNAME:%$(EXE)=%.sym)
+RTEMSIMGS=$(PRODNAME:%$(EXE)=%.bin)
+INSTALL_RTEMSSYMS=$(RTEMSSYMS:%=$(INSTALL_BIN)/%)
+INSTALL_RTEMSIMGS=$(RTEMSIMGS:%=$(INSTALL_BIN)/%)
+
+OP_SYS_LDLIBS += -lbspExt
+
+%.sym: %$(EXE)
+	$(XSYMS) $^ $@
+
+%.bin: %$(EXE)
+	$(OBJCOPY) -Obinary $^ $@
+
+#PRODTARGETS+=$(INSTALL_RTEMSSYMS) $(INSTALL_RTEMSIMGS)

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -24,4 +24,6 @@ define MUNCH_CMD
 	rm -f rtems.gz
 endef
 
+OP_SYS_LDLIBS += -lbspExt
+
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme3100

@@ -0,0 +1,32 @@
+#
+# All RTEMS targets use the same Makefile fragment
+#
+override EXE=.elf
+RTEMS_TARGET_CPU = powerpc
+GNU_TARGET=powerpc-rtems
+ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
+ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
+
+MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+define MUNCH_CMD
+	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
+endef
+
+CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik
+
+include $(CONFIG)/os/CONFIG.Common.RTEMS
+RTEMSSYMS=$(PRODNAME:%$(EXE)=%.sym)
+RTEMSIMGS=$(PRODNAME:%$(EXE)=%.bin)
+INSTALL_RTEMSSYMS=$(RTEMSSYMS:%=$(INSTALL_BIN)/%)
+INSTALL_RTEMSIMGS=$(RTEMSIMGS:%=$(INSTALL_BIN)/%)
+
+OP_SYS_LDLIBS += -lbspExt
+
+%.sym: %$(EXE)
+	$(XSYMS) $^ $@
+
+%.bin: %$(EXE)
+	$(OBJCOPY) -Obinary $^ $@
+
+#PRODTARGETS+=$(INSTALL_RTEMSSYMS) $(INSTALL_RTEMSIMGS)

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -16,8 +16,3 @@ define MUNCH_CMD
 endef
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS
-
-#
-# Must put this one so it shows up after the -m528x
-#
-OP_SYS_LDFLAGS += -m5200

configure/os/CONFIG.Common.UnixCommon

@@ -12,15 +12,6 @@
 # Unix valid build types
 VALID_BUILDS = Host Ioc
 
-#-------------------------------------------------------
-# Gnu directory
-GNU_DIR = /usr/local
-
-#-------------------------------------------------------
-# Get fullpathname of relative dirs
-SHRLIB_SEARCH_FULLPATHDIRS = $(foreach dir,$(SHRLIB_SEARCH_DIRS), \
-  $(shell perl $(TOOLS)/fullPathName.pl $(dir)))
-
 #-------------------------------------------------------
 # Unix prefix and suffix definitions
 EXE =
@@ -55,8 +46,10 @@ SHRLIB_DEPLIBS=$(foreach lib, $(LIB_LIBS) $(USR_LIBS), \
 SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS) \
  $($*_SYS_LIBS) $(LIB_SYS_LIBS) $(USR_SYS_LIBS)) $(LDLIBS)
 
-SHRLIB_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(SHRLIB_DEPLIBS))
-SHRLIBDIR_LDFLAGS += $(sort $(SHRLIB_DEPLIB_DIRS:%=-L%))
+SHRLIB_DEPLIB_DIRS = $(foreach word,$(sort $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \
+  $(shell $(PERL) $(TOOLS)/fullPathName.pl $(word)))
+
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-L%)
 
 #-------------------------------------------------------
 # Prod: DEPLIBS, LDFLAGS, and LDLIBS definitions
@@ -75,17 +68,17 @@ LDLIBS_SHARED_NO = LDLIBS
 PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
                $(LDLIBS_SHARED_$(SHARED_LIBRARIES))))
 
-PROD_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS))
-PRODDIR_LDFLAGS += $(sort $(PROD_DEPLIB_DIRS:%=-L%))
+PROD_DEPLIB_DIRS = $(foreach word,$(sort $(dir $($*_DEPLIBS) $(PROD_DEPLIBS))), \
+  $(shell $(PERL) $(TOOLS)/fullPathName.pl $(word)))
+
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-L%)
 
 #--------------------------------------------------
 # Link definitions
 LINK.cpp = $(CCC) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
 LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
-LINK.shrlib = $(CCC) -o $@ $(SHRLIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
+LINK.shrlib = $(CCC) -o $@ $(TARGET_LIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
 LINK.shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
-LINK.loadable_shrlib = $(CCC) -o $@ $(LOADABLE_SHRLIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
-LINK.loadable_shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
 
 #--------------------------------------------------
 # Operating system definitions

configure/os/CONFIG.Common.cygwin-x86

@@ -13,24 +13,59 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon
 OS_CLASS = cygwin32
 ARCH_CLASS = x86
 
-EXE=.exe
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline -lcurses
 
-COMPILER_CPPFLAGS = -D_REENTRANT
-
-#POSIX_CPPFLAGS = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS
-# _POSIX_SOURCE eliminates select()
 POSIX_CPPFLAGS = -D_POSIX_THREADS -D_POSIX_TIMERS
+#POSIX_CPPFLAGS += -D_POSIX_SOURCE
 POSIX_LDLIBS += -lpthread
 
-ARCH_DEP_CPPFLAGS += -D_X86_
+ARCH_DEP_CFLAGS += -m32
+ARCH_DEP_LDFLAGS += -m32
 
-OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32
+# Compiler defines _X86_ 1
+# Compiler defines __MSVCRT__ 1
+# Compiler defines __CYGWIN__ 1
+# Compiler defines __CYGWIN32__ 1
+# Compiler defines __unix__ 1
+# Compiler defines __unix 1
+# Compiler defines unix 1
 
-# Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+OP_SYS_CPPFLAGS += -DCYGWIN32
 
-#  Definitions used when COMMANDLINE_LIBRARY is READLINE
-INCLUDES_READLINE = -I$(GNU_DIR)/include
-LDFLAGS_READLINE += -L$(GNU_DIR)/lib
-LDLIBS_READLINE = -lreadline
+EXE=.exe
+
+VISC_DLL_NO = -DEPICS_DLL_NO
+VISC_DLL_YES =
+VISC_DLL = $(VISC_DLL_$(SHARED_LIBRARIES))
+STATIC_CFLAGS_YES= $(VISC_DLL)
+STATIC_CFLAGS_NO=  $(VISC_DLL) -D_DLL
+STATIC_CXXFLAGS_YES= $(VISC_DLL)
+STATIC_CXXFLAGS_NO=  $(VISC_DLL) -D_DLL
+
+#	adjust names of libraries to build
+#
+#	But: if there are no objects LIBRARY_LD_OBJS to include
+#	in this library (may be for e.g. base/src/libCompat
+#	on some archs), don't define (and build) any library!
+SHRLIB_PREFIX=
+SHRLIB_SUFFIX=.dll
+SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
+LOADABLE_SHRLIB_PREFIX=
+LOADABLE_SHRLIB_SUFFIX=.dll
+LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX))
+
+#
+# When SHARED_LIBRARIES is YES we are building a DLL link library 
+# and when SHARED_LIBRARIES is NO we are building an object library
+#
+LIB_PREFIX=
+LIB_SUFFIX=.lib
+DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX))
+DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES))
+LIBNAME_NO = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX))
+LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES))
+
+#	dll install location
+INSTALL_SHRLIB = $(INSTALL_BIN)
 

configure/os/CONFIG.Common.darwin-ppc

@@ -7,52 +7,10 @@
 # Sites may override these definitions in CONFIG_SITE.Common.darwin-ppc
 #-------------------------------------------------------
 
-# Include definitions common to all Unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
 #
-# Set OS-specific information
+# Architecture-specific information
 #
-OS_CLASS = Darwin
 ARCH_CLASS = ppc
 
-#
-# Special flags for Darwin
-#   No common blocks (as required when using shared libraries)
-#
-OP_SYS_CFLAGS += -fno-common
-
-#
-# Don't try to use precompiled headers when converting sequencer files
-#
-CPPSNCFLAGS += -no-cpp-precomp
-
-#
-# Darwin os definition
-#
-OP_SYS_CPPFLAGS += -Ddarwin
-
-#
-# The following two definitions enable the use of DarwinPorts packages.
-
-#
-OP_SYS_INCLUDES += -I/opt/local/include
-# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist
-OP_SYS_LDFLAGS +=  $(addprefix -L,$(dir $(firstword $(wildcard /opt/local/lib/*))))
-
-#
-# The following two definitions enable the use of Fink packages.
-#
-OP_SYS_INCLUDES += -I/sw/include
-# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist
-OP_SYS_LDFLAGS +=  $(addprefix -L,$(dir $(firstword $(wildcard /sw/lib/*))))
-
-#
-# Libraries for command-line editing.
-#
-LDLIBS_READLINE = -lreadline
-
-#
-# Command-line input support
-#
-COMMANDLINE_LIBRARY=READLINE
+# Include definitions common to all Darwin targets
+include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

configure/os/CONFIG.Common.darwin-ppcx86

@@ -0,0 +1,22 @@
+# CONFIG.Common.darwin-ppcx86
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for Darwin 'universal' (PowerPC, Intel) target builds
+# Sites may override these definitions in CONFIG_SITE.Common.darwin-ppcx86
+#-------------------------------------------------------
+
+#
+# Set architecture-specific information
+#
+ARCH_CLASS = ppcx86
+
+#
+# Universal binary support
+#
+OP_SYS_CFLAGS += -arch i386 -arch ppc
+OP_SYS_LDFLAGS += -arch i386 -arch ppc
+
+# Include definitions common to all Darwin targets
+include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

configure/os/CONFIG.Common.darwin-x86

@@ -0,0 +1,16 @@
+# CONFIG.Common.darwin-x86
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for darwin-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.darwin-x86
+#-------------------------------------------------------
+
+#
+# Architecture-specific information
+#
+ARCH_CLASS = x86
+
+# Include definitions common to all Darwin targets
+include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

configure/os/CONFIG.Common.freebsd-x86

@@ -0,0 +1,34 @@
+# $Id$
+#
+# This file is maintained by the build community.
+#
+# Definitions for freebsd-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.freebsd-x86
+#-------------------------------------------------------
+
+# Include definitions common to all freebsd targets
+include $(CONFIG)/os/CONFIG.Common.freebsdCommon
+
+ARCH_CLASS = x86
+
+ARCH_DEP_CPPFLAGS += -D_X86_
+
+ifeq ($(BUILD_CLASS),CROSS)
+ifeq ($(EPICS_HOST_ARCH),freebsd-x86)
+   # Added for 386,486,... cross builds
+   CMPLR_PREFIX=
+   CROSS_INCLUDES=
+   CROSS_LDFLAGS=
+   # Use -w not -Wall
+   #WARN_CFLAGS_YES = -w
+   #WARN_CXXFLAGS_YES = -w
+-include $(CONFIG)/os/CONFIG_SITE.Common.freebsd-x86
+-include $(CONFIG)/os/CONFIG.freebsd-x86.freebsd-x86
+-include $(CONFIG)/os/CONFIG_SITE.freebsd-x86.freebsd-x86
+else
+   GNU_TARGET=i586-pc-freebsd-gnu
+   CMPLR_SUFFIX=
+   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
+endif
+endif
+

configure/os/CONFIG.Common.freebsd-x86_64

@@ -0,0 +1,34 @@
+# $Id$
+#
+# This file is maintained by the build community.
+#
+# Definitions for freebsd-x86_64 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.freebsd-x86_64
+#-------------------------------------------------------
+
+# Include definitions common to all freebsd targets
+include $(CONFIG)/os/CONFIG.Common.freebsdCommon
+
+ARCH_CLASS = x86_64
+
+ARCH_DEP_CPPFLAGS += -D_X86_64_
+
+ifeq ($(BUILD_CLASS),CROSS)
+ifeq ($(EPICS_HOST_ARCH),freebsd-x86_64)
+   # Added for 386,486,... cross builds
+   CMPLR_PREFIX=
+   CROSS_INCLUDES=
+   CROSS_LDFLAGS=
+   # Use -w not -Wall
+   #WARN_CFLAGS_YES = -w
+   #WARN_CXXFLAGS_YES = -w
+-include $(CONFIG)/os/CONFIG_SITE.Common.freebsd-x86_64
+-include $(CONFIG)/os/CONFIG.freebsd-x86_64.freebsd-x86_64
+-include $(CONFIG)/os/CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
+else
+   GNU_TARGET=i586-pc-freebsd-gnu
+   CMPLR_SUFFIX=
+   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
+endif
+endif
+

configure/os/CONFIG.Common.freebsdCommon

@@ -0,0 +1,32 @@
+# $Id$
+#
+# This file is maintained by the build community.
+#
+# Definitions for freebsd target builds
+# Sites may override these definitions in CONFIG_SITE.Common.freebsdCommon
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = freebsd
+
+CODE_CPPFLAGS = -D_REENTRANT
+
+POSIX_CPPFLAGS = -D_POSIX_THREADS
+POSIX_LDLIBS = -lpthread
+
+# -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
+OP_SYS_CPPFLAGS += -D_BSD_SOURCE
+OP_SYS_CPPFLAGS += -Dfreebsd
+
+# Set runtime path for shared libraries
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline -lcurses
+
+GNU_LDLIBS_YES = -lgcc_pic

configure/os/CONFIG.Common.hpux-parisc

@@ -26,6 +26,9 @@ LOADABLE_SHRLIB_SUFFIX = .sl$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
 # Set runtime path for shared libraries
 empty:=                                      # trick from the make docs...
 space:= $(empty) $(empty)
-RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_FULLPATHDIRS))),+s
+SHRLIBDIR_LDFLAGS += -Wl,+b$(subst $(space),:,$(SHRLIB_DEPLIB_DIRS)),+s
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += -Wl,+b$(subst $(space),:,$(PROD_DEPLIB_DIRS)),+s
 
 GNU_TARGET=parisc-hp-unix

configure/os/CONFIG.Common.linux-386

@@ -10,9 +10,13 @@
 # Include definitions common to all linux x86 targets
 include $(CONFIG)/os/CONFIG.Common.linux-x86
 
-ARCH_DEP_CFLAGS = -march=i386
+ARCH_DEP_CFLAGS += -march=i386
 
 ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i386-pc-linux-gnu
+  VALID_BUILDS = Ioc
 endif
 
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. i386-pc-linux-gnu-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-386 file, e.g. GNU_TARGET=i386-pc-linux-gnu
+

configure/os/CONFIG.Common.linux-486

@@ -10,9 +10,13 @@
 # Include definitions common to all linux x86 targets
 include $(CONFIG)/os/CONFIG.Common.linux-x86
 
-ARCH_DEP_CFLAGS = -march=i486
+ARCH_DEP_CFLAGS += -march=i486
 
 ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i486-pc-linux-gnu
+   VALID_BUILDS = Ioc
 endif
 
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. i486-pc-linux-gnu-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-486 file, e.g. GNU_TARGET=i486-pc-linux-gnu
+

configure/os/CONFIG.Common.linux-586

@@ -10,10 +10,15 @@
 # Include definitions common to all linux x86 targets
 include $(CONFIG)/os/CONFIG.Common.linux-x86
 
-# i586 is euivalent to pentiumpro
-ARCH_DEP_CFLAGS = -march=i586
+# i586 is equivalent to pentium
+ARCH_DEP_CFLAGS += -march=i586
 
 ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i586-pc-linux-gnu
+   VALID_BUILDS = Ioc
 endif
 
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. i586-pc-linux-gnu-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-586 file, e.g. GNU_TARGET=i586-pc-linux-gnu
+
+

configure/os/CONFIG.Common.linux-686

@@ -11,9 +11,13 @@
 include $(CONFIG)/os/CONFIG.Common.linux-x86
 
 # i686 is euivalent to pentiumpro
-ARCH_DEP_CFLAGS = -march=i686
+ARCH_DEP_CFLAGS += -march=i686
 
 ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i686-pc-linux-gnu
+   VALID_BUILDS = Ioc
 endif
 
+# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
+# e.g. i686-pc-linux-gnu-gcc, put a GNU_TARGET definition in
+# CONFIG_SITE.<host>.linux-686 file, e.g. GNU_TARGET=i686-pc-linux-gnu
+