-RC2 release.

Added POSIX_CFLAGS, POSIX_CXXFLAGS, POSIX_LDFLAGS

LICENSE

@@ -1,29 +1,19 @@
-Copyright (c) 1991-2003 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 agreement:
+EPICS BASE is distributed subject to the following license conditions:
 
  SOFTWARE LICENSE AGREEMENT
  Software: EPICS BASE
  Versions: 3.13.7 and higher
 
-IMPORTANT! READ CAREFULLY: EPICS BASE is NOT distributed as Open Source.
-This is a legal agreement between you (in your capacity as an individual
-and as an agent for your company, institution or other entity) and The
-University of Chicago, as Operator of Argonne National Laboratory under
-Contract W-31-109-ENG-38 with the U.S. Department of Energy ("Argonne"),
-and The Regents of the University of California, as Operator of Los Alamos
-National Laboratory under Contract W-7405-ENG-36 with the U.S. Department
-of Energy ("Los Alamos").
-
  1. The "Software", below, refers to EPICS BASE (in either source code, or
     binary form and accompanying documentation). Each licensee is
     addressed as "you" or "Licensee."
 
- 2. Argonne and Los Alamos are copyright holders in the Software. The
-    copyright holders and their third-party licensors hereby grant
-    Licensee a royalty-free nonexclusive license, subject to the
-    limitations stated herein and U.S. Government license rights.
+ 2. The copyright holders shown above and their third-party licensors
+    hereby grant Licensee a royalty-free nonexclusive license, subject to
+    the limitations stated herein and U.S. Government license rights.
 
  3. You may modify and make a copy or copies of the Software for use
     within your organization, if you meet the following conditions:
@@ -44,39 +34,28 @@ of Energy ("Los Alamos").
          materials provided with the copy;
       c. Modified copies and works based on the Software must carry
          prominent notices stating that you changed specified portions of
-         the Software; and
-      d. Prior to sending a copy or modified copy of the Software to any
-         person or entity outside your organization you must verify with
-         Argonne that the intended recipient of the Software has executed
-         a license with Argonne for EPICS BASE. (See
-         http://www.aps.anl.gov/epics/license/verify.php for information
-         on how to contact Argonne.)
+         the Software.
 
- 5. THE SOFTWARE INCLUDES PORTIONS WHICH MAY REQUIRE SOME FORM OF EXPORT
-    CONTROL LICENSE FROM THE U.S. GOVERNMENT. FAILURE TO OBTAIN SUCH
-    EXPORT CONTROL LICENSE MAY RESULT IN CRIMINAL LIABILITY UNDER U.S.
-    LAWS.
-
- 6. Portions of the Software resulted from work developed under a U.S.
+ 5. Portions of the Software resulted from work developed under a U.S.
     Government contract and are subject to the following license: the
     Government is granted for itself and others acting on its behalf a
     paid-up, nonexclusive, irrevocable worldwide license in this computer
     software to reproduce, prepare derivative works, and perform publicly
     and display publicly.
 
- 7. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY
+ 6. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY
     OF ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY LICENSORS, THE
     UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR
     EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
     BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-    FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT, (2) DO NOT ASSUME
+    FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME
     ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS,
     OR USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE
     SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT
-    THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR FREE
+    THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE
     OR THAT ANY ERRORS WILL BE CORRECTED.
 
- 8. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR
+ 7. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR
     THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT
     OF ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL,
     CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE,
@@ -89,21 +68,17 @@ of Energy ("Los Alamos").
 ________________________________________________________________________
 
 This software is in part copyrighted by the BERLINER SPEICHERRING
-GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY),
-BERLIN, GERMANY.
+GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY), BERLIN, GERMANY.
 
-In no event shall BESSY be liable to any party for direct,
-indirect, special, incidental, or consequential damages arising
-out of the use of this software, its documentation, or any
-derivatives thereof, even if BESSY has been advised of the
-possibility of such damage.
+In no event shall BESSY be liable to any party for direct, indirect,
+special, incidental, or consequential damages arising out of the use of
+this software, its documentation, or any derivatives thereof, even if
+BESSY has been advised of the possibility of such damage.
 
-BESSY specifically disclaims any warranties, including, but not
-limited to, the implied warranties of merchantability, fitness for
-a particular purpose, and non-infringement.  This software is
-provided on an "as is" basis, and BESSY has no obligation to
-provide maintenance, support, updates, enhancements, or
-modifications.
+BESSY specifically disclaims any warranties, including, but not limited
+to, the implied warranties of merchantability, fitness for a particular
+purpose, and non-infringement.  This software is provided on an "as is"
+basis, and BESSY has no obligation to provide maintenance, support,
+updates, enhancements, or modifications.
 ________________________________________________________________________
 
-

Makefile

@@ -14,7 +14,16 @@
 TOP = .
 include $(TOP)/configure/CONFIG
 
-DIRS += config config/tools configure src
+# 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.Darwin

@@ -29,6 +29,7 @@ RANLIB = ranlib
 ANSI=GCC
 CPLUSPLUS=G++
 
+OP_SYS_CPPFLAGS += -DDarwin
 OP_SYS_CFLAGS += -no-cpp-precomp
 OP_SYS_INCLUDES = -I/sw/include -I/usr/X11R6/include
 OP_SYS_LDFLAGS += -L/sw/lib -L/usr/X11R6/lib

config/CONFIG.Host.Linux

@@ -29,7 +29,7 @@ G++_SHRLIB_LDFLAGS_YES +=  -Wl,-soname,$@
 
 OP_SYS_CFLAGS += -D_BSD_SOURCE
 
-ARCH_DEP_CFLAGS = -D_X86_ -Dlinux -mcpu=pentium
+ARCH_DEP_CFLAGS = -D_X86_ -Dlinux
 ARCH_DEP_LDLIBS += -lpthread -lreadline -lcurses -lrt
 
 #Allows R3.13 built extensions to load R3.14 shared libs

config/CONFIG.Host.LynxOS

@@ -1,65 +0,0 @@
-#*************************************************************************
-# 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. 
-#*************************************************************************
-# CONFIG.Host.LynxOS
-#
-#  This file is maintained by the EPICS community.
-#  Sites may override these definitions in CONFIG_SITE.Host.LynxOS
- 
-ARCH_CLASS = LynxOS
-
-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
-
-AR = ar -rc
-ARCMD = $(AR) $@
-RANLIB = ranlib -t
-
-
-
-# Configure OS vendor C compiler
-ACC_ANSI = $(ACC) -ansi
-ACC_STRICT = $(ACC) -ansi -pedantic
-ACC_TRAD = $(ACC)
-ACC_WARN_YES = -Wall 
-ACC_WARN_NO =  -w
-ACC_OPT_YES =  -O
-ACC_OPT_NO = -g
-ACC_SFLAGS_YES = -Bstatic
-ACC_SFLAGS_NO=
-ACC_SLIBS_YES =
-ACC_SLIBS_NO=
-ACC_SHRLIB_CFLAGS_YES = 
-ACC_SHRLIB_LDFLAGS_YES =
-
-
-
-# Configure OS vendor C++ compiler
-CCC_NORMAL = $(CCC)
-CCC_STRICT = $(CCC)
-CCC_TEMPL_INST_FLAG = -pedantic -DEXPL_TEMP
-CCC_WARN_YES = -Wall
-CCC_WARN_NO = -w
-CCC_OPT_YES =  -O
-CCC_OPT_NO = -g
-CCC_SFLAGS_YES = -Bstatic
-CCC_SFLAGS_NO=
-CCC_SLIBS_YES = 
-CCC_SLIBS_NO=
-CCC_DEPENDS_FLAG = -pedantic
-
-
-# added smh 6/5/98 : when building fdmgr - seems to use this not ACC
-# in effect this overides orig def in CONFIG_COMMON :
-# which is GCC_STRICT = $(GCC) -ansi -pedantic
-GCC_STRICT = $(GCC)
-G++_STRICT = $(G++) -Wtraditional -DEXPL_TEMP
-
-ARCH_DEP_CFLAGS = -DLynxOS -mposix -D_X86_ -DLYNXOS_RELEASE_2_4_0
-ARCH_DEP_LDLIBS = -lc -lbsd -lnsl -lm -lposix4d9 -llynx

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

@@ -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$
+
+# 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

@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 #*************************************************************************
 # Copyright (c) 2002 The University of Chicago, as Operator of Argonne
 #     National Laboratory.
@@ -8,9 +7,6 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
- 
-use Cwd;
+# $Id$
 
-chdir $ARGV[0];
-
-print cwd();
+-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.hp700

@@ -21,7 +21,8 @@ include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
 
 SHRLIB_SUFFIX = .sl
 
-AR = ar -rc
+AR = ar
+ARFLAGS = -rc
 
 # Configure OS vendor C compiler
 ACC = cc

config/CONFIG.Host.linux-ppc

@@ -0,0 +1,24 @@
+#*************************************************************************
+# 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 = ppc
+
+ARCH_DEP_CPPFLAGS += -D_ppc_
+
+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

@@ -7,16 +7,11 @@
 # 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 = Linux
 
