R3.14.6 updates.

unknown reason - without it, the program doesn't always exit properly.

LICENSE

@@ -1,29 +1,19 @@
-Copyright (c) 1991-2003 University of Chicago and The Regents of the
+Copyright (c) 1991-2004 University of Chicago 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,10 @@
 TOP = .
 include $(TOP)/configure/CONFIG
 
-DIRS += config config/tools configure src
+ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
+DIRS += config config/tools
+endif
+DIRS += configure 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.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.solaris

@@ -67,16 +67,20 @@ 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
+
+ARCH_DEP_LDFLAGS += -mt
 
 # socket and nsl needed by libca.a
 ARCH_DEP_LDLIBS += -lsocket -lnsl
 ARCH_DEP_LDLIBS += -lposix4 -lpthread
 ARCH_DEP_LDLIBS_8 = -lCrun
+ARCH_DEP_LDLIBS_9 = -lCrun
 ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
 
 #Allows R3.13 built extensions to load R3.14 shared libs
 SYS_DLL_LIBS_solaris_8 = Crun
+SYS_DLL_LIBS_solaris_9 = Crun
 SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
 
 # Runtime ldflags

config/CONFIG.Host.solarisGnu

@@ -37,14 +37,18 @@ SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
 POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
 
+ARCH_DEP_LDFLAGS += -mt
+
 # socket and nsl needed by libca.a
 ARCH_DEP_LDLIBS += -lsocket -lnsl
 ARCH_DEP_LDLIBS += -lposix4 -lpthread
 ARCH_DEP_LDLIBS_8 = -lCrun
+ARCH_DEP_LDLIBS_9 = -lCrun
 ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
 
 #Allows R3.13 built extensions to load R3.14 shared libs
 SYS_DLL_LIBS_solaris_8 = Crun
+SYS_DLL_LIBS_solaris_9 = Crun
 SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
 
 # Runtime ldflags

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_BASE_VERSION

@@ -18,7 +18,7 @@
 
 EPICS_VERSION=3
 EPICS_REVISION=14
-EPICS_MODIFICATION=3
+EPICS_MODIFICATION=6
 EPICS_UPDATE_NAME=
 EPICS_UPDATE_LEVEL=0
 

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)
 

config/CONFIG_COMPAT

@@ -24,7 +24,7 @@ ARCH_WIN32 = win32-x86
 ARCH_hp700 = hpux-m68k
 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

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

@@ -1,18 +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_ARCH.LynxOS
-#
-# Override values in CONFIG.LynxOS
-
-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
-
-WIND_HOST_TYPE = LynxOS
-

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_SITE.Host.LynxOS

@@ -1,15 +0,0 @@
-#
-# $Id$
-#
-# Site Specific Configuration Information
-# Only the local epics system manager should modify this file
-
-# APS overrides of definitions 
-
-GCC = gcc
-G++ = g++
-CC = gcc
-CCC = g++
-ACC = gcc
-PLUSPLUS = g++
-CXX = g++

config/Makefile

@@ -15,10 +15,12 @@ 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*))
+endif
 
 include $(TOP)/configure/RULES
 

config/RULES.Host

@@ -650,8 +650,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
@@ -784,8 +784,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) $<
 

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
 

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/Makefile

@@ -15,8 +15,10 @@ TOP=../..
 
 include $(TOP)/configure/CONFIG
 
+ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
 SCRIPTS_HOST += $(subst ../,,$(wildcard ../*.pl)) 
 SCRIPTS_HOST += installEpics
+endif
 
 include $(TOP)/configure/RULES
 

configure/CONFIG

@@ -23,7 +23,10 @@ CONFIG ?= $(TOP)/configure
 
 -include $(CONFIG)/RELEASE
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
+ifdef T_A
+-include $(CONFIG)/RELEASE.Common.$(T_A)
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+endif
 
 include $(CONFIG)/CONFIG_COMMON
 
@@ -67,21 +70,11 @@ 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_BASE

@@ -24,7 +24,7 @@ endif
 #---------------------------------------------------------------
 # Epics base Ioc libraries 
 
-EPICS_BASE_IOC_LIBS += recIoc softDevIoc testDevIoc iocsh 
+EPICS_BASE_IOC_LIBS += recIoc softDevIoc iocsh 
 EPICS_BASE_IOC_LIBS += miscIoc rsrvIoc dbtoolsIoc asIoc
 EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com 
 

configure/CONFIG_BASE_VERSION

@@ -18,7 +18,7 @@
 
 EPICS_VERSION=3
 EPICS_REVISION=14
-EPICS_MODIFICATION=3
+EPICS_MODIFICATION=6
 EPICS_UPDATE_NAME=
 EPICS_UPDATE_LEVEL=0
 
@@ -27,3 +27,4 @@ EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_M
 CVS_DATE="\$$Date$$"
 CVS_TAG="\$$Name$$"
 
+BASE_3_14=YES

configure/CONFIG_COMMON

@@ -240,8 +240,8 @@ 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)_OBJS) $(LIBRARY_OBJS)))
 LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
 
 #--------------------------------------------------
@@ -254,24 +254,24 @@ 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)
+ $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $($(BUILD_CLASS)_INCLUDES)
 
-CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
+CFLAGS = $(CONFORM_CFLAGS) $($(BUILD_CLASS)_CFLAGS) $(OPT_CFLAGS) $(DEBUG_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)\
+CXXFLAGS = $(CONFORM_CXXFLAGS) $($(BUILD_CLASS)_CXXFLAGS) $(OPT_CXXFLAGS)\
  $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
  $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
 
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
- $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_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)
 
-CPPFLAGS += $(CONFORM_CPPFLAGS) $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\
+CPPFLAGS += $(CONFORM_CPPFLAGS) $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\
  $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
  $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
@@ -291,10 +291,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 =
+# Use only dependancies from current top tree
 HDEPENDS_INCLUDES = $(filter .%,$(subst -I,,$(INCLUDES)))
 HDEPENDSFLAGS = -m $*$(DEP) $(HDEPENDS_INCLUDES) $@ $<
 HDEPENDS_CMD_YES   = -$(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)

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
 

configure/CONFIG_SITE

@@ -130,6 +130,22 @@ HOST_WARN=YES
 #	must be either YES or NO
 CROSS_WARN=YES
 
+#  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=NO
+
+#  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
 #Note: INSTALL_LOCATION definition moved to configure/RELEASE file
 

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 2004  US: Apr  4 - Oct 31
+#	              EU: Mar 28 - Oct 31
+#	(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:040402:103102
+#EPICS_TIMEZONE=MET::-60:032802:103102
 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/RELEASE

@@ -7,12 +7,16 @@
 # 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
+# RELEASE: Define location of external products
 #
-# NOTE: RELEASE.$(EPICS_HOST_ARCH) files will override
+# NB: Settings in RELEASE files can be overridden in files named
+#   RELEASE.$(EPICS_HOST_ARCH)
+#   RELEASE.Common.$(T_A)
+#   RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 
 #  Tornado directory
-VX_DIR = /usr/local/vw/tornado202
+VX_DIR = /usr/local/vw/tornado202p1
+#VX_DIR = /usr/local/vw/tornado22-$(ARCH_CLASS)
 
 # If you don't want to install into $(TOP) dir then 
 # define INSTALL_LOCATION here

configure/RULES.Db

@@ -11,9 +11,9 @@
 
 #####################################################  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)
@@ -23,6 +23,7 @@ vpath bpt%.data $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 # dbExpand
 INSTALL_DBDFLAGS += -I $(INSTALL_LOCATION)/dbd
 DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS)
+DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. $(GENERIC_SRC_INCLUDES)
 
 #####################################################  Targets
 
@@ -192,10 +193,18 @@ $(INSTALL_DB)/%.template: %.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) $< $@
@@ -206,6 +215,13 @@ $(COMMON_DIR)/bpt%.dbd: bpt%.data
 	@$(RM) $@
 	$(MAKEBPT) $< $@
 
+$(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd 
+	@$(RM) $@$(DEP)
+	@$(DBDDEPENDS_CMD)
+	@echo "Expanding dbd"
+	@$(RM) $@
+	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
+
 $(COMMON_DIR)/%.dbd: %Include.dbd 
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
@@ -213,6 +229,14 @@ $(COMMON_DIR)/%.dbd: %Include.dbd
 	@$(RM) $@
 	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
 
+$(COMMON_DIR)/%Include.dbd:
+	@$(RM) $@
+	$(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $@
+
+$(INSTALL_DBD)/%: $(COMMON_DIR)/%
+	@echo "Installing dbd file $@"
+	@$(INSTALL) -d -m 644 $< $(@D)
+
 $(INSTALL_DBD)/%: %
 	@echo "Installing dbd file $@"
 	@$(INSTALL) -d -m 644 $< $(@D)
@@ -221,7 +245,7 @@ dbdInstalls:  $(DBD_INSTALLS)
 	@echo "Installing $(^F)"
 	@$(INSTALL) -d -m 555 $^ $(INSTALL_DBD)
 
-.PRECIOUS: $(COMMON_DBDS)
+.PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%Include.dbd
 
 ##################################################### DB files
 
@@ -237,7 +261,15 @@ $(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@echo "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
 	@echo "Inflating database from $<"
 	@$(RM) $@
-	$(MSI) -S$< $(TEMPLATE_FILENAME) > msi.tmp
+	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > msi.tmp
+	$(MV) msi.tmp $@
+
+$(COMMON_DIR)/%.db$(RAW): %.template
+	@$(RM) $@$(DEP)
+	@$(DBDDEPENDS_CMD)
+	@echo "Inflating database from $<"
+	@$(RM) $@
+	$(MSI) $(DBFLAGS)  $< > msi.tmp
 	$(MV) msi.tmp $@
 
 # dbst based database optimization
@@ -252,10 +284,6 @@ $(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
@@ -265,6 +293,10 @@ $(INSTALL_DB)/%: %
 	@$(INSTALL) -d -m 644 $< $(@D)
 endif
 
+$(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
+	@echo "Installing db file $@"
+	@$(INSTALL) -d -m 644 $< $(@D)
+
 dbInstalls:  $(DB_INSTALLS)
 	@echo "Installing $(^F)"
 	@$(INSTALL) -d -m 555 $^ $(INSTALL_DB)
@@ -274,9 +306,15 @@ dbInstalls:  $(DB_INSTALLS)
 
 ##################################################### 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) $< $(basename $@) > $@
+	@$(RM) $@ temp.cpp
+	$(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) > temp.cpp
+	$(MV) temp.cpp $@
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
 

configure/RULES.ioc

@@ -16,7 +16,7 @@ install: buildInstall
 buildInstall: $(TARGETS)
 
 envPaths cdCommands: $(wildcard $(TOP)/configure/RELEASE*) \
-	$(TOP)/configure/CONFIG $(TOP)/bin
+	$(TOP)/configure/CONFIG $(INSTALL_BIN)
 	@$(RM) $@
 ifeq ($(IOCS_APPL_TOP),)
 	$(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) $@
@@ -24,6 +24,6 @@ else
 	$(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) -t $(IOCS_APPL_TOP) $@
 endif
 
-clean:
-	@$(RM) cdCommands envPaths
+realclean clean:
+	$(RM) cdCommands envPaths
 

configure/RULES_ARCHS

@@ -47,15 +47,30 @@ $(buildDirs):
 O.Common:
 	$(MKDIR) O.Common
 
-checkRelease: $(wildcard $(TOP)/configure/RELEASE*)
+#
+# 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)
 	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) $@
 
+$(checkReleaseTargets):checkRelease.%:
+	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) -a $* checkRelease
+
 #
 # special clean rule
 #
 clean ::
 	$(RMDIR) $(addprefix O.,$(BUILD_ARCHS)) O.Common
 
+archclean ::
+	$(RMDIR) $(addprefix O.,$(BUILD_ARCHS))
+
 $(cleanArchTargets) ::
 	$(RMDIR) O.$(archPart)
 
@@ -65,6 +80,6 @@ realclean ::
 .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

@@ -77,7 +77,7 @@ endif
 
 ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY)))
 
-MakefileInclude: ../Makefile
+MakefileInclude: ../Makefile $(wildcard $(TOP)/configure/RELEASE*)
 	@$(RM) $@
 	@$(PERL) $(TOOLS)/makeMakefileInclude.pl $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) $@
 
@@ -327,19 +327,18 @@ $(INSTALL_LIB)/%.lib: %.lib
 	@$(INSTALL_LIBRARY) -d -m 644 $< $(INSTALL_LIB)
 
 $(INSTALL_SHRLIB)/lib%: lib%
-	@echo "Installing library $@"
+	@echo "Installing shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
 ifdef 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_TCLLIB)/%: ../%
 	@echo "Installing Tcl library $@"
 	@$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB)
@@ -348,7 +347,7 @@ endif
 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	@echo "Installing loadable shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
- 
+
 $(INSTALL_CONFIG)/%: %
 	@echo "Installing config file $@"
 	@$(INSTALL) -d -m 644 $< $(@D)
@@ -400,5 +399,3 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD
-
-

configure/RULES_DIRS

@@ -13,7 +13,7 @@
  
 
 ARCHS += $(BUILD_ARCHS)
-ACTIONS += inc build install buildInstall clean realclean
+ACTIONS += inc build install buildInstall clean realclean archclean
  
 dirPart = $(word 1, $(subst $(DIVIDER), ,$@))
 actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$@)), \

configure/RULES_JAVA

@@ -16,11 +16,11 @@
 
 JAVA_INC = $(JAVA_DIR)/include
 JAVA_BIN = $(JAVA_DIR)/bin
-JAVA_INCLUDES += -I$(JAVA_INC) -I$(JAVA_INC)/$(OS_CLASS) -I$(COMMON_DIR)
+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) $(COMMON_JAR) $(JARINPUT) $(JARPACKAGES))
 
 #-------------------------------------------------------
 vpath %.java .. 
@@ -60,9 +60,11 @@ DEPTESTJAVA += $(subst .class,.java,$(TESTCLASSES))
 
 COMMON_JAR += $(addprefix $(COMMON_DIR)/,$(JAR))
 INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR))
-JARMANIFEST += $(firstword $(trim $(MANIFEST) $(JAR_MANIFEST)))
+JARMANIFEST += $(firstword $(MANIFEST) $(JAR_MANIFEST))
 JARINPUT += $(subst .java,.class,$(JAR_INPUT))
-JARDEPFILES +=  $(JARINPUT) $(JARMANIFEST)
+JARDEPFILES += $(addprefix $(INSTALL_JAVA)/,$(subst .java,.class,$(JAVA))) $(JARINPUT)
+JARPACKAGES += $(foreach pkg,$(JAR_PACKAGES),-C $(INSTALL_JAVA) $(subst .,/,$(pkg)))
+
 ifneq ($(JARMANIFEST),)
 JAR_OPTIONS = cvmf $(JARMANIFEST)
 else

configure/RULES_TOP

@@ -20,16 +20,20 @@ $(uninstallArchTargets): uninstallDirs
 	@$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart) $(INSTALL_LOCATION_LIB)/$(archPart) 
 
 cleandirs:
-	@echo " " #stops "nothing to be done for cleandirs" message
 ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
 	@$(RMDIR) $(INSTALL_LOCATION_BIN)
 endif
 ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
 	@$(RMDIR) $(INSTALL_LOCATION_LIB)
 endif
+	@echo
+# The echo above stops a "nothing to be done for cleandirs" message
 
 distclean: realclean realuninstall
 
+cvsclean:
+	@$(PERL) $(TOOLS)/cvsclean.pl 
+
 realuninstall:
 	@$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
 	@$(RMDIR) $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
@@ -57,6 +61,7 @@ help:
 	@echo "     rebuild        - Same as clean install"
 	@echo "     inc            - Installs header files"
 	@echo "     build          - Builds all targets"
+	@echo "     archclean      - Removes O.<arch> dirs but not O.Common dir"
 	@echo "\"Partial\" build targets supported by Makefiles:"
 	@echo "     inc.<arch>     - Installs <arch> only header files."
 	@echo "     install.<arch> - Builds and installs <arch> only."
@@ -66,10 +71,12 @@ help:
 	@echo "     uninstall      - Cleans directories created by the install."
 	@echo "     realuninstall  - Removes ALL install dirs"
 	@echo "     distclean      - Same as realclean realuninstall."
+	@echo "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
 	@echo "     help           - Prints this list of valid make targets "
 	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
 .PHONY : $(uninstallArchTargets)
 .PHONY : uninstall help cleandirs distclean uninstallDirs realuninstall
+.PHONY : cvsclean
 

configure/Sample.Makefile

@@ -72,7 +72,7 @@ INC         = file.h
 #	defining a library
 # --------------------------------------------------------------------
 #
-#	Contents of a library are specified via SRCS, LIBSRCS, or .._SRCS.
+#	Contents of a library are specified via SRCS, LIB_SRCS, or .._SRCS.
 #	From this the platform specific object names (.o, .obj, ...)
 #	are derived automatically.
 #
@@ -86,7 +86,7 @@ INC         = file.h
 #	./os/OS_CLASS
 #	./os/generic
 #	.
-#	So usually only LIBSRCS should be sufficient!
+#	So usually only LIB_SRCS should be sufficient!
 
 #   SRCS files will be used for both LIBRARY and PROD
 SRCS            = file_for_lib.c another_file.cpp

configure/os/CONFIG.Common.RTEMS

@@ -98,8 +98,8 @@ CONFORM_CXXFLAGS_STRICT = -ansi
 
 #--------------------------------------------------
 # Command-line input support
-COMMANDLINE_LIBRARY = LIBTECLA
 LDLIBS_LIBTECLA = -ltecla_r -lncurses
+LDLIBS_READLINE = -lreadline -lncurses
 
 #--------------------------------------------------
 # Allow site overrides

configure/os/CONFIG.Common.UnixCommon

@@ -16,6 +16,14 @@ VALID_BUILDS = Host Ioc
 # Gnu directory
 GNU_DIR = /usr/local
 
+#-------------------------------------------------------
+FULLPATHTOP= $(shell perl $(TOOLS)/fullPathName.pl $(TOP))
+# Get fullpathname of modules relative to TOP
+SHRLIB_SEARCH_FULLPATHTOP = $(SHRLIB_SEARCH_DIRS:$(TOP)/%=$(FULLPATHTOP)/%)
+# Get fullpathname of other relative dirs
+SHRLIB_SEARCH_FULLPATHDIRS = $(SHRLIB_SEARCH_FULLPATHTOP:.%= \
+  $(shell perl $(TOOLS)/fullPathName.pl .%)
+
 #-------------------------------------------------------
 # Unix prefix and suffix definitions
 EXE =
@@ -24,7 +32,7 @@ OBJ = .o
 LIB_PREFIX = lib
 LIB_SUFFIX = .a
 SHRLIB_SUFFIX = .so$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = .so$(addprefix .,$(SHRLIB_VERSION))
+LOADABLE_SHRLIB_SUFFIX = .so
 LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------

configure/os/CONFIG.Common.cygwin-x86

@@ -1,10 +1,10 @@
-# CONFIG.Common.win32-x86-cygwin
+# CONFIG.Common.cygwin-x86
 #
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for win32-x86-cygwin target builds
-# Sites may override these definitions in CONFIG_SITE.Common.win32-x86-cygwin
+# Definitions for cygwin-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.cygwin-x86
 #-------------------------------------------------------
 
 # Include definitions common to all Unix targets
@@ -15,11 +15,20 @@ ARCH_CLASS = x86
 
 EXE=.exe
 
+COMPILER_CPPFLAGS = -D_REENTRANT
+
 #POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS
 # _POSIX_SOURCE eliminates select()
 POSIX_CPPFLAGS_YES = -D_POSIX_THREADS -D_POSIX_TIMERS
 #POSIX_LDLIBS_YES += -lpthread
+POSIX_LDLIBS_YES += -lpthread
 
 ARCH_DEP_CPPFLAGS += -D_X86_
 
 OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32
+
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
+
+LDLIBS_READLINE = -lcygreadline5 -lcygcurses7
+

configure/os/CONFIG.Common.hpux-parisc

@@ -21,15 +21,14 @@ OP_SYS_CFLAGS = -D_HPUX_SOURCE
 OP_SYS_CXXFLAGS =
 
 SHRLIB_SUFFIX = .sl$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = .sl$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_PREFIX =
+LOADABLE_SHRLIB_SUFFIX = .sl
 
 # Set runtime path for shared libraries
 empty:=                                      # trick from the make docs...
 space:= $(empty) $(empty)
-RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_DIRS))),+s
+RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_FULLPATHDIRS))),+s
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=parisc-hp-unix
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))

configure/os/CONFIG.Common.linux-386

@@ -0,0 +1,18 @@
+# CONFIG.Common.linux-386
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-386 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-386
+#-------------------------------------------------------
+
+# Include definitions common to all linux x86 targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS = -march=i386
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=i386-pc-linux-gnu
+endif
+

configure/os/CONFIG.Common.linux-486

@@ -0,0 +1,18 @@
+# CONFIG.Common.linux-486
+#
+# $Id
+# This file is maintained by the build community.
+#
+# Definitions for linux-486 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-486
+#-------------------------------------------------------
+
+# Include definitions common to all linux x86 targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS = -march=i486
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=i486-pc-linux-gnu
+endif
+

configure/os/CONFIG.Common.linux-586

@@ -0,0 +1,19 @@
+# CONFIG.Common.linux-586
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-586 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-586
+#-------------------------------------------------------
+
+# Include definitions common to all linux x86 targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+# i586 is euivalent to pentiumpro
+ARCH_DEP_CFLAGS = -march=i586
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=i586-pc-linux-gnu
+endif
+

configure/os/CONFIG.Common.linux-686

@@ -0,0 +1,19 @@
+# CONFIG.Common.linux-686
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-686 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-686
+#-------------------------------------------------------
+
+# Include definitions common to all linux x86 targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+# i686 is euivalent to pentiumpro
+ARCH_DEP_CFLAGS = -march=i686
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=i686-pc-linux-gnu
+endif
+

configure/os/CONFIG.Common.linux-athlon

@@ -0,0 +1,19 @@
+# CONFIG.Common.linux-athlon
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-athlon target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-athlon
+#-------------------------------------------------------
+
+# Include definitions common to all linux x86 targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS += -march=athlon-mp -mfpmath=sse
+
+
+ifeq ($(BUILD_CLASS),CROSS)
+   GNU_TARGET=athlon-pc-linux-gnu
+endif
+

configure/os/CONFIG.Common.linux-mpc82xx

@@ -1,38 +0,0 @@
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for linux-mpc82xx target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-mpc82xx
-#-------------------------------------------------------
-
-# Include definitions common to all Unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = Linux
-ARCH_CLASS = mpc82xx
-
-CODE_CPPFLAGS = -D_REENTRANT
-
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES = -lpthread
-POSIX_LDLIBS_NO =
-
-# -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
-OP_SYS_CPPFLAGS += -D_BSD_SOURCE
-OP_SYS_CPPFLAGS += -Dlinux
-OP_SYS_LDFLAGS +=
-OP_SYS_LDLIBS = -lrt
-
-#ARCH_DEP_CPPFLAGS += -D_X86_
-
-# Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
-
-ifdef CROSS
-   GNU_TARGET=ppc_82xx
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-
-

configure/os/CONFIG.Common.linux-x86

@@ -25,14 +25,28 @@ OP_SYS_CPPFLAGS += -Dlinux
 OP_SYS_LDLIBS += -lrt
 
 ARCH_DEP_CPPFLAGS += -D_X86_
-ARCH_DEP_CFLAGS += -mcpu=pentium
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
+ifeq ($(EPICS_HOST_ARCH),linux-x86)
+   # Added for 386,486,... cross builds
+   CMPLR_PREFIX=
+   CROSS_INCLUDES=
+   CROSS_LDFLAGS=
+   # Use -w not -Wall
+   #WARN_CFLAGS_YES = -w
+   #WARN_CXXFLAGS_YES = -w
+-include $(CONFIG)/os/CONFIG_SITE.Common.linux-x86
+-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+-include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-x86
+else
    GNU_TARGET=i586-pc-linux-gnu
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
 endif
+endif
+
+LDLIBS_READLINE = -lreadline -lcurses
 

configure/os/CONFIG.Common.linux-x86-borland

@@ -21,11 +21,10 @@ OP_SYS_CPPFLAGS += -Dlinux
 OP_SYS_LDLIBS = libc.so libm.so libdl.so librt.so
 
 ARCH_DEP_CPPFLAGS += -D_X86_
-ARCH_DEP_CFLAGS += -mcpu=pentium
 
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=i586-pc-linux-gnu
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))

configure/os/CONFIG.Common.lynxos-x86

@@ -1,31 +0,0 @@
-#  CONFIG.Common.lynxos-x86
-#
-# $Id$
-#
-#  This file is maintained by the build community.
-#  Sites may override these definitions in CONFIG_SITE.Common.lynxos-x86
-#-------------------------------------------------------
-
-#Include definitions common to unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = lynxos
-ARCH_CLASS = x86
-
-CODE_CPPFLAGS =
-
-POSIX_CPPFLAGS_YES =
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES += -lposix4d9 -lpthread
-POSIX_LDLIBS_NO +=
-
-ARCH_DEP_CPPFLAGS += -D_X86_
-ARCH_DEP_LDFLAGS =
-ARCH_DEP_LDLIBS =
-
-ifdef CROSS
-   GNU_TARGET=x86-lynxos
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-

configure/os/CONFIG.Common.osf-alpha

@@ -1,30 +0,0 @@
-# CONFIG.Common.osf-alpha
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for osf-alpha target archs
-# Sites may override these definitions in CONFIG_SITE.Common.osf-alpha
-#-------------------------------------------------------
-
-# Include definitions common to all Unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = osf
-ARCH_CLASS = alpha
-
-CODE_CPPFLAGS =
-
-POSIX_CPPFLAGS_YES =
-POSIX_LDLIBS_YES +=
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_NO +=
-
-OP_SYS_CPPFLAGS = -D_OSF_SOURCE
-
-ifdef CROSS
-   GNU_TARGET=alpha-osf
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-

configure/os/CONFIG.Common.solaris-sparc

@@ -13,24 +13,24 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon
 OS_CLASS = solaris
 ARCH_CLASS = sparc
 
-CODE_CPPFLAGS = -D__EXTENSIONS__ 
+CODE_CPPFLAGS = -D__EXTENSIONS__
+
+COMPILER_CPPFLAGS += -mt
+COMPILER_LDFLAGS += -mt
 
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
-# Flags for solaris 6
-POSIX_CPPFLAGS_YES_6 += -D_REENTRANT
-
 POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
 POSIX_CPPFLAGS_YES += -D_XOPEN_SOURCE=500
-POSIX_LDLIBS_YES_6 += -lthread
 POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
 
-OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION)
+OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
+OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=sparc-sun-solaris2
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
@@ -38,6 +38,7 @@ endif
 
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE

configure/os/CONFIG.Common.solaris-sparc-gnu

@@ -11,5 +11,10 @@
 include $(CONFIG)/os/CONFIG.Common.solaris-sparc
 # CONFIG.Common.solaris-sparc
 
-OP_SYS_LDLIBS_8 = -lc
+COMPILER_CPPFLAGS =  -D_REENTRANT
+
+OP_SYS_LDLIBS_8 = -lc
+OP_SYS_LDLIBS_9 = -lc
+
+OP_SYS_LDFLAGS += -R$(GNU_LIB) -L$(GNU_LIB)
 

configure/os/CONFIG.Common.solaris-x86

@@ -15,23 +15,23 @@ ARCH_CLASS = x86
 
 CODE_CPPFLAGS = -D__EXTENSIONS__
 
-SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
+COMPILER_CPPFLAGS += -mt
+COMPILER_LDFLAGS += -mt
 
-# Flags for solaris 6
-POSIX_CPPFLAGS_YES_6 += -D_REENTRANT
+SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
 POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
 POSIX_CPPFLAGS_YES += -D_XOPEN_SOURCE=500
-POSIX_LDLIBS_YES_6 += -lthread
 POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
 
-OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION)
+OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
+OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
 ARCH_DEP_CPPFLAGS = -D_X86_
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=x86-sun-solaris2
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
@@ -39,4 +39,15 @@ endif
 
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+GNU_DIR = /opt/gnu
+INCLUDES_READLINE = -I$(GNU_DIR)/include
+LDFLAGS_READLINE += -R$(GNU_DIR)/lib
+LDFLAGS_READLINE += -L$(GNU_DIR)/lib
+LDLIBS_READLINE = -lreadline -lcurses
+# Use archive if there is a problem with the readline shared library
+#LDLIBS_READLINE = -Bstatic -lreadline -Bdynamic -lcurses
+

configure/os/CONFIG.Common.solaris-x86-gnu

@@ -10,3 +10,10 @@
 # Include definitions common to all solaris-x86  target archs
 include $(CONFIG)/os/CONFIG.Common.solaris-x86
 
+COMPILER_CPPFLAGS = -D_REENTRANT
+
+OP_SYS_LDLIBS_8 = -lc
+OP_SYS_LDLIBS_9 = -lc
+
+OP_SYS_LDFLAGS += -R$(GNU_LIB) -L$(GNU_LIB)
+

configure/os/CONFIG.Common.sun4-x86

@@ -1,36 +0,0 @@
-# CONFIG.Common.sun4-x86
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for sun4-x86 target archs
-# Sites may override these definitions in CONFIG_SITE.Common.sun4-x86
-#-------------------------------------------------------
-
-# Include definitions common to all Unix target archs
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = sun4
-ARCH_CLASS = x86
-
-CODE_CPPFLAGS = -D__EXTENSIONS__
-
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES += -lpthread -lthread
-
-OP_SYS_CPPFLAGS = -DSUNOS4
-
-ARCH_DEP_CPPFLAGS += -D_X86_
-
-# Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
-
-ifdef CROSS
-   GNU_TARGET=x86-sun-sunos4
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-
-OP_SYS_LDLIBS += -lsocket -lnsl
-

configure/os/CONFIG.Common.vxWorks-68040

@@ -19,3 +19,4 @@ ARCH_CLASS = 68k
 ARCH_DEP_CPPFLAGS = -DCPU=MC68040
 ARCH_DEP_CFLAGS = -m68040
 
+GNU_TARGET = m68k-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-68040lc

@@ -18,3 +18,5 @@ ARCH_CLASS = 68k
 # Architecture specific build flags
 ARCH_DEP_CPPFLAGS = -DCPU=MC68LC040
 ARCH_DEP_CFLAGS = -m68040 -msoft-float
+
+GNU_TARGET = m68k-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-68060

@@ -19,3 +19,4 @@ ARCH_CLASS = 68k
 ARCH_DEP_CPPFLAGS = -DCPU=MC68060
 ARCH_DEP_CFLAGS = -m68040
 
+GNU_TARGET = m68k-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-ppc603

@@ -19,3 +19,4 @@ ARCH_CLASS = ppc
 ARCH_DEP_CPPFLAGS = -DCPU=PPC603  
 ARCH_DEP_CFLAGS = -mcpu=603 -mstrict-align
 
+GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-ppc603_long

@@ -19,3 +19,4 @@ ARCH_CLASS = ppc
 ARCH_DEP_CPPFLAGS = -DCPU=PPC603  
 ARCH_DEP_CFLAGS = -mcpu=603 -mstrict-align -mlongcall
 
+GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-ppc604

@@ -19,3 +19,4 @@ ARCH_CLASS = ppc
 ARCH_DEP_CPPFLAGS = -DCPU=PPC604
 ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align
 
+GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-ppc604_long

@@ -19,3 +19,4 @@ ARCH_CLASS = ppc
 ARCH_DEP_CPPFLAGS = -DCPU=PPC604
 ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align -mlongcall
 
+GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorksCommon

@@ -134,6 +134,11 @@ LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
 CFLAGS_ctdt = $(filter-out -pedantic,$(CFLAGS)) -fdollars-in-identifiers
 COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG)
 
+#--------------------------------------------------
+# C preprocessor command
+VXCPPFLAGS = $(filterout $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
+PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.vxWorksCommon

configure/os/CONFIG.cygwin-x86.Common

@@ -1,10 +1,10 @@
-# CONFIG.win32-x86-cygwin.Common
+# CONFIG.cygwin-x86.Common
 #
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for win32-x86-cygwin host archs
-# Sites may override these definitions in CONFIG_SITE.win32-x86-cygwin.Common
+# Definitions for cygwin-x86 host archs
+# Sites may override these definitions in CONFIG_SITE.cygwin-x86.Common
 #-------------------------------------------------------
 
 #Include definitions common to unix hosts

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

@@ -1,9 +1,9 @@
-#  CONFIG.win32-x86-cygwin.win32-x86-cygwin
+#  CONFIG.cygwin-x86.cygwin-x86
 #
 # $Id$
 #
-# Definitions for win32-x86-cygwin host - win32-x86-cygwin target builds
-# Sites may override these definitions in CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
+# Definitions for cygwin-x86 host - cygwin-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.cygwin-x86.cygwin-x86
 #-------------------------------------------------------
 
 # Include common gnu compiler definitions

configure/os/CONFIG.linux-mpc82xx.Common

@@ -1,10 +0,0 @@
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for linux-mpc82xx host builds
-# Sites may override these definitions in CONFIG_SITE.linux-mpc82xx.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
-

configure/os/CONFIG.linux-mpc82xx.linux-mpc82xx

@@ -1,22 +0,0 @@
-# $Id$
-#
-# Definitions for linux-mpc82xx host - linux-mpc82xx target builds
-# Sites may override these definitions in CONFIG_SITE.linux-mpc82xx.linux-mpc82xx
-#-------------------------------------------------------
-
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
-GNU_DIR = /usr
-
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
-
-STATIC_LDFLAGS_YES= -Wl,-Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Wl,-Bdynamic
-STATIC_LDLIBS_NO=
-
-SHRLIB_LDFLAGS +=  -shared -z defs
-LOADABLE_SHRLIB_LDFLAGS = -shared
-

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

@@ -28,6 +28,7 @@ WINLINK = $(BORLAND_BIN)/ilink -q
 CCLINKOPT = -q -a8
 CC = $(BORLAND_BIN)/bc++ $(CCLINKOPT)
 LD = $(BORLAND_BIN)/bc++ -r
+RANLIB = 
 
 #
 # __STDC__=0 works but not as cleanly as with

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

@@ -10,3 +10,6 @@
 #Include definitions common to linux-x86 hosts
 include $(CONFIG)/os/CONFIG.linux-x86.Common
 
+# Make all crosscompiler builds debug builds
+#CROSS_OPT=NO
+

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

@@ -9,3 +9,6 @@
 
 include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 
+# Removes -O optimization and adds -g compile option
+HOST_OPT=NO
+

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

@@ -1,17 +0,0 @@
-# $Id$
-#
-# Definitions for linux-x86 host - linux-mpc82xx target builds
-# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-mpc82xx
-#-------------------------------------------------------
-
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
-GNU_DIR = /opt/hardhat/devkit/ppc/82xx
-GNU_TARGET_INCLUDE_DIR = $(GNU_DIR)/target/usr/include/
-
-CC = $(GNU_BIN)/ppc_82xx-gcc
-CCC = $(GNU_BIN)/ppc_82xx-g++
-
-# Override the -nostdinc flag, needed here...
-CROSS_CPPFLAGS =

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

@@ -0,0 +1,13 @@
+# CONFIG.linux-x86-debug.linux-x86-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86 host - linux-x86-debug target build with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-x86-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86-debug.linux-x86-debug
+
+BUILD_CLASS = HOST
+

configure/os/CONFIG.lynxos-x86.Common

@@ -1,14 +0,0 @@
-# CONFIG.lynxos-68k.Common
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for lynxos-68k host archs
-# Sites may override these definitions in CONFIG_SITE.lynxos-68k.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
-
-WIND_HOST_TYPE = lynxos
-

configure/os/CONFIG.lynxos-x86.lynxos-x86

@@ -1,13 +0,0 @@
-#  CONFIG.lynxos-x86.lynxos-x86
-#
-# $Id$
-#
-#  This file is maintained by the build community.
-#  Sites may override these definitions in CONFIG_SITE.lynxos-x86.lynxos-x86
-#-------------------------------------------------------
- 
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
-GNU_DIR = /usr
-

configure/os/CONFIG.osf-alpha.Common

@@ -1,14 +0,0 @@
-# CONFIG.osf-alpha.Common
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for osf-alpha host archs
-# Sites may override these definitions in CONFIG_SITE.osf-alpha.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
-
-WIND_HOST_TYPE = osf-alpha
-

configure/os/CONFIG.osf-alpha.osf-alpha

@@ -1,49 +0,0 @@
-# CONFIG.osf-alpha.osf-alpha
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for osf-alpha host archs
-# Sites may override these definitions in CONFIG_SITE.osf-alpha.osf-alpha
-#-------------------------------------------------------
-
-CC = cc
-CCC = cxx 
-CPP = $(CC) -E
-RANLIB =
-AR = ar
-LD = -r
-
-# Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = -std
-CONFORM_CFLAGS_STRICT = -std1
-CONFORM_CFLAGS_TRAD = -std0
-CODE_CFLAGS = 
-WARN_CFLAGS_YES =
-WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O
-OPT_CFLAGS_NO = -g
-
-# Configure OS vendor C++ compiler
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT =
-PROF_CXXFLAGS_YES = +p
-PROF_CXXFLAGS_NO =
-CODE_CXXFLAGS =
-WARN_CXXFLAGS_YES =
-WARN_CXXFLAGS_NO =
-OPT_CXXFLAGS_YES = -O
-OPT_CXXFLAGS_NO = -g
-
-STATIC_LDFLAGS_YES= -Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Bdynamic
-STATIC_LDLIBS_NO=
-
-SHRLIB_LDFLAGS = -shared
-LOADABLE_SHRLIB_LDFLAGS = $(SHRLIB_LDFLAGS)
-
-#############  ???????????
-#####ACC_SFLAGS_YES= -non_shared
-#####ACC_SFLAGS_NO= -call_shared
-

configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu

@@ -23,7 +23,8 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_LDFLAGS = -G -h $@ -z ignore -z combreloc -z lazyload
-SHRLIB_LDFLAGS += -z defs
-LOADABLE_SHRLIB_LDFLAGS = -G -h $@ -z ignore -z combreloc -z lazyload
+SHRLIB_LDFLAGS += -G -h $@  -z ignore -z defs
+LOADABLE_SHRLIB_LDFLAGS += -G -h $@
+
+OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
 

configure/os/CONFIG.solaris-sparc.solaris-sparc

@@ -52,8 +52,9 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_LDFLAGS += -z defs -KPIC -G -h $@
-LOADABLE_SHRLIB_LDFLAGS += -KPIC -G -h $@
+SHRLIB_CFLAGS = -KPIC
+SHRLIB_LDFLAGS += -z defs -G -h $@ -z text
+LOADABLE_SHRLIB_LDFLAGS += -G -h $@ -z text
 
 OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
 

configure/os/CONFIG.solaris-sparc.solaris-sparc-debug

@@ -0,0 +1,15 @@
+# CONFIG.solaris-sparc.solaris-sparc-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc host - solaris-sparc-debug target build with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.solaris-sparc.solaris-sparc
+
+BUILD_CLASS = HOST
+
+GNU = NO
+

configure/os/CONFIG.solaris-sparc.solaris-sparc-gnu

@@ -0,0 +1,13 @@
+# CONFIG.solaris-sparc.solaris-sparc-gnu
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc host - solaris-sparc-gnu target build with gnu compiler
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc-gnu
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu
+
+BUILD_CLASS = HOST
+

configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu

@@ -21,5 +21,5 @@ LD = ld -r
 SHRLIB_LDFLAGS = -z defs -G -h $@
 LOADABLE_SHRLIB_LDFLAGS += -G -h $@
 
-OP_SYS_LDFLAGS = -z ignore -z combreloc -z lazyload
+OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
 

configure/os/CONFIG.solaris-x86.solaris-x86

@@ -54,5 +54,5 @@ STATIC_LDLIBS_NO=
 SHRLIB_LDFLAGS = -z defs -KPIC -G -h $@
 LOADABLE_SHRLIB_LDFLAGS = -KPIC -G -h $@
 
-OP_SYS_LDFLAGS = -z ignore -z combreloc -z lazyload
+OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
 

configure/os/CONFIG.sun4-68k.Common

@@ -1,14 +0,0 @@
-# CONFIG.sun4-68k.Common
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for sun4-68k host archs
-# Sites may override these definitions in CONFIG_SITE.sun4-68k.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
-
-WIND_HOST_TYPE = sun4-sunos4
-

configure/os/CONFIG.sun4-68k.sun4-68k

@@ -1,49 +0,0 @@
-# CONFIG.sun4-68k.sun4-68k
-#
-# $Id$
-# This file is maintained by the build community.
-#
-# Definitions for sun4-68k target arch when host arch is sun4-68k
-# Sites may override these definitions in CONFIG_SITE.sun4-68k.sun4-68k
-#-------------------------------------------------------
-
-# Include definitions common to all Unix target archs
-include $(CONFIG)/os/CONFIG.common.UnixCommon
-
-OS_CLASS = sun4
-ARCH_CLASS = 68k
-
-CC = cc
-CCC = CC
-CPP = $(CC) -E
-RANLIB = ranlib -t
-AR = $(CCC) -xar -o
-LD = ld -r
-
-# Configure OS vendor C compilers
-CONFORM_CFLAGS_ANSI = -Xa
-CONFORM_CFLAGS_STRICT = -Xc
-CONFORM_CFLAGS_TRAD = -Xs
-CODE_CFLAGS = -pic
-WARN_CFLAGS_YES = -vc
-WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O
-OPT_CFLAGS_NO = -g
-
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT =
-CONFORM_CXXFLAGS_TRAD = 
-CODE_CXXFLAGS = -pic
-WARN_CXXFLAGS_YES =
-WARN_CXXFLAGS_NO = -w
-OPT_CXXFLAGS_YES = -O
-OPT_CXXFLAGS_NO = -g
-
-STATIC_LDFLAGS_YES= -Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Bdynamic
-STATIC_LDLIBS_NO=
-
-SHRLIB_LDFLAGS = -assert pure-text -h $@
-LOADABLE_SHRLIB_LDFLAGS = -assert pure-text -h $@
-

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

@@ -43,6 +43,7 @@ ARCMD = $(BORLAND_BIN)/tlib $@   $(foreach lib,$(LIBRARY_LD_OBJS),+$(lib))
 CCLINKOPT = -q -tWM -tWD -a8 -D_WIN32 -D_RTLDLL
 CC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT)
 LD = $(BORLAND_BIN)/bcc32 -r
+RANLIB =
 
 #
 # __STDC__=0 works but not as cleanly as with
@@ -84,7 +85,8 @@ OPT_CFLAGS_YES = -k- -H- -R- -O1 -v- -vi
 OPT_CFLAGS_NO =
 
 # OS vendor c preprocessor
-CPP = $(BORLAND_BIN)/cl  /E
+CPP = $(BORLAND_BIN)/cpp32  -Sr
+PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(subst /,\\,$(INCLUDES)) -o$@ $<
 
 # Configure OS vendor C++ compiler
 #
@@ -152,6 +154,7 @@ LINK_OPT_FLAGS_NO = -c -C -Gi -Gn -Tpd -x -w-
 WIN32_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
 OPT_LDFLAGS =
 
+SHRLIB_CFLAGS=
 ARCH_DEP_CFLAGS=
 
 #	to identify the general architecture class:

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

@@ -9,3 +9,4 @@
 
 include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
 
+HOST_OPT=NO

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

@@ -91,9 +91,9 @@ STATIC_CFLAGS_YES= /MT$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
 STATIC_CFLAGS_NO= /MD$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
 
 # OS vendor c preprocessor
-#CPP = cl  /E
+CPP = cl /C /E
 #GNU c preprocessor
-CPP = gcc -x c -E
+#CPP = gcc -x c -E
 
 # Configure OS vendor C++ compiler
 #
@@ -151,6 +151,8 @@ STATIC_CXXFLAGS_NO= /MD$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
 
 STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib
 STATIC_LDLIBS_NO=
+STATIC_LDFLAGS=
+RANLIB=
 
 # add /profile here to run the ms profiler
 # /LTCG - whole program optimization
@@ -161,6 +163,7 @@ LINK_OPT_FLAGS_NO = /debug /incremental:no /fixed:no
 OPT_LDFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT))
 
 ARCH_DEP_CFLAGS=
+SHRLIB_CFLAGS=
 
 #	to identify the general architecture class:
 #	should be BSD, SYSV, WIN32, ...

configure/os/CONFIG_COMPAT

@@ -16,7 +16,7 @@ ARCH_Darwin = darwin-ppc
 ARCH_WIN32 = win32-x86
 ARCH_hp700 = hpux-parisc
 ARCH_alpha = osf-alpha
-ARCH_cygwin32 = win32-x86-cygwin
+ARCH_cygwin32 = cygwin-x86
 ARCH_Borland = win32-x86-borland
 
 ifndef EPICS_HOST_ARCH

configure/os/CONFIG_SITE.Common.linux-x86

@@ -20,4 +20,3 @@
 # If readline is not installed comment the following line
 # to omit command-line editing and history support
 COMMANDLINE_LIBRARY = READLINE
-LDLIBS_READLINE = -lreadline -lncurses

configure/os/CONFIG_SITE.cygwin-x86.Common

@@ -1,9 +1,9 @@
-# CONFIG_SITE.win32-x86-cygwin.Common
+# CONFIG_SITE.cygwin-x86.Common
 #
 # $Id$
 # This file is maintained by the build community.
 #
-# Site override definitions for win32-x86-cygwin host builds
+# Site override definitions for cygwin-x86 host builds
 #-------------------------------------------------------
  
 CROSS_COMPILER_TARGET_ARCHS =

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

@@ -1,9 +1,9 @@
-# CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
+# CONFIG_SITE.cygwin-x86.cygwin-x86
 #
 # $Id$
 # This file is maintained by the build community.
 #
-# Site override definitions for win32-x86-cygwin host - win32-x86-cygwin target builds
+# Site override definitions for cygwin-x86 host - cygwin-x86 target builds
 #-------------------------------------------------------
  
 ##GNU_DIR=C:/cygwin

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

@@ -5,5 +5,3 @@
 #Compiles for profiling with the gprof profiler.
 #GPROF=YES
 
-# Removes -O optimization and adds -g compile option
-HOST_OPT=NO

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

@@ -1,3 +0,0 @@
-
-# Removes optimization and adds debugging options
-HOST_OPT=NO

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

@@ -1,7 +1,7 @@
 #  $Id$
 
 # Microsoft Visual C++ .NET is the default compiler
-# If you have Visual C++ 6.0, uncomment the following 4 override lines
+# If you have Visual C++ 6.0, uncomment the following override lines
 # This will to eliminate warnings about unknown options /GL, LTCG, and /44355.
 #OPT_CFLAGS_YES = /Ox
 #OPT_CXXFLAGS_YES = /Ox

configure/tools/convertRelease.pl

@@ -14,18 +14,15 @@ eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
 #
 # Parse configure/RELEASE file(s) and generate a derived output file.
 #
-# This tool replaces makeConfigAppInclude.pl, makeIocCdCommands.pl and
-# makeRulesInclude.pl and adds consistency checks for RELEASE files.
-#
 
-use Cwd;
+use Cwd qw(cwd abs_path);
 use Getopt::Std;
 
 $cwd = cwd();
 $cwd =~ s/\/tmp_mnt//;	# hack for sun4
 $cwd =~ s/\\/\//g;	# hack for win32
 
-getopt "aht";
+getopt "ahtT";
 
 if ($opt_a) {
     $arch = $opt_a;
@@ -37,29 +34,28 @@ if ($opt_a) {
 $hostarch = $arch;
 $hostarch = $opt_h if ($opt_h);
 
-# Find $top from current path; NB only works under iocBoot/* and configure/*
-$top = $cwd;
-#$top =~ s/^\/cygdrive\/(\w)\//$1:\//;
-$top =~ s/\/iocBoot.*$//;
-$top =~ s/\/configure.*$//;
-if ($^O eq "cygwin") {
-  chomp($top = `cygpath -m $top`);
+if ($opt_T) {
+    $top = $opt_T;
+} else {		# Find $top from current path
+    # This approach is only possible under iocBoot/* and configure/*
+    $top = $cwd;
+    $top =~ s/\/iocBoot.*$//;
+    $top =~ s/\/configure.*$//;
+    chomp($top = `cygpath -m $top`) if ($^O eq "cygwin");
 }
 
 # The IOC may need a different path to get to $top
 if ($opt_t) {
-    $iocroot = $ioctop = $opt_t;
+    $iocroot = $opt_t;
     $root = $top;
     while (substr($iocroot, -1, 1) eq substr($root, -1, 1)) {
 	chop $iocroot;
 	chop $root;
     }
-} else {
-    $ioctop = $top;
 }
 
 unless (@ARGV == 1) {
-    print "Usage: convertRelease.pl [-a arch] [-h hostarch] [-t ioctop] outfile\n";
+    print "Usage: convertRelease.pl [-a arch] [-h hostarch] [-T top] [-t ioctop] outfile\n";
     print "   where outfile is be one of:\n";
     print "\tcheckRelease - checks consistency with support apps\n";
     print "\tcdCommands - generate cd path strings for vxWorks IOCs\n";
@@ -76,13 +72,8 @@ $outfile = $ARGV[0];
 
 # Read the RELEASE file(s)
 $relfile = "$top/configure/RELEASE";
-die "Can't find configure/RELEASE file" unless (-f $relfile);
-&readRelease($relfile, \%macros, \@apps);
-
-if ($hostarch) {
-    $relfile .= ".$hostarch";
-    &readRelease($relfile, \%macros, \@apps) if (-r $relfile);
-}
+die "Can't find $relfile" unless (-f $relfile);
+&readReleaseFiles($relfile, \%macros, \@apps);
 &expandRelease(\%macros, \@apps);
 
 
@@ -97,7 +88,29 @@ for ($outfile) {
 }
 
 #
-# Parse a configure/RELEASE file.
+# Parse all relevent configure/RELEASE* files and includes
+#
+sub readReleaseFiles {
+    my ($relfile, $Rmacros, $Rapps) = @_;
+
+    return unless (-r $relfile);
+    &readRelease($relfile, $Rmacros, $Rapps);
+    if ($hostarch) {
+	my ($hrelfile) = "$relfile.$hostarch";
+	&readRelease($hrelfile, $Rmacros, $Rapps) if (-r $hrelfile);
+    }
+    if ($arch) {
+	my ($crelfile) = "$relfile.Common.$arch";
+	&readRelease($crelfile, $Rmacros, $Rapps) if (-r $crelfile);
+	if ($hostarch) {
+	    my ($arelfile) = "$relfile.$hostarch.$arch";
+	    &readRelease($arelfile, $Rmacros, $Rapps) if (-r $arelfile);
+	}
+    }
+}
+
+#
+# Parse a configure/RELEASE file and its includes.
 #
 # NB: This subroutine also appears in base/src/makeBaseApp/makeBaseApp.pl
 # If you make changes here, they will be needed there as well.
@@ -113,7 +126,7 @@ sub readRelease {
 	s/\r$//;		# Shouldn't need this, but sometimes...
 	s/\s*#.*$//;		# Remove trailing comments
 	s/\s+$//;		# Remove trailing whitespace
-        next if /^\s*$/;	# Skip blank lines
+	next if /^\s*$/;	# Skip blank lines
 	
 	# Expand all already-defined macros in the line:
 	while (($pre,$var,$post) = /(.*)\$\((\w+)\)(.*)/) {
@@ -165,23 +178,23 @@ sub configAppInclude {
 	    print OUT "export ${app}\n";
 	}
 	foreach $app (@includes) {
-            $path = $macros{$app};
+	    $path = $macros{$app};
 	    next unless (-d "$path/bin/$hostarch");
 	    print OUT "${app}_HOST_BIN = \$(strip \$($app))/bin/\$(EPICS_HOST_ARCH)\n";
 	}
 	foreach $app (@includes) {
-            $path = $macros{$app};
+	    $path = $macros{$app};
 	    next unless (-d "$path/lib/$hostarch");
 	    print OUT "${app}_HOST_LIB = \$(strip \$($app))/bin/\$(EPICS_HOST_ARCH)\n";
 	}
 	foreach $app (@includes) {
-            $path = $macros{$app};
-            next unless (-d "$path/bin/$arch");
+	    $path = $macros{$app};
+	    next unless (-d "$path/bin/$arch");
 	    print OUT "${app}_BIN = \$(strip \$($app))/bin/$arch\n";
 	}
 	foreach $app (@includes) {
-            $path = $macros{$app};
-            next unless (-d "$path/lib/$arch");
+	    $path = $macros{$app};
+	    next unless (-d "$path/lib/$arch");
 	    print OUT "${app}_LIB = \$(strip \$($app))/lib/$arch\n";
 	}
 	# We can't just include TOP in the foreach list:
@@ -191,20 +204,20 @@ sub configAppInclude {
 	print OUT "SHRLIB_SEARCH_DIRS = $path/lib/$arch\n";
 	foreach $app (@includes) {
 	    $path = $macros{$app};
-            next unless (-d "$path/lib/$arch");
+	    next unless (-d "$path/lib/$arch");
 	    print OUT "SHRLIB_SEARCH_DIRS += \$(${app}_LIB)\n";
 	}
     }
     foreach $app (@includes) {
-        $path = $macros{$app};
-        next unless (-d "$path/include");
+	$path = $macros{$app};
+	next unless (-d "$path/include");
 	print OUT "RELEASE_INCLUDES += -I\$(strip \$($app))/include/os/\$(OS_CLASS)\n";
 	print OUT "RELEASE_INCLUDES += -I\$(strip \$($app))/include\n";
     }
     foreach $app (@includes) {
-        $path = $macros{$app};
-        next unless (-d "$path/dbd");
-        print OUT "RELEASE_DBDFLAGS += -I \$(strip \$($app))/dbd\n";
+	$path = $macros{$app};
+	next unless (-d "$path/dbd");
+	print OUT "RELEASE_DBDFLAGS += -I \$(strip \$($app))/dbd\n";
     }
     close OUT;
 }
@@ -218,8 +231,8 @@ sub rulesInclude {
     print OUT "# be lost when the application is next rebuilt.\n\n";
     
     foreach $app (@includes) {
-        $path = $macros{$app};
-        next unless (-r "$path/configure/RULES_BUILD");
+	$path = $macros{$app};
+	next unless (-r "$path/configure/RULES_BUILD");
 	print OUT "-include \$(strip \$($app))/configure/RULES_BUILD\n";
     }
     close OUT;
@@ -237,17 +250,23 @@ sub cdCommands {
     
     print OUT "startup = \"$startup\"\n";
     
+    $ioc = $cwd;
+    $ioc =~ s/^.*\///;	# iocname is last component of directory name
+    
+    print OUT "putenv \"ARCH=$arch\"\n";
+    print OUT "putenv \"IOC=$ioc\"\n";
+    
     foreach $app (@includes) {
 	$iocpath = $path = $macros{$app};
 	$iocpath =~ s/^$root/$iocroot/o if ($opt_t);
 	$app_lc = lc($app);
-	$app_uc = uc($app);
 	print OUT "$app_lc = \"$iocpath\"\n" if (-d $path);
-	print OUT "putenv \"$app_uc=$iocpath\"\n" if (-d $path);
+	print OUT "putenv \"$app=$iocpath\"\n" if (-d $path);
 	print OUT "${app_lc}bin = \"$iocpath/bin/$arch\"\n" if (-d "$path/bin/$arch");
     }
     close OUT;
 }
+
 sub envPaths {
     die "Architecture not set (use -a option)" unless ($arch);
     @includes = grep !/^TEMPLATE_TOP$/, @apps;
@@ -256,7 +275,7 @@ sub envPaths {
     open(OUT,">$outfile") or die "$! creating $outfile";
     
     $ioc = $cwd;
-    $ioc =~ s/^.*\///;
+    $ioc =~ s/^.*\///;	# iocname is last component of directory name
     
     print OUT "epicsEnvSet(ARCH,\"$arch\")\n";
     print OUT "epicsEnvSet(IOC,\"$ioc\")\n";
@@ -264,10 +283,11 @@ sub envPaths {
     foreach $app (@includes) {
 	$iocpath = $path = $macros{$app};
 	$iocpath =~ s/^$root/$iocroot/o if ($opt_t);
-        print OUT "epicsEnvSet($app,\"$iocpath\")\n" if (-d $path);
+	print OUT "epicsEnvSet($app,\"$iocpath\")\n" if (-d $path);
     }
     close OUT;
 }
+
 sub checkRelease {
     $status = 0;
     delete $macros{TOP};
@@ -277,16 +297,13 @@ sub checkRelease {
 	%check = (TOP => $path);
 	@order = ();
 	$relfile = "$path/configure/RELEASE";
-	&readRelease($relfile, \%check, \@order) if (-r $relfile);
-	if ($hostarch) {
-	    $relfile .= ".$hostarch";
-	    &readRelease($relfile, \%check, \@order) if (-r $relfile);
-	}
+	&readReleaseFiles($relfile, \%check, \@order);
 	&expandRelease(\%check, \@order);
 	delete $check{TOP};
 	
 	while (($parent, $ppath) = each %check) {
-	    if (exists $macros{$parent} && ($macros{$parent} ne $ppath)) {
+	    if (exists $macros{$parent} &&
+		abs_path($macros{$parent}) ne abs_path($ppath)) {
 		print "\n" unless ($status);
 		print "Definition of $parent conflicts with $app support.\n";
 		print "In this application configure/RELEASE defines\n";

configure/tools/cvsclean.pl

@@ -0,0 +1,21 @@
+eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
+    if $running_under_some_shell; # cvsclean.pl
+#*************************************************************************
+# 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.
+# This file is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# $Id$
+#
+# Find and delete cvs .#* files in all dirs of directory tree
+
+use File::Find;
+
+@ARGV = ('.') unless @ARGV;
+
+find sub { unlink if -f && m/^\.\#/ }, @ARGV;
+

configure/tools/dos2unix.pl

@@ -0,0 +1,35 @@
+eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
+    if $running_under_some_shell; # makeConfigAppInclude.pl
+#*************************************************************************
+# 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. 
+#*************************************************************************
+
+# Converts text file in DOS CR/LF format to unix ISO format
+#  $Id$
+
+@files=@ARGV;
+
+$| = 1;
+foreach( @files ) {
+    open(INPUT, "<$_");
+    $backup = "$_.bak";
+    rename( $_, $backup) || die "Unable to rename $_\n$!\n";
+    # Make the output be binary so it won't convert /n back to /r/n
+    binmode OUTPUT, ":raw";
+    open(OUTPUT, ">$_");
+    binmode OUTPUT, ":raw";
+    while(<INPUT>) {
+	# Remove CR-LF sequences
+	s/\r\n/\n/;
+	print OUTPUT;
+    }
+    close INPUT;
+    close OUTPUT;
+    unlink ($backup) or die "Cannot remove $backup";
+}