-SCRIPTS_HOST += $(subst ../,,$(wildcard ../*.pl)) 
-SCRIPTS_HOST += installEpics
-
-include $(TOP)/configure/RULES
+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

@@ -45,7 +45,7 @@ ACC_SFLAGS_NO=
 ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic
 ACC_SLIBS_NO=
 ACC_SHRLIB_CFLAGS_YES =
-ACC_SHRLIB_LDFLAGS_YES =  -G -h $@ -z ignore -z combreloc -z lazyload
+ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
 
 # Configure OS vendor C++ compiler
 CCC = $(SPARCWORKS)/bin/CC
@@ -63,24 +63,33 @@ CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic
 CCC_SLIBS_NO=
 CCC_DEPENDS_FLAG = -xM1
 CCC_SHRLIB_CFLAGS_YES =
-CCC_SHRLIB_LDFLAGS_YES =  -G -h $@ -z ignore -z combreloc -z lazyload
+CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
 
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
-POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
+POSIX_CPPFLAGS_YES += -D__EXTENSIONS__ -mt
 
-# socket and nsl needed by libca.a
+ARCH_DEP_LDFLAGS += -mt
+
+# 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_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
 RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
  $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
 
+OP_SYS_LDFLAGS =  -z ignore -z combreloc -z lazyload
+
 

config/CONFIG.Host.solaris-sparc-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$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solaris
+

config/CONFIG.Host.solaris-sparc-staticlib

@@ -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$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solaris
+

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,21 +20,3 @@ ANSI=GCC
 CPLUSPLUS=G++
 #==========================
 
-SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
-ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
-POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
-
-# 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 += $(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 += 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.LynxOS

@@ -1,142 +0,0 @@
-#*************************************************************************
-# 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 contains definitions for Vx builds
-
-#--------------------------------------------------
-# operating system class (include/os/<os_class>)
-OS_CLASS = LynxOS
-
-lynx_pc486 =YES
-
-CC = gcc
-CXX = g++
-
-#--------------------------------------------------
-# vxWorks directory definitions
-
-# The definitions VX_DIR, VX_GNU, GNU_DIR and GNU_LIB
-# can be overridden for specific host architectures
-# by creating a CONFIG_SITE.Vx.<host_arch> file with
-# the override definitions.
- 
-# Tornado directory definitions
-VX_INCLUDE_YES =
-VX_GNU_YES =
-VX_GNU_BIN_YES =
-VX_GNU_LIB_YES =
-
-
-# pre Torando directory definitions
-VX_INCLUDE_NO =
-VX_GNU_NO =
-VX_GNU_BIN_NO =
- 
-# directory definitions
-VX_DIR =
-VX_INCLUDE =
-VX_GNU = 
-
-GNU_BIN = /usr/local/bin
-GNU_LIB = /usr/local/lib
-
-#--------------------------------------------------
-# VxWorks command definitions
-
-#GCC = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc
-#AR = $(GNU_BIN)/ar$(CMPLR_SUFFIX)
-#CPP = $(GNU_BIN)/cpp$(CMPLR_SUFFIX) -nostdinc
-#RANLIB = $(GNU_BIN)/ranlib$(CMPLR_SUFFIX)
-#LD = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r
-
-AR = ar -rc
-ARCMD = $(AR) $@
-RANLIB = ranlib -t
-GCC = gcc 
-CPP = cpp
-LD = ld -r
-
-
-#--------------------------------------------------
-# Tornado C++ crosscompiler definitions
-
-#CPLUSPLUS_YES = G++
-#G++ = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc
-#LD_G++ = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r
-#NM = $(GNU_BIN)/nm$(CMPLR_SUFFIX)
-#MUNCH = $(GNU_BIN)/munch
-
-CPLUSPLUS_YES = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
-G++ = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
-LD_G++ = ld -r
-NM = nm
-
-#--------------------------------------------------
-# Pre Tornado C++ crosscompiler definitions
-# These are pre tornado definitions for Hideos builds (defined for 68k only)
-
-#CPLUSPLUS_NO = CCC
-#CCC = $(GNU_DIR)/bin/sun3-g++ -B$(GNU_DIR)/lib/gcc-lib/ -nostdinc -DEXPL_TEMPL
-#LD_CCC = $(GNU_DIR)/bin/sun3-ld $(OLD_ARCH_DEP_LDFLAGS) -r
-
-CPLUSPLUS_NO = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
-CCC = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
-LD_CCC = ld -r
-
-CCC_NORMAL = $(CCC) $(OLD_ARCH_DEP_CFLAGS)
-CCC_STRICT = $(CCC) -ansi -pedantic -Wall -traditional $(OLD_ARCH_DEP_CFLAGS)
-CCC_TRAD = $(CCC) -traditional $(OLD_ARCH_DEP_CFLAGS)
-CCC_TEMPL_INST_FLAG = -DEXPL_TEMP
-CCC_WARN_YES = -Wall
-CCC_WARN_NO = -w
-CCC_OPT_YES = -O
-CCC_OPT_NO = -g
-CCC_DEPENDS_FLAG =  -pedantic -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
-CPU = i486
-OS = lynxos
-OLD_ARCH_DEP_CFLAGS = -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
-#	 --no-builtin -Wa,"-m68040" -DOS_EQ_$(OS) \
-#	-DBOARD_EQ_$(BOARD) -DCPU_EQ_$(CPU) -DBOARD=$(BOARD)
-OLD_ARCH_DEP_LDFLAGS = -mposix -lc -lbsd -lnsl -lm -lposix4d9 -llynx
-#	 -Ur -N -T$(EPICS_BASE_BIN)/vxldscript.MRI
-
-#--------------------------------------------------
-# C compiler definitions  
-ANSI = gcc -ansi
-
-#--------------------------------------------------
-# Command definitions
-CPLUSPLUS = g++
-#	 $(CPLUSPLUS_$(TORNADO))
-LD_CXX = ld -r
-#	 $(LD_$(CPLUSPLUS))
-
-#--------------------------------------------------
-# Operating system flags
-OP_SYS_INCLUDES =
-#	 -I$(VX_INCLUDE)
-OP_SYS_CFLAGS =  -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
-#		-DvxWorks -DV5_vxWorks -fno-builtin 
-OP_SYS_LDFLAGS = -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
-OP_SYS_LDLIBS = -lc -lbsd -lnsl -lm -lposix4d9 -llynx
-
-#--------------------------------------------------
-# Optimization flag overrides
-GCC_OPT_YES = -O	
-#	2 -fstrength-reduce
-G++_OPT_YES = -O
-#	2 -fstrength-reduce
-
-#--------------------------------------------------
-# Link definitions
-LINK.c = $(LD) $(LDFLAGS) -o
-LINK.cc = $(LD_CXX) $(LDFLAGS) -o
-

config/CONFIG.Vx

@@ -20,7 +20,7 @@ OS_CLASS = vxWorks
 
 # The definitions VX_DIR, VX_GNU, GNU_DIR and GNU_LIB
 # can be overridden for specific host architectures
-# by creating a CONFIG_SITE.Vx.<host_archfile with
+# by creating a CONFIG_SITE.Vx.<host_arch> file with
 # the override definitions.
 
 # Tornado directory definitions
@@ -41,7 +41,6 @@ VX_GNU = $(VX_GNU_$(TORNADO))
 GNU_BIN = $(VX_GNU_BIN_$(TORNADO))
 GNU_LIB = $(VX_GNU_LIB_$(TORNADO))
 export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/
-export WIND_BASE = $(VX_DIR)
 
 #--------------------------------------------------
 # VxWorks command definitions
@@ -148,4 +147,3 @@ MUNCHNAME = $(LIBNAME:%=%$(MUNCH_SUFFIX))
 export WIND_BASE = $(VX_DIR)
 export WIND_HOST_TYPE
 
-

config/CONFIG.Vx.vxWorks-ppc603_long

@@ -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$
+
+# vxWorks-ppc603 is the new R3.14 name for ppc603
+include $(EPICS_BASE)/config/CONFIG.Vx.ppc603_long

config/CONFIG.Vx.vxWorks-ppc604_long

@@ -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$
+
+# vxWorks-ppc604 is the new R3.14 name for ppc604
+include $(EPICS_BASE)/config/CONFIG.Vx.ppc604_long

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=2
-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

@@ -42,6 +42,7 @@ INSTALL_CONFIG              = $(INSTALL_LOCATION)/config
 INSTALL_JAVA                = $(INSTALL_LOCATION)/javalib
 
 EPICS_BASE_INCLUDE      = $(EPICS_BASE)/include
+EPICS_BASE_TOOLS        = $(EPICS_BASE)/config/tools
 
 DIVIDER = .
 OBJ = .
@@ -63,7 +64,7 @@ LEX   = $(ELEX)
 PERL=perl
 
 # install from EPICS
-INSTALL = $(PERL) $(EPICS_BASE_HOST_BIN)/installEpics.pl
+INSTALL = $(PERL) $(EPICS_BASE_TOOLS)/installEpics.pl
 INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
@@ -86,10 +87,10 @@ EPICS_BASE_BIN          = $(EPICS_BASE)/bin/$(T_A)
 
 GCC_ANSI = $(GCC) -ansi
 GCC_STRICT = $(GCC) -ansi -pedantic
-GCC_TRAD = $(GCC) -traditional
+GCC_TRAD = $(GCC)
 GCC_DEP_CFLAGS = -fPIC -D_REENTRANT
 
-GCC_WARN_YES = -Wall
+GCC_WARN_YES = -Wall -Wmissing-prototypes -Wstrict-prototypes
 GCC_WARN_NO = -w
 GCC_OPT_YES = -O3
 GCC_OPT_NO = -g
@@ -101,13 +102,13 @@ GCC_SHRLIB_CFLAGS_YES =
 GCC_SHRLIB_LDFLAGS_YES =  -shared
 
 G++_NORMAL = $(G++) -ansi -pedantic
-G++_STRICT = $(G++) -ansi -pedantic -Wtraditional
-G++_TRAD = $(G++) -traditional
+G++_STRICT = $(G++) -ansi -pedantic
+G++_TRAD = $(G++)
 G++_TEMPL_INST_FLAG = -DEXPL_TEMPL
 G++_DEP_CFLAGS = -fPIC -D_REENTRANT
 G++_WARN_YES = -Wall \
-      -Wmissing-prototypes -Woverloaded-virtual \
-      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion\
       -Wpointer-arith -Winline
 G++_WARN_NO = -w
 G++_OPT_YES = -O3
@@ -240,10 +241,10 @@ CXXFLAGS = $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
  $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS) $(RUNTIME_LDFLAGS)
 
-LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS)\
- $(STATIC_LDLIBS) $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)
+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

@@ -15,14 +15,18 @@
 #Syntax:
 # ARCH_<host_arch> = <epics_host_arch>
 ARCH_solarisGnu = solaris-sparc-gnu
+ARCH_solarisNonshared = solaris-sparc-nonshared
+#ARCH_solaris = solaris-sparc-static
+#ARCH_solaris = solaris-sparc-debug
 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 = win32-x86-cygwin
+ARCH_cygwin32 = cygwin-x86
 
 ifndef EPICS_HOST_ARCH
 ifdef HOST_ARCH
@@ -44,4 +48,3 @@ HOST_ARCH := $(EPICS_HOST_ARCH)
 # and change ARCH_solaris=solaris-<arch> to ARCH_solaris=solaris-<arch>-gnu
 # in base/config/CONFIG_COMPAT.
 
-

config/CONFIG_HOST_ARCH.Borland

@@ -13,12 +13,12 @@
 EXE=.exe
 HOSTEXE=.exe
 
-CP   =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
-MV   =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl
-RM   =$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -f
-MKDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/mkdir.pl
-RMDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -rf
-FN   =$(PERL) $(EPICS_BASE_HOST_BIN)/fullName.pl
+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
+FN   =$(PERL) $(EPICS_BASE_TOOLS)/fullName.pl
 CHMOD=echo
 ECHO=echo
 

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.WIN32

@@ -13,11 +13,11 @@
 EXE=.exe
 HOSTEXE=.exe
 
-CP   =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
-MV   =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl
-RM   =$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -f
-MKDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/mkdir.pl
-RMDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -rf
+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
 

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

@@ -0,0 +1,23 @@
+#*************************************************************************
+# 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. 
+#*************************************************************************
+# CONFIG_HOST_ARCH.cygwin-x86
+#
+# This file is maintained by the EPICS community.
+
+# Include definitions common to all Unix archs
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
+
+EXE=.exe
+HOSTEXE=.exe
+
+TORNADO=YES
+
+WIND_HOST_TYPE = x86-win32
+

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

@@ -7,12 +7,9 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#  CONFIG_HOST_ARCH.LynxOS
-#
-# Override values in CONFIG.LynxOS
+# $Id$
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
 
-WIND_HOST_TYPE = LynxOS
-
+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

@@ -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.solaris
+
+HOST_OPT = NO

config/CONFIG_HOST_ARCH.solaris-sparc-gnu

@@ -9,5 +9,5 @@
 #*************************************************************************
 #  $Id$
 
--include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solarisGnu
 

config/CONFIG_HOST_ARCH.solaris-sparc-staticlib

@@ -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.solaris
+

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.solaris-x86-gnu

@@ -1,4 +1,4 @@
 #  $Id$
 
--include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solarisGnu
 

config/CONFIG_HOST_ARCH.solarisGnu

@@ -1,6 +1,5 @@
-#  CONFIG_HOST_ARCH.solaris
+#  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

@@ -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$
+#
+# Override values in CONFIG_SITE_HOST_ARCH.win32-x86-cygwin
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
+
+HOSTEXE=.exe
+
+WIND_HOST_TYPE = x86-win32
+

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

@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 #*************************************************************************
 # Copyright (c) 2002 The University of Chicago, as Operator of Argonne
 #     National Laboratory.
@@ -8,38 +7,23 @@
 # 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-mingw
 
-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 "";
+EXE=.exe
+HOSTEXE=.exe
 
-foreach $arg ( @ARGV )
-{
-	next unless -e $arg;
+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
 
-	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";
-	}
-}
+WIND_HOST_TYPE = x86-win32
 
-# EOF rm.pl

config/CONFIG_SITE

@@ -24,6 +24,7 @@
 #	solarisGnu  (GNU compiler)
 #	solaris-x86
 #	sun4
+
 #
 #  HOST_ARCH now an environment variable
 #  HOST_ARCH=$(shell /usr/local/epics/startup/HostArch)
@@ -31,29 +32,18 @@ ifndef HOST_ARCH
 	HOST_ARCH=unsupported
 endif
 
-#  The architectures to build EPICS for
+#  The R3.14 architectures to build EPICS for
 #
 #  Currently Supporting:
-#       frc40
-#       frc5ce
-#       hkbaja47
-#       hkv2f
-#       mv147
-#       mv1604
-#       mv162
-#       mv162lc
-#       mv167
-#       mv177
-#       mv2700
-#       niCpu030
-#       pc486
-#       ppc603
-#       ppc604
-#       ppc603_long (over 32MB)
-#       ppc604_long (over 32MB)
-#       sbs_pc6
-#       vxipc
-#
+#       vxWorks-486
+#       vxWorks-68040
+#       vxWorks-68040lc
+#       vxWorks-68060
+#       vxWorks-ppc603
+#       vxWorks-ppc604
+#       vxWorks-ppc603_long
+#       vxWorks-ppc604_long
+
 CROSS_COMPILER_TARGET_ARCHS=
 
 

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-sparc-debug

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

config/CONFIG_SITE.Host.solaris-sparc-staticlib

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

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

@@ -15,10 +15,15 @@ TOP=..
 
 include $(TOP)/configure/CONFIG
 
+ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
 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.Db

@@ -204,7 +204,7 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo "Expanding dbd"
 	@$(RM) $@
-	$(DBEXPAND) $(DBDFLAGS) $< > $@
+	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
 endif
 
 ##################################################### Dependencies

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
@@ -463,10 +464,12 @@ endif  #ifdef PROD
 #     Java classes and packages
 #
 
+ifdef JAVA
 DIRECTORY_TARGETS += $(INSTALL_JAVA)
 ifdef PACKAGE
 DIRECTORY_TARGETS += $(INSTALL_JAVA)/$(PACKAGE)
 endif
+endif
 
 vpath %.class $(INSTALL_JAVA)/$(PACKAGE)
 
@@ -648,8 +651,8 @@ endif
 	@$(RM) $@
 	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.i
 
-%.c:	%.stt
-	@echo "converting $<
+%.c: ../%.stt
+	@echo "converting $<"
 	ln -s $< $*.st
 	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.st
 	@$(RM) $*.st
@@ -722,7 +725,7 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo Expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) $(DBDFLAGS) $< > $@
+	$(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) $(DBDFLAGS) -o $@ $<
 
 ifneq (,$(wildcard ../base.dbd))
 $(DBDNAME): ../base.dbd
@@ -736,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
@@ -782,8 +786,8 @@ $(INSTALL_SHRLIB)/lib%: lib%
 	@echo "Installing library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
 ifdef SHRLIB_VERSION
-	@$(RM) $(@:%.$(SHRLIB_VERSION)=%)
-	ln -s $< $(@:%.$(SHRLIB_VERSION)=%) 
+	$(RM) $(subst .$(SHRLIB_VERSION),,$@)
+	ln -s $< $(subst .$(SHRLIB_VERSION),,$@)
 endif # SHRLIB_VERSION
 
 $(INSTALL_TCLLIB)/%: %

config/RULES.Unix

@@ -148,8 +148,8 @@ $(TARGETS) $(PROD): $(DEPLIBS)
 	@$(RM) $@
 	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.i
 
-%.c: %.stt
-	@echo "converting $<
+%.c: ../%.stt
+	@echo "converting $<"
 	@$(RM) $@
 	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $<
 
@@ -221,7 +221,7 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE_HOST_BIN)/dbExpand $(DBDFLAGS) $< > $@
+	$(EPICS_BASE_HOST_BIN)/dbExpand $(DBDFLAGS) -o $@ $<
 
 ifneq (,$(wildcard ../base.dbd))
 $(DBDNAME): ../base.dbd

config/RULES.Vx

@@ -129,7 +129,7 @@ endif
 %.out : %.o
 	@ $(RM) ctct.o ctdt.c nm.out
 	$(NM) $<  > nm.out
-	$(PERL) $(EPICS_BASE)/bin/$(HOST_ARCH)/munch.pl < nm.out > ctdt.c
+	$(PERL) $(EPICS_BASE_TOOLS)/munch.pl < nm.out > ctdt.c
 	$(COMPILE.c) -traditional ctdt.c
 	$(LINK.cc) $@ $< ctdt.o
 
@@ -137,7 +137,7 @@ endif
 $(MUNCHNAME):%.munch : %
 	@ $(RM) ctct.o ctdt.c nm.out
 	$(NM) $<  > nm.out
-	$(PERL) $(EPICS_BASE)/bin/$(HOST_ARCH)/munch.pl < nm.out > ctdt.c
+	$(PERL) $(EPICS_BASE_TOOLS)/munch.pl < nm.out > ctdt.c
 	$(COMPILE.c) -traditional ctdt.c
 	$(LINK.cc) $@ $(LDFLAGS) $< ctdt.o
 
@@ -248,7 +248,7 @@ ifdef DBDEXPAND
 $(DBDNAME): ../$(DBDEXPAND)
 	@echo Expanding dbd
 	@$(RM) $@
-	$(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) $(DBDFLAGS) $< > $@
+	$(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) $(DBDFLAGS) -o $@ $<
 endif
 
 $(LIBNAME): $(LIBOBJS)

config/RULES_ARCHS

@@ -22,7 +22,6 @@ ACTIONS += install
 ACTIONS += buildInstall 
 ACTIONS += depends 
 ACTIONS += rebuild 
-ACTIONS += browse 
 
 actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
@@ -61,11 +60,11 @@ $(crossActionArchTargets) :
 $(crossArchs) : 
 endif
 
-$(hostDirs) : 
-	$(PERL) $(EPICS_BASE_HOST_BIN)/makeMakefile.pl $@ Host
+$(hostDirs) : $(EPICS_BASE_TOOLS)/makeMakefile.pl
+	$(PERL) $(EPICS_BASE_TOOLS)/makeMakefile.pl $@ Host
 
-$(crossDirs) : 
-	$(PERL) $(EPICS_BASE_HOST_BIN)/makeMakefile.pl $@ Vx
+$(crossDirs) : $(EPICS_BASE_TOOLS)/makeMakefile.pl
+	$(PERL) $(EPICS_BASE_TOOLS)/makeMakefile.pl $@ Vx
 
 #
 # host/cross action targets

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,31 +17,43 @@
 #  Common build definitions
 #
 
-ifndef CONFIG
+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
 
@@ -59,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)
@@ -66,23 +84,32 @@ 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
--include $(HOME)/os/configure/CONFIG.Host.$(HOST_ARCH)
--include $(HOME)/os/configure/CONFIG.Host.$(EPICS_HOST_ARCH)
--include $(HOME)/os/configure/CONFIG.$(HOST_ARCH).Common
--include $(HOME)/os/configure/CONFIG.$(EPICS_HOST_ARCH).Common
+-include $(HOME)/configure/CONFIG_USER
+-include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH)
 ifdef T_A
--include $(HOME)/configure/CONFIG.$(OS_CLASS)
--include $(HOME)/configure/CONFIG.Target.$(T_A)
--include $(HOME)/configure/CONFIG.Common.$(T_A)
--include $(HOME)/configure/CONFIG.$(HOST_ARCH).$(T_A)
--include $(HOME)/configure/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
--include $(HOME)/configure/os/CONFIG.Target.$(T_A)
--include $(HOME)/configure/os/CONFIG.Common.$(T_A)
--include $(HOME)/configure/os/CONFIG.$(HOST_ARCH).$(T_A)
--include $(HOME)/configure/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
+-include $(HOME)/configure/CONFIG_USER.Common.$(T_A)
+-include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH).$(T_A)
 endif
 
 #  All options

configure/CONFIG.CrossCommon

@@ -18,14 +18,15 @@ 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_CLASS))
+
 # All cross builds use the gnu compiler
 include $(CONFIG)/CONFIG.gnuCommon
 

configure/CONFIG.gnuCommon

@@ -15,8 +15,8 @@ GNU = YES
 GNU_BIN = $(GNU_DIR)/bin
 GNU_LIB = $(GNU_DIR)/lib
 
-CC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
-CCC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++$(CMPLR_SUFFIX)
 AR = $(GNU_BIN)/$(CMPLR_PREFIX)ar$(CMPLR_SUFFIX) -rc
 LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
 CPP = $(CC) -x c -E
@@ -45,8 +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,20 +51,26 @@
 #    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
+#    LOADABLE_LIBRARY        module to build and install
+#    LOADABLE_LIBRARY_HOST   module to build and install
 #    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
 #    USR_INCLUDES  include directories
 #    BIN_INSTALLS  binaries to install
+#    LIB_INSTALLS  library binaries to install
 #    RCS           win32 resource files for building libraries and prods
 #    PROD_RCS      win32 resource files for building prods
 #    LIB_RCS       win32 resource files for building libraries
@@ -169,19 +175,6 @@ LIB_LDFLAGS+=$(LIB_LDFLAGS_DEFAULT)
 endif
 endif
 
-#	check for special includes:
-#
-ifneq ($(strip $(INC_$(OS_CLASS))),)
-#	os-specific includes go to the include/os-directory:
-INC += $(subst -nil-,,$(INC_$(OS_CLASS)))
-else
-ifdef INC_DEFAULT
-INC += $(INC_DEFAULT)
-endif
-endif
-
-#	concat specific library contents (if defined)
-#
 ifneq ($(strip $(LIBSRCS_$(OS_CLASS))),)
 LIBSRCS += $(subst -nil-,,$(LIBSRCS_$(OS_CLASS)))
 else
@@ -230,6 +223,14 @@ BIN_INSTALLS+=$(BIN_INSTALLS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(LIB_INSTALLS_$(OS_CLASS))),)
+LIB_INSTALLS+=$(subst -nil-,,$(LIB_INSTALLS_$(OS_CLASS)))
+else
+ifdef LIB_INSTALLS_DEFAULT
+LIB_INSTALLS+=$(LIB_INSTALLS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(PROD_OBJS_$(OS_CLASS))),)
 PROD_OBJS+=$(subst -nil-,,$(PROD_OBJS_$(OS_CLASS)))
 else
@@ -326,6 +327,22 @@ LIBRARY_HOST+=$(LIBRARY_HOST_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(LOADABLE_LIBRARY_$(OS_CLASS))),)
+LOADABLE_LIBRARY+=$(subst -nil-,,$(LOADABLE_LIBRARY_$(OS_CLASS)))
+else
+ifneq (,$(strip $(LOADABLE_LIBRARY_DEFAULT)))
+LOADABLE_LIBRARY+=$(LOADABLE_LIBRARY_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(LOADABLE_LIBRARY_HOST_$(OS_CLASS))),)
+LOADABLE_LIBRARY_HOST+=$(subst -nil-,,$(LOADABLE_LIBRARY_HOST_$(OS_CLASS)))
+else
+ifneq (,$(strip $(LOADABLE_LIBRARY_HOST_DEFAULT)))
+LOADABLE_LIBRARY_HOST+=$(LOADABLE_LIBRARY_HOST_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(PROD_LIBS_$(OS_CLASS))),)
 PROD_LIBS += $(subst -nil-,,$(PROD_LIBS_$(OS_CLASS)))
 else
@@ -359,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
 #
@@ -477,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
 
@@ -19,28 +15,29 @@ EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
 EPICS_BASE_HOST_LIB = $(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)
 ifdef T_A
 EPICS_BASE_LIB      = $(EPICS_BASE)/lib/$(T_A)
+EPICS_BASE_BIN      = $(EPICS_BASE)/bin/$(T_A)
 endif
 
 #---------------------------------------------------------------
 # Epics base Ioc libraries 
 
-EPICS_BASE_IOC_LIBS += recIoc softDevIoc testDevIoc 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
+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
@@ -48,23 +45,41 @@ endif # EPICS_BASE
 BASE_CPPFLAGS = 
 
 # osithread default stack
-OSITHREAD_USE_DEFAULT_STACK = YES
+OSITHREAD_USE_DEFAULT_STACK = NO
 OSITHREAD_DEFAULT_STACK_FLAGS_YES = -DOSITHREAD_USE_DEFAULT_STACK
 OSITHREAD_DEFAULT_STACK_FLAGS_NO =
 BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
 
+#---------------------------------------------------------------
+# Where to find the installed build tools
+
+TOOLS = $(EPICS_BASE_HOST_BIN)
+
 #---------------------------------------------------------------
 # Epics base build tools and tool flags
 
-MAKEBPT                    = $(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)
-DBEXPAND                   = $(EPICS_BASE_HOST_BIN)/dbExpand$(HOSTEXE)
-DBTORECORDTYPEH            = $(EPICS_BASE_HOST_BIN)/dbToRecordtypeH$(HOSTEXE)
-DBTOMENUH                  = $(EPICS_BASE_HOST_BIN)/dbToMenuH$(HOSTEXE)
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_BASE_HOST_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 = $(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE)
-ELEX = $(EPICS_BASE_HOST_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,29 +1,59 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2008 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=2
-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 must be a number >0 and <256 
+EPICS_VERSION = 3
+
+# EPICS_REVISION must be a number >=0 and <256 
+EPICS_REVISION = 14
+
+# EPICS_MODIFICATION must be a number >=0 and <256 
+EPICS_MODIFICATION = 10
+
+# EPICS_PATCH_LEVEL must be a number  (win32 resource file requirement)
+# Not included if zero
+EPICS_PATCH_LEVEL = 0
+
+# This will end in -CVS between official releases
+#EPICS_CVS_SNAPSHOT=-CVS
+#EPICS_CVS_SNAPSHOT=-pre1
+#EPICS_CVS_SNAPSHOT=-pre1-CVS
+#EPICS_CVS_SNAPSHOT=-RC1
+#EPICS_CVS_SNAPSHOT=-RC1-CVS
+EPICS_CVS_SNAPSHOT=-RC2
+#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$$"
-

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)
@@ -73,10 +88,12 @@ INSTALL_SHRLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
 
+#Directories for libraries
+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
@@ -99,24 +116,17 @@ GNU=NO
 # Prefix and suffix
 DEP=.depends
 OBJ = .
-RES = .
-
-#-------------------------------------------------------
-# 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
+CMPLR_SUFFIX=
+CMPLR_PREFIX=
+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)
 
 #--------------------------------------------------
@@ -124,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
@@ -140,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)
@@ -151,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)
 
 #--------------------------------------------------
@@ -218,21 +228,18 @@ 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_CPPFLAGS = $(WARN_CPPFLAGS_$($(BUILD_CLASS)_WARN))
 WARN_CFLAGS = $(WARN_CFLAGS_$($(BUILD_CLASS)_WARN))
 WARN_CXXFLAGS = $(WARN_CXXFLAGS_$($(BUILD_CLASS)_WARN))
 
 # Optimization flags
+OPT_CPPFLAGS = $(OPT_CPPFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CFLAGS = $(OPT_CFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CXXFLAGS = $(OPT_CXXFLAGS_$($(BUILD_CLASS)_OPT))
 
-# Posix flags
-POSIX=YES
-POSIX_CPPFLAGS=$(POSIX_CPPFLAGS_$(POSIX))
-POSIX_LDLIBS=$(POSIX_LDLIBS_$(POSIX))
-
 # Static build flags
 STATIC_CFLAGS = $(STATIC_CFLAGS_$(STATIC_BUILD))
 STATIC_CXXCFLAGS = $(STATIC_CXXFLAGS_$(STATIC_BUILD))
@@ -240,10 +247,16 @@ STATIC_LDFLAGS = $(STATIC_LDFLAGS_$(STATIC_BUILD))
 STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD))
 
 #--------------------------------------------------
-# cflags for library src file 
-LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY),$($(lib)_OBJS) $(LIBRARY_OBJS)))
+# cflags for shared library src files (from SHRLIB_CFLAGS)
+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,25 +266,26 @@ OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY))
 #--------------------------------------------------
 # Flags
 
-INCLUDES = -I. $(GENERIC_SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
- $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $(CROSS_INCLUDES)
+INCLUDES = -I. $(SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
+ $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $($(BUILD_CLASS)_INCLUDES)
 
-CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
- $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
+CFLAGS = $(CONFORM_CFLAGS) $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
+ $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
  $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-CXXFLAGS = $(CONFORM_CXXFLAGS) $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
- $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
- $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
+CXXFLAGS = $(CONFORM_CXXFLAGS) $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS)\
+ $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS)\
+ $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
- $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)\
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
+ $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $($(BUILD_CLASS)_LDFLAGS)\
  $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
 LDLIBS = $(STATIC_LDLIBS)\
- $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)
+ $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS) $(GNU_LDLIBS_$(GNU))
 
-CPPFLAGS += $(CONFORM_CPPFLAGS) $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\
+CPPFLAGS += $(CONFORM_CPPFLAGS) $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\
+ $(OPT_CPPFLAGS) $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS)\
  $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
  $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
@@ -281,8 +295,14 @@ ARFLAGS =
 ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
 
 #--------------------------------------------------
-# ld default
-LDCMD = $(LD) -o $@ $^
+# 'Munch' link-edit
+MUNCH_CMD = $(LD) -o $@ $^
+
+#--------------------------------------------------
+# LEX default option (valid for EPICS base 3.13.0.beta12 and later)
+#
+# to allow characters that are not plain 7bit standard ASCII 
+LEXOPT +=  -8
 
 #--------------------------------------------------
 # Build compile line here
@@ -291,11 +311,15 @@ PATH_FILTER = $(1)
 COMPILE.c = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG)
 COMPILE.cpp = $(CCC) -c $(CPPFLAGS) $(CXXFLAGS) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_CXXFLAG)
 
+#--------------------------------------------------
+# C preprocessor command
+PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
+
 #--------------------------------------------------
 # Depends command
 
 HDEPENDS_FLAGS =
-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 ""
@@ -319,6 +343,7 @@ INSTALL_PROD= $(PRODNAME:%= $(INSTALL_BIN)/%)
 INSTALL_LIBS= $(LIBNAME:%=$(INSTALL_LIB)/%)
 INSTALL_MUNCHS= $(MUNCHNAME:%=$(INSTALL_BIN)/%)
 INSTALL_SHRLIBS= $(SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
+INSTALL_LOADABLE_SHRLIBS= $(LOADABLE_SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
 INSTALL_DLL_LINK_LIBS=$(DLL_LINK_LIBNAME:%=$(INSTALL_LIB)/%)
 INSTALL_TCLLIBS=$(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%)
 INSTALL_TCLINDEX=$(TCLINDEX:%=$(INSTALL_TCLLIB)/%)
@@ -332,6 +357,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
@@ -352,6 +386,7 @@ INSTALL_INC += $(foreach inc, $(INC), \
         $(OS_INSTALL_INC) \
         $(GENERIC_INSTALL_INC) \
         $(GENERATED_INSTALL_INC) ) )
+INSTALL_INC += $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, $(INC_$(OS_CLASS)) )
 
 #
 # Rule 1

configure/CONFIG_ENV

@@ -15,16 +15,14 @@
 #
 #   CONFIG_ENV - EPICS Environment Parameter configuration file
 #
-# This file is interpreted by the Bourne Shell, so spaces are 
-# not allowed around the '=' signs or in unquoted values.
-# Makefile variables are not defined here.
+# This file is read by the script base/src/libCom/env/bldEnvdata.pl
+# Variable definitions must take the form
+#	VAR = VALUE
+# or
+#	VAR = "Value containing spaces"
+# with each one on its own line.
+# Enclosing spaces and "" will be trimmed.
 #
-# Note: This file is read by base/src/libCom/env/bldEnvdata.pl,
-# so the variable definitions in here should be kept 'simple':
-#   VAR=VALUE
-# each one on a single line.
-#
-
 
 #  Default environment settings
 
@@ -38,6 +36,7 @@ EPICS_CA_REPEATER_PORT=5065
 EPICS_CA_SERVER_PORT=5064
 EPICS_CA_MAX_ARRAY_BYTES=16384
 EPICS_CA_BEACON_PERIOD=15.0
+EPICS_CA_MAX_SEARCH_PERIOD=300.0
 EPICS_CAS_BEACON_PERIOD=
 EPICS_CAS_BEACON_PORT=
 EPICS_CAS_AUTO_BEACON_ADDR_LIST=""

configure/CONFIG_FILE_TYPE

@@ -0,0 +1,64 @@
+#*************************************************************************
+# 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 += 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,57 +1,72 @@
 #*************************************************************************
-# 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                (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             (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)
-#	osf-alpha
-#	solaris-sparc          (sun compiler used for host builds)
-#	solaris-sparc-gnu      (GNU compiler used for host builds)
-#	solaris-x86            (sun compiler used for host builds)
-#	solaris-x86-gnu        (GNU compiler used for host builds)
-#	sun4-x86               (sun compiler used for host builds)
+#	linux-ppc              (GNU compiler used for host builds)
 #	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)
+#	solaris-sparc          (Sun compiler used for host builds)
+#	solaris-sparc-gnu      (GNU compiler used for host builds)
+#	solaris-sparc64        (Sun compiler used for host builds)
+#	solaris-sparc64-gnu    (GNU compiler used for host builds)
+#	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-borland      (Borland C++ compiler used for host builds)
-#	lynxos-x86
-#	darwin-ppc
-#	linux-mpc82xx
+#	win32-x86-mingw        (MinGW 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)
-#	solaris-sparc-debug		(sun compiler with -g option for host builds)
-#	win32-x86-debug			(MS Visual C++ compiler with debug option for host builds)
+#	linux-x86-debug        (GNU compiler with -g option for host builds)
+#	linux-x86_64-debug     (GNU compiler with -g option for host builds)
+#	solaris-sparc-debug    (sun compiler no optimization,-g for debugging info)
+#	win32-x86-debug        (MS Visual C++ compiler with debug option for host builds)
 
 
 #  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
 #
 #  Currently Supporting:
+#       linux-386               (linux-x86 host)
+#       linux-486               (linux-x86 host)
+#       linux-586               (linux-x86 host)
+#       linux-686               (linux-x86 host)
+#       linux-arm
+#       linux-arm_eb
+#       linux-arm_el
+#       linux-athlon            (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-xscale_be
 #       vxWorks-486
 #       vxWorks-68040
 #       vxWorks-68040lc
@@ -61,12 +76,21 @@
 #       vxWorks-ppc603_long
 #       vxWorks-ppc604
 #       vxWorks-ppc604_long
+#       vxWorks-ppc604_altivec
+#       vxWorks-mpc8540
+#       RTEMS-at91rm9200ek
+#       RTEMS-beatnik
 #       RTEMS-gen68360
-#       RTEMS-mvme167
-#       RTEMS-pc386
 #       RTEMS-mcp750
+#       RTEMS-mvme167
+#       RTEMS-mvme2100
+#       RTEMS-mvme3100
+#       RTEMS-mvme5500
+#       RTEMS-pc386
 #       RTEMS-psim
+#       RTEMS-uC5282
 #
+
 # Definitions of CROSS_COMPILER_TARGET_ARCHS in
 # configure/os/CONFIG_SITE.<host>.Common files will
 # override 
@@ -98,12 +122,15 @@ CXXCMPLR=STRICT
 #     NOTE: os/CONFIG.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files and
 #     os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files may override
 #
-#     NOTE WIN32: YES results in a DLL.
+#     NOTE WIN32: YES results in a DLL.  Valid settings are
+#                   SHARED_LIBRARIES=YES and STATIC_BUILD=NO
+#                   SHARED_LIBRARIES=NO  and STATIC_BUILD=YES
 #
 SHARED_LIBRARIES=YES
 
 #  Build client objects statically ?
 #        must be either YES or NO
+#
 STATIC_BUILD=NO
 
 #  Should header dependancy files be automatically generated
@@ -127,6 +154,35 @@ HOST_WARN=YES
 #	must be either YES or NO
 CROSS_WARN=YES
 
-#  Installation directory
-#Note: INSTALL_LOCATION definition moved to configure/RELEASE file
+#  Create and/or install perl build tools for R3.13 extension builds?
+#  must be either YES or NO
+#
+#  NOTE: Set to YES only if you have existing R3.13 extensions to be
+#  built with this base
+#
+#COMPAT_TOOLS_313=YES
+
+#  Create and/or install files for R3.13 ioc application and extension builds?
+#  must be either YES or NO
+#
+#  NOTE: Set to YES only if you have existing R3.13 ioc applications
+#  and extensions to be built with this base
+#
+COMPAT_313=NO
+
+#  Installation directory
+# 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

@@ -15,30 +15,42 @@
 #
 #	CONFIG_SITE_ENV - EPICS Environment Parameter Site configuration file
 #
-# This file is interpreted by the Bourne Shell, so spaces are 
-# not allowed around the '=' signs or in unquoted values.
-# Makefile variables are not defined here.
-#
-# Note: This file is read by base/src/libCom/env/bldEnvdata.pl,
-# so the variable definitions in here should be kept 'simple':
-#	VAR=VALUE
-# each one on a single line.
+# This file is read by the script base/src/libCom/env/bldEnvdata.pl
+# Variable definitions must take the form
+#	VAR = VALUE
+# or
+#	VAR = "Value containing spaces"
+# with each one on its own line.
+# Enclosing spaces and "" will be trimmed.
 #
 
 #  Site-specific environment settings
 
 # Time service:
-# EPICS_TIMEZONE needed for vxWorks
-# EPICS_TIMEZONE=<name>::<minutesWest>:<start daylight>:<end daylight>
-#NOTE: start and end are mmddhh that bis mounth,day,hour
-# eg EPICS_TIMEZONE=CUS::360:033102:102802
-#  DST for 2003  US: Apr  6 - Oct 26
-#                EU: Mar 30 - Oct 26
-# EPICS_TS_NTP_INET ntp or Unix time server ip addr.
+# EPICS_TIMEZONE
+#	local timezone info for vxWorks IOCs.  The format required is
+#	<name>::<minutesWest>:<start daylight>:<end daylight>
+#	where the start and end are mmddhh - that is month,day,hour
+#	eg EPICS_TIMEZONE=CUS::360:033102:102802
+#
+#	DST for 2008  US: Mar 09 - Nov 02
+#	              EU: Mar 30 - Oct 26
+#	(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:040602:102602
+EPICS_TIMEZONE=CUS::360:030902:110202
+#EPICS_TIMEZONE=MET::-60:033002:102602
 EPICS_TS_NTP_INET=
 
+# IOC Shell:
+# IOCSH_PS1
+#	Prompt string
+# IOCSH_HISTSIZE
+#	Number of lines of command history to keep.
+IOCSH_PS1="epics> "
+IOCSH_HISTSIZE=50
 
 # Log Server:
 # EPICS_IOC_LOG_INET 
@@ -48,7 +60,7 @@ EPICS_TS_NTP_INET=
 # EPICS_IOC_LOG_FILE_LIMIT 
 #	maximum log file size.
 # EPICS_IOC_LOG_FILE_COMMAND 
-# 	A shell command string used to obtain a new 
+#	A shell command string used to obtain a new 
 #       path name in response to SIGHUP - the new path name will
 #       replace any path name supplied in EPICS_IOC_LOG_FILE_NAME
 

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

@@ -7,13 +7,15 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#RELEASE Location of external products
-#
-# NOTE: RELEASE.$(EPICS_HOST_ARCH) files will override
+# RELEASE: Define location of external EPICS products
 
-#  Tornado directory
-VX_DIR = /usr/local/vw/tornado202
+# 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).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>

configure/RULES.Db

@@ -11,18 +11,22 @@
 
 #####################################################  vpath
 
-vpath %.dbd $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DBD)) $(COMMON_DIR)
-vpath %.db $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB)) $(COMMON_DIR)
-vpath %.vdb $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB)) $(COMMON_DIR)
+vpath %.dbd $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DBD))
+vpath %.db $(USR_VPATH) $(GENERIC_SRC_DIRS) $(dir $(DB))
+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. -I.. $(INSTALL_DBFLAGS) $(RELEASE_DBFLAGS)
 
 #####################################################  Targets
 
@@ -59,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)) $(TEMPLATE3))
+TEMPLATE_FILENAME=$(firstword $(wildcard $($*_TEMPLATE) $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
 
 # dbst based database optimization
 ifeq '$(DB_OPT)' 'YES'
@@ -68,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))))
@@ -76,9 +96,11 @@ 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
+
 ##################################################### 
 
 ifndef T_A
@@ -90,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
 
@@ -112,46 +134,19 @@ $(DBDDEPENDS_FILES):
 
 #####################################################  build dependancies, clean rule
 
-ifdef DBD_INSTALLS
-buildInstall : dbdInstalls
-endif
-
-ifdef 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)
 
-##################################################### "Foreign" templates
-
-TEMPLATE_LINKS	= $(filter-out $(notdir $(USES_TEMPLATE)), $(USES_TEMPLATE))
-TEMPLATE_FILES	= $(filter     $(notdir $(USES_TEMPLATE)), $(USES_TEMPLATE))
-COMMON_TEMPLATES=$(addsuffix $(COMMON_DIR)/,$(notdir $(TEMPLATE_LINKS)))
-
-ifneq '$(TEMPLATE_LINKS)' ''
-build: $(notdir $(TEMPLATE_LINKS))
-endif
-build: $(TEMPLATE_FILES)
-
-$(COMMON_TEMPLATES): $(COMMON_DIR)/%.template: 
-ifndef WIN32
-	@$(RM) $(notdir $(TEMPLATE_LINKS))
-	ln -s $(TEMPLATE_LINKS) 
-else
-	@$(RM) $(notdir $(TEMPLATE_LINKS))
-	$(CP) $(TEMPLATE_LINKS) 
-endif
+realclean: clean
 
 ##################################################### CapFast filter
 
@@ -166,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
 
@@ -186,43 +182,71 @@ $(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
 
 ##################################################### INC files
 
+$(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
+	@$(RM) $@
+	$(DBTORECORDTYPEH) $(DBDFLAGS)  $< $@
+
 $(COMMON_DIR)/%Record.h: %Record.dbd
 	@$(RM) $@
 	$(DBTORECORDTYPEH) $(DBDFLAGS)  $< $@
 
+$(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd
+	@$(RM) $@
+	$(DBTOMENUH) $< $@
+
 $(COMMON_DIR)/menu%.h: menu%.dbd
 	@$(RM) $@
 	$(DBTOMENUH) $< $@
 
+.PRECIOUS: $(COMMON_DIR)/%.h
+
 ##################################################### DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data 
 	@$(RM) $@
 	$(MAKEBPT) $< $@
 
+$(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd 
+	@$(RM) $@$(DEP)
+	@$(DBDDEPENDS_CMD)
+	@echo "$<:../Makefile" >> $@$(DEP)
+	@echo "Expanding dbd"
+	@$(RM) $@
+	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
+
 $(COMMON_DIR)/%.dbd: %Include.dbd 
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
 	@echo "Expanding dbd"
 	@$(RM) $@
-	$(DBEXPAND) $(DBDFLAGS) $< > dbExpand.tmp
-	$(MV) dbExpand.tmp $@
+	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
+
+$(COMMON_DIR)/%Include.dbd:
+	@$(RM) $@
+	$(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $@
+
+$(INSTALL_DBD)/%: $(COMMON_DIR)/%
+	@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)
+.PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%Include.dbd
 
 ##################################################### DB files
 
@@ -231,16 +255,40 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf
 	@$(REPLACEVAR) < $@.VAR > $@
 	@$(RM) $@.VAR
 
-# dbst based database optimization
+#$(COMMON_DIR)/%.db$(RAW): %.substitutions %.template
+#	@$(RM) $@$(DEP)
+#	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
+#	@echo "Inflating database from $^"
+#	@$(RM) $@
+#	$(MSI) $(DBFLAGS) -S$< $(firstword $(patsubst %.substitutions,,$^)) > msi.tmp
+#	$(MV) msi.tmp $@
+
 $(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@$(RM) $@$(DEP)
-	@$(DBDDEPENDS_CMD)
+	$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $@$(DEP)
 	@echo "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
+	@echo "Inflating database from $< $(TEMPLATE_FILENAME)"
+	@$(RM) $@
+	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > msi.tmp
+	$(MV) msi.tmp $@
+
+$(COMMON_DIR)/%.db$(RAW): %.template
+	@$(RM) $@$(DEP)
+	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
 	@echo "Inflating database from $<"
 	@$(RM) $@
-	$(MSI) -S$< $(TEMPLATE_FILENAME) > msi.tmp
+	$(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'
 
@@ -253,31 +301,40 @@ $(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
 	@$(RM) $@
 	$(DBST) . $< -d > $@
 
-$(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
-	@echo "Installing db file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
-
 .PRECIOUS: $(COMMON_DIR)/%.db
 .PRECIOUS: $(DB:%=$(COMMON_DIR)/%$(RAW))
 else
 
 $(INSTALL_DB)/%: %
 	@echo "Installing db file $@"
-	@$(INSTALL) -d -m 644 $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 endif
 
-dbInstalls:  $(DB_INSTALLS)
-	@echo "Installing $(^F)"
-	@$(INSTALL) -d -m 555 $^ $(INSTALL_DB)
+$(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
+	@echo "Installing created db file $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+
+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)
 
 ##################################################### register record,device,driver support
 
+%_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd 
+	@$(RM) $@ temp.cpp
+	$(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) > temp.cpp
+	$(MV) temp.cpp $@
+
 %_registerRecordDeviceDriver.cpp: %.dbd 
-	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $< > $@
+	@$(RM) $@ temp.cpp
+	$(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) > temp.cpp
+	$(MV) temp.cpp $@
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
 

configure/RULES.ioc

@@ -13,17 +13,25 @@ include $(CONFIG)/RULES_DIRS
 build: buildInstall
 install: buildInstall
 
+ifneq ($(findstring $(ARCH),$(BUILD_ARCHS)),)
 buildInstall: $(TARGETS)
 
-cdCommands: $(wildcard $(TOP)/configure/RELEASE*) \
-	$(TOP)/configure/CONFIG $(TOP)/bin
-	@$(RM) $@
+clean:
+	$(RM) cdCommands envPaths dllPath.bat
+
+else 
+buildInstall:
+clean:
+endif
+
+cdCommands envPaths dllPath.bat: $(wildcard $(TOP)/configure/RELEASE*) \
+	$(TOP)/configure/CONFIG $(INSTALL_BIN)
 ifeq ($(IOCS_APPL_TOP),)
 	$(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) $@
 else
 	$(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) -t $(IOCS_APPL_TOP) $@
 endif
 
-clean:
-	@$(RM) cdCommands
+realclean:
+	$(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,14 +60,31 @@ $(BUILD_ARCHS) : % : O.% O.Common
 
 $(ACTIONS):%: $(foreach arch, $(BUILD_ARCHS), %$(DIVIDER)$(arch))
 
-$(buildDirs): 
+$(buildDirs):
 	$(PERL) $(TOOLS)/makeMakefile.pl $@ $(TOP)/..
 
 O.Common:
 	$(MKDIR) O.Common
 
-checkRelease: $(wildcard $(TOP)/configure/RELEASE*)
-	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) $@
+#
+# RELEASE consistency checking
+
+# The RELEASE.$(EPICS_HOST_ARCH) files don't need to be included here:
+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)
+	$(CONVERTRELEASE) checkRelease
+$(checkReleaseTargets):checkRelease.%:
+	$(CONVERTRELEASE) -a $* checkRelease
+
+warnReleaseTargets = $(addprefix warnRelease, $(suffix $(targetReleaseFiles)))
+warnRelease: $(warnReleaseTargets)
+	-$(CONVERTRELEASE) checkRelease
+$(warnReleaseTargets):warnRelease.%:
+	-$(CONVERTRELEASE) -a $* checkRelease
 
 #
 # special clean rule
@@ -56,15 +92,17 @@ checkRelease: $(wildcard $(TOP)/configure/RELEASE*)
 clean ::
 	$(RMDIR) $(addprefix O.,$(BUILD_ARCHS)) O.Common
 
+archclean ::
+	$(RMDIR) $(addprefix O.,$(BUILD_ARCHS))
+
 $(cleanArchTargets) ::
 	$(RMDIR) O.$(archPart)
 
-realclean :: 
+realclean ::
 	$(RMDIR) O.*
 
 .PHONY : $(actionArchTargets)
 .PHONY : $(cleanArchTargets)
 .PHONY : $(BUILD_ARCHS)
-.PHONY : $(ACTIONS) clean realclean all
-.PHONY : checkRelease
-
+.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,11 +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
 
@@ -47,6 +51,7 @@ LIBRARY += $(LIBRARY_IOC)
 OBJS += $(OBJS_IOC)
 PROD += $(PROD_IOC)
 SCRIPTS += $(SCRIPTS_IOC)
+TESTSCRIPTS += $(TESTSCRIPTS_IOC)
 TESTPROD += $(TESTPROD_IOC)
 endif
 
@@ -72,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)))
-
-MakefileInclude: ../Makefile
-	@$(RM) $@
-	@$(PERL) $(TOOLS)/makeMakefileInclude.pl $(PROD) $(TESTPROD) $(LIBRARY) $@
-
--include MakefileInclude
-
-endif # PROD, TESTPROD, or LIBRARY defined
+#ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY)))
+include $(CONFIG)/RULES_TARGET
+#endif
 
 #---------------------------------------------------------------
 #   Products and Object libraries
@@ -93,17 +92,15 @@ PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
 #   Libraries 
 #
 
-LIBTARGETS += $(LIBNAME)
-LIBTARGETS += $(INSTALL_LIBS)
-LIBTARGETS += $(SHRLIBNAME) $(INSTALL_SHRLIBS) \
-              $(DLL_LINK_LIBNAME) $(INSTALL_DLL_LINK_LIBS)
+LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) \
+              $(SHRLIBNAME) $(INSTALL_SHRLIBS) \
+              $(DLL_LINK_LIBNAME) $(INSTALL_DLL_LINK_LIBS) \
+              $(LOADABLE_SHRLIBNAME) $(INSTALL_LOADABLE_SHRLIBS)
 
-#---------------------------------------------------------------
-ifneq ($(CONFIG),$(TOP)/configure)
--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
 
@@ -116,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) \
@@ -127,20 +124,22 @@ buildInstall : \
 	$(INSTALL_DOCS) \
 	$(INSTALL_HTMLS) \
 	$(INSTALL_TEMPLATE) \
-	$(INSTALL_CONFIGS)
-
-ifdef BIN_INSTALLS
-buildInstall : binInstalls
-endif
+	$(INSTALL_BIN_INSTALLS)
 
 clean::
 	@echo "Cleaning"
 	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME)\
-	$(INC) *$(RES) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
-	*.out MakefileInclude \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS)
+	$(INC) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
+	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) *.manifest *.exp \
+	$(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
@@ -155,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)
 
@@ -171,7 +175,7 @@ $(OBJLIBNAME):%$(OBJ): $(OBJLIB_LD_OBJS)
 %$(OBJ): %.c
 	@$(HDEPENDS_CMD)
 	@$(RM) $@
-	$(COMPILE.c) $(call PATH_FILTER,$<)
+	$(COMPILE.c) $(call PATH_FILTER,$<) $(COMPILE_FILTER.c)
 
 %$(OBJ): %.cc
 	@$(HDEPENDS_CMD)
@@ -253,20 +257,31 @@ $(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) 
-	@$(RM) $@
-	$(LINK.shrlib)
+$(DLL_LINK_LIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) 
 
-$(SHRLIBNAME):$(LIB_PREFIX)%$(SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+$(SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+
+ifneq ($(SHRLIB_SUFFIX),.dll)
+$(SHRLIBNAME):$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
+endif
+
+$(LOADABLE_SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+
+$(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
+	@$(RM) $@
+	$(LINK.shrlib)
+	$(MT_DLL_COMMAND)
 
 # C++ munching for VxWorks
 %.nm : %$(EXE)
@@ -281,115 +296,160 @@ $(SHRLIBNAME):$(LIB_PREFIX)%$(SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(
 	@$(RM) $@
 	$(PERL) $(TOOLS)/munch.pl <  $< > $@
 
-$(MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(EXE)
+$(MUNCHNAME):%$(MUNCH_SUFFIX) : $(MUNCH_DEPENDS) %$(EXE)
 	@$(RM) $@
-	$(LDCMD)
+	$(MUNCH_CMD)
 
 $(OBJLIB_MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(OBJ)
 	@$(RM) $@
-	$(LDCMD)
+	$(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 $@ $<
+
+#---------------------------------------------------------------
+## 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 $@"
-	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
+	@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 library $@"
-	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
-ifdef SHRLIB_VERSION
+	@echo "Installing shared library $@"
+	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_SHRLIB)
+ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst .$(SHRLIB_VERSION),,$@)
 	ln -s $< $(subst .$(SHRLIB_VERSION),,$@)
-
 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)
+	@echo "Updating $@"
+	@echo eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
+
+$(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
+	@echo "Installing loadable shared library $@"
+	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
+ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
+	@$(RM) $(subst .$(LOADABLE_SHRLIB_VERSION),,$@)
+	ln -s $< $(subst .$(LOADABLE_SHRLIB_VERSION),,$@)
+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)
+
+ifeq ($(SHRLIB_SUFFIX),.dll)
+ifeq ($(SHARED_LIBRARIES),YES)
+$(LIB_PREFIX)%$(LIB_SUFFIX) $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
+	@$(RM)  $(LIB_PREFIX)$*$(LIB_SUFFIX) $(SHRLIB_PREFIX)$*$(SHRLIB_SUFFIX)
+	$(LINK.shrlib)
+	$(MT_DLL_COMMAND)
+endif
+endif
+
+-include $(CONFIG)/RULES_EXPAND
 
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
 
-.PHONY: all inc build install clean rebuild buildInstall binInstalls
+.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
- 
-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

@@ -11,37 +11,48 @@
 #
 
 
+ifeq ($(BUILD_CLASS),HOST)
+
 #-------------------------------------------------------
 # java jdk1.1.5 definitions
 
 JAVA_INC = $(JAVA_DIR)/include
 JAVA_BIN = $(JAVA_DIR)/bin
-JAVA_INCLUDES += -I${JAVA_INC} -I${JAVA_INC}/${OS_CLASS}
+JAVA_INCLUDES += -I$(JAVA_INC) -I$(JAVA_INC)/$(word 1, $(subst -, ,$(T_A))) -I$(COMMON_DIR)
 
 JAVACCMD = $(subst \,/,$(JAVA_BIN)/javac$(EXE) $(CLASSPATH) $(SOURCEPATH) $(JAVACFLAGS))
 JAVAHCMD = $(subst \,/,$(JAVA_BIN)/javah$(EXE) -d $(COMMON_DIR) -force $(CLASSPATH) $(JAVAHFLAGS))
-JARCMD   = $(subst \,/,$(JAVA_BIN)/jar$(EXE) $(JAR_OPTIONS) $(COMMON_JAR) $(JARINPUT))
+JARCMD   = $(subst \,/,$(JAVA_BIN)/jar$(EXE) $(JAR_OPTIONS) $@ $(JARINPUT) $(JARPACKAGES))
 
 #-------------------------------------------------------
 vpath %.java .. 
+vpath %.jar .. $(COMMON_DIR)
 
-CLASSPATH=-classpath $(INSTALL_JAVA)$(addprefix :,$(USR_CLASSPATH))
-SOURCEPATH=-sourcepath .:..:../..
+empty:=
+space:= $(empty) $(empty)
+CLASSPATH = -classpath $(subst $(space),:,$(strip $(USR_PRECLASSPATH) $(INSTALL_JAVA) $(USR_CLASSPATH)))
+SOURCEPATH = -sourcepath .:..:../..
+
+#-------------------------------------------------------
+# Java directory
+
+ifdef JAVA
+JAVA_DIRECTORY_TARGETS += $(INSTALL_JAVA)
+endif
 
 #-------------------------------------------------------
 # Java native method C header files
 
 JAVAHFLAGS += $(USR_JAVAHFLAGS)
-COMMON_JAVAINC += $(addprefix $(COMMON_DIR)/,$(JAVAINC))
 JAVAINC_CLASSFILES += $(addprefix $(INSTALL_JAVA)/,$(subst _,/,$(subst .h,.class,$(JAVAINC))))
 JAVAINC_CLASSNAMES += $(subst _,.,$(subst .h,,$(JAVAINC)))
+COMMON_JAVAINC += $(addprefix $(COMMON_DIR)/,$(JAVAINC))
 
 #-------------------------------------------------------
 # Java class files
 
 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)))
@@ -51,11 +62,13 @@ DEPTESTJAVA += $(subst .class,.java,$(TESTCLASSES))
 #-------------------------------------------------------
 # Java jar file
 
-COMMON_JAR += $(addprefix $(COMMON_DIR)/,$(JAR))
 INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR))
-JARMANIFEST += $(firstword $(trim $(MANIFEST) $(JAR_MANIFEST)))
-JARINPUT += $(subst .java,.class,$(JAR_INPUT))
-JARDEPFILES +=  $(JARINPUT) $(JARMANIFEST)
+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)))
+JARPACKAGES += $(foreach pkg,$(JAR_PACKAGES),-C $(INSTALL_JAVA) $(subst .,/,$(pkg)))
+PACKAGEDIRS += $(foreach pkg,$(JAR_PACKAGES),$(addprefix $(INSTALL_JAVA)/,$(subst .,/,$(pkg))))
+
 ifneq ($(JARMANIFEST),)
 JAR_OPTIONS = cvmf $(JARMANIFEST)
 else
@@ -64,10 +77,10 @@ endif
 
 #-------------------------------------------------------
 # Java doc  definitions
-ifeq ($(JAVADOC),YES)
+ifdef JAVADOC
 JAVADOCFLAGS += $(USR_JAVADOCFLAGS)
 JAVADOCCMD = $(subst \,/,$(JAVA_BIN)/javadoc$(EXE) $(CLASSPATH) $(SOURCEPATH) $(JAVADOCFLAGS))
-INSTALL_JAVADOC = $(CLASSES:%.class=$(INSTALL_HTML)/%.html)
+INSTALL_JAVADOC = $(addprefix $(INSTALL_HTML)/,$(JAVADOC))/index.html
 endif
 
 #-------------------------------------------------------
@@ -81,22 +94,24 @@ buildInstall : build
 
 rebuild: clean install
 
-inc:  $(INSTALL_CLASSES) $(COMMON_JAVAINC)
+inc:  $(JAVA_DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(COMMON_JAVAINC)
 
 build: inc
 
-build:  $(COMMON_TESTCLASSES) $(COMMON_JAR)
+build:  $(COMMON_TESTCLASSES)
 
 buildInstall : $(INSTALL_JAR) $(INSTALL_JAVADOC)
 
 #This clean works only from O.* dirs.
 clean:: 
-	@$(RMDIR) $(INSTALL_CLASSES)
+	@$(RMDIR) $(INSTALL_CLASSES) $(PACKAGEDIRS)
 	@$(RM) $(INSTALL_JAR) $(INSTALL_JAVADOC)
-	@$(RM) $(COMMON_TESTCLASSES) $(COMMON_JAR) $(COMMON_JAVAINC)
+	@$(RM) $(COMMON_TESTCLASSES) $(COMMON_JAVAINC)
 
-$(INSTALL_JAVA):
+ifdef JAVA_DIRECTORY_TARGETS
+$(JAVA_DIRECTORY_TARGETS):
 	$(MKDIR) -p $@
+endif
 
 $(COMMON_JAVAINC):$(JAVAINC_CLASSFILES)
 	@echo Creating header files $(COMMON_JAVAINC)
@@ -108,23 +123,35 @@ $(COMMON_TESTCLASSES): $(addprefix ../,$(DEPTESTJAVA))
 	@$(RM) $@
 	$(JAVACCMD) -d $(COMMON_DIR) $^
 
-$(INSTALL_CLASSES): $(INSTALL_JAVA) $(addprefix ../,$(DEPJAVA))
+$(INSTALL_CLASSES): $(addprefix ../,$(JAVA))
 	@echo Creating java class files 
 	@$(RM) $@
 	$(JAVACCMD) -d $(INSTALL_JAVA) $^
 
-$(INSTALL_JAVADOC): $(INSTALL_JAVA) $(addprefix ../,$(DEPJAVA))
-	@echo Creating java class files 
+$(INSTALL_JAVADOC): $(addprefix ../,$(JAVA))
+	@echo Creating java doc files 
 	@$(RM) $@
-	$(JAVADOCCMD) -d $(INSTALL_JAVA) $^
+	$(JAVADOCCMD) -d $(addprefix $(INSTALL_HTML)/,$(JAVADOC)) $^
 
 $(COMMON_DIR)/%.jar: $(JARDEPFILES)
 	@echo Creating java jar file $@
 	@$(RM) $@
 	$(JARCMD)
 
-$(INSTALL_JAVA)/%.jar: $(INSTALL_JAVA) $(COMMON_DIR)/%.jar
+$(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  $(INSTALL_PERMISSIONS) $< $(@D)
+
+$(addprefix $(INSTALL_JAVA)/, $(JARINPUT)): $(INSTALL_JAVA)/%: ../%
+	@echo "Installing jar input file $@"
+	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PHONY: all install buildInstall rebuild clean build inc
+
+.PRECIOUS: $(COMMON_JAVAINC)
+
+endif