Now works with MakeRelease

and the install target
o eliminated redundant "inc" build by creating buildInstall target

COPYRIGHT_Combined

@@ -0,0 +1,21 @@
+/*      Experimental Physics and Industrial Control System (EPICS)
+ *
+ *      Copyright 1991, the Regents of the University of California,
+ *      and the University of Chicago Board of Governors.
+ *
+ *      This software was produced under  U.S. Government contracts:
+ *      (W-7405-ENG-36) at the Los Alamos National Laboratory,
+ *      and (W-31-109-ENG-38) at Argonne National Laboratory.
+ *
+ *      Initial development by:
+ *              The Controls and Automation Group (AT-8)
+ *              Ground Test Accelerator
+ *              Accelerator Technology Division
+ *              Los Alamos National Laboratory
+ *
+ *      Co-developed with
+ *              The Controls and Computing Group
+ *              Accelerator Systems Division
+ *              Advanced Photon Source
+ *              Argonne National Laboratory
+ ***********************************************************************/

MakeRelease

@@ -10,6 +10,21 @@
 #    [-b] - For fully built release
 #
 # $Log$
+# Revision 1.9  1996/09/04 21:41:36  jba
+# Top level dir no longer passed to MakeRelease
+#
+# Revision 1.8  1996/07/02 13:45:09  jba
+# Added dbd and base/config dirs. Removed epics/config and base/rec.
+#
+# Revision 1.7  1996/06/25 21:54:42  jba
+# Command line parm now base dir
+#
+# Revision 1.6  1996/06/07 19:19:10  jba
+# MakeRelease is now in release tar file.
+#
+# Revision 1.5  1996/03/04 21:03:48  jba
+# epicsVersion.h now in src/include.
+#
 # Revision 1.4  1996/02/20 21:03:53  jba
 # Updated README files to reflect directory changes and new installEpics.
 #
@@ -58,60 +73,50 @@
 #
 #
 
-EPICS=${1};
 
 if [ ! -d src ]; then
 	echo "Cannot find src directory, are you at the top of EPICS base ?"
 	exit 1
 fi
 
-cd $EPICS/base
 
 FULLY_BUILT=NO
-if [ "${2}" = "-b" ]; then
+if [ "${1}" = "-b" ]; then
 	FULLY_BUILT=YES
 	shift
+	if [ "${1}" != "." ]; then
+		echo "TOP: Cannot create a fully built release.";
+		exit 1;
+	fi
 fi
 
-# Retrieve EPICS release string from src/include/epicsVersion.h
-grep EPICS_VERSION_STRING src/include/epicsVersion.h > /dev/null 2>&1 || ERR=1;
+# Retrieve EPICS release string from config/CONFIG_BASE_VERSION
+. config/CONFIG_BASE_VERSION
 
-if [ "$ERR" = "1" ];
+if [ -z "${EPICS_VERSION}" ];
 	then
-		echo "TOP:  Cannot retrieve release number from include/epicsVersion.h";
+		echo "TOP:  Cannot retrieve release number from config/CONFIG_BASE_VERSION";
 		exit 1;
 	fi
 
-RELS=`grep "EPICS_VERSION_STRING" src/include/epicsVersion.h \
-		| sed   -e 's-.*Version--' \
-			-e 's-[  ][      ]*--g' \
-         		-e 's-".*--' \
-                	-e 's-\.0$--'`;
- 
-if [ -z "${RELS}" ];
-	then
-		echo "TOP: Cannot retrieve release number from src/include/epicsVersion.h";
-		exit 1;
-	fi
-
-RELS="R${RELS}";
+RELS="R${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}";
 
 echo TOP: Creating ../${RELS}.Tar;
 
 if [ -f ${RELS}.Tar* ];
 	then
 		echo "TOP: This release has already been created.";
-		echo "TOP: Remove Tar file or edit src/include/epicsVersion.h.";
+		echo "TOP: Remove Tar file or edit config/CONFIG_BASE_VERSION.";
 		exit 1;
 	fi
 
 # Create list of files and dirs to include in Tar file
 
-cd $EPICS
+cd ..
 
 ls base/README* | xargs tar cvf ${RELS}.Tar
 
-ls base/Makefile* > /tmp/make_release.out.$$;
+ls base/Make* > /tmp/make_release.out.$$;
 
 ls base/*COPYRIGHT* >> /tmp/make_release.out.$$;
 
@@ -121,9 +126,6 @@ if [ -d startup ];
 				>> /tmp/make_release.out.$$;
 	fi
 
-find config -name CVS -prune -o \
-		! -type d -print >> /tmp/make_release.out.$$;
-
 # binary / library / default.dctsdr / <rec>Record.h / etc.
 if [ $FULLY_BUILT = "YES" ];
 	then
@@ -139,10 +141,14 @@ if [ $FULLY_BUILT = "YES" ];
 		find base/lib -name CVS -prune -o ! -type d -print \
 				>> /tmp/make_release.out.$$;
 
-		find base/rec -name CVS -prune -o ! -type d -print \
+		find base/dbd -name CVS -prune -o ! -type d -print \
 				>> /tmp/make_release.out.$$;
+
 	fi
 
+find base/config -name CVS -prune -o -name SCCS -prune -o ! -type d -print \
+		| grep -v '/O\..*$' >> /tmp/make_release.out.$$
+
 find base/src -name CVS -prune -o -name SCCS -prune -o ! -type d -print \
 		| grep -v '/O\..*$' >> /tmp/make_release.out.$$
 

Makefile

@@ -1,5 +1,4 @@
 #
-#
 # Top Level EPICS Makefile
 #        by Matthew Needes and Mike Bordua
 #
@@ -11,139 +10,25 @@
 #    However, the release dependencies DOES require a complete
 #         install because the release.% syntax is illegal.
 #
-# $Log$
-# Revision 1.26  1996/01/25 21:37:09  mrk
-# uninstall base/man
-#
-# Revision 1.25  1996/01/25 21:29:42  mrk
-# base/rec=>base/db base/include now installed
-#
-# Revision 1.24  1995/08/17  20:14:59  jba
-# Added base/tools scripts functionality to base/Makefile, removed scripts
-# Moved base/tools/MakeRelease to base dir.
-#
-# Revision 1.23  1995/02/13  15:00:09  jba
-# Changed include file from CONFIG_SITE to CONFIG
-#
-# Revision 1.22  1994/11/14  23:12:17  tang
-# Replace ARCH_TYPE with .
-#
-# Revision 1.1.1.1  1994/11/09  01:08:53  epics
-# Import of R3.12.0Beta
-#
-# Revision 1.18  1994/10/13  19:44:34  mda
-# Introduce temporary symbol (ARCH_TYPE=$$ARCH) and use in later targets/rules
-# to avoid problem with $* symbol resolution in some versions of gnumake.
-#
-# Revision 1.17  1994/10/05  18:45:57  jba
-# Modified syntax of makefile usage
-#
-# Revision 1.16  1994/09/09  17:32:27  jba
-# Cleanup of files
-#
-# Revision 1.15  1994/09/08  17:25:39  mcn
-# Changed clean to tools/Clean.  Added "uninstall" dependency.
-#
-# Revision 1.14  1994/09/07  20:42:19  jba
-# Minor changes
-#
-# Revision 1.13  1994/09/07  19:15:17  jba
-# Modified to eork with extensions and do depends
-#
-# Revision 1.12  1994/08/21  00:55:51  mcn
-# New stuff.
-#
-# Revision 1.11  1994/08/19  15:38:01  mcn
-# Dependencies are now generated with a "make release".
-#
-# Revision 1.10  1994/08/12  18:51:29  mcn
-# Added Log and/or Id.
-#
+# $Id$
 #
 
-EPICS=..
-include $(EPICS)/config/CONFIG
+TOP=.
+include $(TOP)/config/CONFIG_BASE
 
-all: install
+DIRS = src config
 
-build:
-	@(for ARCH in ${BUILD_ARCHS}; do    \
-		${MAKE} $@.$${ARCH}; \
-	done)
-
-install:
-	@(for ARCH in ${BUILD_ARCHS}; do    \
-		${MAKE} $@.$${ARCH}; \
-	done)
-
-depends:
-	@(for ARCH in ${BUILD_ARCHS}; do    \
-		${MAKE} $@.$${ARCH}; \
-	done)
-
-clean:
-	@(for ARCH in ${BUILD_ARCHS}; do    \
-		${MAKE} $@.$${ARCH}; \
-	done)
-
-uninstall:
-	@(for ARCH in ${BUILD_ARCHS}; do    \
-		${MAKE} $@.$${ARCH}; \
-	done)
+include $(TOP)/config/RULES_TOP
 
 release: 
 	@echo TOP: Creating Release...
-	@./MakeRelease ${EPICS}
+	@./MakeRelease
 
-built_release: install
+built_release:
 	@echo TOP: Creating Fully Built Release...
-	@./MakeRelease ${EPICS} -b
-
-#  Notes for single architecture build rules:
-#    CheckArch only has to be run for dirs.% .  That
-#    way it will only be run ONCE when filtering down
-#    dependencies.
-#
-#  CheckArch does not have to be run for cleans
-#    because you might want to eliminate binaries for
-#    an old architecture.
-
-# DIRS RULE  syntax:  make depends.arch
-#              e.g.:  make depends.mv167
-#
-#  Create dependencies for an architecture.  We MUST
-#     do this separately for each architecture because
-#     some things may be included on a per architecture 
-#     basis.
-
-build.%:
-	@echo $*: Building
-	@${MAKE} ${MFLAGS} T_A=$* -f Makefile.subdirs build
-
-install.%:
-	@echo $*: Installing
-	@${MAKE} ${MFLAGS} T_A=$* -f Makefile.subdirs install
-
-depends.%:
-	@echo $*: Performing Make Depends
-	@${MAKE} ${MFLAGS} T_A=$* -f Makefile.subdirs depends
-
-# Illegal Syntax
-
-release.%:
-	@echo
-	@echo "The release.arch syntax is not supported by this build."
-	@echo "   Use 'make release' or 'make built_release' instead."
-	@echo
-
-uninstall.%:
-	@echo "TOP: Uninstalling $* "
-	@rm -rf ./bin/$* ./lib/$* db include man
-	@rm -rf  rec.bak rec
-
-clean.%:
-	@echo "TOP: Cleaning $* "
-	@find src -type d -name "O.$*" -prune -exec rm -rf {} \;
-
+	@./MakeRelease -b $(INSTALL_LOCATION)
 
+uninstall::
+	@DIR1=`pwd`;cd $(INSTALL_LOCATION);DIR2=`pwd`;cd $$DIR1;\
+	if [ "$$DIR1" != "$$DIR2" ]; then rm -fr $(INSTALL_LOCATION)/config; fi
 

Makefile.subdirs

@@ -1,76 +0,0 @@
-#
-# base $Id$
-#
-# EPICS Makefile For Subdirectory Recursions
-#    by Matthew Needes and Mike Bordua
-#
-# $Log$
-# Revision 1.13  1994/09/09  17:32:29  jba
-# Cleanup of files
-#
-# Revision 1.12  1994/09/08  17:25:41  mcn
-# Changed clean to tools/Clean.  Added "uninstall" dependency.
-#
-# Revision 1.11  1994/09/07  19:15:19  jba
-# Modified to eork with extensions and do depends
-#
-# Revision 1.10  1994/08/21  00:55:52  mcn
-# New stuff.
-#
-# Revision 1.9  1994/08/19  15:38:03  mcn
-# Dependencies are now generated with a "make release".
-#
-# Revision 1.8  1994/08/12  18:51:28  mcn
-# Added Log and/or Id.
-#
-#
-
-EPICS=..
-include $(EPICS)/config/CONFIG_BASE
-
-all: build
-
-build: dirs
-	@(for DIR in ${DIRS};						\
-		do							\
-			TMP=`pwd`; echo "${T_A}: $@: $$DIR";	 	\
-			cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@;	\
-			cd $$TMP;					\
-		done)
-
-install: dirs
-	@(for DIR in ${DIRS};						\
-		do							\
-			TMP=`pwd`; echo "${T_A}: $@: $$DIR";	 	\
-			cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@;	\
-			cd $$TMP;					\
-		done)
-
-depends: dirs
-	@(for DIR in ${DIRS};						\
-		do							\
-			TMP=`pwd`; echo "${T_A}: $@: $$DIR";	 	\
-			cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@;	\
-			cd $$TMP;					\
-		done)
-
-dirs:
-	@echo ${T_A}: Creating Directories 
-	@for DIR in ${DIRS};						\
-		do							\
-			TMP=`pwd`; 	\
-			cd $$DIR ;	\
-			if [ -f Makefile.${BUILD_TYPE} ] ; then \
-				test -d O.${T_A} || \
-				mkdir O.${T_A}; \
-				test -f O.${T_A}/Makefile || \
-				ln -s ../Makefile.${BUILD_TYPE} O.${T_A}/Makefile \
-					> /dev/null 2> /dev/null; \
-				test -f O.${T_A}/Target.include || \
-					echo "T_A=${T_A}" > O.${T_A}/Target.include; \
-				test -f O.${T_A}/.DEPENDS || \
-					touch O.${T_A}/.DEPENDS; \
-				fi ; \
-			cd $$TMP;					\
-		done
-

README

@@ -1,7 +1,7 @@
 $Id$
 
 ----------------------------------------------------------------------------
-3.12 EPICS BASE Notes and Build Instructions.
+3.13 EPICS BASE Notes and Build Instructions.
 	- By Matthew Needes
 ----------------------------------------------------------------------------
 
@@ -27,9 +27,9 @@ Notes:
 
 1.2  To add a target architecture to EPICS:
 
-   cd epics/config
-   cp CONFIG_ARCH.mv167 CONFIG_ARCH.YOUR_ARCH
-   edit CONFIG_ARCH.YOUR_ARCH   - For compiler flags / etc.
+   cd base/config
+   cp CONFIG.mv167 CONFIG.YOUR_ARCH
+   edit CONFIG.YOUR_ARCH   - For compiler flags / etc.
 
    cp CONFIG.Vx.68k CONFIG.Vx.YOUR_ARCH_CLASS
    cp CONFIG_SITE.Vx.68k CONFIG_SITE.Vx.YOUR_ARCH_CLASS
@@ -41,35 +41,51 @@ Notes:
 1.3  To build EPICS:
 
    cd epics/base
-   gnumake             - To build and install EPICS.
+   gnumake             - To install include files, build and install EPICS.
+                         (Same as "gnumake inc install")
+   gnumake all         - Same as "gnumake"
    gnumake clean       - To clean temporary object files.  Top level 
-                       clean will remove all the O.ARCH dirs, not
-                       only those specified in BUILD_ARCHS.
+                         clean will remove all the O.ARCH dirs, not
+                         only those specified in BUILD_ARCHS.
+   gnumake uninstall   - Only available at the top level directory.
+                         Cleans directories created by the install.
+   gnumake rebuild     - Same as "gnumake clean uninstall all"
 
-1.4  To create an EPICS release:
+1.4  "Partial" build commands:
 
-   edit base/include/version.h  - ONLY IF you need to change the EPICS
-                                  version number.
+     The complete set of targets now supported are: 
 
-   gnumake release          - Will create Tar file
+            action 
+            arch 
+            action.arch 
+            dir 
+            dir.action 
+            dir.arch 
+            dir.action.arch 
 
-   gnumake built_release    - Will create Tar file, after generating
-                              dependencies, INCLUDING BINARIES.
+      where: 
+            action can be clean, inc, install, depends, or build
+            action can also be uninstall or rebuild at top level only
+            dir is the name of a subdirectory. 
+            arch can be host, cross, sun4, solaris, mv167, ... 
 
-1.5  "Partial" build commands:
+    Examples are:
 
-   gnumake clean.sun4       - Cleans sun4 binaries in O.sun4 dirs only.
-   gnumake install.sun4     - Builds sun4 only.
-   gnumake install.mv167    - Builds mv167 only (a HOST_ARCH build must
-                              be complete before this can be issued).
+       gnumake inc              - To install include files
+       gnumake install.host     - To build and install EPICS for host arch.
+       gnumake install.cross    - To build and install EPICS for Vx archs.
+       gnumake clean.sun4       - Cleans sun4 binaries in O.sun4 dirs only.
+       gnumake install.sun4     - Builds sun4 only.
+       gnumake install.mv167    - Builds mv167 only (a HOST_ARCH build must
+                                  be complete before this can be issued).
 
 NOTES:
-   1. base/MakeRelease will create tar files in the directory ABOVE
-      base.  These tar files are then meant to be untarred at that level.
-      This release will include the "epics/config" directory.
 
-   2. EPICS binaries and shellscripts are installed into the bin/ARCH and
-      lib/ARCH directories. 
+   1. EPICS binaries and shellscripts are installed into the directory
+      $(INSTALL_LOCATION)/bin/ARCH.
+
+   2. EPICS libraries are installed into the $(INSTALL_LOCATION)/lib/ARCH
+      directory.
 
    3. During a normal build (a "make" or "make install"), the "depends"
       dependency will NOT be invoked.  Only if "make depends" is run
@@ -88,7 +104,7 @@ NOTES:
       mv167 target.
 
 ----------------------------------------------------------------------------
-   Part 2  ---  Configuration Files in epics/config
+   Part 2  ---  Configuration Files in epics/base/config
 ----------------------------------------------------------------------------
 CONFIG - This file is meant to be included in the low-level EPICS Makefiles.
 It includes the other EPICS makefiles, and allows individual developers
@@ -107,7 +123,7 @@ manager.  It specifies:
 	etc.
 
 ----------------------------------------------------------------------------
-CONFIG_ARCH.ARCH - This file defines a particular architecture.  It
+CONFIG.ARCH - This file defines a particular architecture.  It
 contains the following variables:
 
 	BUILD_TYPE: Unix / Vx
@@ -115,23 +131,21 @@ contains the following variables:
 	Architecture dependent build flags.  The flag names / contents
 		depend on your architecture class.
 ----------------------------------------------------------------------------
-CONFIG_SITE.BUILD_TYPE.ARCH_CLASS - Contains definitions of where to
-find things, like X11 / Motif, etc.
 ----------------------------------------------------------------------------
-CONFIG.BUILD_TYPE.ARCH_CLASS - Contains definitions pertaining to a
-particular architecture class.  This file's primary usefulness is to
-define compile and link flags.
+CONFIG_SITE.ARCH - Contains site specific definitions pertaining to a
+particular architecture.  This file's primary usefulness is to
+define site specific compile and link flags.
 ----------------------------------------------------------------------------
 CONFIG_COMMON - Contains definitions describing the layout of base.
 ----------------------------------------------------------------------------
-CONFIG_BASE
-CONFIG_EXTENSIONS - Defines what subdirectories get built by default under
-base and extensions.
+CONFIG_BASE -  Defines what subdirectories get built by default under base.
 ----------------------------------------------------------------------------
 RULES.Vx - Rules for building with VxWorks makefiles.
 ----------------------------------------------------------------------------
 RULES.Unix - Rules for building with Unix makefiles.
 ----------------------------------------------------------------------------
+RULES_TOP - Top level rules for building.
+----------------------------------------------------------------------------
 RULES_ARCHS
 RULES_DIRS - Allows top-level type command syntax in low-level directories.
 ----------------------------------------------------------------------------
@@ -143,18 +157,18 @@ Filename                  SYS_MGR  ADD_VX_ARCH  ADD_UNIX_ARCH  DEVELOPER
 
 CONFIG                       m         -             -             m
 CONFIG_SITE                  m         m             m             -
-CONFIG_ARCH.ARCH             -         c             c             -
-CONFIG_SITE.Unix.ARCH_CLASS  m         -             c*            -
-CONFIG_SITE.Vx.ARCH_CLASS    m         c*            -             -
-CONFIG.Unix.ARCH_CLASS       -         -             c*            -
+CONFIG_SITE_ENV              m         -             -             -
+CONFIG.ARCH                  -         c             c             -
+CONFIG_SITE.ARCH             -         c             c             -
 CONFIG.Vx.ARCH_CLASS         -         c*            -             -
 RULES.Vx                     -         -             -             -
 RULES.Unix                   -         -             -             -
 CONFIG_BASE                  -         -             -             -
-CONFIG_EXTENSIONS            -         -             -             -
 CONFIG_COMMON                -         -             -             -
+CONFIG_ENV                   -         -             -             -
 RULES_ARCHS                  -         -             -             -
 RULES_DIRS                   -         -             -             -
+RULES_TOP                    -         -             -             -
 
      m -  Modify an existing file.
      c -  Create a new file.
@@ -172,63 +186,57 @@ RULES_DIRS                   -         -             -             -
             (files are numbered in the order of their inclusion)
 
  src/db/Makefile.Vx     (An example EPICS makefile)
- ^  ^   ^
- |  |   +--- 3.  RULES.Vx
- |  |              Default rules.
- |  +------- 2.  CONFIG
- |              ^ ^ ^ ^ ^
- |              | | | | |
- |              | | | | +- 1. CONFIG_SITE
- |              | | | |             HOST_ARCH = sun4
- |              | | | |             BUILD_ARCHS = $(HOST_ARCH) mv167 hkv2f
- |              | | | |             VX_DIR = /vxworks
- |              | | | |             More.
- |              | | | +--- 2. CONFIG_COMMON
- |              | | |               General info about base.
- |              | | +----- 3. CONFIG_ARCH.hkv2f
- |              | |                 BUILD_TYPE = Vx
- |              | |                 ARCH_CLASS = 68k 
- |              | |                 Arch Specific Compiler Flag Setup
- |              | +------- 4. CONFIG_SITE.Vx.68k
- |              |                   Directory locations
- |              +--------- 5. CONFIG.Vx.68k
- |                                  Compiler/utility setup for ARCH_CLASS
- +---------- 1.  Target.include
-                   T_A definition (target architecture)
+    ^   ^
+    |   +--- 3.  RULES.Vx
+    |              Default rules.
+    +------- 2.  CONFIG
+                  ^ ^ ^ ^
+                  | | | |
+                  | | | +- 1. CONFIG_SITE
+                  | | |             HOST_ARCH = sun4
+                  | | |             BUILD_ARCHS = $(HOST_ARCH) mv167 hkv2f
+                  | | |             VX_DIR = /vxworks
+                  | | |             More.
+                  | | +--- 2. CONFIG_COMMON
+                  | |               General info about base.
+                  | +----- 3. CONFIG.hkv2f
+                  |           ^     BUILD_TYPE = Vx
+                  |           |     ARCH_CLASS = 68k 
+                  |           |     Arch Specific Compiler Flag Setup
+                  |           +---  a. CONFIG.Vx.68k
+                  |                         Compiler/utility setup for ARCH_CLASS
+                  +------- 4. CONFIG_SITE.hkv2f
+                                    Site Specific setup 
 
 ----------------------------  sun4  example --------------------------------
             (files are numbered in the order of their inclusion)
 
  src/db/Makefile.Unix   (An example EPICS makefile)
- ^  ^   ^
- |  |   +--- 3.  RULES.Unix
- |  |              Default rules.
- |  +------- 2.  CONFIG
- |              ^ ^ ^ ^ ^
- |              | | | | |
- |              | | | | +- 1. CONFIG_SITE
- |              | | | |             HOST_ARCH = sun4
- |              | | | |             BUILD_ARCHS = $(HOST_ARCH) mv167 hkv2f
- |              | | | |             VX_DIR = /vxworks
- |              | | | |             More.
- |              | | | +--- 2. CONFIG_COMMON
- |              | | |               General info about base.
- |              | | +----- 3. CONFIG_ARCH.sun4
- |              | |                 BUILD_TYPE = Unix
- |              | |                 ARCH_CLASS = sun4 
- |              | |                 Arch Specific Compiler Flag Setup
- |              | +------- 4. CONFIG_SITE.Unix.sun4
- |              |                   Directory locations
- |              +--------- 5. CONFIG.Unix.sun4
- |                                  Compiler/utility setup for ARCH_CLASS
- +---------- 1.  Target.include
-                   T_A definition (target architecture)
+    ^   ^
+    |   +--- 3.  RULES.Unix
+    |              Default rules.
+    +------- 2.  CONFIG
+                  ^ ^ ^ ^
+                  | | | |
+                  | | | +- 1. CONFIG_SITE
+                  | | |             HOST_ARCH = sun4
+                  | | |             BUILD_ARCHS = $(HOST_ARCH) mv167 hkv2f
+                  | | |             VX_DIR = /vxworks
+                  | | |             More.
+                  | | +--- 2. CONFIG_COMMON
+                  | |               General info about base.
+                  | +----- 3. CONFIG.sun4
+                  |                 BUILD_TYPE = Unix
+                  |                 ARCH_CLASS = sun4 
+                  |                 Arch Specific Compiler Flag Setup
+                  +------- 4. CONFIG_SITE.sun4
+                                    Directory locations
 
 ----------------------------------------------------------------------------
-   Part 4  ---  EPICS dependencies
+   Part 4  ---  EPICS makefile rules
 ----------------------------------------------------------------------------
 
- Dependencies supported by lower level Makefiles:
+ Rules supported by lower level Makefiles:
 
     depends		- Generate include dependencies
     build		- Builds objects, using libraries from "build_libs"

README.WIN32

@@ -0,0 +1,161 @@
+Compiling EPICS on WIN32 (Windows95/NT)
+---------------------------------------
+
+	-kuk- 11/18/96	questions & comments please
+			mailto:kasemir@atdiv.lanl.gov
+
+0) what you will get
+--------------------
+
+Right now this port of EPICS to WIN32 should allow you to
+
+* compile almost all EPICS base using Tornado, MS Visual C
+  and some additional tools: gnumake, a UNIX-like shell, awk, sed, ...
+  (See below where to get these.)
+* load EPICS on a PC IOC (486, pentium),
+  load simple databases
+  (no drivers/devices for real I/O available, yet.
+   Some Greenspring IP support [Relay, Dig, ADC, DAC] is in progress)
+* build and use ca.dll on NT or Win95 to access all IOCs,
+  as well as the Com-library as a DLL.
+  The remaining libraries are statically linked and
+  therefore only accessible from programming languages like C,
+  not general WIN32 apps.
+* build gdd, cas and a demo of the new portable CA server on WIN32.
+* missing: the sequencer, makeExampleApp etc.  and long term tests
+
+1) see what you have
+--------------------
+
+To compiler EPICS on WIN32, we need
+
+	WindRiver Systems Tornado (used: 1.0)
+	Microsoft Visual C       (used: 4.0)
+
+and some tools:
+
+	a Unix-like shell
+	gnumake
+	basename
+	date
+	mv
+	touch
+	sort
+
+All the above except. the shell are available 'on the net'
+as sources which compile with MS Visual C++.
+If you cannot/don't want to find them, contact me, please!
+
+I could not find a shell that's fully operational.
+The best one seems to be the Cygnus bash for WIN32, though it
+still has errors and doesn't come with sources that compile
+under MS VC++.
+I use a small self-written shell called knts,
+again: Contact me if you need it.
+
+* The final solution to make the shell, basename, date, ...
+* obsolete:
+* Use 
+* 1) no shell scripts
+* 2) Perl which is available for Unix and WIN32
+
+In addition we need some binaries that I have no sources
+for, yet, but that come with Tornado if and only if you
+INSTALL THE FULL PACKAGE (!)
+Including the 'WTX Test Suite i386/i486'
+(under "Select Sub-components" when installing Tornado)
+
+You should find in your <Tornado>/host/x86-win32/bin dir:
+
+	awk, cat, cp, rm, mkdir
+
+(There is also a bash and a GNU-make which are really poor,
+ and WindRiver told me that they do not consider to support
+ those in the future, so I no longer use them.)
+
+2) set environment variables
+----------------------------
+
+Your path should include:
+- The EPICS-binaries that we are about to build in base/bin/WIN32
+- The NTtools that you've built in step 1
+- The System (for me it's in NT40...)
+- The MS Visual C compiler binaries
+- The Tornado binaries
+
+Check with e.g.:
+
+/users/kay/Src/epics/nttools >echo $Path
+c:\users\kay\src\epics\base\bin\WIN32;c:\users\kay\src\epics\NTtools\bin;C:\NT40
+\system32;C:\NT40;c:\msdev\bin;C:\users\Tornado\host\x86-win32\bin
+
+On NT, $Path is defined by the operatin system, on Win95, it's $PATH instead.
+knts tries to use PATH and falls back on Path,
+what should wok on both systems.
+
+MS Visual C and Tornado should be installed properly with
+these env. variables set:
+
+WIND_BASE=c:\usersTornado
+WIND_HOST_TYPE=x86-win32
+
+This way the EPICS makesystem can locate Tornado 
+without any changes to the files in base/config.
+So for pc486 the settings in CONFIG_SITE where
+you specify the location of VxWorks are ignored,
+this information is taken from WIND_BASE and _HOST_TYPE!!
+
+MSDevDir=C:\MSDEV
+include=c:\msdev\include;c:\msdev\mfc\include
+lib=c:\msdev\lib;c:\msdev\mfc\lib
+
+(Setting env. vars. is different: for NT, use Settings/System,
+for Win95 use autoexec.bat)
+
+For EPICS, set:
+
+#	select host arch to build:
+HOST_ARCH=WIN32
+
+EPICS_CA_ADDR_LIST              128.165.32.255	(addr of WIN32 host)
+EPICS_CA_AUTO_CA_ADDR_LIST	NO
+EPICS_CA_CONN_TMO		30.0
+EPICS_CA_BEACON_PERIOD		15.0
+EPICS_CA_REPEATER_PORT		5065
+EPICS_CA_SERVER_PORT		5064
+EPICS_TS_MIN_WEST		420		(Germany: -120)
+
+
+To debug knts, set KNTS to 5:
+KNTS=5
+export KNTS
+
+You should do this, however, only if you really want the debugging info.
+
+
+3) building EPICS
+-----------------
+
+Prepare apx. 2 ltr. Tee and type:
+
+	cd <epics>/base
+	gnumake
+
+Watch for errors and send them to me.
+
+There might be loads of compiler warnings.
+Known errors:
+* gnumake seems to be faster than WIN32 sometimes
+  which results in warnings/errors like
+  "file has modification date in the future"
+  for newly vreated things.
+  Very seldom this is fatal, so you have to
+  stop gnumake and restart it.
+* This is strange because Windows95/NT don't care
+  about upper/lower case:
+  WIN32 is WIN32, not win32. Gnumake fails
+  if e.g. base/src/include/os/WIN32 is ...win32.
+
+Good luck !
+
+-Kay

README.niCpu030

@@ -0,0 +1,34 @@
+
+The CPU030 may need to have the nivxi path set correctly:
+	From the vxWorks shell type "vxitedit" (you may need to
+	loading the NI vxitedit package first)
+	take option 2
+	take option 3
+	type list
+	type modify 0
+		type in the correct path when promped
+		(the path should end in nivxi 
+		and should traverse the niCpu030
+		directories shipped with the 030
+		ie something of the form "???/config/niCPU030/nivxi"
+	type save
+	type exit
+	.
+	.
+	.
+
+	see "Getting Started with Your VXIcpu-030" from NI
+
+You may may need to setup front panel to backplane trigger
+routing:
+
+To take a TTL input and map it to VXI backplane ECL trigger 0
+type in (to the vxWorks shell):
+
+epvxiRouteTriggerECL(<logical address>, 1, 0)
+
+where <logical address> specifies the card with the 
+front panel trigger connection.
+
+johill@lanl.gov
+

README.solaris

@@ -1,6 +1,9 @@
 ----------------------------------------------------------------------------
 EPICS R3.12.2 Notes for Solaris
 	- By Andrew Johnson
+
+updated 12-16-96 by Jeff Hill
+
 ----------------------------------------------------------------------------
 
 Notes:
@@ -8,8 +11,10 @@ Notes:
 1. In order to build EPICS under Solaris 2, you must ensure that the
 solaris directory /usr/ccs/bin is in your search path.
 
-2. It is not possible to compile EPICS under Solaris 2 using only the
-GNU gcc compiler -- you must have the Sun SPARCworks ANSI C compiler.
+2. It is now possible to compile EPICS under Solaris 2 using either the
+GNU gcc compiler or the Sun SPARCworks ANSI C compiler. The g++/
+Sun SPARCworks ANSI C compiler combination has compiled and linked
+without errors but has not been extensively tested.
 
 3. EPICS under Solaris 2 no longer uses the UCB compatability libraries.
 In order to ensure that the /usr/ucblib files are not inherited, you

SkeletonCOPYRIGHT_Combined

@@ -0,0 +1,11 @@
+/*****************************************************************
+                          COPYRIGHT NOTIFICATION
+*****************************************************************
+
+(C)  COPYRIGHT 1991 Regents of the University of California,
+and the University of Chicago Board of Governors.
+
+This software was developed under a United States Government license
+described on the COPYRIGHT_Combined file included as part
+of this distribution.
+**********************************************************************/

config/CONFIG

@@ -0,0 +1,46 @@
+#
+#  $Id$
+#
+#  The developer may edit this file.
+
+#  Site-specific build options
+#
+include $(EPICS_BASE)/config/CONFIG_SITE
+ 
+#  EPICS base definitions
+#
+include $(EPICS_BASE)/config/CONFIG_COMMON
+ 
+# assume T_A is the host arch if not specified
+ifndef T_A
+T_A = $(HOST_ARCH)
+endif
+
+#  Architecture specific definitions
+#
+include $(EPICS_BASE)/config/CONFIG.$(T_A)
+#
+-include $(EPICS_BASE)/config/CONFIG_SITE.$(T_A)
+ 
+#  User specific definitions
+#
+-include $(HOME)/.EPICS_CONFIG
+-include $(HOME)/.EPICS_CONFIG.$(HOST_ARCH)
+
+#  All EPICS options other than BUILD_TYPE
+#   may be overridden here.
+#
+# EXAMPLES
+# --------
+#  Build client objects statically ?  must be either YES or NO
+#STATIC_BUILD=NO
+#  Unix Optimization,   must be either YES or NO
+#UNIX_OPT=YES
+#  VxWorks Optimization,  must be either YES or NO
+#VX_OPT=YES
+#  Generate Verbose Compiler Warnings for Unix,  must be either YES or NO
+#UNIX_WARN=YES
+#  Generate Verbose Compiler Warnings for VxWorks,  must be either YES or NO
+#VX_WARN=YES
+#etc.
+#

config/CONFIG.Linux

@@ -0,0 +1,125 @@
+#
+# $Id$
+#
+#  This file is maintained by the EPICS community.
+
+# Compiler and utility invocation (supply path to compiler here)
+#   (with warning flags built in)
+#  Paths to compilers
+
+# BUILD_TYPE
+#   Currently either Vx or Unix
+BUILD_TYPE = Unix
+ 
+GCC = gcc
+ACC = acc
+SUNCC = cc
+AR = ar 
+ARFLAGS = r
+ARCMD = $(AR) $(ARFLAGS)
+RANLIB = ranlib
+RANLIBFLAGS = -t
+YACC = $(EYACC)
+LEX = $(ELEX)
+G++ = g++
+CCC = CC
+MV = mv
+RMDIR = rm -rf
+MKDIR = mkdir
+
+ACC_ANSI_INVOKE_W_NO = $(ACC) -Xa -w
+ACC_ANSI_INVOKE_W_YES = $(ACC) -Xa
+ACC_TRAD_INVOKE_W_NO = $(ACC) -Xs -w
+ACC_TRAD_INVOKE_W_YES = $(ACC) -Xs
+ACC_STRICT_INVOKE_W_NO = $(ACC) -Xc -w
+ACC_STRICT_INVOKE_W_YES = $(ACC) -Xc
+SUNCC_TRAD_INVOKE_W_NO = $(SUNCC) -w
+SUNCC_TRAD_INVOKE_W_YES = $(SUNCC)
+GCC_ANSI_INVOKE_W_NO = $(GCC) -ansi -w
+GCC_ANSI_INVOKE_W_YES = $(GCC) -ansi
+GCC_STRICT_INVOKE_W_NO = $(GCC) -ansi -pedantic
+GCC_STRICT_INVOKE_W_YES = $(GCC) -ansi -Wall -pedantic
+GCC_TRAD_INVOKE_W_NO = $(GCC) -traditional -w
+GCC_TRAD_INVOKE_W_YES = $(GCC) -traditional
+ 
+C_OLD = $($(STANDARD)_TRAD_INVOKE_W_$(UNIX_WARN))
+C_ANSI = $($(ANSI)_ANSI_INVOKE_W_$(UNIX_WARN))
+C_STRICT = $($(ANSI)_STRICT_INVOKE_W_YES)
+CC = $(C_$(CMPLR))
+
+CCC_NORMAL_INVOKE_W_NO = $(CCC) +p
+CCC_NORMAL_INVOKE_W_YES = $(CCC) +p +w 
+CCC_STRICT_INVOKE_W_YES = $(CCC) +p +w 
+CCC_LD_FLAGS = 
+CCC_LD_LIBS = 
+G++_NORMAL_INVOKE_W_NO = $(G++) -ansi -pedantic -w
+G++_NORMAL_INVOKE_W_YES = $(G++) -ansi -pedantic -Wall 
+G++_STRICT_INVOKE_W_YES = $(G++) -ansi -pedantic -Wtraditional -Wall \
+      -Wmissing-prototypes -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Wpointer-arith -Winline
+
+CXX_NORMAL = $($(CPLUSPLUS)_NORMAL_INVOKE_W_$(UNIX_WARN))
+CXX_STRICT = $($(CPLUSPLUS)_STRICT_INVOKE_W_YES)
+
+# GNU make likes CXX instead of CCC
+CXX = $(CXX_$(CXXCMPLR))
+
+# Static Build options
+ACC_SFLAGS_YES= -Bstatic
+ACC_SFLAGS_NO=
+CC_SFLAGS_YES= -Bstatic
+CC_SFLAGS_NO=
+GCC_SFLAGS_YES= -static
+GCC_SFLAGS_NO=
+
+SF_OLD = $($(STANDARD)_SFLAGS_$(STATIC_BUILD))
+SF_ANSI = $($(ANSI)_SFLAGS_$(STATIC_BUILD))
+SF_STRICT = $(SF_ANSI)
+UNIX_SFLAGS = $(SF_$(CMPLR))
+ 
+# Optimization
+OPTIM_YES = -O
+OPTIM_NO =
+UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT))
+
+# Include files
+UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \
+                -I$(EPICS_BASE_INCLUDE)/os/$(T_A)
+ 
+# Operating system flags
+OP_SYS_FLAGS = -DUNIX 
+ 
+UNIX_LDFLAGS = -L$(EPICS_BASE_LIB)
+UNIX_LDLIBS = -lm 
+ 
+ARCH_DEP_CFLAGS = -D_X86_ -Dlinux
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
+
+UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
+ 
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
+ 
+# Target specific flags
+TARGET_CFLAGS = $($(basename $@)_CFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
+TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
+TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
+TARGET_LDLIBS = $($(basename $@)_LDLIBS)
+TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
+
+CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
+
+LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
+ 
+# Override SUN defaults
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS
+DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Linux

config/CONFIG.Vx.68k

@@ -0,0 +1,71 @@
+
+# $Id$
+#
+# This file is maintained by the EPICS community.
+
+AR = $(VX_GNU_BIN)/ar68k
+RANLIB = $(VX_GNU_BIN)/ranlib68k
+YACC = $(EYACC)
+LEX = $(ELEX)
+CC = $(VX_GNU_BIN)/cc68k -B$(VX_GNU_LIB)/gcc-lib/ -nostdinc
+CXX = $(VX_GNU_BIN)/cc68k -B$(VX_GNU_LIB)/gcc-lib/ -nostdinc
+CPP = $(VX_GNU_BIN)/cpp68k -nostdinc
+#CPP = $(CC) -E
+GCC = $(CC)
+LD = $(VX_GNU_BIN)/ld68k -r
+EPICS_LDLIBS =
+MV=mv
+RM=rm -f
+MKDIR = mkdir
+RMDIR=rm -rf
+
+# special c library requirements
+SPECIAL_LANG =
+
+# Compiler flags, don't mess with this
+#    Optimization flags
+VX_OPT_YES = -O
+VX_OPT_NO =
+VX_OPT_FLAGS = $(VX_OPT_$(VX_OPT))
+ 
+#    Include files
+VX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \
+	-I$(EPICS_BASE_INCLUDE)/os/vxWorks -I$(VX_INCLUDE)
+
+#    Warnings
+#At some time we should turn on pedantic
+#VX_WARN_YES = -Wall -pedantic
+VX_WARN_YES = -W
+VX_WARN_NO =
+VX_WARN_FLAGS = $(VX_WARN_$(VX_WARN))
+ 
+#    Operating system flags
+VX_OP_SYS_FLAGS = -DvxWorks -DV5_vxWorks
+ 
+#    Arch dependent flags are set in CONFIG_ARCH.*
+VX_CFLAGS = $(VX_OPT_FLAGS) $(VX_WARN_FLAGS) \
+        $(VX_INCLUDES) $(VX_OP_SYS_FLAGS)
+ 
+#VX_LDFLAGS = -T$(EPICS_BASE)/src/libvxWorks/vxldscript.MRI -o
+VX_LDFLAGS = -o
+ 
+TARGET_CFLAGS = $($(basename $@)_CFLAGS)
+TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
+TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
+TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
+
+CFLAGS = $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VX_CFLAGS)
+CXXFLAGS = $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VX_CFLAGS)
+LDFLAGS = $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(VX_LDFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
+# Build compile line here
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+LINK.c = $(LD) $(LDFLAGS)
+COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+LINK.cc = $(LD) $(LDFLAGS) 
+
+CPPSNCFLAGS = $(VX_INCLUDES)
+
+DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS
+DEPENDS_RULE.cc = -$(COMPILE.cc) -M $(SRCS.cc) > .DEPENDS 
+

config/CONFIG.Vx.pc486

@@ -0,0 +1,91 @@
+# $Id$
+#
+# This file is maintained by the EPICS community.
+
+# OLDINSTALL def used only for releases prior to R3.12.2.2
+# Unix Compiler and other Utilities
+OLDINSTALL = echo CONFIG.Vx.486 OLDINSTALL
+
+MV=mv
+RM=rm -f
+CP=cp
+RMDIR=rm -rf
+MKDIR=mkdir
+
+#	overrides defines in CONFIG_SITE that don't fit Tornado
+#
+#	We are lucky because
+#	this should not really be site specific
+#
+#	(if Tornado is installed correctly
+#	   -> WIND_BASE, WIND_HOST_TYPE set  )
+#
+#	At first we hack a little bit on WIND_BASE 
+#	to convert the DOS style into a Unix style path:
+#
+#	If C: was in WIND_BASE, it's converted into c: (lowercase),
+#	then c: is removed and all '\' are converted into '/'.
+SANE_WIND_BASE := $(subst \,/,$(subst c:,,$(subst C:,c:,$(WIND_BASE))))
+VX_DIR         := $(SANE_WIND_BASE)/target
+VX_GNU         := $(SANE_WIND_BASE)/host/$(WIND_HOST_TYPE)
+VX_GNU_BIN     := $(VX_GNU)/bin
+VX_GNU_LIB     := $(VX_GNU)/lib
+VX_IMAGE        = $(VX_CONFIG_DIR)/$(T_A)/vxWorks
+VX_IMAGE_SYM    = $(VX_CONFIG_DIR)/$(T_A)/vxWorks.sym
+
+
+AR = $(VX_GNU_BIN)/ar386
+RANLIB = $(VX_GNU_BIN)/ranlib386
+YACC = $(EYACC)
+LEX = $(ELEX)
+CC = $(VX_GNU_BIN)/cc386 -B$(VX_GNU_LIB)/gcc-lib/ -nostdinc -fno-builtin -fno-defer-pop
+CPP = $(VX_GNU_BIN)/cpp386 -nostdinc
+#CPP = $(CC) -E
+GCC = $(CC)
+LD = $(VX_GNU_BIN)/ld386 -r
+EPICS_LDLIBS =
+
+# special c library requirements
+SPECIAL_LANG =
+
+# Compiler flags, don't mess with this
+#    Optimization flags
+VX_OPT_YES = -O
+VX_OPT_NO = -O0
+VX_OPT_FLAGS = $(VX_OPT_$(VX_OPT))
+ 
+#    Include files
+VX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE)	\
+	 -I$(EPICS_BASE_INCLUDE)/os/vxWorks -I$(VX_INCLUDE)
+
+#    Warnings
+#At some time we should turn on pedantic
+#VX_WARN_YES = -Wall -pedantic
+VX_WARN_YES = -W
+VX_WARN_NO =
+VX_WARN_FLAGS = $(VX_WARN_$(VX_WARN))
+ 
+#    Operating system flags
+VX_OP_SYS_FLAGS = -DvxWorks -DV5_vxWorks
+ 
+#    Arch dependent flags are set in CONFIG_ARCH.*
+VX_CFLAGS = $(VX_OPT_FLAGS) $(VX_WARN_FLAGS) \
+        $(VX_INCLUDES) $(VX_OP_SYS_FLAGS)
+ 
+VX_LDFLAGS = -o
+ 
+TARGET_CFLAGS = $($(basename $@)_CFLAGS)
+TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
+
+CFLAGS = $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VX_CFLAGS)
+LDFLAGS = $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(VX_LDFLAGS)
+ 
+# Build compile line here
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+COMPILE.cc = $(CC) -x 'c++' $(CFLAGS) $(CPPFLAGS)  -c
+LINK.c = $(LD) $(LDFLAGS)
+
+CPPSNCFLAGS = $(USR_INCLUDES) $(VX_INCLUDES)
+
+DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) >> .DEPENDS
+DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.68k

config/CONFIG.WIN32

@@ -0,0 +1,127 @@
+#	CONFIG.WIN32  -kuk-
+#
+#	The current make-system for WIN32
+#	needs
+#	* gnumake (OK, sources for WIN32 are available)
+#	* several UNIX tools: sed, grep, ... (dito)
+#	* a UNIX-like shell (ouch!)
+#
+#	I found no fully operational shell and no sources for WIN32 so far,
+#	Cygnus' bash e.g. cannot handle this:
+#	(echo a>a; echo b>>a)
+#	Right now I use the knts that I wrote and simplified scripts.
+#	Jeff eliminated many shell-lines in Makefile.*,
+#	the final solution could be:
+#	1) replace shell, awk, grep, sed, ... by  Perl!
+#	2) use C code
+#
+
+#	Set this to the UNIX-like shell that you have:
+SHELL=knts
+
+# BUILD_TYPE
+#   Currently either Vx or Host (latter used to be Unix)
+BUILD_TYPE=Host
+
+#	to identify the general architecture class:
+#	should be BSD, SYSV, WIN32, ...
+#	is: WIN32, sun4, hpux, linux, ...
+#
+ARCH_CLASS=WIN32
+
+
+EXE=.exe
+OBJ=.obj
+
+#	ifdef WIN32   looks better that  ifeq ($(ARCH_CLASS),WIN32)  ??
+WIN32=1
+
+# Compiler and utility invocation (supply path to compiler here)
+#   (with warning flags built in)
+#  Paths to compilers
+YACC = $(EYACC)
+LEX = $(ELEX)
+CC = cl -nologo
+MV=mv
+RM=rm -f
+MKDIR=mkdir
+RMDIR=rm -rf
+
+# Include files
+HOST_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE)	\
+		-I$(EPICS_BASE_INCLUDE)/os/$(ARCH_CLASS)
+ 
+#	Operating system flags (from win32.mak)
+#
+#	__STDC__=0 is a real great idea of Jeff that gives us both:
+#	1) define STDC for EPICS code (pretend ANSI conformance)
+#	2) set it to 0 to use MS C "extensions" (open for _open etc.)
+#	   because MS uses:   if __STDC__ ... disable many nice things
+#
+#	-MDd : use MSVCRTD (run-time as DLL, multi-thread support)
+#	       this also calls for _DLL
+#	-Zi  : included debugging info
+#
+OP_SYS_FLAGS:=-MDd -Zi -VMG -VMV -DWIN32 -D_WIN32 -D_DEBUG -D_WINDOWS \
+	-D_X86_ -D_NTSDK -D_DLL -D__STDC__=0
+
+#	Files and flags needed to link DLLs (used in RULES.Host)
+#
+#	Strange but seems to work without: WIN32LDFLAGS should contain
+#	an entry point:
+#		'-entry:_DllMainCRTStartup$(DLLENTRY)'
+DLLENTRY:=@12
+WIN32SYSTEMLIBS := user32.lib kernel32.lib wsock32.lib advapi32.lib winmm.lib
+
+#	yes, for MS it's I386 for 386, 486, Pentium!
+#	don't mix this with VxWorks which has different BSPs for [34]86 !
+WIN32LDFLAGS := $(WIN32SYSTEMLIBS) -nologo -subsystem:windows -dll\
+		-incremental:no -debug -machine:I386 
+
+#
+#	The remaining lines are very similar to
+#	all other CONFIG.xxx files.
+#	This includes the GCC lines which may be removed?
+#
+
+HOST_LDLIBS:=$(WIN32SYSTEMLIBS)
+ARCH_DEP_CFLAGS =
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
+HOST_CFLAGS = $(HOST_SFLAGS) $(HOST_INCLUDES) $(OP_SYS_FLAGS)
+ 
+HOST_CXXFLAGS = $(HOST_CFLAGS)
+ 
+# Target specific flags
+TARGET_CFLAGS = $($(basename $@)_CFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
+TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
+TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
+TARGET_LDLIBS = $($(basename $@)_LDLIBS)
+TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
+
+CFLAGS = $(HOST_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(HOST_CFLAGS)
+CXXFLAGS = $(HOST_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(HOST_CXXFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
+
+CXX = cl 
+
+LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(HOST_LDFLAGS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(HOST_LDLIBS)
+ 
+# Override SUN defaults
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+
+#	Problem: MS Visual C++ does not recognize  *.cc as C++ source,
+#	we have to compile xx.cc  using the flag -Tp xx.cc,
+#	i.e.  -Tp  has to be immediately before the source file name
+#	-kuk-
+COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp
+
+LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -Fe$@
+LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -Fe$@
+
+#	The DEPENDS_RULE may be a script on other systems,
+#	if you need different rules for .c and .cc,
+#	that script has to figure out what to call.
+#
+DEPENDS_RULE = @echo no DEPENDS_RULE defined in CONFIG.WIN32

config/CONFIG.alpha

@@ -0,0 +1,120 @@
+# CONFIG.Unix.alpha
+#
+#  This file is maintained by the EPICS community.
+
+# BUILD_TYPE
+#   Currently either Vx or Unix
+BUILD_TYPE = Unix
+
+# Compiler and utility invocation (supply path to compiler here)
+#   (with warning flags built in)
+#  Paths to compilers
+GCC = gcc
+ACC = cc -std
+TRADCC = cc -traditional
+AR = ar 
+ARCMD = $(AR) $(ARFLAGS)
+RANLIB = ranlib
+YACC = $(EYACC)
+LEX = $(ELEX)
+G++ = g++
+CCC = CC
+MV = mv
+RMDIR = rm -rf
+MKDIR = mkdir
+
+ACC_ANSI_INVOKE_W_NO = $(ACC) -w
+ACC_ANSI_INVOKE_W_YES = $(ACC)
+ACC_STRICT_INVOKE_W_YES = $(ACC) -stdl -w
+ACC_STRICT_INVOKE_W_NO = $(ACC) -stdl
+ACC_TRAD_INVOKE_W_NO = $(ACC) -w
+ACC_TRAD_INVOKE_W_YES = $(ACC)
+GCC_ANSI_INVOKE_W_NO = $(GCC) -ansi -w
+GCC_ANSI_INVOKE_W_YES = $(GCC) -ansi
+GCC_STRICT_INVOKE_W_NO = $(GCC) -ansi -pedantic
+GCC_STRICT_INVOKE_W_YES = $(GCC) -ansi -Wall -pedantic
+GCC_TRAD_INVOKE_W_NO = $(GCC) -traditional -w
+GCC_TRAD_INVOKE_W_YES = $(GCC) -traditional
+ 
+C_OLD = $($(STANDARD)_TRAD_INVOKE_W_$(UNIX_WARN))
+C_ANSI = $($(ANSI)_ANSI_INVOKE_W_$(UNIX_WARN))
+C_STRICT = $($(ANSI)_STRICT_INVOKE_W_YES)
+CC = $(C_$(CMPLR))
+
+CCC_NORMAL_INVOKE_W_NO = $(CCC) +p
+CCC_NORMAL_INVOKE_W_YES = $(CCC) +p +w 
+CCC_STRICT_INVOKE_W_YES = $(CCC) +p +w 
+CCC_LD_FLAGS =
+CCC_LD_LIBS = 
+G++_NORMAL_INVOKE_W_NO = $(G++) -ansi -pedantic -w
+G++_NORMAL_INVOKE_W_YES = $(G++) -ansi -pedantic -Wall 
+G++_STRICT_INVOKE_W_YES = $(G++) -ansi -pedantic -Wtraditional -Wall \
+      -Wmissing-prototypes -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Wpointer-arith -Winline
+
+CXX_NORMAL = $($(CPLUSPLUS)_NORMAL_INVOKE_W_$(UNIX_WARN))
+CXX_STRICT = $($(CPLUSPLUS)_STRICT_INVOKE_W_YES)
+
+# GNU make likes CXX instead of CCC
+CXX = $(CXX_$(CXXCMPLR))
+
+# Static Build options
+ACC_SFLAGS_YES= -non_shared
+ACC_SFLAGS_NO= -call_shared
+CC_SFLAGS_YES= -non_shared
+CC_SFLAGS_NO= -call_shared
+GCC_SFLAGS_YES= -static
+GCC_SFLAGS_NO=
+
+SF_OLD = $($(STANDARD)_SFLAGS_$(STATIC_BUILD))
+SF_ANSI = $($(ANSI)_SFLAGS_$(STATIC_BUILD))
+SF_STRICT = $(SF_ANSI)
+UNIX_SFLAGS = $(SF_$(CMPLR))
+ 
+# Optimization
+OPTIM_YES = -O
+OPTIM_NO =
+UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT))
+
+# Include files
+UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \
+                -I$(EPICS_BASE_INCLUDE)/os/$(T_A)
+ 
+# Operating system flags
+OP_SYS_FLAGS = -DUNIX
+ 
+SPECIAL_LDFLAGS = 
+UNIX_LDFLAGS = -L$(EPICS_BASE_LIB)
+UNIX_LDLIBS = -lm
+ 
+ARCH_DEP_CFLAGS = -D_OSF_SOURCE -DLITTLE_ENDIAN
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
+UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
+ 
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
+ 
+# Target specific flags
+TARGET_CFLAGS = $($(basename $@)_CFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
+TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
+TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
+TARGET_LDLIBS = $($(basename $@)_LDLIBS)
+TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
+
+CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
+
+LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
+ 
+# Override defaults
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+DEPEND_RULE.c = @echo no DEPENDS_RULE.c defined in CONFIG.alpha
+DEPEND_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.alpha
+

config/CONFIG.hkv2f

@@ -0,0 +1,17 @@
+
+# $Id$
+#
+# This file is maintained by the EPICS community.
+
+# BUILD_TYPE
+BUILD_TYPE = Vx
+
+# For Vx directories of form:
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+ARCH_CLASS = 68k
+
+include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS)
+ 
+# Architecture specific build flags
+ARCH_DEP_CFLAGS = -DCPU=MC68020 -m68020 -DCPU_FAMILY=MC680X0
+ 

config/CONFIG.hp700

@@ -0,0 +1,129 @@
+# CONFIG.Unix.hp700
+#
+#  This file is maintained by the EPICS community.
+
+# BUILD_TYPE
+#   Currently either Vx or Unix
+BUILD_TYPE = Unix
+
+# Compiler and utility invocation (supply path to compiler here)
+#   (with warning flags built in)
+#  Paths to compilers
+GCC = gcc
+ACC = cc -Aa
+HPACC = cc -Aa
+HPCC = cc -Ac
+TRADCC = cc
+AR = ar 
+ARCMD = $(AR) $(ARFLAGS)
+RANLIB = ranlib
+YACC = $(EYACC)
+LEX = $(ELEX)
+G++ = g++
+CCC = CC
+MV = mv
+RMDIR = rm -rf
+MKDIR = mkdir
+
+ACC_ANSI_INVOKE_W_NO = $(ACC) -w
+ACC_ANSI_INVOKE_W_YES = $(ACC)
+ACC_TRAD_INVOKE_W_NO = $(TRADCC) -w
+ACC_TRAD_INVOKE_W_YES = $(TRADCC)
+ACC_STRICT_INVOKE_W_NO = $(ACC) -w
+ACC_STRICT_INVOKE_W_YES = $(ACC)
+HPACC_ANSI_INVOKE_W_NO = $(HPACC) -w 
+HPACC_ANSI_INVOKE_W_YES = $(HPACC)
+HPCC_TRAD_INVOKE_W_NO = $(HPCC) -w
+HPCC_TRAD_INVOKE_W_YES = $(HPCC)
+HPACC_STRICT_INVOKE_W_NO = $(HPACC) -w
+HPACC_STRICT_INVOKE_W_YES = $(HPACC)
+
+GCC_ANSI_INVOKE_W_NO = $(GCC) -ansi -w
+GCC_ANSI_INVOKE_W_YES = $(GCC) -ansi
+GCC_STRICT_INVOKE_W_YES = $(GCC) -ansi -Wall -pedantic
+GCC_TRAD_INVOKE_W_NO = $(GCC) -traditional -w
+GCC_TRAD_INVOKE_W_YES = $(GCC) -traditional
+
+CCC_NORMAL_INVOKE_W_NO = $(CCC) +p
+CCC_NORMAL_INVOKE_W_YES = $(CCC) +p +w 
+CCC_STRICT_INVOKE_W_YES = $(CCC) +p +w 
+CCC_LD_FLAGS =
+CCC_LD_LIBS = 
+G++_NORMAL_INVOKE_W_NO = $(G++) -ansi -pedantic -w
+G++_NORMAL_INVOKE_W_YES = $(G++) -ansi -pedantic -Wall 
+G++_STRICT_INVOKE_W_YES = $(G++) -ansi -pedantic -Wtraditional -Wall \
+      -Wmissing-prototypes -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Wpointer-arith -Winline
+
+CXX_NORMAL = $($(CPLUSPLUS)_NORMAL_INVOKE_W_$(UNIX_WARN))
+CXX_STRICT = $($(CPLUSPLUS)_STRICT_INVOKE_W_YES)
+
+# GNU make likes CXX instead of CCC
+CXX = $(CXX_$(CXXCMPLR))
+
+C_OLD = $($(STANDARD)_TRAD_INVOKE_W_$(UNIX_WARN))
+C_ANSI = $($(ANSI)_ANSI_INVOKE_W_$(UNIX_WARN))
+C_STRICT = $($(ANSI)_STRICT_INVOKE_W_YES)
+CC = $(C_$(CMPLR))
+
+# Static Build options
+ACC_SFLAGS_YES= -Wl,-a,archive
+ACC_SFLAGS_NO=
+CC_SFLAGS_YES= -Wl,-a,archive
+CC_SFLAGS_NO=
+GCC_SFLAGS_YES= -static
+GCC_SFLAGS_NO=
+
+SF_OLD = $($(STANDARD)_SFLAGS_$(STATIC_BUILD))
+SF_ANSI = $($(ANSI)_SFLAGS_$(STATIC_BUILD))
+SF_STRICT = $(SF_ANSI)
+UNIX_SFLAGS = $(SF_$(CMPLR))
+ 
+# Optimization
+OPTIM_YES = -O
+OPTIM_NO =
+UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT))
+
+# Include files
+UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \
+                -I$(EPICS_BASE_INCLUDE)/os/$(T_A)
+ 
+# Operating system flags
+OP_SYS_FLAGS = -DUNIX
+ 
+SPECIAL_LDFLAGS = 
+UNIX_LDFLAGS = -L$(EPICS_BASE_LIB)
+UNIX_LDLIBS = -lm
+ 
+ARCH_DEP_CFLAGS = -D_HPUX_SOURCE -DHP_UX
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
+
+UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
+ 
+# Target specific flags
+TARGET_CFLAGS = $($(basename $@)_CFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
+TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
+TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
+TARGET_LDLIBS = $($(basename $@)_LDLIBS)
+TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
+
+CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
+
+ARFLAGS = rv
+
+LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
+ 
+# Override defaults
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
+DEPENDS_RULE.c = @echo no DEPENDS_RULE.c defined in CONFIG.hp700
+DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.hp700
+

config/CONFIG.mv147

@@ -0,0 +1,16 @@
+
+# $Id$
+#
+# This file is maintained by the EPICS community.
+
+BUILD_TYPE = Vx
+
+# For Vx directories of form:
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+ARCH_CLASS = 68k
+ 
+include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS)
+
+# Architecture specific build flags
+ARCH_DEP_CFLAGS = -DCPU=MC68030 -m68030 -DCPU_FAMILY=MC680X0
+ 

config/CONFIG.mv162

@@ -0,0 +1,17 @@
+
+# $Id$
+#
+# This file is maintained by the EPICS community.
+
+# BUILD_TYPE
+BUILD_TYPE = Vx
+
+# For Vx directories of form:
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+ARCH_CLASS = 68k
+
+include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS)
+ 
+# Architecture specific build flags
+ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0
+ 

config/CONFIG.mv162lc

@@ -0,0 +1,16 @@
+
+# $Id$
+#
+# This file is maintained by the EPICS community.
+
+# BUILD_TYPE
+BUILD_TYPE = Vx
+
+# For Vx directories of form:
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+ARCH_CLASS = 68k
+
+include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS)
+ 
+# Architecture specific build flags
+ARCH_DEP_CFLAGS = -DCPU=MC68040 -msoft-float -DCPU_FAMILY=MC680X0

config/CONFIG.mv167

@@ -0,0 +1,16 @@
+
+# $Id$
+#
+# This file is maintained by the EPICS community.
+
+BUILD_TYPE = Vx
+
+# For Vx directories of form:
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+ARCH_CLASS = 68k
+
+include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS)
+ 
+# Architecture specific build flags
+ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0
+ 

config/CONFIG.niCpu030

@@ -0,0 +1,16 @@
+
+# BUILD_TYPE
+#   Currently either Vx or Unix
+BUILD_TYPE = Vx
+
+# For Vx directories of form:
+#
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+#
+ARCH_CLASS = 68k
+
+include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS)
+
+# Architecture specific build flags
+ARCH_DEP_CFLAGS = -DCPU=MC68030 -m68030 -DCPU_FAMILY=MC680X0
+ 

config/CONFIG.pc486

@@ -0,0 +1,27 @@
+SHELL=knts
+
+# BUILD_TYPE
+#   Currently either Vx or Unix
+BUILD_TYPE = Vx
+
+# For Vx directories of form:
+#
+#   $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+#
+# And configuration files:
+#
+#   CONFIG_SITE.Vx.68k  -or-  CONFIG_SITE.Unix.sun4
+#
+ARCH_CLASS = pc486
+
+include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS)
+
+# Architecture specific build flags
+# Defines:
+#	CPU, CPU_FAMILY is used by VxWorks header files,
+#	_X86_ is used in base/src/ca
+#
+#	-g is for debugging information, I didn't know where elso to put it
+#
+ARCH_DEP_CFLAGS = -DCPU=I80486 -m486 -DCPU_FAMILY=I80x86 -D_X86_ -g
+ 

config/CONFIG.sgi

@@ -0,0 +1,125 @@
+#
+# $Id$
+#
+#  This file is maintained by the EPICS community.
+
+# BUILD_TYPE
+#   Currently either Vx or Unix
+BUILD_TYPE = Unix
+ 
+# Compiler and utility invocation (supply path to compiler here)
+#   (with warning flags built in)
+#  Paths to compilers
+GCC = cc
+ACC = cc
+KRCC = cc -cckr
+AR = ar 
+ARCMD = $(AR) $(ARFLAGS)
+ARFLAGS = r
+RANLIB = ls
+RANLIBFLAGS =
+YACC = $(EYACC)
+LEX = $(ELEX)
+G++ = g++
+CCC = CC
+MV = mv
+RMDIR = rm -rf
+MKDIR = mkdir
+
+ACC_ANSI_INVOKE_W_NO = $(ACC) -xansi -w
+ACC_ANSI_INVOKE_W_YES = $(ACC) -xansi
+ACC_TRAD_INVOKE_W_NO = $(ACC) -Xs -xansi -w
+ACC_TRAD_INVOKE_W_YES = $(ACC) -Xs -xansi
+KRCC_TRAD_INVOKE_W_NO = $(KRCC) -w
+KRCC_TRAD_INVOKE_W_YES = $(KRCC)
+ACC_STRICT_INVOKE_W_NO = $(ACC) -ansi -w
+ACC_STRICT_INVOKE_W_YES = $(ACC) -ansi
+GCC_ANSI_INVOKE_W_NO = $(GCC) -ansi -w
+GCC_ANSI_INVOKE_W_YES = $(GCC) -ansi
+GCC_STRICT_INVOKE_W_NO = $(GCC) -ansi -pedantic
+GCC_STRICT_INVOKE_W_YES = $(GCC) -ansi -Wall -pedantic
+GCC_TRAD_INVOKE_W_NO = $(GCC) -traditional -w
+GCC_TRAD_INVOKE_W_YES = $(GCC) -traditional
+ 
+C_OLD = $(KRCC_TRAD_INVOKE_W_$(UNIX_WARN))
+C_ANSI = $($(ANSI)_ANSI_INVOKE_W_$(UNIX_WARN))
+C_STRICT = $($(ANSI)_STRICT_INVOKE_W_YES)
+CC = $(C_$(CMPLR))
+
+CCC_NORMAL_INVOKE_W_NO = $(CCC) +p
+CCC_NORMAL_INVOKE_W_YES = $(CCC) +p +w 
+CCC_STRICT_INVOKE_W_YES = $(CCC) +p +w 
+CCC_LD_FLAGS =
+CCC_LD_LIBS = 
+G++_NORMAL_INVOKE_W_NO = $(G++) -ansi -pedantic -w
+G++_NORMAL_INVOKE_W_YES = $(G++) -ansi -pedantic -Wall 
+G++_STRICT_INVOKE_W_YES = $(G++) -ansi -pedantic -Wtraditional -Wall \
+      -Wmissing-prototypes -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Wpointer-arith -Winline
+
+CXX_NORMAL = $($(CPLUSPLUS)_NORMAL_INVOKE_W_$(UNIX_WARN))
+CXX_STRICT = $($(CPLUSPLUS)_STRICT_INVOKE_W_YES)
+
+# GNU make likes CXX instead of CCC
+CXX = $(CXX_$(CXXCMPLR))
+
+
+# Static Build options
+ACC_SFLAGS_YES= -Bstatic
+ACC_SFLAGS_NO=
+CC_SFLAGS_YES= -Bstatic
+CC_SFLAGS_NO=
+GCC_SFLAGS_YES= -static
+GCC_SFLAGS_NO=
+
+SF_OLD = $($(STANDARD)_SFLAGS_$(STATIC_BUILD))
+SF_ANSI = $($(ANSI)_SFLAGS_$(STATIC_BUILD))
+SF_STRICT = $(SF_ANSI)
+UNIX_SFLAGS = $(SF_$(CMPLR))
+ 
+# Optimization
+OPTIM_YES = -O
+OPTIM_NO =
+UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT))
+
+# Include files
+UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \
+                -I$(EPICS_BASE_INCLUDE)/os/$(T_A)
+ 
+# Operating system flags
+OP_SYS_FLAGS = -DUNIX
+ 
+UNIX_LDFLAGS = -L$(EPICS_BASE_LIB)
+UNIX_LDLIBS = -lm
+ 
+ARCH_DEP_CFLAGS = -DSGI
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
+UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
+ 
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
+ 
+# Target specific flags
+TARGET_CFLAGS = $($(basename $@)_CFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
+TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
+TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
+TARGET_LDLIBS = $($(basename $@)_LDLIBS)
+TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
+
+CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
+
+LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
+ 
+# Override defaults
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LOAD.c = ld -shared $(LDFLAGS)
+
+DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS
+DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.sgi

config/CONFIG.solaris

@@ -0,0 +1,164 @@
+#
+# $Id$: CONFIG.Unix.solaris,v $
+#
+#  This file is maintained by the EPICS community.
+
+# BUILD_TYPE
+#   Currently either Vx or Host
+BUILD_TYPE = Host
+
+ARCH_CLASS = solaris
+ 
+# Compiler and utility invocation (supply path to compiler here)
+#   (with warning flags built in)
+#  Paths to compilers
+GCC = /opt/gnu/bin/gcc 
+ACC = $(SPARCWORKS)/bin/cc
+# SUNCC doesn't exist under Solaris
+
+#
+# required by sun's C++ compiler
+#
+AR = ar
+_AR = $(AR) $(ARFLAGS)
+G++_AR = $(_AR)
+CCC_AR = $(CCC) -xar -o
+ARCMD = $($(CPLUSPLUS)_AR)
+
+RANLIB =
+YACC = $(EYACC)
+LEX = $(ELEX)
+G++ = /opt/gnu/bin/g++
+CCC = /opt/SUNWspro/bin/CC
+
+RMDIR = rm -rf
+MKDIR = mkdir
+CP=cp
+MV=mv
+RM=rm -f
+MKDIR=mkdir
+RMDIR=rm -rf
+EXE=
+OBJ=.o
+
+
+ACC_ANSI_INVOKE_W_NO = $(ACC) -Xa -w
+ACC_ANSI_INVOKE_W_YES = $(ACC) -Xa
+ACC_STRICT_INVOKE_W_YES = $(ACC) -Xc -v
+ACC_TRAD_INVOKE_W_NO = $(ACC) -Xs -w
+ACC_TRAD_INVOKE_W_YES = $(ACC) -Xs
+ACC_LD_FLAGS = 
+ACC_LD_LIBS =
+SUNCC_TRAD_INVOKE_W_NO = $(ACC_TRAD_INVOKE_W_NO)
+SUNCC_TRAD_INVOKE_W_YES = $(ACC_TRAD_INVOKE_W_YES)
+GCC_ANSI_INVOKE_W_NO = $(GCC) -ansi -w
+GCC_ANSI_INVOKE_W_YES = $(GCC) -ansi
+GCC_STRICT_INVOKE_W_YES = $(GCC) -ansi -Wall -pedantic
+GCC_TRAD_INVOKE_W_NO = $(GCC) -traditional -w
+GCC_TRAD_INVOKE_W_YES = $(GCC) -traditional
+GCC_LD_LIBS = 
+GCC_LD_FLAGS =
+
+C_OLD = $($(STANDARD)_TRAD_INVOKE_W_$(UNIX_WARN))
+C_ANSI = $($(ANSI)_ANSI_INVOKE_W_$(UNIX_WARN))
+C_STRICT = $($(ANSI)_STRICT_INVOKE_W_YES)
+CC = $(C_$(CMPLR))
+
+LD_LIBS_OLD = $($(STANDARD)_LD_LIBS)
+LD_LIBS_ANSI = $($(ANSI)_LD_LIBS)
+LD_LIBS_STRICT = $($(ANSI)_LD_LIBS)
+CCOMPILER_LDLIBS = $(LD_LIBS_$(CMPLR))
+LD_FLAGS_OLD = $($(STANDARD)_LD_FLAGS)
+LD_FLAGS_ANSI = $($(ANSI)_LD_FLAGS)
+LD_FLAGS_STRICT = $($(ANSI)_LD_FLAGS)
+CCOMPILER_LDFLAGS = $(LD_FLAGS_$(CMPLR))
+
+CCC_NORMAL_INVOKE_W_NO = $(CCC) +p
+CCC_NORMAL_INVOKE_W_YES = $(CCC) +p +w
+CCC_STRICT_INVOKE_W_YES = $(CCC) +p +w
+CCC_LD_FLAGS = -L$(SPECIAL_LANG)
+CCC_LD_LIBS =
+G++_NORMAL_INVOKE_W_NO = $(G++) -ansi -pedantic -w
+G++_NORMAL_INVOKE_W_YES = $(G++) -ansi -pedantic -Wall
+G++_STRICT_INVOKE_W_YES = $(G++) -ansi -pedantic -Wtraditional -Wall \
+      -Wmissing-prototypes -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Wpointer-arith -Winline
+
+CXX_NORMAL = $($(CPLUSPLUS)_NORMAL_INVOKE_W_$(UNIX_WARN))
+CXX_STRICT = $($(CPLUSPLUS)_STRICT_INVOKE_W_YES)
+ 
+# GNU make likes CXX instead of CCC
+CXX = $(CXX_$(CXXCMPLR))
+
+# Static Build options
+#ACC_SFLAGS_YES= -dn
+ACC_SFLAGS_YES= -Bstatic
+ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX
+ACC_SLIBS_NO=
+ACC_SFLAGS_NO=
+CC_SFLAGS_YES= -dn
+CC_SFLAGS_NO=
+GCC_SFLAGS_YES= -static
+GCC_SFLAGS_NO=
+
+SF_OLD = $($(STANDARD)_SFLAGS_$(STATIC_BUILD))
+SF_ANSI = $($(ANSI)_SFLAGS_$(STATIC_BUILD))
+SF_STRICT = $(SF_ANSI)
+UNIX_SFLAGS = $(SF_$(CMPLR))
+ 
+SL_OLD = $($(STANDARD)_SLIBS_$(STATIC_BUILD))
+SL_ANSI = $($(ANSI)_SLIBS_$(STATIC_BUILD))
+SL_STRICT = $(SL_ANSI)
+UNIX_SLIBS = $(SL_$(CMPLR))
+ 
+# Optimization
+OPTIM_YES = -O
+OPTIM_NO =
+UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT))
+
+# Include files
+UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \
+                -I$(EPICS_BASE_INCLUDE)/os/$(T_A)
+ 
+# Operating system flags
+OP_SYS_FLAGS = -DUNIX
+ 
+UNIX_LDFLAGS = -L$(EPICS_BASE_LIB) $(CCOMPILER_LDFLAGS)
+UNIX_LDLIBS = $(UNIX_SLIBS) -lm $(CCOMPILER_LDLIBS)
+ 
+# Architecture specific build flags
+ARCH_DEP_CFLAGS = -DSOLARIS 
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
+ARCH_DEP_LDLIBS = -lsocket -lnsl
+# -lsocket     needed by libca.a
+# -lnsl        needed by libca.a 
+ 
+UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
+ 
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
+ 
+# Target specific flags
+TARGET_CFLAGS = $($(basename $@)_CFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
+TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
+TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
+TARGET_LDLIBS = $($(basename $@)_LDLIBS)
+TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
+
+CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
+
+LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
+ 
+# Override SUN defaults
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+# Unlike the 'Unix' makesystem, output flags -o .. are now part of LINK.c[c]
+LINK.c = $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+DEPENDS_RULE.c = -$(COMPILE.c) -xM $(SRCS.c) > .DEPENDS
+DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.solaris

config/CONFIG.sun4

@@ -0,0 +1,161 @@
+#
+# $Id$
+#
+#  This file is maintained by the EPICS community.
+
+# BUILD_TYPE
+#   Currently either Vx or Host
+
+BUILD_TYPE = Host
+
+ARCH_CLASS=sun4
+ 
+# Compiler and utility invocation (supply path to compiler here)
+#   (with warning flags built in)
+#  Paths to compilers
+GCC = gcc 
+ACC = /usr/lang/acc
+SUNCC = cc
+RANLIB = ranlib
+RANLIBFLAGS = -t
+YACC = $(EYACC)
+LEX = $(ELEX)
+G++ = g++
+CCC = /usr/lang/CC
+
+RMDIR = rm -rf
+MKDIR = mkdir
+CP=cp
+MV=mv
+RM=rm -f
+EXE=
+OBJ=.o
+
+#
+# original before use of sun C++
+#
+
+#
+# required by sun's C++ compiler
+#
+ARFLAGS = r
+AR = ar
+_AR = $(AR) $(ARFLAGS)
+G++_AR = $(_AR) 
+CCC_AR = $(CCC) -xar -o 
+ARCMD = $($(CPLUSPLUS)_AR)
+
+ACC_ANSI_INVOKE_W_NO = $(ACC) -Xa -w
+ACC_ANSI_INVOKE_W_YES = $(ACC) -Xa
+ACC_TRAD_INVOKE_W_NO = $(ACC) -Xs -w
+ACC_TRAD_INVOKE_W_YES = $(ACC) -Xs
+ACC_STRICT_INVOKE_W_NO = $(ACC) -Xc -w
+ACC_STRICT_INVOKE_W_YES = $(ACC) -Xc -vc
+ACC_LD_FLAGS = -L$(SPECIAL_LANG)
+ACC_LD_LIBS = 
+SUNCC_TRAD_INVOKE_W_NO = $(SUNCC) -w
+SUNCC_TRAD_INVOKE_W_YES = $(SUNCC)
+GCC_ANSI_INVOKE_W_NO = $(GCC) -ansi -w -D__USE_FIXED_PROTOTYPES__
+GCC_ANSI_INVOKE_W_YES = $(GCC) -ansi -D__USE_FIXED_PROTOTYPES__
+GCC_STRICT_INVOKE_W_NO = $(GCC) -ansi -pedantic -D__USE_FIXED_PROTOTYPES__
+GCC_STRICT_INVOKE_W_YES = $(GCC) -ansi -Wall -pedantic -D__USE_FIXED_PROTOTYPES__
+GCC_TRAD_INVOKE_W_NO = $(GCC) -traditional -w
+GCC_TRAD_INVOKE_W_YES = $(GCC) -traditional
+GCC_LD_LIBS = -liberty
+GCC_LD_FLAGS = 
+ 
+C_OLD = $($(STANDARD)_TRAD_INVOKE_W_$(UNIX_WARN))
+C_ANSI = $($(ANSI)_ANSI_INVOKE_W_$(UNIX_WARN))
+C_STRICT = $($(ANSI)_STRICT_INVOKE_W_YES)
+CC = $(C_$(CMPLR))
+
+LD_LIBS_OLD = $($(STANDARD)_LD_LIBS)
+LD_LIBS_ANSI = $($(ANSI)_LD_LIBS)
+LD_LIBS_STRICT = $($(ANSI)_LD_LIBS)
+CCOMPILER_LDLIBS = $(LD_LIBS_$(CMPLR))
+LD_FLAGS_OLD = $($(STANDARD)_LD_FLAGS)
+LD_FLAGS_ANSI = $($(ANSI)_LD_FLAGS)
+LD_FLAGS_STRICT = $($(ANSI)_LD_FLAGS)
+CCOMPILER_LDFLAGS = $(LD_FLAGS_$(CMPLR))
+
+CCC_NORMAL_INVOKE_W_NO = $(CCC) +p
+CCC_NORMAL_INVOKE_W_YES = $(CCC) +p +w 
+CCC_STRICT_INVOKE_W_YES = $(CCC) +p +w 
+CCC_LD_FLAGS = -L$(SPECIAL_LANG)
+CCC_LD_LIBS = 
+G++_NORMAL_INVOKE_W_NO = $(G++) -ansi -pedantic -w
+G++_NORMAL_INVOKE_W_YES = $(G++) -ansi -pedantic -Wall 
+G++_STRICT_INVOKE_W_YES = $(G++) -ansi -pedantic -Wtraditional -Wall \
+      -Wmissing-prototypes -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Wpointer-arith -Winline
+
+CXX_NORMAL = $($(CPLUSPLUS)_NORMAL_INVOKE_W_$(UNIX_WARN))
+CXX_STRICT = $($(CPLUSPLUS)_STRICT_INVOKE_W_YES)
+
+# GNU make likes CXX instead of CCC
+CXX = $(CXX_$(CXXCMPLR))
+
+
+# Static Build options
+ACC_SFLAGS_YES= -Bstatic
+ACC_SFLAGS_NO=
+CC_SFLAGS_YES= -Bstatic
+CC_SFLAGS_NO=
+GCC_SFLAGS_YES= -static
+GCC_SFLAGS_NO=
+
+SF_OLD = $($(STANDARD)_SFLAGS_$(STATIC_BUILD))
+SF_ANSI = $($(ANSI)_SFLAGS_$(STATIC_BUILD))
+SF_STRICT = $(SF_ANSI)
+UNIX_SFLAGS = $(SF_$(CMPLR))
+ 
+# Optimization
+OPTIM_YES = -O
+OPTIM_NO =
+UNIX_OPT_FLAGS = $(OPTIM_$(UNIX_OPT))
+
+# Include files
+UNIX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(EPICS_BASE_INCLUDE) \
+                -I$(EPICS_BASE_INCLUDE)/os/$(T_A)
+ 
+# Operating system flags
+OP_SYS_FLAGS = -DUNIX
+ 
+
+UNIX_LDFLAGS = -L$(EPICS_BASE_LIB) $(CCOMPILER_LDFLAGS)
+
+UNIX_LDLIBS = -lm $(CCOMPILER_LDLIBS)
+
+ARCH_DEP_CFLAGS = -DSUNOS4
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
+UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
+ 
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
+ 
+# Target specific flags
+TARGET_CFLAGS = $($(basename $@)_CFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
+TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
+TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
+TARGET_LDLIBS = $($(basename $@)_LDLIBS)
+TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
+
+CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
+
+LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
+ 
+# Override SUN defaults
+COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+
+# changed from 'Unix' makesystem:
+# link command now contains the output flag '-o $@'
+LINK.c = $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS
+DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.sun4

config/CONFIG_BASE

@@ -0,0 +1,50 @@
+#
+#  $Id$
+#
+
+# the order of following list is important
+
+#
+# for c++ build add the dirs gdd and cas after ca
+# (and uncomment the c++ files in src/lbCom/Makefile.Unix)
+#
+DIRS = \
+    tools \
+    include \
+    cxxTemplates \
+    toolsComm\
+    libCom \
+    libvxWorks\
+    cvtDctsdr \
+    dbStatic \
+    db \
+    bpt \
+    ca \
+    util \
+    misc \
+    sequencer \
+    dbtools \
+    rsrv\
+    rec\
+    as \
+    drv\
+    dev\
+    devOpt\
+    iocCore
+
+EPICS_BASE = $(TOP)
+
+# EPICS include config file
+include $(EPICS_BASE)/config/CONFIG
+
+EPICS_BASE = $(INSTALL_LOCATION)
+
+#
+# this speeds up the build by turning off implicit rules search
+#
+.PHONY:: $(EPICS_BASE)/config/CONFIG
+.PHONY:: $(EPICS_BASE)/config/CONFIG.* $(EPICS_BASE)/config/CONFIG_* 
+.PHONY:: $(EPICS_BASE)/config/RULES.* $(EPICS_BASE)/config/RULES_* .DEPENDS
+.PHONY:: $(HOME)/.EPICS_CONFIG $(HOME)/.EPICS_CONFIG.$(HOST_ARCH)
+.PHONY:: ../Makefile.Vx ../Makefile.Unix ../Makefile.Host Makefile
+

config/CONFIG_BASE_VERSION

@@ -0,0 +1,19 @@
+#
+#  $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=3
+EPICS_REVISION=13
+EPICS_MODIFICATION=0
+EPICS_UPDATE_NAME=beta
+EPICS_UPDATE_LEVEL=5
+
+EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}"
+
+CVS_DATE="\$$Date$$"
+

config/CONFIG_COMMON

@@ -0,0 +1,80 @@
+#
+#  $Id$
+#
+#  CONFIG_COMMON - Another EPICS BASE config file
+#	by Matthew Needes and Mike Bordua
+#
+#  This file is to be maintained by the EPICS community.
+#
+
+# Common Configuration Information 
+
+BUILD_ARCHS=$(HOST_ARCH)
+ifndef CROSS_COMPILER_HOST_ARCHS
+     BUILD_ARCHS+=$(CROSS_COMPILER_TARGET_ARCHS)
+else
+     ifeq ($(HOST_ARCH),$(findstring $(HOST_ARCH),$(CROSS_COMPILER_HOST_ARCHS)))
+          BUILD_ARCHS+=$(CROSS_COMPILER_TARGET_ARCHS)
+     endif
+endif
+
+INSTALL_LOCATION = $(TOP)
+ 
+INSTALL_LOCATION_LIB        = $(INSTALL_LOCATION)/lib
+INSTALL_LOCATION_BIN        = $(INSTALL_LOCATION)/bin
+
+INSTALL_INCLUDE             = $(INSTALL_LOCATION)/include
+INSTALL_DOC                 = $(INSTALL_LOCATION)/doc
+INSTALL_MAN                 = $(INSTALL_LOCATION)/man
+INSTALL_TEMPLATES           = $(INSTALL_LOCATION)/templates
+INSTALL_DBD                 = $(INSTALL_LOCATION)/dbd
+INSTALL_CONFIG              = $(INSTALL_LOCATION)/config
+
+EPICS_BASE_INCLUDE      = $(EPICS_BASE)/include
+EPICS_BASE_DBD          = $(EPICS_BASE)/dbd
+
+EPICS_EXTENSIONS_INCLUDE      = $(EPICS_EXTENSIONS)/include
+EPICS_EXTENSIONS_TEMPLATES    = $(EPICS_EXTENSIONS)/templates
+
+DIVIDER = .
+
+# private versions of lex/yacc from EPICS
+EYACC = $(EPICS_BASE)/bin/$(HOST_ARCH)/antelope
+ELEX = $(EPICS_BASE)/bin/$(HOST_ARCH)/e_flex -S$(EPICS_BASE_INCLUDE)/flex.skel.static
+
+# install from EPICS
+INSTALL = $(EPICS_BASE)/bin/$(HOST_ARCH)/installEpics
+INSTALL_PRODUCT = $(INSTALL)
+
+# dbtools from EPICS
+
+# state notation language compiler (installed from base/src/sequencer)
+SNC = $(EPICS_BASE)/bin/$(HOST_ARCH)/snc
+
+# vxWorks definitions
+VX_CONFIG_DIR = $(VX_DIR)/config
+VX_INCLUDE = $(VX_DIR)/h
+VX_GNU_BIN = $(VX_GNU)/$(HOST_ARCH).$(ARCH_CLASS)/bin
+VX_GNU_LIB = $(VX_GNU)/$(HOST_ARCH).$(ARCH_CLASS)/lib
+
+ifdef T_A
+
+INSTALL_LIB                 = $(INSTALL_LOCATION_LIB)/$(T_A)
+INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
+INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
+
+EPICS_BASE_LIB          = $(EPICS_BASE)/lib/$(T_A)
+EPICS_BASE_BIN          = $(EPICS_BASE)/bin/$(T_A)
+
+EPICS_EXTENSIONS_LIB          = $(EPICS_EXTENSIONS)/lib/$(T_A)
+EPICS_EXTENSIONS_BIN          = $(EPICS_EXTENSIONS)/bin/$(T_A)
+
+VX_IMAGE = $(VX_CONFIG_DIR)/$(T_A)/vxWorks
+VX_IMAGE_SYM = $(VX_CONFIG_DIR)/$(T_A)/vxWorks.sym
+
+# location of installed vxWorks image
+EPICS_VX_IMAGE = $(EPICS_BASE_BIN)/vxWorks
+EPICS_VX_IMAGE_SYM = $(EPICS_BASE_BIN)/vxWorks.sym
+
+endif
+

config/CONFIG_ENV

@@ -0,0 +1,71 @@
+#	$Id$
+#	Author:	Andrew Johnson
+#	Date:	20 April 1995
+#
+#	Experimental Physics and Industrial Control System (EPICS)
+#
+#	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.
+#
+#
+
+
+#  Default environment settings
+
+# Channel Access:
+# EPICS_CA_ADDR_LIST augment beacon/search dest ip addr list
+#	from white space separated ip addresses in this
+#	environment variable. "Quote" if more than one addr.
+# EPICS_CA_AUTO_ADDR_LIST YES = augment beacon/search dest ip
+#	addr list from network interfaces found; NO = only use
+#	EPICS_CA_ADDR_LIST to create this list.
+# EPICS_CA_CONN_TMO sec before sending echo request from client.
+# EPICS_CA_REPEATER_PORT CA repeater port number.
+# EPICS_CA_SERVER_PORT CA server port number.
+
+EPICS_CA_ADDR_LIST=""
+EPICS_CA_AUTO_ADDR_LIST=YES
+EPICS_CA_CONN_TMO=30.0
+EPICS_CA_REPEATER_PORT=5065
+EPICS_CA_SERVER_PORT=5064
+
+#
+# These parameters are only used by the CA server library
+#
+# EPICS_CA_BEACON_PERIOD quiescent sec between server beacons.
+# EPICS_CAS_INTF_ADDR_LIST - list of IP addresses identifying
+#	a limited set of interfaces that the server should bind to.
+#	If this parameter is empty then connections are accepted
+#	from any interface. Beacons are sent only to the broadcast
+#	address of each interface in this list (or the destination 
+#	address of point to point interfaces) if EPICS_CA_AUTO_ADDR_LIST
+#	is YES. Type "ifconfig -a" in order to determine which 
+# 	interfaces are available.
+# EPICS_CAS_BEACON_ADDR_LIST - If this parameter is specified
+#	or if EPICS_CAS_INTF_ADDR_LIST isnt empty then this parameter
+#	is used instead of EPICS_CA_ADDR_LIST by the server library 
+# 	to augment the list of addresses to send beacons to.
+# EPICS_CAS_SERVER_PORT - If this parameter is specified then it
+#	and not EPICS_CA_SERVER_PORT is used to determine the server's
+# 	port number.
+#
+EPICS_CA_BEACON_PERIOD=15.0
+EPICS_CAS_INTF_ADDR_LIST=""
+EPICS_CAS_BEACON_ADDR_LIST=""
+EPICS_CAS_SERVER_PORT=
+
+
+# Log Server:
+# EPICS_IOC_LOG_PORT Log server port number.
+
+EPICS_IOC_LOG_PORT=7004
+
+
+# Other services:
+
+EPICS_CMD_PROTO_PORT=
+EPICS_AR_PORT=7002
+

config/CONFIG_SITE

@@ -0,0 +1,111 @@
+#
+#  $Id$
+#
+#  CONFIG_SITE  - EPICS BASE config file
+#	by Matthew Needes and Mike Bordua
+#
+#  This file is to be modified by the EPICS system manager
+#	only.
+#
+
+
+#  The host architecture performing the build,
+#	i.e.: the arch running DCT/getrel/etc.
+#
+#  Currently Supporting:
+#	sun4
+#	hp700
+#	alpha
+#	solaris
+#	sgi
+#	Linux
+#	WIN32
+#
+#  HOST_ARCH now an environment variable
+#  HOST_ARCH=$(shell /usr/local/epics/startup/HostArch)
+ifndef HOST_ARCH
+	HOST_ARCH=unsupported
+endif
+
+#  The architectures to build EPICS for
+#
+#  Currently Supporting:
+#       mv167
+#       mv162
+#       mv162lc
+#       mv147
+#       hkv2f
+#	niCpu030
+#	pc486
+#
+CROSS_COMPILER_TARGET_ARCHS=mv167 mv162
+
+#  If only a subset of the host architectures perform
+#  the build for the CROSS_COMPILER_TARGET_ARCHS 
+#  uncomment the following line and specify them.
+#
+#CROSS_COMPILER_HOST_ARCHS=sun4
+
+#  VxWorks directory
+#VX_DIR=/usr/csite/vw/5.1.1/vw
+#VX_DIR=/usr/local/vw/vxV51.mm
+#VX_DIR=/usr/local/vw/vxV52/vw
+VX_DIR=/usr/local/vw/vxV52p1/vw
+
+#VX_GNU = $(VX_DIR)
+VX_GNU = $(VX_DIR)/../vxgccV2.2.3.1
+
+
+#  Client ANSI Compiler
+#   GCC     (gcc -ansi)
+#   ACC     (acc)
+#   HPACC   (cc -Aa)
+#ANSI=HPACC
+ANSI=ACC
+ 
+#  Client Standard C Compiler choice
+#   GCC     (gcc -traditional)
+#   ACC     (acc -Xs)
+#   SUNCC   (cc)
+#   HPCC    (cc -Ac)
+#STANDARD=HPCC
+STANDARD=ACC
+ 
+#  Client C++ Compiler (Not supported yet)
+#   G++     (g++)   GNU C++
+#   CCC     (CC)    SUN C++
+#CPLUSPLUS=G++
+CPLUSPLUS=CCC
+
+#  Build client objects statically ?
+#        must be either YES or NO
+STATIC_BUILD=NO
+
+#  Unix Optimization
+#	must be either YES or NO
+UNIX_OPT=YES
+
+#  VxWorks Optimization
+#	must be either YES or NO
+VX_OPT=YES
+ 
+#  Generate Verbose Compiler Warnings for Unix
+#	must be either YES or NO
+UNIX_WARN=YES
+
+#  Generate Verbose Compiler Warnings for VxWorks
+#	must be either YES or NO
+VX_WARN=YES
+
+# sch2edif compiler and flags
+SCH2EDIF = sch2edif
+SCH2EDIF_PATH =
+SCH2EDIF_SYSFLAGS = -n -ap -p.+..+$(SCH2EDIF_PATH)+$(EPICS_EXTENSIONS)/templates/capfast/sym+
+SCH2EDIF_FLAGS =
+ 
+# e2db and flags
+#    - again there is an assumption where edb.def is installed.
+E2DB = $(EPICS_EXTENSIONS)/bin/$(HOST_ARCH)/e2db
+E2DB_SYSFLAGS = -ate -d $(EPICS_EXTENSIONS)/templates/capfast/edb.def
+E2DB_FLAGS =
+

config/CONFIG_SITE.Linux

@@ -0,0 +1,20 @@
+#
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Default SUN compiler, individual Makefiles will override
+#  if they cannot support ANSI compilation.
+#   STRICT -  ANSI C - force warning flags
+#   ANSI   -  ANSI C
+#   OLD    -  Standard C - Not appropriate here.
+CMPLR=ANSI
+
+# Default SUN C++ compiler, individual Makefiles will override
+#  if they are coded to a higher standard.
+#   STRICT -  ANSI C++ force strict warning flags
+#   NORMAL -  ANSI C++ optional warning flags
+CXXCMPLR=NORMAL
+#CXXCMPLR=STRICT
+

config/CONFIG_SITE.WIN32

@@ -0,0 +1,7 @@
+#
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+

config/CONFIG_SITE.alpha

@@ -0,0 +1,21 @@
+#
+# CONFIG_SITE.Unix.alpha
+#
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Default compiler, individual Makefiles will override
+#  if they cannot support ANSI compilation.
+#   STRICT -  ANSI C - force warning flags
+#   ANSI   -  ANSI C
+#   OLD    -  Standard C - Not appropriate here.
+CMPLR=ANSI
+
+# Default SUN C++ compiler, individual Makefiles will override
+#  if they are coded to a higher standard.
+#   STRICT -  ANSI C++ force strict warning flags
+#   NORMAL -  ANSI C++ optional warning flags
+CXXCMPLR=NORMAL
+#CXXCMPLR=STRICT
+

config/CONFIG_SITE.hkv2f

@@ -0,0 +1,9 @@
+
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Epics defs
+
+

config/CONFIG_SITE.hp700

@@ -0,0 +1,21 @@
+#
+# CONFIG_SITE.Unix.hp700
+#
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Default compiler, individual Makefiles will override
+#  if they cannot support ANSI compilation.
+#   STRICT -  ANSI C - force warning flags
+#   ANSI   -  ANSI C
+#   OLD    -  Standard C - Not appropriate here.
+CMPLR=ANSI
+
+# Default SUN C++ compiler, individual Makefiles will override
+#  if they are coded to a higher standard.
+#   STRICT -  ANSI C++ force strict warning flags
+#   NORMAL -  ANSI C++ optional warning flags
+CXXCMPLR=NORMAL
+#CXXCMPLR=STRICT
+

config/CONFIG_SITE.mv147

@@ -0,0 +1,9 @@
+
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Epics defs
+
+

config/CONFIG_SITE.mv162

@@ -0,0 +1,9 @@
+
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Epics defs
+
+

config/CONFIG_SITE.mv162lc

@@ -0,0 +1,9 @@
+
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Epics defs
+
+

config/CONFIG_SITE.mv167

@@ -0,0 +1,9 @@
+
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Epics defs
+
+

config/CONFIG_SITE.niCpu030

@@ -0,0 +1,9 @@
+
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Epics defs
+
+

config/CONFIG_SITE.pc486

@@ -0,0 +1,6 @@
+# $Log$
+# Revision 1.1.2.1  1996/11/25 20:20:22  jhill
+# installed
+#
+# -kuk-
+

config/CONFIG_SITE.sgi

@@ -0,0 +1,27 @@
+#
+# $Id$
+#
+# Revision 1.2  1994/06/28  00:02:32  bordua
+# First cut at the RULES and CONFIGS.
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Default SUN compiler, individual Makefiles will override
+#  if they cannot support ANSI compilation.
+#   STRICT -  ANSI C - force warning flags
+#   ANSI   -  ANSI C
+#   OLD    -  Standard C - Not appropriate here.
+CMPLR=ANSI
+
+# Default SUN C++ compiler, individual Makefiles will override
+#  if they are coded to a higher standard.
+#   STRICT -  ANSI C++ force strict warning flags
+#   NORMAL -  ANSI C++ optional warning flags
+CXXCMPLR=NORMAL
+#CXXCMPLR=STRICT
+
+# Special C library requirements
+SPECIAL_LANG = /usr/lang/SC2.0.1patch
+
+

config/CONFIG_SITE.solaris

@@ -0,0 +1,26 @@
+#
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Default SUN compiler, individual Makefiles will override
+#  if they cannot support ANSI compilation.
+#   STRICT -  ANSI C - force warning flags
+#   ANSI   -  ANSI C
+#   OLD    -  Standard C - Not appropriate here.
+CMPLR=ANSI
+
+# Default SUN C++ compiler, individual Makefiles will override
+#  if they are coded to a higher standard.
+#   STRICT -  ANSI C++ force strict warning flags
+#   NORMAL -  ANSI C++ optional warning flags
+CXXCMPLR=NORMAL
+#CXXCMPLR=STRICT
+
+# Unbundled C compiler stuff
+SPARCWORKS = /opt/SUNWspro
+#SPECIAL_LANG = $(SPARCWORKS)/lib
+SPECIAL_LANG = .
+
+

config/CONFIG_SITE.sun4

@@ -0,0 +1,31 @@
+#
+# $Id$
+#
+# Site Specific Configuration Information
+# Only the local epics system manager should modify this file
+
+# Default SUN compiler, individual Makefiles will override
+#  if they cannot support ANSI compilation.
+#   STRICT -  ANSI C - force warning flags
+#   ANSI   -  ANSI C
+#   OLD    -  Standard C - Not appropriate here.
+
+CMPLR=ANSI
+
+# Default SUN C++ compiler, individual Makefiles will override
+#  if they are coded to a higher standard.
+#   STRICT -  ANSI C++ force strict warning flags
+#   NORMAL -  ANSI C++ optional warning flags
+CXXCMPLR=NORMAL
+#CXXCMPLR=STRICT
+
+#CMPLR=STRICT
+#ANSI=GCC
+#STANDARD=GCC
+#CPLUSPLUS=G++
+
+# Special C library requirements
+#SPECIAL_LANG = /usr/lang/SC3.0.1
+#SPECIAL_LANG = /usr/lang/lib
+SPECIAL_LANG = .
+

config/CONFIG_SITE_ENV

@@ -0,0 +1,40 @@
+#	$Id$
+#	Author:	Andrew Johnson
+#	Date:	1 May 1995
+#
+#	Experimental Physics and Industrial Control System (EPICS)
+#
+#	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.
+#
+
+#  Site-specific environment settings
+
+# Time service:
+# EPICS_TS_MIN_WEST the local time difference from GMT.
+# EPICS_TS_NTP_INET ntp or Unix time server ip addr.
+
+EPICS_TS_MIN_WEST=360
+EPICS_TS_NTP_INET=
+
+
+# Log Server:
+# EPICS_IOC_LOG_INET 
+#	Log server ip addr.
+# EPICS_IOC_LOG_FILE_NAME 
+#	pathname to the log file.
+# EPICS_IOC_LOG_FILE_LIMIT 
+#	maximum log file size.
+# EPICS_IOC_LOG_FILE_COMMAND 
+# 	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
+
+EPICS_IOC_LOG_INET=164.54.8.167
+EPICS_IOC_LOG_FILE_NAME=/home/phebos1/epics/apple/log/iocLog.text
+EPICS_IOC_LOG_FILE_COMMAND=
+EPICS_IOC_LOG_FILE_LIMIT=1000000
+

config/HostSys.txt

@@ -0,0 +1,99 @@
+Short Description of the "Host" (vs. "Unix") Build System
+---------------------------------------------------------
+
+	7-30-96  -kuk-
+	questions/comments please mailto:kasemir@atdiv.lanl.gov
+
+
+To build EPICS on the WIN32 architecture
+the "old" make-system using Makefile.Unix in each
+subdir and RULES.Host was not suitable because
+it is too much Unix-dependent.
+
+A "new" system using Makefile.Host and RULES.Host
+was used instead. This "host" system should work
+on all other architectures as well.
+The idea is that ALL architectures should be able to use
+the "host" system in future because.
+
+The syntax of the 'Host' Makefiles is described
+in 'Sample.Makefile.Host'. Any suggestions for a
+better syntax (in connection whith ideas how to
+implement this in RULES.Host!) are very welcome!
+
+To use it, only a few changes should be necessary:
+
+A) In CONFIG.<WIN32, sun4, hp700, ... whatever you are using>:
+
+1) Set
+	BUILD_TYPE=Host
+   instead of 'Unix'. This switches you over to using
+   Makefile.Host instead of Makefile.Unix.
+
+2) Set ARCH_CLASS to the correct architecture class.
+   (ARCH_CLASS used to be defined in the past, right now
+    it seems it's only set for VxWorks targets, not hosts).
+
+   ARCH_CLASS is used to define system-dependent
+   CFLAGS, library contents etc. in Makefile.Host,
+   so it should describe the general architecture,
+   maybe 
+	WIN32 : this is the only one really supported in Makefile.Host by now
+	BSD for sun4,
+	SYSV for ??,
+   
+   Maybe this "general arch" is not sufficient, so we will
+   end up using
+       ARCH_CLASS=WIN32, sun4, hp700, ....
+   as it used to be.
+
+3) Make sure that the following (new) macros are defined:
+
+   CP=cp
+   MV=mv
+   RM=rm -f
+   MKDIR=mkdir
+   RMDIR=rm -rf
+   EXE=
+   OBJ=.o
+
+4) LINK.c and LINK.cc must now include the target-flag, e.g.:
+
+   LINK.c = $(CC) $(LDFLAGS) -o $@
+
+   because the "-o $@" is also system dependent (it's -Fe$@ for WIN32)
+
+5) The bin directory for the host based epics tools
+	$(EPICS)/base/bin/$(HOST_ARCH)
+   must be in your PATH.
+
+
+B) Adjust Makefile.Host
+
+  If you are trying to build EPICS now, there might be errors
+  because the Makefile.Host files are only tested on WIN32, yet.
+
+  If changes are necessare in some base/src/???/Makefile.Host,
+  refer to Sample.Makefile.Host in the base/config dir.
+
+
+
+
+The current make-system for WIN32
+needs
+* gnumake (OK, sources for WIN32 are available)
+* several UNIX tools: sed, grep, ... (dito)
+* a UNIX-like shell (ouch!)
+
+I found no fully operational shell and no sources for WIN32 so far,
+Cygnus' bash e.g. cannot handle this:
+(echo a>a; echo b>>a)
+Right now I use the knts that I wrote and simplified scripts.
+Jeff eliminated many shell-lines in Makefile.*,
+the final solution could be:
+1) replace shell, awk, grep, sed, ... by  Perl!
+2) use C code
+
+Perl looks like a real option because it's available
+for many platforms and maybe the best idea for
+'portable scripts'.

config/Makefile

@@ -0,0 +1,10 @@
+#
+# $Id$
+#
+
+TOP=..
+
+include $(TOP)/config/CONFIG_BASE
+
+include $(TOP)/config/RULES_ARCHS
+

config/Makefile.Host

@@ -0,0 +1,57 @@
+#
+# $Id$
+#
+
+TOP = ../..
+include $(TOP)/config/CONFIG_BASE
+
+CONFIGS += CONFIG
+CONFIGS += CONFIG_BASE
+CONFIGS += CONFIG_COMMON
+CONFIGS += CONFIG_ENV
+
+CONFIGS += CONFIG.WIN32
+CONFIGS += CONFIG.pc486
+CONFIGS += CONFIG.Linux
+CONFIGS += CONFIG.alpha
+CONFIGS += CONFIG.hp700
+CONFIGS += CONFIG.sgi
+CONFIGS += CONFIG.solaris
+CONFIGS += CONFIG.sun4
+CONFIGS += CONFIG.hkv2f
+CONFIGS += CONFIG.mv147
+CONFIGS += CONFIG.mv162
+CONFIGS += CONFIG.mv162lc
+CONFIGS += CONFIG.mv167
+CONFIGS += CONFIG.niCpu030
+
+CONFIGS += CONFIG.Vx.68k
+
+CONFIGS += CONFIG_SITE
+CONFIGS += CONFIG_SITE_ENV
+
+CONFIGS += CONFIG_SITE.WIN32
+CONFIGS += CONFIG_SITE.pc486
+CONFIGS += CONFIG_SITE.Linux
+CONFIGS += CONFIG_SITE.alpha
+CONFIGS += CONFIG_SITE.hp700
+CONFIGS += CONFIG_SITE.sgi
+CONFIGS += CONFIG_SITE.solaris
+CONFIGS += CONFIG_SITE.sun4
+CONFIGS += CONFIG_SITE.hkv2f
+CONFIGS += CONFIG_SITE.mv147
+CONFIGS += CONFIG_SITE.mv162lc
+CONFIGS += CONFIG_SITE.mv162
+CONFIGS += CONFIG_SITE.mv167
+CONFIGS += CONFIG_SITE.niCpu030
+
+CONFIGS += RULES.Host
+CONFIGS += RULES.Vx
+CONFIGS += RULES_ARCHS
+CONFIGS += RULES_DIRS
+CONFIGS += RULES_TOP
+
+include $(TOP)/config/RULES.Host
+
+ 
+

config/Makefile.Unix

@@ -0,0 +1,30 @@
+#
+# $Id$
+#
+
+TOP = ../..
+include $(TOP)/config/CONFIG_BASE
+
+CONFIGS += CONFIG
+CONFIGS += CONFIG_BASE
+CONFIGS += CONFIG_COMMON
+CONFIGS += CONFIG_ENV
+
+CONFIGS += CONFIG.Vx.68k
+
+CONFIGS += CONFIG_SITE
+CONFIGS += CONFIG_SITE_ENV
+
+CONFIGS += $(HOST_ARCH:%=CONFIG.%)
+CONFIGS += $(CROSS_COMPILER_TARGET_ARCHS:%=CONFIG.%)
+CONFIGS += $(HOST_ARCH:%=CONFIG_SITE.%)
+CONFIGS += $(CROSS_COMPILER_TARGET_ARCHS:%=CONFIG_SITE.%)
+
+CONFIGS += RULES.Unix
+CONFIGS += RULES.Vx
+CONFIGS += RULES_ARCHS
+CONFIGS += RULES_DIRS
+CONFIGS += RULES_TOP
+
+include $(TOP)/config/RULES.Unix
+

config/RULES.Db

@@ -0,0 +1,43 @@
+#RULES.Db
+SUBTOOL = $(EPICS_BASE_BIN)/subtool
+PREFIX=$(shell echo $* | sed -e 's-[0-9]--g' | sed -e 's-\.db--g')
+
+install: .DEPENDS dbd $(DBFROMTEMPLATE) $(INDDBFROMTEMPLATE) $(PROD)
+
+buildInstall:: install
+
+inc build depends:
+
+dbd:
+	@if [ ! -d $(TOP)/dbd ]; then \
+		mkdir $(TOP)/dbd ; \
+	fi 
+	@if [ ! -d dbd ]; then \
+		echo "ln -s $(TOP)/dbd dbd" ; \
+		ln -s $(TOP)/dbd dbd ; \
+	fi
+
+
+$(DBFROMTEMPLATE):%.db: %.template %.substitutions
+	$(RM) $@
+	$(SUBTOOL) $*.template $*.substitutions > $@
+
+
+$(INDDBFROMTEMPLATE):%.db: %.substitutions
+	$(RM) $@
+	$(SUBTOOL) $(PREFIX).template $*.substitutions > $@
+
+.DEPENDS: Makefile
+	@$(RM) $@
+	@for NAME in $(INDDBFROMTEMPLATE) garbage_marty ; do \
+	    if [ $$NAME != garbage_marty ] ; then \
+		PREFIX="`echo $$NAME | sed -e 's-[0-9]--g' | sed -e 's-\.db--g'`";\
+		echo "$$NAME: $$PREFIX.template" >> $@;\
+	    fi ; \
+        done 
+
+clean::
+	@$(RM) dbd  $(DBFROMTEMPLATE) $(INDDBFROMTEMPLATE) .DEPENDS $(PROD)
+
+-include .DEPENDS
+

config/RULES.Host

@@ -0,0 +1,583 @@
+# $Id$
+#
+#	Rules for making things specified in Makefile.Host
+#
+#	Some rules for filename-massage are system specific
+#	and have "ifdefs" here instead of using definitions
+#	from CONFIG.Host.$(ARCH_CLASS)  -  sorry about this,
+#	but so far the rules are quite similar on all systems
+#	except WIN32 has some specials.
+#
+#	Maybe there is a way to use indentation to make it
+#	easier to read this file?
+#
+#	Most things may also work if you say e.g.
+#		VAR+=ADD
+#	even if ADD is not there, but this way "VAR" would
+#	be defined in any case, that's why I try to use
+#		ifdef ADD
+#		VAR+=ADD
+#		endif
+#
+#	-kuk-
+
+#	we are in O.$(ARCH_CLASS), but most sources are one dir above:
+#
+#	The use of VPATH (no suffix specification) caused everything
+#	to break several times.
+#	vpath, of course, has the disadvantage that we need explicit rules
+#	for scripts or similar os-specific filed which have _no_ suffix...
+vpath %.c $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic ..
+vpath %.cc $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic ..
+#	This prevents base/src/include/*.h from being installed. Why??
+#vpath %.h ../os/$(ARCH_CLASS) ../os/generic ..
+vpath %.h $(USER_VPATH)   
+
+#	check for add-on CFLAGS and CXXFLAGS
+#
+#	Rules:
+#	1) USR_CFLAGS is used
+#	2) if there is a special USR_CFLAGS_$(ARCH_CLASS), it's
+#	   appended to 1)
+#	3) if there is no special defined, but a generic USR_CFLAGS_DEFAULT,
+#	   this one is appended
+#	4) if you have the special case that your USR_CFLAGS_$(ARCH_CLASS) is
+#	   empty but you don't want 3), you have to define it as '-nil-', e.g.:
+#		USR_CFLAGS := <defines for all systems>
+#		USR_CFLAGS_sun4 := -nil-
+#		USR_CFLAGS_DEFAULT := <defines for most systems, not sun4>
+#
+#	These rules apply to these Makefile-variables:
+#	USR_CFLAGS	C flags
+#	USR_CXXFLAGS	C++ flags
+#	INC		include-files to install
+#	LIBSRCS		source files for building library
+#	PROD_LIBS	libs needed by PROD
+#	PROD		products to build and install
+#	SCRIPTS		scripts to install
+#
+#	Remark:
+#	If you define a special INC, e.g. INC_WIN32 := getopt.h,
+#	the source (getopt.h) has to be in os/WIN32 (or os/<your ARCH_CLASS>)
+#
+#	This makes INC_$(ARCH_CLASS) slightly different from OSINC:
+#	OSINC := a_file.h
+#	means that you have a special  os/$(ARCH_CLASS)/a_file.h
+#	for _every_ ARCH_CLASS.
+#	If you use INC_$(ARCH_CLASS), you need the special include
+#	only for the specified ARCH_CLASS!
+#
+ifneq (x$(USR_CFLAGS_$(ARCH_CLASS)),x)
+USR_CFLAGS+=$(subst -nil-,,$(USR_CFLAGS_$(ARCH_CLASS)))
+else
+ifdef USR_CFLAGS_DEFAULT
+USR_CFLAGS+=$(USR_CFLAGS_DEFAULT)
+endif
+endif
+
+ifneq (x$(USR_CXXFLAGS_$(ARCH_CLASS)),x)
+USR_CXXFLAGS+=$(subst -nil-,,$(USR_CXXFLAGS_$(ARCH_CLASS)))
+else
+ifdef USR_CXXFLAGS_DEFAULT
+USR_CXXFLAGS+=$(USR_CXXFLAGS_DEFAULT)
+endif
+endif
+
+#	check for special includes:
+#
+ifneq (x$(INC_$(ARCH_CLASS)),x)
+#	os-specific includes go to the include/os-directory:
+OSINC += $(subst -nil-,,$(INC_$(ARCH_CLASS)))
+else
+ifdef INC_DEFAULT
+INC += $(INC_DEFAULT)
+endif
+endif
+
+#	concat specific library contents (if defined) to LIBCONTENS
+#
+ifneq (x$(LIBSRCS_$(ARCH_CLASS)),x)
+LIBSRCS += $(subst -nil-,,$(LIBSRCS_$(ARCH_CLASS)))
+else
+
+ifdef LIBSRCS_DEFAULT
+LIBSRCS+=$(LIBSRCS_DEFAULT)
+endif
+
+endif
+
+#	adjust object names for library contents
+#
+ifdef LIBSRCS
+LIBOBJS=$(addsuffix $(OBJ), $(basename $(LIBSRCS)))
+endif
+
+#
+#	concat specific library contents (if defined) to PROD_LIBS
+#
+ifneq (x$(PROD_LIBS_$(ARCH_CLASS)),x)
+PROD_LIBS += $(subst -nil-,,$(PROD_LIBS_$(ARCH_CLASS)))
+
+else
+
+ifdef PROD_LIBS_DEFAULT
+PROD_LIBS += $(PROD_LIBS_DEFAULT)
+endif
+
+endif
+
+#
+#	concat specific products
+#
+ifneq (x$(PROD_$(ARCH_CLASS)),x)
+PROD += $(subst -nil-,,$(PROD_$(ARCH_CLASS)))
+
+else
+
+ifdef PROD_DEFAULT
+PROD += $(PROD_DEFAULT)
+endif
+
+endif
+
+#
+#	concat specific scripts
+#
+ifneq (x$(SCRIPTS_$(ARCH_CLASS)),x)
+SCRIPTS += $(subst -nil-,,$(SCRIPTS_$(ARCH_CLASS)))
+
+else
+
+ifdef SCRIPTS_DEFAULT
+SCRIPTS += $(SCRIPTS_DEFAULT)
+endif
+
+endif
+
+# -------------------------------------------------------------------
+#	adjust names to platform specific pre-/postfixes,
+#	this is ugly (ifdef XXX...) but hopefully get's you there...
+# -------------------------------------------------------------------
+
+#	adjust names of libraries to build
+#
+#	But: if there are no objects LIBOBJS to include
+#	in this library (may be for e.g. base/src/libCompat
+#	on some archs), don't define (and build) any library!
+ifdef LIBRARY
+ifdef LIBOBJS
+
+ifndef WIN32
+#	handle plain Unix first because it's easy: <lib> ->  lib<lib>.a
+LIBNAME:=$(LIBRARY:%=lib%.a)
+
+else
+#	WIN32 library name:
+LIBNAME:=$(LIBRARY).lib
+#	check if DLL or plain lib requested:
+ifeq ($(LIBTYPE),SHARED)
+#	create name for dll, import file
+DLLNAME:=$(LIBRARY).dll
+#	libs defined that we need to link the DLL with?
+DLL_DEP_LIBS:=$(DLL_LIBS:%=$(INSTALL_LIB)/%.lib)
+endif # LIBTYPE=SHARED
+endif # WIN32
+
+endif
+endif # LIBRARY and LIBOBJS
+
+#	dito for libraries used by PROD
+#
+ifdef PROD_LIBS
+
+ifdef WIN32
+PRODDEPLIBS:=$(PROD_LIBS:%=$(INSTALL_LIB)/%.lib)
+#	add to USR_LDLIBS so that the libs are linked
+#	we need the full path because there is no "-L" option on WIN32....
+USR_LDLIBS += $(PRODDEPLIBS)
+else
+#	On Unix: library "ca" is linked with "-lca"  etc.
+#	A library may be just newly build in the local dir: add "-L."
+PRODDEPLIBS=$(PROD_LIBS:%=lib%.a)
+USR_LDLIBS += -L. $(PROD_LIBS:%=-l%) 
+endif
+
+endif
+
+
+#	adjust executables
+ifdef PROD
+PROD := $(addsuffix $(EXE), $(PROD))
+endif
+
+ifdef TESTPROD
+TESTPROD := $(addsuffix $(EXE), $(TESTPROD))
+endif
+
+#	----------------------------------------------------
+#	create names (lists) for installed things
+#	----------------------------------------------------
+
+#	each list starts with the destination directory name(s)
+#	to make sure it's there
+
+INSTALL_PROD= $(PROD:%= $(INSTALL_BIN)/%)
+
+#	DLLs (only defined on WIN32) are like executables:
+ifdef DLLNAME
+INSTALL_DLLS=$(DLLNAME:%=$(INSTALL_BIN)/%)
+endif
+
+INSTALL_LIBS= $(LIBNAME:%=$(INSTALL_LIB)/%)
+INSTALL_INC= $(INC:%=$(INSTALL_INCLUDE)/%)
+INSTALL_OSINCLUDE=$(INSTALL_INCLUDE)/os/$(ARCH_CLASS)
+INSTALL_OSINC= $(OSINC:%= $(INSTALL_OSINCLUDE)/%)
+MANLIST = 1 2 3 4 5 6 7 8 9
+INSTALL_MANS = $(foreach n, \
+        $(MANLIST),$(INSTALL_MAN)/man$(n) $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%))
+INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%)
+INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%)
+ifdef TEMPLATES_DIR
+INSTALL_TEMPLATES_SUBDIR = $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)
+else
+INSTALL_TEMPLATES_SUBDIR = $(INSTALL_TEMPLATES)
+endif
+INSTALL_TEMPLATE = $(TEMPLATES:%= $(INSTALL_TEMPLATES_SUBDIR)/%)
+INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%)
+
+MAN_DIRECTORY_TARGETS = $(foreach n, $(MANLIST),$(INSTALL_MAN)/man$(n))
+
+DIRECTORY_TARGETS = $(INSTALL_INCLUDE) $(INSTALL_INCLUDE)/os \
+	$(INSTALL_OSINCLUDE) $(INSTALL_DOC) \
+	$(INSTALL_LOCATION_BIN) $(INSTALL_BIN) $(INSTALL_LIB) \
+	$(INSTALL_LOCATION_LIB) $(INSTALL_CONFIG) \
+	$(MAN_DIRECTORY_TARGETS) $(INSTALL_MAN) \
+	$(INSTALL_TEMPLATES) 
+
+ifdef TEMPLATES_DIR
+DIRECTORY_TARGETS += $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)
+endif
+
+
+#	Main target
+#
+all::	install
+
+#	Problem on WIN32:
+#	There seems to be no -L switch, so we have to specify the
+#	full library names (including the path).
+#	OK, so we prefix all libs by $(INSTALL_LIB) to be able to link
+#	with the installed libraries. This means, however, that
+#	libs have to be installed _before_ we build any PROD that uses them,
+#	because we cannot use them from the current O.WIN32 directory any more.
+#	Example: dbExpand etc. in dbStatic all need the db library.
+#
+#	Solution: place INSTALL_DLLS and _LIBS in build
+#
+build:: $(LIBNAME) $(DLLNAME) \
+	$(INSTALL_LOCATION_LIB) $(INSTALL_LIB)\
+	$(INSTALL_LIBS) $(INSTALL_DLLS) $(PROD) $(TESTPROD)
+
+
+inc:: $(INSTALL_INCLUDE) $(INSTALL_INC) \
+	$(INSTALL_INCLUDE)/os $(INSTALL_OSINCLUDE) $(INSTALL_OSINC)
+
+rebuild:: clean install
+
+install:: inc buildInstall 
+
+buildInstall :: build $(TARGETS) $(INSTALL_LOCATION_BIN) \
+	$(INSTALL_BIN) $(INSTALL_SCRIPTS) $(INSTALL_PROD) \
+	$(INSTALL_MAN) $(INSTALL_MANS) \
+	$(INSTALL_DOC) $(INSTALL_DOCS) \
+	$(INSTALL_TEMPLATES) $(INSTALL_TEMPLATES_SUBDIR) $(INSTALL_TEMPLATE) \
+	$(INSTALL_CONFIG) $(INSTALL_CONFIGS) 
+
+depends:: $(LIBSRCS) $(SRCS)
+	$(RM) .DEPENDS
+	touch .DEPENDS
+ifdef DEPENDS_RULE
+	$(DEPENDS_RULE)
+else
+	@echo RULES.Host: You have no DEPENDS_RULE defined for $(ARCH_CLASS)
+	@echo (DEPENDS_RULE should be able to handle both C and C++ files,
+	@echo  use a script if all else failes)
+	@exit
+endif
+
+
+clean::
+	@echo "Cleaning"
+	@$(RM) *.i *$(OBJ) *.a $(PROD) $(LIBNAME) $(INC)
+
+$(DIRECTORY_TARGETS) :
+	$(MKDIR) $@
+
+# Problem: PRODDEPLIBS may contain libm.a etc. which we cannot locate
+# But: The order in build/install should make sure that libs are
+# in place before we build PROD anyway.
+# $(PROD): $(PRODDEPLIBS)
+
+#  The order of the following dependencies is
+#  VERY IMPORTANT !!!!
+
+#	generic rule to build executable from same-name-object:
+# 	(this should be handled by the implicit rule below)
+#
+#%$(EXE):	%$(OBJ)
+#ifdef WIN32
+#	$(LINK.c) $< $(LDLIBS)
+#else
+#	$(RM) $@
+#	echo LINKING:
+#	$(LINK.c) $< $(LDLIBS)
+#endif
+
+#	explicit list of source files given for PROD ?
+#	(otherwise implicit rule  .c -> $(OBJ) -> $(EXE)
+ifdef SRCS
+
+ifeq ($(findstring cc,$(suffix $(SRCS))),cc)
+PROD_LINKER = $(LINK.cc)
+else
+PROD_LINKER = $(LINK.c)
+endif
+
+PROD_OBJS=$(addsuffix $(OBJ), $(basename $(SRCS)))
+
+$(PROD): $(PROD_OBJS)
+	$(RM) $@
+	echo $(LDLIBS)
+	$(PROD_LINKER) $(PROD_OBJS) $(LDLIBS)
+endif
+
+#	explicit list of source files given for TESTPROD ?
+#	(otherwise implicit rule  .c -> $(OBJ) -> $(EXE)
+ifdef TESTPROD_SRCS
+
+ifeq ($(findstring cc,$(suffix $(TESTPROD_SRCS))),cc)
+TESTPROD_LINKER = $(LINK.cc)
+else
+TESTPROD_LINKER = $(LINK.c)
+endif
+
+TESTPROD_OBJS=$(addsuffix $(OBJ), $(basename $(TESTPROD_SRCS)))
+
+$(TESTPROD): $(TESTPROD_OBJS)
+	$(RM) $@
+	$(TESTPROD_LINKER) $(TESTPROD_OBJS) $(LDLIBS)
+endif
+
+%$(EXE): %.c
+	$(RM) $@
+	$(LINK.c)  $< $(LDLIBS)
+
+%$(EXE): %.cc
+	$(RM) $@
+	$(LINK.cc)  $< $(LDLIBS)
+
+%$(OBJ): %.c
+	$(RM) $@
+	$(COMPILE.c)  $<
+
+%$(OBJ): %.cc
+	$(RM) $@
+	$(COMPILE.cc)  $<
+
+%.c %.h: ../%.y
+	$(RM) y.tab.c y.tab.h
+	$(YACC) $(YACCOPT) $<
+	@if [ -f y.tab.c ]; \
+		then \
+			echo "$(MV) y.tab.c $*.c"; \
+			$(RM) $*.c; \
+			$(MV) y.tab.c $*.c; \
+	fi
+	@if [ -f y.tab.h ]; \
+		then \
+			echo "$(MV) y.tab.h $*.h"; \
+			$(RM) $*.h; \
+			$(MV) y.tab.h $*.h; \
+	fi
+
+%.c: ../%.l
+	$(RM) lex.yy.c
+	$(LEX) $(LEXOPT) $<
+	$(RM) $@
+	$(MV) lex.yy.c $@
+
+#state notation language rule
+%.c: ../%.st
+	@echo "preprocessing $*.st"
+	@$(RM) $*.i
+	$(CPP) $(CPPFLAGS) $< $*.i
+	@echo "converting $*.i"
+	@$(RM) $@
+	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.i
+
+%.c:	%.stt
+	@echo "converting $<"
+	@$(RM) $@
+	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $<
+	
+# Capfast Rules:
+%.db: %.edf
+	$(E2DB) $(E2SR_SYSFLAGS) $(E2SR_FLAGS) $<
+
+%.db: ../%.edf
+	$(E2DB) $(E2SR_SYSFLAGS) $(E2SR_FLAGS) $<
+
+%.edf: ../%.sch $(DEPSCHS)
+	@if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi
+	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) $<
+
+# Mangen Rule:
+%.1:%
+	$(RM) $(<F)
+	$(RM) $(<F).nr
+	ln -s $<
+	$(MANGEN) -s $(<F)
+	$(MV) $(<F).nr $(<F).1
+
+# Mangen Rule:
+%.1:../%
+	$(RM) $(<F)
+	$(RM) $(<F).nr
+	ln -s $<
+	$(MANGEN) -s $(<F)
+	$(MV) $(<F).nr $(<F).1
+
+
+#	Rules for building LIBRARY with LIBSRCS
+#	(which are now LIBNAME, LIBOBJS)
+#
+ifdef WIN32
+
+ifeq ($(LIBTYPE),SHARED)
+#	A WIN32 dll has tree parts:
+#	x.dll: the real dll (DLLNAME)
+#	x.lib: what you link to progs that use the dll (LIBNAME)
+#	x.exp: what you need to build the dll (in no variable)
+#
+#	the latter two are created automatically when building the dll:
+$(LIBNAME):	$(DLLNAME)
+
+#	test if there is a def file for this dll:
+#
+DLL_DEF_FILE := ../$(LIBRARY).def
+
+ifeq ($(DLL_DEF_FILE), $(wildcard $(DLL_DEF_FILE)))
+DLL_DEF := -def:$(DLL_DEF_FILE)
+endif
+
+#	Ugly trick:
+#	HOST_OPT_FLAGS is part of CFLAGS/CXXFLAGS,
+#	which in turn are used in COMPILE.c[c]
+#
+#	If we compile a .c, .cc into an $(OBJ),
+#	we test if this object is part of the 
+#	library objects LIBOBJS.
+#	If so, we define _WINDLL so that
+#	e.g. include/shareLib.h works correctly.
+#
+#HOST_OPT_FLAGS += $(subst $@, -D_WINDLL, $(findstring $@,$(LIBOBJS)))
+
+$(DLLNAME): $(LIBOBJS)
+	link	$(WIN32LDFLAGS)\
+		-implib:$(LIBNAME) -out:$(DLLNAME) $(DLL_DEF) \
+		$(DLL_DEP_LIBS) $(LIBOBJS)
+else
+#	still on WIN32, this time no DLL but plain lib requested:
+$(LIBNAME):	$(LIBOBJS)
+	lib -nologo -verbose -out:$(LIBNAME)\
+		$(LIBOBJS)
+	lib -nologo -list $(LIBNAME)
+
+endif # LIBTYPE is SHARED ?
+
+else  # not WIN32
+
+#	usual Unix rule for lib creation
+$(LIBNAME): $(LIBOBJS)
+	$(RM) $@
+	$(ARCMD) $@ $(LIBOBJS)
+	@if [ ! -z "$(RANLIB)" ] ; then\
+		echo $(RANLIB) $@; \
+		$(RANLIB) $@; \
+	fi
+endif # ifdef WIN32
+# end of library creation rules
+
+
+$(INSTALL_BIN)/%: ../os/$(ARCH_CLASS)/%
+	@echo "Installing os-specific script $@"
+	@$(INSTALL_PRODUCT) -m 555 $< $(INSTALL_BIN)
+
+$(INSTALL_BIN)/%: %
+	@echo "Installing binary $@"
+	@$(INSTALL_PRODUCT) -m 555 $< $(INSTALL_BIN)
+
+$(INSTALL_BIN)/%: ../%
+	@echo "Installing script $@"
+	@$(INSTALL_PRODUCT) -m 555 $< $(INSTALL_BIN)
+
+$(INSTALL_LIB)/%.a: %.a
+	@echo "Installing library $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_LIB)
+	@if [ ! -z "$(RANLIB)" ] ; then\
+		$(RANLIB) $(RANLIBFLAGS) $@; \
+	fi
+
+$(INSTALL_LIB)/%.lib: %.lib
+	@echo "Installing library $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_LIB)
+
+$(INSTALL_CONFIG)/%: %
+	@echo "Installing config file $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_CONFIG)
+
+$(INSTALL_CONFIG)/%: ../%
+	@echo "Installing config file $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_CONFIG)
+
+$(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : % 
+	@echo "Installing man file $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : ../% 
+	@echo "Installing man file $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(INSTALL_INCLUDE)/%: %
+	@echo "Installing include file $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(INSTALL_INCLUDE)/%: ../%
+	@echo "Installing include file $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(INSTALL_DOC)/%: %
+	@echo "Installing doc $@"
+	@testmkdir $(INSTALL_DOC)
+	@$(INSTALL) -m 644 $< $(INSTALL_DOC)
+
+$(INSTALL_DOC)/%: ../%
+	@echo "Installing doc $@"
+	@testmkdir $(INSTALL_DOC)
+	@$(INSTALL) -m 644 $< $(INSTALL_DOC)
+
+$(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)/%: ../%
+	@echo "Installing $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)
+
+$(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)/%: %
+	@echo "Installing $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)
+
+.PRECIOUS: %.o %.c
+
+-include .DEPENDS
+
+.PHONY:: all inc depends build install clean rebuild buildInstall
+
+#	EOF RULES.Host

config/RULES.Unix

@@ -0,0 +1,227 @@
+# $Id$
+
+INSTALL_PROD = $(PROD:%= $(INSTALL_BIN)/%)
+INSTALL_LIBS = $(LIBNAME:%= $(INSTALL_LIB)/%)
+INSTALL_INC = $(INC:%= $(INSTALL_INCLUDE)/%)
+INSTALL_OSINCLUDE = $(INSTALL_INCLUDE)/os/$(T_A)
+INSTALL_OSINC = $(OSINC:%= $(INSTALL_OSINCLUDE)/%)
+MANLIST = 1 2 3 4 5 6 7 8 9
+INSTALL_MANS = $(foreach n, \
+        $(MANLIST),$(INSTALL_MAN)/man$(n) $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%))
+INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%)
+INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%)
+INSTALL_TEMPLATES_SUBDIR = $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)
+INSTALL_TEMPLATE = $(TEMPLATES:%= $(INSTALL_TEMPLATES_SUBDIR)/%)
+INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%)
+
+MAN_DIRECTORY_TARGETS = $(foreach n, $(MANLIST),$(INSTALL_MAN)/man$(n))
+
+DIRECTORY_TARGETS = $(INSTALL_INCLUDE) $(INSTALL_INCLUDE)/os \
+	$(INSTALL_OSINCLUDE) $(INSTALL_DOC) \
+	$(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) $(INSTALL_TEMPLATES) \
+	$(INSTALL_LOCATION_BIN) $(INSTALL_BIN) $(INSTALL_LIB) \
+	$(INSTALL_LOCATION_LIB) $(INSTALL_CONFIG) \
+	$(MAN_DIRECTORY_TARGETS) $(INSTALL_MAN)
+
+all:: install
+
+pre_build::
+
+rebuild:: clean install
+
+build:: pre_build $(LIBNAME) $(TARGETS) $(PROD)
+
+inc:: $(INSTALL_INCLUDE) $(INSTALL_INC) $(INSTALL_INCLUDE)/os \
+	$(INSTALL_OSINCLUDE) $(INSTALL_OSINC)
+
+install:: inc buildInstall 
+
+buildInstall :: build \
+	$(INSTALL_LOCATION_LIB) $(INSTALL_LIB) $(INSTALL_LIBS) \
+	$(TARGETS) \
+	$(INSTALL_LOCATION_BIN) $(INSTALL_BIN) \
+		$(INSTALL_SCRIPTS) $(INSTALL_PROD) \
+	$(INSTALL_MAN) $(INSTALL_MANS) \
+	$(INSTALL_DOC) $(INSTALL_DOCS) $(INSTALL_TEMPLATES) \
+	$(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) $(INSTALL_TEMPLATE) \
+	$(INSTALL_CONFIG) $(INSTALL_CONFIGS) 
+
+depends:: $(SRCS.c) $(SRCS.cc)
+ifdef SRCS
+	echo you have a SRCS in your Makefile
+	exit 2
+endif
+ifdef SRCS.c
+	$(DEPENDS_RULE.c)
+endif
+ifdef SRCS.cc
+	$(DEPENDS_RULE.cc)
+endif
+
+clean::
+	@echo "Cleaning"
+	@$(RM) *.i *.o *.a $(TARGETS) $(PROD) $(LIBNAME) $(INC)
+
+$(DIRECTORY_TARGETS) :
+	@$(MKDIR) $@
+
+$(TARGETS) $(PROD): $(DEPLIBS)
+
+#  The order of the following dependencies is
+#  VERY IMPORTANT !!!!
+
+%: %.o
+	$(RM) $@
+	$(LINK.c) -o $@ $< $(LDLIBS)
+
+#$(PROD): $(OBJS)
+#	$(RM) $@
+#	$(LINK.c) -o $@ ${OBJS} $(LDLIBS)
+
+%.o: %.c
+	$(RM) $@
+	$(COMPILE.c) $<
+
+%.o: ../%.c
+	$(RM) $@
+	$(COMPILE.c) $<
+
+%.o: %.cc
+	$(RM) $@
+	$(COMPILE.cc) $<
+
+%.o: ../%.cc
+	$(RM) $@
+	$(COMPILE.cc) $<
+
+%.c: ../%.y
+	$(RM) y.tab.c y.tab.h
+	$(YACC) $(YACCOPT) $<
+	@if [ -f y.tab.c ]; \
+		then \
+			echo "$(MV) y.tab.c $*.c"; \
+			$(MV) y.tab.c $*.c; \
+	fi
+	@if [ -f y.tab.h ]; \
+		then \
+			echo "$(MV) y.tab.h $*.h"; \
+			$(MV) y.tab.h $*.h; \
+	fi
+
+%.c: ../%.l
+	$(RM) lex.yy.c
+	$(LEX) $(LEXOPT) $<
+	$(RM) $@
+	$(MV) lex.yy.c $@
+
+#state notation language rule
+%.c: ../%.st
+	@echo "preprocessing $*.st"
+	@$(RM) $*.i
+	$(CPP) $(CPPFLAGS) $< $*.i
+	@echo "converting $*.i"
+	@$(RM) $@
+	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.i
+
+%.c: %.stt
+	@echo "converting $<
+	@$(RM) $@
+	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $<
+
+# Capfast Rules:
+%.db: %.edf
+	$(E2DB) $(E2SR_SYSFLAGS) $(E2SR_FLAGS) $<
+
+%.db: ../%.edf
+	$(E2DB) $(E2SR_SYSFLAGS) $(E2SR_FLAGS) $<
+
+%.edf: ../%.sch $(DEPSCHS)
+	@if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi
+	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) $<
+
+# Mangen Rule:
+%.1:%
+	$(RM) $(<F)
+	$(RM) $(<F).nr
+	ln -s $<
+	$(MANGEN) -s $(<F)
+	$(MV) $(<F).nr $(<F).1
+
+# Mangen Rule:
+%.1:../%
+	$(RM) $(<F)
+	$(RM) $(<F).nr
+	ln -s $<
+	$(MANGEN) -s $(<F)
+	$(MV) $(<F).nr $(<F).1
+
+$(LIBNAME): $(LIBOBJS)
+	@echo Building library $@
+	$(RM) $@
+	$(ARCMD) $@ $(LIBOBJS)
+	@if [ ! -z "$(RANLIB)" ] ; then\
+		echo $(RANLIB) $@; \
+		$(RANLIB) $@; \
+	fi
+
+$(INSTALL_BIN)/%: % 
+	@echo "Installing Binary $@"
+	@$(INSTALL_PRODUCT) -m 555 $< $(INSTALL_BIN)
+
+$(INSTALL_BIN)/%: ../% 
+	@echo "Installing Binary $@"
+	@$(INSTALL_PRODUCT) -m 555 $< $(INSTALL_BIN)
+
+$(INSTALL_LIB)/%.a: %.a 
+	@echo "Installing library $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_LIB)
+	@if [ ! -z "$(RANLIB)" ] ; then\
+		$(RANLIB) $(RANLIBFLAGS) $@; \
+	fi
+
+$(INSTALL_CONFIG)/%: % 
+	@echo "Installing Config File $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_CONFIG)
+
+$(INSTALL_CONFIG)/%: ../% 
+	@echo "Installing Config File $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_CONFIG)
+
+$(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : % 
+	@echo "Installing man file $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : ../% 
+	@echo "Installing man file $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(INSTALL_INCLUDE)/%: % 
+	@echo "Installing Include File $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(INSTALL_INCLUDE)/%: ../% 
+	@echo "Installing Include File $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(INSTALL_DOC)/%: % 
+	@echo "Installing doc $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_DOC)
+
+$(INSTALL_DOC)/%: ../% 
+	@echo "Installing doc $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_DOC)
+
+$(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)/%: ../% 
+	@echo "Installing template $@"
+	@$(INSTALL) -d -m 644 $< $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)
+
+$(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)/%: % 
+	@echo "Installing template $@"
+	@$(INSTALL) -d -m 644 $< $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)
+
+.PRECIOUS: %.o %.c
+
+.PHONY:: all inc depends build install pre-build clean rebuild  
+
+-include .DEPENDS
+

config/RULES.Vx

@@ -0,0 +1,247 @@
+# $Id$
+
+INCREC +=$(RECTYPES) $(MENUS)
+INSTALL_PROD = $(PROD:%= $(INSTALL_BIN)/%)
+INSTALL_LIBS = $(LIBNAME:%= $(INSTALL_BIN)/%)
+INSTALL_INC = $(INC:%= $(INSTALL_INCLUDE)/%)
+INSTALL_OSINCLUDE = $(INSTALL_INCLUDE)/os/vxWorks
+INSTALL_OSINC = $(OSINC:%= $(INSTALL_OSINCLUDE)/%)
+INSTALL_INCREC = $(INCREC:%= $(INSTALL_INCLUDE)/%)
+MANLIST = 1 2 3 4 5 6 7 8 9
+INSTALL_MANS = $(foreach n, \
+	$(MANLIST),$(INSTALL_MAN)/man$(n) $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%))
+INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%)
+INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%)
+INSTALL_INSTALLS = $(INSTALLS:%= $(INSTALL_BIN)/%)
+
+INSTALL_BPTS = $(BPTS:%= $(INSTALL_DBD)/%)
+INSTALL_DBS = $(DBDINSTALL:%= $(INSTALL_DBD)/%)\
+              $(RECTYPES:%.h= $(INSTALL_DBD)/%.dbd)\
+              $(MENUS:%.h= $(INSTALL_DBD)/%.dbd)
+
+INSTALL_DBDNAME = $(DBDNAME:%= $(INSTALL_DBD)/%)
+
+MAN_DIRECTORY_TARGETS = $(foreach n, $(MANLIST),$(INSTALL_MAN)/man$(n))
+
+DIRECTORY_TARGETS = $(INSTALL_INCLUDE) $(INSTALL_DOC) $(INSTALL_DBD) \
+	$(INSTALL_OSINCLUDE) $(INSTALL_INCLUDE)/os \
+	$(INSTALL_LOCATION_BIN) $(INSTALL_BIN) \
+	$(MAN_DIRECTORY_TARGETS) $(INSTALL_MAN)
+
+all:: install 
+
+rebuild:: clean install
+
+pre_build:: 
+
+build:: pre_build $(MENUS) $(RECTYPES) $(BPTS)\
+         $(LIBNAME) $(TARGETS) $(PROD) $(DBDNAME)
+
+inc:: $(INSTALL_INCLUDE) $(INSTALL_INC) $(INSTALL_INCLUDE)/os \
+	$(INSTALL_OSINCLUDE) $(INSTALL_OSINC)
+
+install:: inc buildInstall 
+
+buildInstall :: build $(INSTALL_INCREC)\
+	 $(INSTALL_LOCATION_BIN) \
+         $(INSTALL_BIN) $(INSTALL_LIBS) \
+	 $(TARGETS) $(INSTALL_PROD) \
+	 $(INSTALL_MAN) $(INSTALL_MANS)\
+         $(INSTALL_DOC) $(INSTALL_DOCS) \
+	 $(INSTALL_SCRIPTS) $(INSTALL_INSTALLS)\
+	 $(INSTALL_DBD) $(INSTALL_DBS) $(INSTALL_BPTS) $(INSTALL_DBDNAME)
+
+depends:: $(SRCS.c) $(SRCS.cc)
+ifdef SRCS
+	echo you have a SRCS in your Makefile
+	exit 2
+endif
+ifdef SRCS.c
+	$(DEPENDS_RULE.c)
+endif
+ifdef SRCS.cc
+	$(DEPENDS_RULE.cc)
+endif
+
+clean::
+	@echo "Cleaning"
+	@$(RM) *.i *.o *.a $(TARGETS) $(PROD) $(LIBNAME) $(INC) \
+	$(DBDINSTALL) $(MENUS) $(RECTYPES) $(BPTS) $(DBDNAME)
+
+$(DIRECTORY_TARGETS) :
+	@$(MKDIR) $@
+
+#  The order of the following dependencies is
+#  VERY IMPORTANT !!!!
+
+%: %.o
+	$(RM) $@
+	$(LINK.c) $@ $<
+
+#$(PROD): $(OBJS)
+#	$(RM) $@
+#	$(LINK.c) $@ $(OBJS)
+
+%.o: %.c
+	$(RM) $@
+	$(COMPILE.c) $<
+
+%.o: ../%.c
+	$(RM) $@
+	$(COMPILE.c) $<
+
+%.o: %.cc
+	$(RM) $@
+	$(COMPILE.cc) $<
+
+%.o: ../%.cc
+	$(RM) $@
+	$(COMPILE.cc) $<
+
+%.c: ../%.y
+	$(RM) y.tab.c y.tab.h
+	$(YACC) $(YACCOPT) $<
+	@if [ -f y.tab.c ]; \
+		then \
+			echo "$(MV) y.tab.c $*.c"; \
+			$(MV) y.tab.c $*.c; \
+	fi
+	@if [ -f y.tab.h ]; \
+		then \
+			echo "$(MV) y.tab.h $*.h"; \
+			$(MV) y.tab.h $*.h; \
+	fi
+
+%.c: ../%.l
+	$(RM) lex.yy.c
+	$(LEX) $(LEXOPT) $<
+	$(RM) $@
+	$(MV) lex.yy.c $@
+
+#state notation language rules
+%.c: ../%.st
+	@echo "preprocessing $*.st"
+	@$(RM) $*.i
+	$(CPP) $(CPPFLAGS) $< $*.i
+	@echo "converting $*.i"
+	@$(RM) $@
+	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $*.i
+
+%.c: %.stt
+	@echo "converting $<
+	@$(RM) $@
+	$(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $<
+
+# Capfast Rules:
+%.db: %.edf
+	$(E2DB) $(E2SR_SYSFLAGS) $(E2SR_FLAGS) $<
+
+%.db: ../%.edf
+	$(E2DB) $(E2SR_SYSFLAGS) $(E2SR_FLAGS) $<
+
+%.edf: ../%.sch $(DEPSCHS)
+	@if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi
+	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) $<
+
+# Mangen Rule:
+%.1:%
+	$(RM) $(<F)
+	$(RM) $(<F).nr
+	ln -s $<
+	$(MANGEN) -s $(<F)
+	$(MV) $(<F).nr $(<F).1
+
+
+$(INSTALL_DBD)/%: % 
+	@echo "Installing $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_DBD)
+
+$(INSTALL_DBD)/%: ../% 
+	@echo "Installing $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_DBD)
+
+%Record.h: %Record.dbd
+	$(RM) $@
+	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH \
+		$(USER_DBDFLAGS)  $<
+
+%Record.h: ../%Record.dbd
+	$(RM) $@
+	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH \
+		$(USER_DBDFLAGS)  $<
+
+menu%.h: menu%.dbd
+	$(RM) $@
+	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToMenuH $<
+
+menu%.h: ../menu%.dbd
+	$(RM) $@
+	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToMenuH $<
+
+bpt%.dbd: bpt%.data
+	$(RM) $@
+	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt $<
+
+bpt%.dbd: ../bpt%.data
+	$(RM) $@
+	$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt $<
+
+$(DBDNAME): ../$(DBDEXPAND)
+	@echo expanding dbd
+	@$(RM) $@
+	$(EPICS_BASE)/bin/$(HOST_ARCH)/dbExpand\
+		$(USER_DBDFLAGS) $< > $@
+
+$(LIBNAME): $(LIBOBJS)
+	@echo Building library $@
+	@$(RM) $@
+	$(LINK.c) $@ $(LIBOBJS)
+
+$(INSTALL_BIN)/%: % 
+	@echo "Installing $@"
+	@$(INSTALL) -m 555 $< $(INSTALL_BIN)
+
+$(INSTALL_BIN)/%: ../% 
+	@echo "Installing $@"
+	@$(INSTALL) -m 555 $< $(INSTALL_BIN)
+
+#
+# avoid confusing circular dependency message when
+# INSTALL_BIN and EPICS_BASE_BIN are the same (in base)
+#
+ifneq ($(INSTALL_BIN),$(EPICS_BASE_BIN))
+$(INSTALL_BIN)/%: $(EPICS_BASE_BIN)/% 
+	@echo "Installing $@"
+	@$(INSTALL) -m 555 $< $(INSTALL_BIN)
+endif
+
+$(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : % 
+	@echo "Installing $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : ../% 
+	@echo "Installing $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(INSTALL_INCLUDE)/%: % 
+	@echo "Installing $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(INSTALL_INCLUDE)/%: ../% 
+	@echo "Installing $@"
+	@$(INSTALL) -m 644 $< $(@D)
+
+$(INSTALL_DOC)/%: % 
+	@echo "Installing $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_DOC)
+
+$(INSTALL_DOC)/%: ../% 
+	@echo "Installing $@"
+	@$(INSTALL) -m 644 $< $(INSTALL_DOC)
+
+.PRECIOUS: %.o %.c
+
+.PHONY:: all inc depends build install pre_build clean rebuild buildInstall
+
+-include .DEPENDS
+

config/RULES.ioc

@@ -0,0 +1,33 @@
+#RULES.ioc
+APPDIR := $(shell grep '.*".*App/' st.* | sed -e 's/.*"\(.*App\).*/\1/' | sort -u )
+ASCF = $(TOP)/../ascf
+TARGETBIN = $(TOP)/bin/$(ARCH)
+ 
+install: makelinks
+ 
+buildInstall:: install
+ 
+inc build depends:
+ 
+makelinks:
+	@$(RM) ascf bin vxWorks vxWorks.sym dbd share $(APPDIR)
+	ln -s $(ASCF) ascf
+	ln -s $(TARGETBIN) bin
+	ln -s $(TARGETBIN)/vxWorks vxWorks
+	ln -s $(TARGETBIN)/vxWorks.sym vxWorks.sym
+	ln -s $(TOP)/dbd dbd
+	ln -s $(SHARE) share
+	@for dir in $(APPDIR) ; do  \
+		if [ -d $(TOP)/$$dir ]; then \
+			ln -s $(TOP)/$$dir $$dir ; \
+			echo "ln -s $(TOP)/$$dir $$dir" ; \
+		elif [ -d $(MASTER_IOCAPPS)/$$dir ]; then \
+			ln -s $(MASTER_IOCAPPS)/$$dir $$dir ; \
+			echo "ln -s $(MASTER_IOCAPPS)/$$dir $$dir" ; \
+		else \
+			echo "$$dir not found" ; \
+		fi ; \
+	done
+ 
+clean::
+	@$(RM) ascf bin vxWorks vxWorks.sym dbd share $(APPDIR)

config/RULES_ARCHS

@@ -0,0 +1,92 @@
+#
+# $Id$
+#
+#  EPICS RULES_ARCH
+#       by Matthew Needes and Mike Bordua and Janet Andersoni and Jeff Hill
+#
+
+all:: install
+
+ACTIONS += inc
+ACTIONS += build
+ACTIONS += install
+ACTIONS += buildInstall 
+ACTIONS += depends 
+ACTIONS += rebuild 
+
+actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
+archPart = $(word 2, $(subst $(DIVIDER), ,$@))
+
+#
+# hostActionArchTargets
+#
+hostArchs = $(HOST_ARCH)
+hostActionArchTargets = $(foreach x, $(ACTIONS),\
+		$(foreach arch,$(hostArchs), $(x)$(DIVIDER)$(arch)))
+ifeq (Makefile.$(BUILD_TYPE), $(wildcard Makefile.$(BUILD_TYPE)))
+hostDirs = $(addprefix O.,$(hostArchs))
+$(hostActionArchTargets) : $(hostDirs)
+	$(MAKE) -C O.$(archPart) -f ../Makefile.$(BUILD_TYPE) T_A=$(archPart) $(actionPart)
+$(hostArchs) : % : O.% 
+	$(MAKE) -C O.$@ -f ../Makefile.$(BUILD_TYPE) T_A=$@ 
+else
+$(hostActionArchTargets) :
+$(hostArchs) :
+endif
+
+#
+# crossActionArchTargets
+#
+crossArchs = $(filter-out $(hostArchs),$(BUILD_ARCHS))
+crossActionArchTargets = $(foreach x, $(ACTIONS), \
+	$(foreach arch, $(CROSS_COMPILER_TARGET_ARCHS), $(x)$(DIVIDER)$(arch)))
+ifeq (Makefile.Vx, $(wildcard Makefile.Vx))
+crossDirs = $(addprefix O.,$(crossArchs))
+$(crossActionArchTargets) : $(crossDirs)
+	$(MAKE) -C O.$(archPart) -f ../Makefile.Vx T_A=$(archPart) $(actionPart)
+$(crossArchs) : % : O.%
+	$(MAKE) -C O.$@ -f ../Makefile.Vx T_A=$@
+else
+$(crossActionArchTargets) :
+$(crossArchs) : 
+endif
+
+$(hostDirs) : 
+	$(MKDIR) $@
+	echo "T_A=$(subst O.,,$@)" > $@/Makefile
+	echo "include ../Makefile.$(BUILD_TYPE)" >> $@/Makefile
+
+$(crossDirs) : 
+	$(MKDIR) $@
+	echo "T_A=$(subst O.,,$@)" > $@/Makefile
+	echo "include ../Makefile.Vx" >> $@/Makefile
+
+#
+# host/cross action targets
+#
+$(ACTIONS) clean : % : %$(DIVIDER)host %$(DIVIDER)cross 
+HostActionTargets = $(foreach x, $(ACTIONS) clean, $(x)$(DIVIDER)host)
+CrossActionTargets = $(foreach x, $(ACTIONS) clean, $(x)$(DIVIDER)cross)
+$(HostActionTargets) : %$(DIVIDER)host : $(addprefix %$(DIVIDER), $(hostArchs))
+$(CrossActionTargets) : %$(DIVIDER)cross : $(addprefix %$(DIVIDER), $(crossArchs))
+
+
+#
+# arch targets
+#
+host : $(hostArchs)
+cross : $(crossArchs)
+
+#
+# special clean rule
+#
+clean$(DIVIDER)% : 
+	$(RMDIR) O.$*
+
+.PHONY :: $(HostActionTargets)
+.PHONY :: $(CrossActionTargets)
+.PHONY :: $(crossActionArchTargets)
+.PHONY :: $(hostActionArchTargets)
+.PHONY :: $(hostArchs) $(crossArchs)
+.PHONY :: $(ACTIONS) clean all host cross
+

config/RULES_DIRS

@@ -0,0 +1,46 @@
+#
+#  $Id$
+#
+ 
+
+ARCHS += $(BUILD_ARCHS) host cross
+ACTIONS += clean inc depends buildInstall
+ 
+dirPart = $(word 1, $(subst $(DIVIDER), ,$@))
+actionArchPart = $(subst $(dirPart)$(DIVIDER), ,$@)
+ 
+dirActionArchTargets = $(foreach dir, $(DIRS), \
+                       $(foreach action, $(ACTIONS) install,\
+                       $(foreach arch, $(ARCHS), \
+                       $(dir)$(DIVIDER)$(action)$(DIVIDER)$(arch))))
+dirArchTargets += $(foreach dir, $(DIRS), \
+                  $(foreach arch, $(ARCHS),\
+                  $(dir)$(DIVIDER)$(arch)))
+dirActionTargets += $(foreach dir, $(DIRS), \
+                    $(foreach action, $(ACTIONS) install,\
+                    $(dir)$(DIVIDER)$(action)))
+actionArchTargets = $(foreach action, $(ACTIONS) install,\
+                    $(foreach arch, $(ARCHS), \
+                    $(action)$(DIVIDER)$(arch)))
+
+all install :: inc buildInstall 
+
+rebuild:: clean all
+
+$(DIRS) $(dirActionTargets) $(dirArchTargets)$(dirActionArchTargets) ::
+	$(MAKE) -C $(dirPart) $(actionArchPart)
+
+$(ARCHS) $(installArchTargets) :%: \
+	$(foreach dir, $(DIRS), $(dir)$(DIVIDER)inc) \
+	$(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
+
+$(ACTIONS) $(actionArchTargets) :%: \
+	$(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
+ 
+
+.PHONY :: $(DIRS) all install rebuild
+.PHONY :: $(ARCHS) $(ACTIONS)
+.PHONY :: $(dirActionTargets) $(dirArchTargets)
+.PHONY :: $(dirActionArchTargets)
+.PHONY :: $(actionArchTargets)
+

config/RULES_TOP

@@ -0,0 +1,51 @@
+#
+#  $Id$
+#
+
+include $(TOP)/config/RULES_DIRS
+
+uninstall$(DIVIDER)%::
+	@$(RMDIR) $(INSTALL_LOCATION_BIN)/$* $(INSTALL_LOCATION_LIB)/$* \
+		$(INSTALL_LOCATION)/dbd $(INSTALL_MAN) $(INSTALL_INCLUDE) \
+		$(INSTALL_DOC) $(INSTALL_DBD) $(INSTALL_TEMPLATES)
+	@$(RMDIR)  rec.bak rec
+
+uninstall:: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
+
+tar:
+	@DIRNAME=$(notdir $(shell pwd)); \
+	echo "TOP: Creating $$DIRNAME.Tar file..."; \
+	ls Makefile* | xargs tar vcf $$DIRNAME.Tar; \
+	if [ -f .current_rel_hist ]; then \
+		ls .current_rel_hist | xargs tar vrf $$DIRNAME.Tar ; \
+	fi ;\
+	if [ -f EPICS_BASE ]; then \
+		ls EPICS_BASE | xargs tar vrf $$DIRNAME.Tar ; \
+	fi ;\
+	for DIR in ${DIRS}; do    \
+		find $${DIR} -name CVS -prune -o ! -type d -print \
+		| grep -v "/O\..*$$" | xargs tar vrf $$DIRNAME.Tar; \
+	done
+
+help:
+	@echo "Usage: gnumake [options] [target] ..."
+	@echo "Targets supported by all Makefiles:"
+	@echo "     install		- Installs executables in bin/<arch> (default rule)"
+	@echo "     build		- Builds objects, using libraries from "build_libs"
+	@echo "     clean		- Cleans objects.  Clean removes the" O.<arch> dirs
+	@echo "                   in all except the O.<arch> level Makefile"
+	@echo "     depends		- Generates include dependencies"
+	@echo "\"Partial\" build targets supported by Makefiles:"
+	@echo "     install.<arch> - Builds and installs <arch> only.
+	@echo "     clean.<arch>   - Cleans <arch> binaries in O.<arch> dirs only."
+	@echo "     build.<arch>   - Builds <arch> only.
+	@echo "     depends.<arch> - Generates <arch> dependencies only.
+	@echo "Targets supported by top level Makefile:"
+	@echo "     uninstall   - Cleans directories created by the install."
+	@echo "     tar         - Create tar file "
+	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
+	@echo "     xxxRecord.o 
+
+.PHONY :: uninstall tar help
+.PHONY :: $(addprefix uninstall$(DIVIDER), $(BUILDARCHS))
+

config/Sample.Makefile.Host

@@ -0,0 +1,185 @@
+#	Makefile.Host  for  base/src/sample
+#
+#
+#	Sample Makefile.Host showing all possible entries
+#	that are allowed using RULES.Host.
+#
+#	8-01-96 -kuk-
+#
+#
+
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
+CMPLR = STRICT
+
+#	Add-on CFLAGS that are needed in this subproject.
+#	(If possible, all system specific flags should be
+#	 defined in CONFIG.$(ARCH_CLASS))
+#
+#	Whenever possible, ONLY USR_CFLAGS should be
+#	used. If you need special flags for your system,
+#	try to put them in CONFIG.YourSystem!
+#
+#	This is used on all systems:
+USR_CFLAGS         := -DVAR=value -Ddefine_for_all_systems
+#	This is added to the above, but only for ARCH_CLASS=BSD:
+USR_CFLAGS_BSD     := -DVERSION='Berkeley enhanced'
+#	..only for WIN32:
+USR_CFLAGS_WIN32   := -DVERSION='WIN32 port'
+#
+#	-nil- is special:
+#	if USR_CFLAGS_SYSV was undefined or empty, .._DEFAULT would have
+#	been used.
+#	To indicate
+#		"yes, there is a special USR_CFLAGS for SYSV, but it's empty"
+#	you have to set it to -nil-:
+USR_CFLAGS_SYSV    := -nil-
+#	.. for all other arch classes:
+USR_CFLAGS_DEFAULT := -DVERSION='generic Unix'
+
+#	CFLAGS that are only used to compile a_file.c or a_file.cc:
+#
+a_file_CFLAGS      := -DIN_A_FILE
+
+#	---------------------------------------------------------
+#	general rule for all .c .cc .h .hh files and scripts:
+#
+#	In here you supply just the filename without '../' etc.
+#	While building in an O.xxx subdir, the
+#	sources are extracted from either the
+#	             '..'
+#	dir or - if it exists - the dir
+#	             '../$(ARCH_CLASS)'
+#	is preferred.
+#	---------------------------------------------------------
+
+
+#	includes to install from this sub-project
+#
+#	again: if INC_$(ARCH_CLASS) is defined, it is added to INC,
+#	otherwise INC_DEFAULT (if defined) is added:
+#
+INC_DEFAULT := for_all_but_WIN32_or_hp700.h
+INC_WIN32   := only_for_WIN32.h
+INC_hp700   := -nil-		# hp700 uses no special include
+INC         := file.h
+
+# --------------------------------------------------------------------
+#	defining a library
+# --------------------------------------------------------------------
+#
+#	Contents of a library are specified via LIBSRCS.
+#	From this the platform specific object names (.o, .obj, ...)
+#	are derived automatically.
+#
+#	Platform specific objects:
+#	use LIBOBJS_$(ARCH_CLASS)  or  .._DEFAULT
+#
+#	Platform specific files can also be put in
+#	separate os/ARCH_CLASS directories!
+#
+#	For almost every file the seach order is:
+#	./os/ARCH_CLASS
+#	./os/generic
+#	.
+#	So usually only LIBSRCS should be sufficient!
+#
+LIBSRCS         := file_for_lib.c another_file.cc
+LIBSRCS_DEFAULT := posix.c
+LIBSRCS_WIN32   := win32_special.c
+LIBSRCS_BSD     := -nil-
+
+#	Type of library to build.
+#	On WIN32, SHARED results in a DLL, others may ignore this.
+LIBTYPE:=SHARED
+
+#	Ugly but necessary for WIN32:
+#	If LIBRARY is build as a dll, it may need other libraries
+#	to link with that you specify here.
+#	(because a dll is similar to a program:
+#	 all references have to be resolved)
+#
+#	If there is a file ../$(LIBRARY).def, it will
+#	be used as the dll-def-file on WIN32
+#
+#	We need this flag because
+#	1) you may not use a def file ('proper' code needs no def files)
+#	2) you may have one and still not want a DLL (for testing etc.)
+#	
+DLL_LIBS:=some_dll
+
+#	Library to build:
+#	lib$(LIBRARY).a  or   ..dll/..exp/..lib
+#
+#	Currently you can build only one (1) lib per Makefile.Host!
+#	
+LIBRARY:=libname
+
+# --------------------------------------------------------------------
+#	defining products (executable programs)
+# --------------------------------------------------------------------
+#
+#	if SRCS is undefined, it defaults to $(PROD).c 
+SRCS=a.c b.c c.c
+
+#	libs needed to link PROD and TESTPROD
+#
+# for all systems:
+PROD_LIBS         := Com Ca
+# for most systems:
+PROD_LIBS_DEFAULT := mathlib
+PROD_LIBS_WIN32   := -nil-
+
+#	Product,
+#	may be   caRepeater.o -> caRepeater
+#	or       caRepeater.obj -> caRepeater.exe
+PROD         := prod
+PROD_DEFAULT := product_for_rest
+PROD_WIN32   := product_only_for_WIN32
+PROD_BSD     := product_only_for_BSD
+PROD_SYSV    := product_only_for_SYSV
+
+#	Scripts to install
+#
+#	If there is  both  ../$(SCRIPT) and  ../$(ARCH_CLASS)/$(SCRIPT),
+#	the latter, system specific version will be installed!
+#
+SCRIPTS_DEFAULT := script_for_rest
+SCRIPTS_WIN32   := script_only_for_WIN32
+SCRIPTS_BSD     := script_only_for_BSD
+SCRIPTS         := script
+
+
+#	uncomment if you want to build these locally without installing:
+# TESTPROD = test
+
+
+# Unfortunately the above allows you only to
+# 1) build one PROD:=p from many SRCS:=a.c b.c c.c
+# or
+# 2) build many PROD:=a b c  each from a single source (a.c, b.c, c.c)
+#
+# If you have several multi-source products in the same dir
+# you have to fall back to explicit rules.
+# (suggestions for a better syntax welcome!)
+#
+# The explicit rules, however, should look like the following:
+
+#	be careful if you add rules and dependencies:
+#	use $(MV) $(RM) $(CP) $(MKDIR) $(RMDIR) $(OBJ) $(EXE) $(LINK.c) ....
+
+xxxxx$(OBJ):  c1.c c2.c h1.h
+
+#	because the output-flag (mostly '-o $@' on Unix, '-Fe$@' on WIN32)
+#	is also system dependend, it's included in $(LINK.c) and $(LINK.cc) !
+#
+prog$(EXE):	a$(OBJ) b$(OBJ)
+	$(LINK.c) a$(OBJ) b$(OBJ) $(LDLIBS)
+
+
+clean::
+	$(RM) dbLex.c
+
+include $(TOP)/config/RULES.Host
+
+#	EOF Makefile.Host

src/Makefile

@@ -1,42 +1,14 @@
-#   $Id$
-# 	Author: Robert Zieman (ANL)
-# 	Date:	6/03/91
-# 
-# 	Experimental Physics and Industrial Control System (EPICS)
-# 
-# 	Copyright 1991, the Regents of the University of California,
-# 	and the University of Chicago Board of Governors.
-# 
-# 	This software was produced under  U.S. Government contracts:
-# 	(W-7405-ENG-36) at the Los Alamos National Laboratory,
-# 	and (W-31-109-ENG-38) at Argonne National Laboratory.
-# 
-# 	Initial development by:
-# 		The Controls and Automation Group (AT-8)
-# 		Ground Test Accelerator
-# 		Accelerator Technology Division
-# 		Los Alamos National Laboratory
-# 
-# 	Co-developed with
-# 		The Controls and Computing Group
-# 		Accelerator Systems Division
-# 		Advanced Photon Source
-# 		Argonne National Laboratory
-# 
-#  Modification Log:
-#  -----------------
-#  .01	mm-dd-yy	iii	Comment
-#  .02  08-16-93	rcz	moving most of these pre-builds back to the
-# object area Imakefile and adding DependTarget($(EARLYSRC))
 #
-#  	...
+# $Id$
 #
 
-all: bld_errSym
+TOP = ..
+include $(TOP)/config/CONFIG_BASE
 
-bld_errSym:
-	cd libCom;	../../tools/blderrSymTbl
+#
+# Directories to build defined in CONFIG_BASE
+#
 
+ 
+include $(TOP)/config/RULES_DIRS
 
-clean:
-	/bin/rm -f libCom/errInc.o

src/as/Makefile

@@ -1,15 +1,7 @@
-#
-# $Id$
-#
-#  Lowest Level Directroy Makefile
-#        by Janet Anderson
-#
-# $Log$
-#
 
-EPICS=../../..
+TOP=../..
 
-include $(EPICS)/config/CONFIG_BASE
+include $(TOP)/config/CONFIG_BASE
 
-include $(EPICS)/config/RULES_ARCHS
+include $(TOP)/config/RULES_ARCHS
 

src/as/Makefile.Host

@@ -0,0 +1,32 @@
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
+
+USR_CFLAGS = -D_NO_PROTO
+
+INC := asDbLib.h asLib.h
+
+#	build lib As from asLib.c:
+#
+LIBSRCS := asLib.c
+LIBRARY := As
+
+
+#	All systems link the libs As, Com, Db (and again Com ??),
+#	generic Unix needs also lib m:
+#
+PROD_LIBS_DEFAULT := m
+PROD_LIBS_WIN32   := -nil-
+PROD_LIBS         := As Com Db Com
+
+PROD := ascheck
+
+include $(TOP)/config/RULES.Host
+
+# Extra rule since asLib_lex.c is included in asLib.c
+#   In my opinion, these objects should really be built
+#   independently.
+asLib$(OBJ): asLib_lex.c ../asLibRoutines.c
+
+clean::
+	@$(RM) asLib.c asLib_lex.c 
+

src/as/Makefile.Unix

@@ -1,12 +1,11 @@
-EPICS = ../../../..
-include Target.include
-include $(EPICS)/config/CONFIG_BASE
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
 
 USR_CFLAGS = -D_NO_PROTO
 USR_LDLIBS = -lAs -lCom -lDb -lCom -lm -s
 USR_LDFLAGS = -L.
 
-DEPLIBS_BASE = $(EPICS_BASE_LIB)
+DEPLIBS_BASE = $(INSTALL_LIB)
 DEPLIBS = ./libAs.a\
 	  $(DEPLIBS_BASE)/libCom.a\
 	  $(DEPLIBS_BASE)/libDb.a
@@ -20,7 +19,7 @@ LIBOBJS = asLib.o
 LIBNAME = libAs.a
 PROD = ascheck
 
-include $(EPICS)/config/RULES.Unix
+include $(TOP)/config/RULES.Unix
 
 # Extra rule since asLib_lex.c is included in asLib.c
 #   In my opinion, these objects should really be built

src/as/Makefile.Vx

@@ -1,6 +1,5 @@
-EPICS = ../../../..
-include Target.include
-include $(EPICS)/config/CONFIG_BASE
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
 
 USR_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO
 
@@ -8,7 +7,7 @@ SRCS.c = ../asDbLib.c ../asCa.c asLib.c
 LIBOBJS = asDbLib.o asCa.o asLib.o
 LIBNAME = asLibrary
 
-include $(EPICS)/config/RULES.Vx
+include $(TOP)/config/RULES.Vx
 
 # Extra rule since asLib_lex.c is included in asLib.c
 #   In my opinion, these objects should really be built

src/as/asCa.c

@@ -65,7 +65,6 @@ DEVELOPMENT CENTER AT ARGONNE NATIONAL LABORATORY (708-252-2000).
 #include <cadef.h>
 #include <caerr.h>
 #include <caeventmask.h>
-#include <calink.h>
 #include <task_params.h>
 #include <alarm.h>
 
@@ -131,7 +130,6 @@ LOCAL void eventCallback(struct event_handler_args eha)
     struct dbr_sts_double *pdata = eha.dbr;
     int			Ilocked=FALSE;
 
-    
     if(!caInitializing) {
 	FASTLOCK(&asLock);
 	Ilocked = TRUE;
@@ -170,9 +168,8 @@ LOCAL void asCaTask(void)
 	    pasg->inpBad |= (1<<pasginp->inpIndex);
 	    pcapvt = pasginp->capvt = asCalloc(1,sizeof(CAPVT));
 	    /*Note calls connectCallback immediately called for local Pvs*/
-	    SEVCHK(ca_build_and_connect(pasginp->inp,TYPENOTCONN,0,
-		&pcapvt->chid,0,connectCallback,pasginp),
-		"ca_build_and_connect");
+	    SEVCHK(ca_search_and_connect(pasginp->inp,&pcapvt->chid,
+		connectCallback,pasginp),"ca_build_and_connect");
 	    /*Note calls accessRightsCallback immediately called for local Pvs*/
 	    SEVCHK(ca_replace_access_rights_event(pcapvt->chid,accessRightsCallback),
 		"ca_replace_access_rights_event");

src/as/asDbLib.c

@@ -107,7 +107,7 @@ static long asDbAddRecords(void)
     dbCommon	*precord;
 
     dbInitEntry(pdbbase,pdbentry);
-    status = dbFirstRecdes(pdbentry);
+    status = dbFirstRecordType(pdbentry);
     while(!status) {
 	status = dbFirstRecord(pdbentry);
 	while(!status) {
@@ -119,7 +119,7 @@ static long asDbAddRecords(void)
 	    }
 	    status = dbNextRecord(pdbentry);
 	}
-	status = dbNextRecdes(pdbentry);
+	status = dbNextRecordType(pdbentry);
     }
     dbFinishEntry(pdbentry);
     return(0);
@@ -301,7 +301,10 @@ ASMEMBERPVT  asDbGetMemberPvt(void *paddress)
 
 static void astacCallback(ASCLIENTPVT clientPvt,asClientStatus status)
 {
-    printf("astac callback: status=%d",status);
+    char *recordname;
+
+    recordname = (char *)asGetClientPvt(clientPvt);
+    printf("astac callback %s: status=%d",recordname,status);
     printf(" get %s put %s\n",(asCheckGet(clientPvt) ? "Yes" : "No"),
 	(asCheckPut(clientPvt) ? "Yes" : "No"));
 }
@@ -329,6 +332,7 @@ int astac(char *pname,char *user,char *location)
 	errMessage(status,"asAddClient error");
 	return(1);
     } else {
+	asPutClientPvt(*pasclientpvt,(void *)precord->name);
 	asRegisterClientCallback(*pasclientpvt,astacCallback);
     }
     return(0);

src/bdt/Makefile

@@ -4,15 +4,10 @@
 #  Base Lowest Level Directroy Makefile
 #        by Janet Anderson
 #
-# $Log$
-# Revision 1.1  1994/09/07  19:26:22  jba
-# New file
-#
-#
 
-EPICS=../../..
+TOP=../..
 
-include $(EPICS)/config/CONFIG_BASE
+include $(TOP)/config/CONFIG_BASE
 
-include $(EPICS)/config/RULES_ARCHS
+include $(TOP)/config/RULES_ARCHS
 

src/bdt/Makefile.Host

@@ -0,0 +1,10 @@
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
+
+INC := bdt.h
+
+LIBSRCS := bdt.c
+
+LIBRARY := Bdt
+
+include $(TOP)/config/RULES.Host

src/bdt/Makefile.Unix

@@ -1,6 +1,5 @@
-EPICS = ../../../..
-include Target.include
-include $(EPICS)/config/CONFIG_BASE
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
 
 INC += bdt.h
 
@@ -8,4 +7,4 @@ LIBOBJS += bdt.o
 
 LIBNAME = libBdt.a
 
-include $(EPICS)/config/RULES.Unix
+include $(TOP)/config/RULES.Unix

src/bdt/Makefile.Vx

@@ -1,6 +1,5 @@
-EPICS = ../../../..
-include Target.include
-include $(EPICS)/config/CONFIG_BASE
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
 
 SRCS.c += ../bdt.c
 SRCS.c += ../bdtServ.c
@@ -14,7 +13,7 @@ OBJS += bdtServPv.o
 
 PROD = bdt
 
-include $(EPICS)/config/RULES.Vx
+include $(TOP)/config/RULES.Vx
 
 $(PROD): $(OBJS)
 	$(RM) $@

src/bpt/Makefile

@@ -1,18 +1,7 @@
-#
-# $Id$
-#
-#  Lowest Level Directroy Makefile
-#        by Janet Anderson
-#
-# $Log$
-# Revision 1.1  1994/09/07  19:25:39  jba
-# New file
-#
-#
 
-EPICS=../../..
+TOP=../..
 
-include $(EPICS)/config/CONFIG_BASE
+include $(TOP)/config/CONFIG_BASE
 
-include $(EPICS)/config/RULES_ARCHS
+include $(TOP)/config/RULES_ARCHS
 

src/bpt/Makefile.Host

@@ -0,0 +1,14 @@
+#	Makefile.Host for base/src/bpt
+#
+
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
+
+INC := cvtTable.h
+
+SRCS := makeBpt.c
+PROD := makeBpt
+
+include $(TOP)/config/RULES.Host
+
+#	EOF Makefile.Host for base/src/bpt

src/bpt/Makefile.Unix

@@ -1,12 +1,15 @@
-EPICS = ../../../..
-include Target.include
-include $(EPICS)/config/CONFIG_BASE
-
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
 
 INC += cvtTable.h
 
-SRCS.c = ../makeBpt
-OBJS = makeBpt
+SRCS.c = ../makeBpt.c
+OBJS = makeBpt.o
 PROD = makeBpt
 
-include $(EPICS)/config/RULES.Unix
+include $(TOP)/config/RULES.Unix
+
+$(PROD): $(OBJS)
+	$(RM) $@
+	$(LINK.c) -o $@ ${OBJS} $(LDLIBS)
+

src/bpt/Makefile.Vx

@@ -1,16 +1,15 @@
-EPICS = ../../../..
-include Target.include
-include $(EPICS)/config/CONFIG_BASE
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
 
 USR_CFLAGS = -ansi
 VX_WARN_YES = -Wall -pedantic
 
 MENUS += menuConvert.h
 
-BPTS += bptTypeJdegC.db
-BPTS += bptTypeJdegF.db
-BPTS += bptTypeKdegC.db
-BPTS += bptTypeKdegF.db
+BPTS += bptTypeJdegC.dbd
+BPTS += bptTypeJdegF.dbd
+BPTS += bptTypeKdegC.dbd
+BPTS += bptTypeKdegF.dbd
 
 
 SRCS.c = \
@@ -21,5 +20,5 @@ LIBOBJS = \
 
 LIBNAME = pbtLib
 
-include $(EPICS)/config/RULES.Vx
+include $(TOP)/config/RULES.Vx
 

src/bpt/makeBpt.c

@@ -118,7 +118,7 @@ int main(argc, argv)
 	fprintf(stderr,"Input file MUST have .data  extension\n");
 	exit(-1);
     }
-    strcpy(pext,".db");
+    strcpy(pext,".dbd");
     inFile = fopen(argv[1],"r");
     if(!inFile) {
 	fprintf(stderr,"Error opening %s\n",argv[1]);

src/ca/Makefile

@@ -1,15 +1,7 @@
-#
-# $Id$
-#
-#  Lowest Level Directroy Makefile
-#        by Janet Anderson
-#
-# $Log$
-#
 
-EPICS=../../..
+TOP=../..
 
-include $(EPICS)/config/CONFIG_BASE
+include $(TOP)/config/CONFIG_BASE
 
-include $(EPICS)/config/RULES_ARCHS
+include $(TOP)/config/RULES_ARCHS
 

src/ca/Makefile.Host

@@ -0,0 +1,58 @@
+#	Makefile.Host
+
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
+CMPLR = STRICT
+
+#
+#	includes to install from this subproject
+#
+INC += cadef.h
+INC += caerr.h
+INC += caeventmask.h
+INC += caProto.h
+
+#
+#	Contents of library: generic, special and for all systems
+#
+
+# on generic system
+LIBSRCS_DEFAULT := posix_depen.c if_depen.c caRepeater.c
+
+# on WIN32 only
+LIBSRCS_WIN32   := windows_depen.c
+
+# on all systems
+LIBSRCS += iocinf.c
+LIBSRCS += service.c
+LIBSRCS += conn.c
+LIBSRCS += netdb_depen.c
+LIBSRCS += flow_control.c
+LIBSRCS += syncgrp.c
+LIBSRCS += access.c
+LIBSRCS += convert.c
+LIBSRCS += test_event.c
+LIBSRCS += bsd_depen.c
+LIBSRCS += repeater.c
+
+#       Library to build:
+#       lib$(LIBRARY).a  or   ..dll/..exp/..lib
+#
+LIBRARY := ca
+
+#	build LIBRARY as a DLL on WIN32, other systems may ignore this
+LIBTYPE := SHARED
+
+#	WIN32 only: need additional lib to build the DLL and special def-file
+DLL_LIBS := Com
+
+PROD := caRepeater
+
+#	libs needed to build [TEST]PRODUCT
+PROD_LIBS := ca Com
+
+TESTPROD := catime acctst
+
+include $(TOP)/config/RULES.Host
+
+#	EOF Makefile.Host

src/ca/Makefile.Unix

@@ -1,20 +1,18 @@
-EPICS = ../../../..
-include Target.include
-include $(EPICS)/config/CONFIG_BASE
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
 
-USR_LDLIBS = -lca -lCom -lm
+CMPLR = STRICT
+
+USR_LDLIBS = -lca -lCom 
 USR_LDFLAGS = -L.
 
-DEPLIBS_BASE = $(EPICS_BASE_LIB)
-DEPLIBS = ./libca.a\
-	$(DEPLIBS_BASE)/libCom.a
-
+DEPLIBS_BASE = $(INSTALL_LIB)
+DEPLIBS = ./libca.a $(DEPLIBS_BASE)/libCom.a
 
 INC += cadef.h
 INC += caerr.h
 INC += caeventmask.h
-INC += calink.h
-INC += bsdProto.h
+INC += caProto.h
 
 SRCS.c = \
 	../iocinf.c ../access.c ../test_event.c ../service.c \
@@ -34,13 +32,11 @@ LIBNAME = libca.a
 
 PROD = caRepeater 
 
+TARGETS = acctst catime
 
-include $(EPICS)/config/RULES.Unix
+include $(TOP)/config/RULES.Unix
 
-acctst: acctst.o $(LIBOBJS) $(DEPLIBS_BASE)/libCom.a
-	$(LINK.c) -o $@ $< $(LIBOBJS) $(DEPLIBS_BASE)/libCom.a 
-
-catime: catime.o $(LIBOBJS) $(DEPLIBS_BASE)/libCom.a 
-	$(LINK.c) -o $@ $< $(LIBOBJS) $(DEPLIBS_BASE)/libCom.a 
+pacctst: acctst.o $(DEPLIBS)
+	$(PURIFY) -best-effort $(LINK.c) -o $@ acctst.o $(DEPLIBS)
 
 

src/ca/Makefile.Vx

@@ -1,18 +1,18 @@
-EPICS = ../../../..
-include Target.include
-include $(EPICS)/config/CONFIG_BASE
+TOP = ../../..
+include $(TOP)/config/CONFIG_BASE
 
 SRCS.c = \
 	../iocinf.c ../access.c ../test_event.c ../service.c \
 	../flow_control.c ../repeater.c ../conn.c ../syncgrp.c \
 	../if_depen.c ../bsd_depen.c ../vxWorks_depen.c ../acctst.c \
-	../catime.c
+	../catime.c ../convert.c
 
 LIBOBJS = \
 	iocinf.o access.o test_event.o service.o flow_control.o \
-	repeater.o conn.o syncgrp.o if_depen.o bsd_depen.o vxWorks_depen.o 
+	repeater.o conn.o syncgrp.o if_depen.o bsd_depen.o vxWorks_depen.o \
+	convert.o
 
 LIBNAME = caLib 
 
-include $(EPICS)/config/RULES.Vx
+include $(TOP)/config/RULES.Vx
 

src/ca/acctst.c

@@ -7,6 +7,30 @@ static char *sccsId = "@(#) $Id$";
 
 /*
  * $Log$
+ * Revision 1.41  1996/12/11 01:10:33  jhill
+ * added additional vector tests
+ *
+ * Revision 1.40  1996/11/22 19:07:01  jhill
+ * included string.h
+ *
+ * Revision 1.39  1996/11/02 00:50:36  jhill
+ * many pc port, const in API, and other changes
+ *
+ * Revision 1.37  1996/09/16 16:31:01  jhill
+ * fixed NT warnings
+ *
+ * Revision 1.36  1996/07/24 21:55:33  jhill
+ * fixed gnu warnings
+ *
+ * Revision 1.35  1996/07/01 19:49:15  jhill
+ * turned on analog value wrap-around test
+ *
+ * Revision 1.34  1996/06/19 17:59:02  jhill
+ * many 3.13 beta changes
+ *
+ * Revision 1.33  1995/12/19  19:29:04  jhill
+ * changed put test
+ *
  * Revision 1.32  1995/11/29  19:17:25  jhill
  * more tests
  *
@@ -32,6 +56,7 @@ static char *sccsId = "@(#) $Id$";
 #include	<stdlib.h>
 #include	<math.h>
 #include	<float.h>
+#include	<string.h>
 
 #include	"os_depen.h"
 
@@ -49,6 +74,18 @@ int	conn_cb_count;
 #define min(A,B) ((A)>(B)?(B):(A))
 #endif
 
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef NELEMENTS
+#define NELEMENTS(A) (sizeof(A)/sizeof(A[0]))
+#endif
+
 int	doacctst(char *pname);
 void 	test_sync_groups(chid chix);
 void 	multiple_sg_requests(chid chix, CA_SYNC_GID gid);
@@ -94,7 +131,7 @@ int acctst(char *pname)
 			NULL);
 }
 #else /* not vxWorks */
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	if(argc == 2){
 		doacctst(argv[1]);
@@ -122,6 +159,7 @@ int doacctst(char *pname)
 	evid            monix;
 	char            pstring[NUM][MAX_STRING_SIZE];
 	unsigned	size;
+	unsigned	monCount=0u;
 
 	SEVCHK(ca_task_initialize(), "Unable to initialize");
 
@@ -132,6 +170,11 @@ int doacctst(char *pname)
 	lib$init_timer();
 #endif /*VMS*/
 
+	printf("CA Client V%s\n", ca_version());
+
+	/*
+	 * CA pend event delay accuracy test
+	 */
 	{
 		TS_STAMP	end_time;
 		TS_STAMP	start_time;
@@ -149,12 +192,30 @@ int doacctst(char *pname)
 		accuracy = 100.0*(delay-request)/request;
 		printf("CA pend event delay accuracy = %f %%\n",
 			accuracy);
-		assert (abs(accuracy) < 10.0);
+		assert (fabs(accuracy) < 10.0);
 	}
 
 	size = dbr_size_n(DBR_GR_FLOAT, NUM);
 	ptr = (struct dbr_gr_float *) malloc(size);  
 
+	/*
+	 * verify that we dont print a disconnect message when 
+	 * we delete the last channel
+	 * (this fails if we see a disconnect message)
+	 */
+	status = ca_search( pname, &chix3);
+	SEVCHK(status, NULL);
+	status = ca_pend_io(1000.0);
+	SEVCHK(status, NULL);
+	status = ca_clear_channel(chix3);
+	SEVCHK(status, NULL);
+
+	/*
+	 * verify lots of disconnects 
+	 * verify channel connected state variables
+	 */
+	printf("Connect/disconnect test");
+	fflush(stdout);
 	for (i = 0; i < 10; i++) {
 
 		status = ca_search(
@@ -172,14 +233,9 @@ int doacctst(char *pname)
 			    &chix2);
 		SEVCHK(status, NULL);
 
-		status = ca_build_and_connect(
-					    pname,
-					    TYPENOTCONN,
-					    0,
-					    &chix1,
-					    NULL,
-					    NULL,
-					    NULL);
+		status = ca_search(
+			    pname,
+			    &chix1);
 		SEVCHK(status, NULL);
 
 		if (ca_test_io() == ECA_IOINPROGRESS) {
@@ -197,6 +253,9 @@ int doacctst(char *pname)
 		status = ca_pend_io(1000.0);
 		SEVCHK(status, NULL);
 
+		printf(".");
+		fflush(stdout);
+
 		assert(ca_test_io() == ECA_IODONE);
 
 		assert(ca_state(chix1) == cs_conn);
@@ -209,50 +268,97 @@ int doacctst(char *pname)
 		SEVCHK(ca_clear_channel(chix2), NULL);
 		SEVCHK(ca_clear_channel(chix1), NULL);
 	}
+	printf("\n");
 
+	/*
+	 * look for problems with ca_search(), ca_clear_channel(),
+	 * ca_change_connection_event(), and ca_pend_io(() combo
+	 */
 	status = ca_search(pname,& chix3);
 	SEVCHK(status, NULL);
+
 	status = ca_replace_access_rights_event(chix3, accessSecurity_cb);
+	SEVCHK(status, NULL);
 
 	/*
 	 * verify clear before connect
 	 */
-	status = ca_search_and_connect(pname, &chix4, CONN_ROUTINE, NULL);
+	status = ca_search(pname, &chix4);
 	SEVCHK(status, NULL);
 
 	status = ca_clear_channel(chix4);
 	SEVCHK(status, NULL);
 
-	status = ca_search_and_connect(pname, &chix4, CONN_ROUTINE, NULL);
+	status = ca_search(pname, &chix4);
 	SEVCHK(status, NULL);
 
 	status = ca_replace_access_rights_event(chix4, accessSecurity_cb);
 	SEVCHK(status, NULL);
 
-	status = ca_search_and_connect(pname, &chix2, CONN_ROUTINE, NULL);
+	status = ca_search(pname, &chix2);
 	SEVCHK(status, NULL);
 
 	status = ca_replace_access_rights_event(chix2, accessSecurity_cb);
 	SEVCHK(status, NULL);
 
-	status = ca_search_and_connect(pname, &chix1, CONN_ROUTINE, NULL);
+	status = ca_search(pname, &chix1);
 	SEVCHK(status, NULL);
 
 	status = ca_replace_access_rights_event(chix1, accessSecurity_cb);
 	SEVCHK(status, NULL);
 
+	status = ca_change_connection_event(chix1,conn);
+	SEVCHK(status, NULL);
+
+	status = ca_change_connection_event(chix1,NULL);
+	SEVCHK(status, NULL);
+
+	status = ca_change_connection_event(chix1,conn);
+	SEVCHK(status, NULL);
+
+	status = ca_change_connection_event(chix1,NULL);
+	SEVCHK(status, NULL);
+
 	status = ca_pend_io(1000.0);
 	SEVCHK(status, NULL);
 
-	assert(ca_state(chix1) == cs_conn);
-	assert(ca_state(chix2) == cs_conn);
-	assert(ca_state(chix3) == cs_conn);
-	assert(ca_state(chix4) == cs_conn);
+	assert (ca_state(chix1) == cs_conn);
+	assert (ca_state(chix2) == cs_conn);
+	assert (ca_state(chix3) == cs_conn);
+	assert (ca_state(chix4) == cs_conn);
 
-	assert(INVALID_DB_REQ(chix1->type) == FALSE);
-	assert(INVALID_DB_REQ(chix2->type) == FALSE);
-	assert(INVALID_DB_REQ(chix3->type) == FALSE);
-	assert(INVALID_DB_REQ(chix4->type) == FALSE);
+	assert (INVALID_DB_REQ(chix1->type) == FALSE);
+	assert (INVALID_DB_REQ(chix2->type) == FALSE);
+	assert (INVALID_DB_REQ(chix3->type) == FALSE);
+	assert (INVALID_DB_REQ(chix4->type) == FALSE);
+
+	/*
+	 * verify connection handlers are working
+	 */
+	status = ca_clear_channel(chix1);
+	SEVCHK(status, NULL);
+	status = ca_clear_channel(chix2);
+	SEVCHK(status, NULL);
+	status = ca_clear_channel(chix3);
+	SEVCHK(status, NULL);
+	status = ca_clear_channel(chix4);
+	SEVCHK(status, NULL);
+
+	status = ca_search_and_connect(pname, &chix1, conn, NULL);
+	SEVCHK(status, NULL);
+	status = ca_search_and_connect(pname, &chix2, conn, NULL);
+	SEVCHK(status, NULL);
+	status = ca_search_and_connect(pname, &chix3, conn, NULL);
+	SEVCHK(status, NULL);
+	status = ca_search_and_connect(pname, &chix4, conn, NULL);
+	SEVCHK(status, NULL);
+
+	ca_pend_event(1.0);
+	while (conn_cb_count != 4){
+		ca_pend_event(1.0);
+		printf("waiting on connect...");
+		fflush(stdout);
+	}
 
 #ifdef VMS
 	lib$show_timer();
@@ -266,13 +372,95 @@ int doacctst(char *pname)
 		ca_read_access(chix1),
 		ca_write_access(chix1));
 
-#if 0
+	/*
+	 * ca_pend_io() must block
+	 */
+	if(ca_read_access(chix4)){
+		dbr_float_t	req;
+		dbr_float_t	resp;
+
+		printf ("get TMO test ...");
+		fflush(stdout);
+		req = 56.57f;
+		resp = -99.99f;
+		SEVCHK(ca_put(DBR_FLOAT, chix4, &req),NULL);
+		SEVCHK(ca_get(DBR_FLOAT, chix4, &resp),NULL);
+		status = ca_pend_io(1.0e-12);
+		if (status==ECA_NORMAL) {
+			if (resp != req) {
+				printf (
+	"get block test failed - val written %f\n", req);
+				printf (
+	"get block test failed - val read %f\n", resp);
+				assert(0);
+			}
+		}
+		else if (resp != -99.99f) {
+			printf (
+	"CA didnt block for get to return?\n");
+		}
+			
+		req = 33.44f;
+		resp = -99.99f;
+		SEVCHK (ca_put(DBR_FLOAT, chix4, &req),NULL);
+		SEVCHK (ca_get(DBR_FLOAT, chix4, &resp),NULL);
+		SEVCHK (ca_pend_io(2000.0),NULL);
+		if (resp != req) {
+			printf (
+	"get block test failed - val written %f\n", req);
+			printf (
+	"get block test failed - val read %f\n", resp);
+			assert(0);
+		}
+		printf ("done\n");
+	}
+
 	/*
 	 * Verify that we can write and then read back
-	 * the same analog value
+	 * the same analog value (DBR_FLOAT)
 	 */
-	if(	(ca_field_type(chix1)==DBR_FLOAT || 
-		ca_field_type(chix1)==DBR_DOUBLE) &&
+	if(	(ca_field_type(chix1)==DBR_DOUBLE || 
+		ca_field_type(chix1)==DBR_FLOAT) && 
+		ca_read_access(chix1) && 
+		ca_write_access(chix1)){
+
+		dbr_float_t incr;
+		dbr_float_t epsil;
+		dbr_float_t base;
+		unsigned long iter;
+
+		printf ("float test ...");
+		fflush(stdout);
+		epsil = FLT_EPSILON*4.0F;
+		base = FLT_MIN;
+		for (i=FLT_MIN_EXP; i<FLT_MAX_EXP; i+=FLT_MAX_EXP/10) {
+			incr = (dbr_float_t) ldexp (0.5F,i);
+			iter = (unsigned long) (FLT_MAX/fabs(incr));
+			iter = min (iter,10);
+			floatTest(chix1, base, incr, epsil, iter);
+		}
+		base = FLT_MAX;
+		for (i=FLT_MIN_EXP; i<FLT_MAX_EXP; i+=FLT_MAX_EXP/10) {
+			incr =  (dbr_float_t) - ldexp (0.5F,i);
+			iter = (unsigned long) (FLT_MAX/fabs(incr));
+			iter = min (iter,10);
+			floatTest(chix1, base, incr, epsil, iter);
+		}
+		base = - FLT_MAX;
+		for (i=FLT_MIN_EXP; i<FLT_MAX_EXP; i+=FLT_MAX_EXP/10) {
+			incr = (dbr_float_t) ldexp (0.5F,i);
+			iter = (unsigned long) (FLT_MAX/fabs(incr));
+			iter = min (iter,10);
+			floatTest(chix1, base, incr, epsil, iter);
+		}
+		printf ("done\n");
+	}
+
+	/*
+	 * Verify that we can write and then read back
+	 * the same analog value (DBR_DOUBLE)
+	 */
+	if(	ca_field_type(chix1)==DBR_DOUBLE &&
 		ca_read_access(chix1) && 
 		ca_write_access(chix1)){
 
@@ -281,59 +469,32 @@ int doacctst(char *pname)
 		dbr_double_t base;
 		unsigned long iter;
 
-		printf ("float test ...");
-		fflush(stdout);
-		epsil = FLT_EPSILON*4;
-		base = FLT_MIN;
-		for (i=FLT_MIN_EXP; i<FLT_MAX_EXP; i++) {
-			incr = ldexp (0.5,i);
-			iter = FLT_MAX/fabs(incr);
-			iter = min (iter,10);
-			floatTest(chix1, base, incr, epsil, iter);
-		}
-		base = FLT_MAX;
-		for (i=FLT_MIN_EXP; i<FLT_MAX_EXP; i++) {
-			incr =  - ldexp (0.5,i);
-			iter = FLT_MAX/fabs(incr);
-			iter = min (iter,10);
-			floatTest(chix1, base, incr, epsil, iter);
-		}
-		base = - FLT_MAX;
-		for (i=FLT_MIN_EXP; i<FLT_MAX_EXP; i++) {
-			incr = ldexp (0.5,i);
-			iter = FLT_MAX/fabs(incr);
-			iter = min (iter,10);
-			floatTest(chix1, base, incr, epsil, iter);
-		}
-		printf ("done\n");
-
 		printf ("double test ...");
 		fflush(stdout);
 		epsil = DBL_EPSILON*4;
 		base = DBL_MIN;
-		for (i=DBL_MIN_EXP; i<DBL_MAX_EXP; i++) {
+		for (i=DBL_MIN_EXP; i<DBL_MAX_EXP; i+=DBL_MAX_EXP/10) {
 			incr = ldexp (0.5,i);
-			iter = DBL_MAX/fabs(incr);
+			iter = (unsigned long) (DBL_MAX/fabs(incr));
 			iter = min (iter,10);
 			doubleTest(chix1, base, incr, epsil, iter);
 		}
 		base = DBL_MAX;
-		for (i=DBL_MIN_EXP; i<DBL_MAX_EXP; i++) {
+		for (i=DBL_MIN_EXP; i<DBL_MAX_EXP; i+=DBL_MAX_EXP/10) {
 			incr =  - ldexp (0.5,i);
-			iter = DBL_MAX/fabs(incr);
+			iter = (unsigned long) (DBL_MAX/fabs(incr));
 			iter = min (iter,10);
 			doubleTest(chix1, base, incr, epsil, iter);
 		}
 		base = - DBL_MAX;
-		for (i=DBL_MIN_EXP; i<DBL_MAX_EXP; i++) {
+		for (i=DBL_MIN_EXP; i<DBL_MAX_EXP; i+=DBL_MAX_EXP/10) {
 			incr = ldexp (0.5,i);
-			iter = DBL_MAX/fabs(incr);
+			iter = (unsigned long) (DBL_MAX/fabs(incr));
 			iter = min (iter,10);
 			doubleTest(chix1, base, incr, epsil, iter);
 		}
 		printf ("done\n");
 	}
-#endif
 
 	/*
 	 * verify we dont jam up on many uninterrupted
@@ -377,6 +538,7 @@ int doacctst(char *pname)
 	 * solicitations
 	 */
 	if(ca_read_access(chix1)){
+		unsigned	count=0u;
 		printf("Performing multiple get callback test...");
 		fflush(stdout);
 		for(i=0; i<10000; i++){
@@ -385,26 +547,28 @@ int doacctst(char *pname)
 					1,
 					chix1, 
 					null_event, 
-					NULL);
+					&count);
 	
 			SEVCHK(status, NULL);
 		}
 		SEVCHK(ca_flush_io(), NULL);
+		while (count<10000u) {
+			ca_pend_event(1.0);
+			printf("waiting...");
+			fflush(stdout);
+		}
 		printf("done.\n");
 	}
 	else{
 		printf("Skipped multiple get cb test - no read access\n");
 	}
 
-	if(ca_v42_ok(chix1)){
-		test_sync_groups(chix1);
-	}
-
 	/*
 	 * verify we dont jam up on many uninterrupted
-	 * solicitations
+	 * put callback solicitations
 	 */
 	if(ca_write_access(chix1) && ca_v42_ok(chix1)){
+		unsigned	count=0u;
 		printf("Performing multiple put callback test...");
 		fflush(stdout);
 		for(i=0; i<10000; i++){
@@ -415,33 +579,72 @@ int doacctst(char *pname)
 					chix1, 
 					&fval,
 					null_event, 
-					NULL);
+					&count);
 		
 			SEVCHK(status, NULL);
 		}
 		SEVCHK(ca_flush_io(), NULL);
+		while (count<10000u) {
+			ca_pend_event(1.0);
+			printf("waiting...");
+			fflush(stdout);
+		}
+
 		printf("done.\n");
 	}
 	else{
 		printf("Skipped multiple put cb test - no write access\n");
 	}
 
+	/*
+	 * verify that we detect that a large string has been written
+	 */
+	if(ca_write_access(chix1)){
+		dbr_string_t	stimStr;
+		dbr_string_t	respStr;
+		memset(stimStr, 'a', sizeof(stimStr));
+		status = ca_array_put(DBR_STRING, 1u, chix1, stimStr);
+		assert(status==ECA_STRTOBIG);
+		sprintf(stimStr, "%u", 8u);
+		status = ca_array_put(DBR_STRING, 1u, chix1, stimStr);
+		assert(status==ECA_NORMAL);
+		status = ca_array_get(DBR_STRING, 1u, chix1, respStr);
+		assert(status==ECA_NORMAL);
+		status = ca_pend_io(0.0);
+		assert(status==ECA_NORMAL);
+		printf(
+"Test fails if stim \"%s\" isnt roughly equiv to resp \"%s\"\n",
+			stimStr, respStr);
+	}
+	else{
+		printf("Skipped bad string test - no write access\n");
+	}
+
+	if(ca_v42_ok(chix1)){
+		test_sync_groups(chix1);
+	}
+
 	/*
 	 * verify we can add many monitors at once
 	 */
 	printf("Performing multiple monitor test...");
 	fflush(stdout);
 	{
+		unsigned	count=0u;
 		evid		mid[1000];
 		dbr_float_t	temp;
 
 		for(i=0; i<NELEMENTS(mid); i++){
 			SEVCHK(ca_add_event(DBR_GR_FLOAT, chix4, null_event,
-				(void *)0x55555555, &mid[i]),NULL);
+				&count, &mid[i]),NULL);
 		}
 		/*
 		 * force all of the monitors requests to
 		 * complete
+		 *
+		 * NOTE: this hopefully demonstrates that when the
+		 * server is very busy with monitors the client 
+		 * is still able to punch through with a request.
 		 */
 		SEVCHK(ca_get(DBR_FLOAT,chix4,&temp),NULL);
 		SEVCHK(ca_pend_io(1000.0),NULL);
@@ -450,7 +653,7 @@ int doacctst(char *pname)
 			status = ca_clear_event(mid[i]);
 			if(status != ECA_NORMAL){
 				printf(
-			"Clear of event %d %x failed because \"%s\"\n",
+			"Clear of event %ld %x failed because \"%s\"\n",
 					i,
 					mid[i]->id,
 					ca_message(status));
@@ -472,7 +675,7 @@ int doacctst(char *pname)
 				DBR_FLOAT, 
 				chix4, 
 				EVENT_ROUTINE, 
-				(void *)0xaaaaaaaa, 
+				&monCount, 
 				&monix);
 		SEVCHK(status, NULL);
 		SEVCHK(ca_clear_event(monix), NULL);
@@ -480,7 +683,7 @@ int doacctst(char *pname)
 				DBR_FLOAT, 
 				chix4, 
 				EVENT_ROUTINE, 
-				(void *)0xaaaaaaaa, 
+				&monCount, 
 				&monix);
 		SEVCHK(status, NULL);
 	}
@@ -489,7 +692,7 @@ int doacctst(char *pname)
 				DBR_FLOAT, 
 				chix4, 
 				EVENT_ROUTINE, 
-				(void *)0xaaaaaaaa, 
+				&monCount, 
 				&monix);
 		SEVCHK(status, NULL);
 		SEVCHK(ca_clear_event(monix), NULL);
@@ -499,14 +702,14 @@ int doacctst(char *pname)
 				DBR_FLOAT, 
 				chix3, 
 				EVENT_ROUTINE, 
-				(void *)0xaaaaaaaa, 
+				&monCount, 
 				&monix);
 		SEVCHK(status, NULL);
 		status = ca_add_event(
 				DBR_FLOAT, 
 				chix3, 
 				write_event, 
-				(void *)0xaaaaaaaa, 
+				&monCount, 
 				&monix);
 		SEVCHK(status, NULL);
 	}
@@ -519,7 +722,7 @@ int doacctst(char *pname)
 		if (pfloat)
 			for (i = 0; i < NUM; i++) {
 				for (j = 0; j < NUM; j++)
-					sprintf(&pstring[j][0], "%d", j + 100);
+					sprintf(&pstring[j][0], "%ld", j + 100l);
 				SEVCHK(ca_array_put(
 						DBR_STRING, 
 						NUM, 
@@ -550,6 +753,54 @@ int doacctst(char *pname)
 
 	SEVCHK(ca_pend_io(4000.0), NULL);
 
+	/*
+	 * array test
+	 * o verifies that we can at least write and read back the same array
+	 * if multiple elements are present
+	 */
+	if (VALID_DB_REQ(chix1->type)) {
+		if (ca_element_count(chix1)>1u) {
+			dbr_float_t	*pRF, *pWF, *pEF, *pT;
+
+			printf("Performing array test...");
+			fflush(stdout);
+
+			pRF = (dbr_float_t *) calloc(ca_element_count(chix1), sizeof(*pRF));
+			assert(pRF!=NULL);
+
+			pWF = (dbr_float_t *)calloc(ca_element_count(chix1), sizeof(*pWF));
+			assert(pWF!=NULL);
+
+			if (ca_write_access(chix1)) {
+				pT = pWF;
+				while(pRF<pEF) {
+					*pT++ = rand();
+				}
+				status = ca_array_put(
+						DBR_FLOAT, 
+						ca_element_count(chix1), 
+						chix1, 
+						pWF); 
+				SEVCHK(status, "array write test failed");
+			}
+			if (ca_read_access(chix1)) {
+				status = ca_array_get(
+						DBR_FLOAT, 
+						ca_element_count(chix1), 
+						chix1, 
+						pRF); 
+				SEVCHK(status, "array read test failed");
+			}
+			if (ca_read_access(chix1) && ca_write_access(chix1)) {
+				pEF = &pRF[ca_element_count(chix1)];
+				while(pRF<pEF) {
+					assert(*pRF++ == *pWF++);
+				}
+			}
+			printf("done\n");
+		}
+	}
+
 #ifdef VMS
 	lib$show_timer();
 #endif /*VMS*/
@@ -568,11 +819,6 @@ int doacctst(char *pname)
 	SEVCHK(ca_modify_user_name("Willma"), NULL);
 	SEVCHK(ca_modify_host_name("Bed Rock"), NULL);
 
-	if (conn_cb_count != 3){
-		printf ("!!!! Connect cb count = %d expected = 3 !!!!\n", 
-			conn_cb_count);
-	}
-
 	{
 		TS_STAMP	end_time;
 		TS_STAMP	start_time;
@@ -591,7 +837,7 @@ int doacctst(char *pname)
 		accuracy = 100.0*(delay-request)/request;
 		printf("CA pend event delay accuracy = %f %%\n",
 			accuracy);
-		assert (abs(accuracy) < 10.0);
+		assert (fabs(accuracy) < 10.0);
 	}
 
 	{
@@ -645,7 +891,11 @@ unsigned 	iterations)
 		SEVCHK (status, NULL);
 		status = ca_pend_io (100.0);
 		SEVCHK (status, NULL);
-		assert (fabs(fval-fretval) < epsilon);
+		if (fabs(fval-fretval) > epsilon) {
+			printf ("float test failed val written %f\n", fval);
+			printf ("float test failed val read %f\n", fretval);
+			assert(0);
+		}
 
 		fval += increment;
 	}
@@ -672,7 +922,11 @@ unsigned 	iterations)
 		SEVCHK (status, NULL);
 		status = ca_pend_io (100.0);
 		SEVCHK (status, NULL);
-		assert (fabs(fval-fretval) < epsilon);
+		if (fabs(fval-fretval) > epsilon) {
+			printf ("float test failed val written %f\n", fval);
+			printf ("float test failed val read %f\n", fretval);
+			assert(0);
+		}
 
 		fval += increment;
 	}
@@ -680,10 +934,14 @@ unsigned 	iterations)
 
 void null_event(struct event_handler_args args)
 {
-	static int      i;
-	dbr_double_t	fval = 3.8;
-	int		status;
+	unsigned	*pInc = (unsigned *) args.usr;
 
+	if (pInc) {
+		(*pInc)++;
+		if (*pInc%1000u == 0u) {
+			printf("1000 occurred\n");
+		}
+	}
 #if 0
 	if (ca_state(args.chid)==cs_conn) {
 		status = ca_put(DBR_FLOAT, args.chid, &fval);
@@ -694,11 +952,6 @@ void null_event(struct event_handler_args args)
 				ca_name(args.chid));
 	}
 #endif
-
-	if (i++ > 1000) {
-		printf("1000 occurred\n");
-		i = 0;
-	}
 }
 
 
@@ -737,10 +990,11 @@ void conn(struct connection_handler_args args)
 	ca_get_callback(DBR_GR_FLOAT, args.chid, get_cb, NULL);
 }
 
-void get_cb(struct event_handler_args args)
+void get_cb (struct event_handler_args args)
 {
 	if(!(args.status & CA_M_SUCCESS)){
-		printf("Get cb failed because \"%s\"\n", ca_message(args.status));
+		printf("Get cb failed because \"%s\"\n", 
+			ca_message(args.status));
 	}
 	conn_cb_count++;
 }
@@ -767,20 +1021,23 @@ void test_sync_groups(chid chix)
 
 	status = ca_sg_create(&gid2);
 	SEVCHK(status, NULL);
+
 	multiple_sg_requests(chix, gid2);
 	multiple_sg_requests(chix, gid1);
 	status = ca_sg_test(gid2);
 	SEVCHK(status, "SYNC GRP2");
 	status = ca_sg_test(gid1);
 	SEVCHK(status, "SYNC GRP1");
-	status = ca_sg_block(gid1, 15.0);
+	status = ca_sg_block(gid1, 500.0);
 	SEVCHK(status, "SYNC GRP1");
-	status = ca_sg_block(gid2, 15.0);
+	status = ca_sg_block(gid2, 500.0);
 	SEVCHK(status, "SYNC GRP2");
+
 	status = ca_sg_delete(gid2);
 	SEVCHK(status, NULL);
 	status = ca_sg_create(&gid2);
 	SEVCHK(status, NULL);
+
 	multiple_sg_requests(chix, gid1);
 	multiple_sg_requests(chix, gid2);
 	status = ca_sg_block(gid1, 15.0);

src/ca/addrList.h

@@ -3,8 +3,7 @@
 extern "C" {
 #endif
 
-
-#include <envDefs.h>
+#include <envDefs.h>  
 
 void caSetupAddrList(
         ELLLIST *pList,
@@ -15,7 +14,8 @@ void caPrintAddrList(ELLLIST *pList);
 void caDiscoverInterfaces(
         ELLLIST *pList,
         SOCKET socket,
-        int port);
+        int port,
+	struct in_addr matchAddr);
 
 void caAddConfiguredAddr(
         ELLLIST *pList,

src/ca/bsd_depen.c

@@ -78,6 +78,32 @@ int cac_select_io(struct timeval *ptimeout, int flags)
 			continue;
 		}
 
+#ifdef WIN32
+		/* Under WIN32, FD_SETSIZE is the number of sockets,
+		 * not the max. file descriptor value that you may select() !
+		 *
+		 * Of course it's not allowed to look into fd_count,
+		 * but what shall we do?  -kuk-
+		 */
+
+		if (pfdi->readMask.fd_count >= FD_SETSIZE)
+		{
+			ca_printf(
+			"%s.%d: no room for fd %d in fd_set (FD_SETSIZE=%d)\n",
+			   __FILE__, __LINE__, piiu->sock_chan, FD_SETSIZE);
+			continue;
+		}
+
+#else
+		if (piiu->sock_chan>=FD_SETSIZE)
+		{
+			ca_printf(
+			"%s.%d: file number %d > FD_SETSIZE=%d ignored\n",
+			    __FILE__, __LINE__, piiu->sock_chan, FD_SETSIZE);
+			continue;
+		}
+#endif
+
                 /*
                  * Dont bother receiving if we have insufficient
                  * space for the maximum UDP message
@@ -124,17 +150,17 @@ int cac_select_io(struct timeval *ptimeout, int flags)
 	}
 
         if (status<0) {
-                if (MYERRNO == EINTR) {
+                if (SOCKERRNO == EINTR) {
                 }
-                else if (MYERRNO == EWOULDBLOCK) {
+                else if (SOCKERRNO == EWOULDBLOCK) {
                         ca_printf("CAC: blocked at select ?\n");
                 }                  
-		else if (MYERRNO == ESRCH) {
+		else if (SOCKERRNO == ESRCH) {
 		}
                 else {
                         ca_printf (
                                 "CAC: unexpected select fail: %s\n",
-                                strerror(MYERRNO));
+                                strerror(SOCKERRNO));
                 }
         }
 

src/ca/ca.def

@@ -0,0 +1,59 @@
+LIBRARY   ca
+
+VERSION   13
+CODE      PRELOAD MOVEABLE DISCARDABLE
+DATA      PRELOAD SINGLE
+
+
+EXPORTS
+
+ca_version
+ca_test_event                 
+ca_task_initialize             
+ca_task_exit                   
+ca_search_and_connect          
+ca_build_and_connect           
+ca_change_connection_event     
+ca_replace_access_rights_event
+ca_add_exception_event         
+ca_clear_channel               
+ca_array_put                   
+ca_array_put_callback          
+ca_array_get                   
+ca_array_get_callback          
+ca_add_masked_array_event      
+ca_clear_event                 
+ca_pend 
+ca_repeater                       
+ca_test_io                     
+ca_flush_io                    
+ca_signal                     
+ca_signal_with_file_and_lineno
+ca_host_name_function       
+ca_add_fd_registration        
+ca_sg_create                  
+ca_sg_delete                  
+ca_sg_block                   
+ca_sg_test                    
+ca_sg_reset                   
+ca_sg_array_get                
+ca_sg_array_put                
+ca_modify_user_name         
+ca_modify_host_name         
+ca_v42_ok                   
+caFetchPortConfig
+caAddConfiguredAddr
+caDiscoverInterfaces
+ca_printf       
+ca_message_text
+ca_message
+cac_gettimeval
+dbr_value_size
+dbr_value_offset
+dbf_text
+dbf_text_invalid
+dbf_text_dim
+dbr_text
+dbr_text_invalid
+dbr_text_dim
+dbr_size

src/ca/caProto.h

@@ -0,0 +1,262 @@
+/*
+ *      $Id$
+ *
+ *      Author  Jeffrey O. Hill
+ *              johill@lanl.gov
+ *              505 665 1831
+ *
+ *      Experimental Physics and Industrial Control System (EPICS)
+ *
+ *      Copyright 1991, the Regents of the University of California,
+ *      and the University of Chicago Board of Governors.
+ *
+ *      This software was produced under  U.S. Government contracts:
+ *      (W-7405-ENG-36) at the Los Alamos National Laboratory,
+ *      and (W-31-109-ENG-38) at Argonne National Laboratory.
+ *
+ *      Initial development by:
+ *              The Controls and Automation Group (AT-8)
+ *              Ground Test Accelerator
+ *              Accelerator Technology Division
+ *              Los Alamos National Laboratory
+ *
+ *      Co-developed with
+ *              The Controls and Computing Group
+ *              Accelerator Systems Division
+ *              Advanced Photon Source
+ *              Argonne National Laboratory
+ *
+ *
+ * History
+ * $Log$
+ * Revision 1.1  1996/06/20 18:02:22  jhill
+ * installed into CVS
+ *
+ * Revision 1.1.1.1  1996/06/20 00:28:15  jhill
+ * ca server installation
+ *
+ *
+ */
+
+#ifndef __CAPROTO__
+/* $Id$ */
+/*
+ *	History
+ * 	.01 01xx90 joh	removed status field in favor of a independent m_cmmd- 
+ *			saves space on every successful operation
+ *
+ *	.02 041390 joh	moved server ports to above IPPORT_USERRESERVED
+ *			see in.h
+ *
+ *	.03 060391 joh	Bumped protocol version to 4 to support changes for
+ *			SPARC alignment in db_access.h
+ *	
+ *	.04 071291 joh	New command added - claim channel in use block
+ *
+ *	.05 011294 joh	New command added - write notify 
+ *
+ *	.06 020194 joh	New command added for CA V4.1 - client name 
+ *
+ *	.07 041194 joh	New command added for CA V4.2 - access rights 
+ *
+ *	.08 050594 joh	New command added for CA V4.3 - echo request
+ *
+ *	.09 050594 joh	New command added for CA V4.3 - repeater fanout regis 
+ *
+ *	.10 050594 joh	New command added for CA V4.3 - wakeup the server
+ * $Log$
+ * Revision 1.1  1996/06/20 18:02:22  jhill
+ * installed into CVS
+ *
+ * Revision 1.1.1.1  1996/06/20 00:28:15  jhill
+ * ca server installation
+ *
+ *
+ */
+
+#define __CAPROTO__ 
+
+/* 
+ * CA protocol number
+ * TCP/UDP port number (bumped each major protocol change) 
+ */
+#define CA_PROTOCOL_VERSION_STR	4
+#define CA_MINOR_VERSION_STR	7
+
+/* 
+ * add unsigned to the above numbers for numerical
+ * comparisons (two defines above are used to create 
+ * version number string - prefer not to have u there)
+ */
+#ifndef CONCAT
+#define CONCAT(A,B) A ## B
+#endif
+#define UNSIGNED(N) CONCAT(N,u) 
+#define CA_PROTOCOL_VERSION	UNSIGNED(CA_PROTOCOL_VERSION_STR)
+#define CA_MINOR_VERSION	UNSIGNED(CA_MINOR_VERSION_STR)	
+#define CA_UKN_MINOR_VERSION	0u /* unknown minor version */
+#if CA_PROTOCOL_VERSION == 4u
+#define CA_V41(MAJOR,MINOR)	((MINOR)>=1u) 
+#define CA_V42(MAJOR,MINOR)	((MINOR)>=2u)
+#define CA_V43(MAJOR,MINOR)	((MINOR)>=3u)
+#define CA_V44(MAJOR,MINOR)	((MINOR)>=4u)
+#define CA_V45(MAJOR,MINOR)	((MINOR)>=5u)
+#define CA_V46(MAJOR,MINOR)	((MINOR)>=6u)
+#define CA_V47(MAJOR,MINOR)	((MINOR)>=7u)
+#elif CA_PROTOCOL_VERSION > 4u
+#define CA_V41(MAJOR,MINOR)	( 1u )
+#define CA_V42(MAJOR,MINOR)	( 1u )
+#define CA_V43(MAJOR,MINOR)	( 1u )
+#define CA_V44(MAJOR,MINOR)	( 1u )
+#define CA_V45(MAJOR,MINOR)	( 1u )
+#define CA_V46(MAJOR,MINOR)	( 1u )
+#define CA_V47(MAJOR,MINOR)	( 1u )
+#else
+#define CA_V41(MAJOR,MINOR)	( 0u )
+#define CA_V42(MAJOR,MINOR)	( 0u )
+#define CA_V43(MAJOR,MINOR)	( 0u )
+#define CA_V44(MAJOR,MINOR)	( 0u )
+#define CA_V45(MAJOR,MINOR)	( 0u )
+#define CA_V46(MAJOR,MINOR)	( 0u )
+#define CA_V47(MAJOR,MINOR)	( 0u )
+#endif 
+
+/*
+ * NOTE: These port numbers are only used if the CA repeater and 
+ * CA server port numbers cant be obtained from the EPICS 
+ * environment variables "EPICS_CA_REPEATER_PORT" and
+ * "EPICS_CA_SERVER_PORT"
+ */
+#define	CA_PORT_BASE		IPPORT_USERRESERVED + 56U
+#define CA_SERVER_PORT		(CA_PORT_BASE+CA_PROTOCOL_VERSION*2u)
+#define CA_REPEATER_PORT	(CA_PORT_BASE+CA_PROTOCOL_VERSION*2u+1u)
+
+#define MAX_UDP			1024u
+#define MAX_TCP			(MAX_UDP*16u) /* so waveforms fit */
+#define MAX_MSG_SIZE		(MAX_TCP) /* the larger of tcp and udp max */
+
+/*
+ * architecture independent types
+ *
+ * (so far this works on all archs we have ported to)
+ */
+typedef unsigned short  ca_uint16_t;
+typedef unsigned int	ca_uint32_t;
+typedef float           ca_float32_t;
+typedef ca_uint32_t	caResId;
+
+		/* values for m_cmmd */
+#define CA_PROTO_NOOP		0u	/* do nothing, but verify TCP */
+#define CA_PROTO_EVENT_ADD	1u	/* add an event */
+#define CA_PROTO_EVENT_CANCEL	2u	/* cancel an event */
+#define CA_PROTO_READ		3u	/* read and return a channel value*/
+#define CA_PROTO_WRITE		4u	/* write a channel value */
+#define CA_PROTO_SNAPSHOT	5u	/* snapshot of the system */
+#define	CA_PROTO_SEARCH		6u	/* IOC channel search */
+#define CA_PROTO_BUILD		7u	/* build - obsolete */
+#define CA_PROTO_EVENTS_OFF	8u	/* flow control */ 
+#define CA_PROTO_EVENTS_ON	9u	/* flow control */ 
+#define CA_PROTO_READ_SYNC	10u	/* purge old reads */ 
+#define CA_PROTO_ERROR		11u	/* an operation failed */ 
+#define CA_PROTO_CLEAR_CHANNEL	12u	/* free chan resources */
+#define CA_PROTO_RSRV_IS_UP	13u	/* CA server has joined the net */
+#define CA_PROTO_NOT_FOUND	14u	/* channel not found */
+#define CA_PROTO_READ_NOTIFY	15u	/* add a one shot event */
+#define CA_PROTO_READ_BUILD	16u	/* read and build - obsolete */
+#define REPEATER_CONFIRM	17u	/* registration confirmation */
+#define CA_PROTO_CLAIM_CIU	18u	/* client claims resource in server */
+#define CA_PROTO_WRITE_NOTIFY	19u	/* notify after write chan value */
+#define CA_PROTO_CLIENT_NAME	20u	/* CA V4.1 identify client */
+#define CA_PROTO_HOST_NAME	21u	/* CA V4.1 identify client */
+#define CA_PROTO_ACCESS_RIGHTS	22u	/* CA V4.2 asynch access rights chg */
+#define CA_PROTO_ECHO		23u	/* CA V4.3 connection verify */
+#define REPEATER_REGISTER	24u	/* registr for repeater fan out */
+#define CA_PROTO_SIGNAL		25u	/* knock the server out of select */
+#define CA_PROTO_CLAIM_CIU_FAILED 26u	/* unable to create chan resource in server */
+#define CA_PROTO_SERVER_DISCONN	27u	/* server deletes PV (or channel) */
+
+#define CA_PROTO_LAST_CMMD CA_PROTO_CLAIM_CIU_FAILED
+
+/*
+ * for use with search and not_found (if search fails and
+ * its not a broadcast tell the client to look elesewhere)
+ */
+#define DOREPLY		10u
+#define DONTREPLY	5u
+
+/* size of object in bytes rounded up to nearest oct word */
+#define	OCT_ROUND(A)	((((unsigned long)(A))+7u)>>3u)
+#define	OCT_SIZEOF(A)	(OCT_ROUND(sizeof(A)))
+
+/* size of object in bytes rounded up to nearest long word */
+#define	QUAD_ROUND(A)	(((unsigned long)(A))+3u)>>2u)
+#define	QUAD_SIZEOF(A)	(QUAD_ROUND(sizeof(A)))
+
+/* size of object in bytes rounded up to nearest short word */
+#define	BI_ROUND(A)	((((unsigned long)(A))+1u)>>1u)
+#define	BI_SIZEOF(A)	(BI_ROUND(sizeof(A)))
+
+/*
+ * For communicating access rights to the clients
+ *
+ * (placed in m_available hdr field of CA_PROTO_ACCESS_RIGHTS cmmd
+ */
+#define CA_PROTO_ACCESS_RIGHT_READ	(1u<<0u)
+#define CA_PROTO_ACCESS_RIGHT_WRITE	(1u<<1u)
+
+/*
+ * All structures passed in the protocol must have individual
+ * fields aligned on natural boundaries.
+ *
+ * NOTE: all structures declared in this file must have a
+ * byte count which is evenly divisible by 8 matching
+ * the largest atomic data type in db_access.h.
+ */
+#define CA_MESSAGE_ALIGN(A) (OCT_ROUND(A)<<3u)
+
+/*
+ * the common part of each message sent/recv by the
+ * CA server.
+ */
+typedef struct	ca_hdr {
+	ca_uint16_t	m_cmmd;		/* operation to be performed */
+	ca_uint16_t	m_postsize;	/* size of message extension */	
+	ca_uint16_t	m_type;		/* operation data type */ 
+	ca_uint16_t	m_count;	/* operation data count */
+	ca_uint32_t	m_cid;		/* channel identifier */
+	ca_uint32_t	m_available;	/* undefined message location for use
+					 * by client processes */
+}caHdr;
+
+/*
+ * for  monitor (event) message extension
+ */
+struct  mon_info{
+	ca_float32_t	m_lval;		/* low delta */
+	ca_float32_t	m_hval;		/* high delta */ 
+	ca_float32_t	m_toval;	/* period btween samples */
+	ca_uint16_t	m_mask;		/* event select mask */
+	ca_uint16_t	m_pad;		/* extend to 32 bits */
+};
+
+struct	monops {			/* monitor req opi to ioc */
+	caHdr		m_header;
+	struct mon_info	m_info;
+};
+
+/*
+ * PV names greater than this length assumed to be invalid
+ */
+#define unreasonablePVNameSize 500u
+
+#ifndef STRINGOF
+#define STRINGOF(A) #A
+#endif 
+#ifndef EXPANDTOSTRING 
+#define EXPANDTOSTRING(A) STRINGOF(A)
+#endif 
+#define CA_VERSION_STRING \
+(EXPANDTOSTRING(CA_PROTOCOL_VERSION_STR)"."EXPANDTOSTRING(CA_MINOR_VERSION_STR))
+
+#endif /* __CAPROTO__ */
+

src/ca/caRepeater.c

@@ -21,9 +21,10 @@
 
 #include <iocinf.h>
 
-main()
+int main()
 {
 	ca_repeater ();
 	assert (0);
 	return (0);
 }
+

src/ca/caerr.h

@@ -48,6 +48,7 @@
 #define INCLcaerrh
 
 #include <shareLib.h>
+#include <epicsTypes.h>
 
 #ifndef HDRVERSIONID
 #       define HDRVERSIONID(NAME,VERS)
@@ -123,22 +124,22 @@ HDRVERSIONID(caerrh, "@(#) $Id$")
 #define ECA_ADDFAIL	DEFMSG(CA_K_WARNING,	21)
 #define ECA_BADCOUNT	DEFMSG(CA_K_WARNING,	22)
 #define ECA_BADSTR	DEFMSG(CA_K_ERROR,	23)
-#define ECA_DISCONN	DEFMSG(CA_K_INFO,	24)
-#define ECA_DBLCHNL	DEFMSG(CA_K_INFO,	25)
+#define ECA_DISCONN	DEFMSG(CA_K_WARNING,	24)
+#define ECA_DBLCHNL	DEFMSG(CA_K_WARNING,	25)
 #define ECA_EVDISALLOW	DEFMSG(CA_K_ERROR,	26)
 #define ECA_BUILDGET	DEFMSG(CA_K_WARNING,	27)
-#define ECA_NEEDSFP	DEFMSG(CA_K_INFO,	28)
+#define ECA_NEEDSFP	DEFMSG(CA_K_WARNING,	28)
 #define ECA_OVEVFAIL	DEFMSG(CA_K_WARNING,	29)
 #define ECA_BADMONID	DEFMSG(CA_K_ERROR,	30)
-#define ECA_NEWADDR	DEFMSG(CA_K_INFO,	31)
+#define ECA_NEWADDR	DEFMSG(CA_K_WARNING,	31)
 #define ECA_NEWCONN	DEFMSG(CA_K_INFO,	32)
 #define ECA_NOCACTX	DEFMSG(CA_K_WARNING,	33)
 #define ECA_DEFUNCT	DEFMSG(CA_K_FATAL,	34)
 #define ECA_EMPTYSTR	DEFMSG(CA_K_WARNING,	35)
-#define ECA_NOREPEATER	DEFMSG(CA_K_INFO,	36)
-#define ECA_NOCHANMSG	 DEFMSG(CA_K_INFO,	37)
-#define ECA_DLCKREST	 DEFMSG(CA_K_INFO,	38)
-#define ECA_SERVBEHIND	 DEFMSG(CA_K_INFO,	39)
+#define ECA_NOREPEATER	DEFMSG(CA_K_WARNING,	36)
+#define ECA_NOCHANMSG	 DEFMSG(CA_K_WARNNING,	37)
+#define ECA_DLCKREST	 DEFMSG(CA_K_WARNING,	38)
+#define ECA_SERVBEHIND	 DEFMSG(CA_K_WARNING,	39)
 #define ECA_NOCAST	 DEFMSG(CA_K_WARNING,	40)
 #define ECA_BADMASK      DEFMSG(CA_K_ERROR,     41)
 #define ECA_IODONE       DEFMSG(CA_K_INFO,      42)
@@ -149,12 +150,13 @@ HDRVERSIONID(caerrh, "@(#) $Id$")
 #define ECA_NOWTACCESS	 DEFMSG(CA_K_WARNING,	47)
 #define ECA_ANACHRONISM	 DEFMSG(CA_K_ERROR,	48)
 #define ECA_NOSEARCHADDR DEFMSG(CA_K_WARNING,	49)
+#define ECA_NOCONVERT	 DEFMSG(CA_K_WARNING,	50)
 
 
 #ifndef CA_ERROR_GLBLSOURCE
-epicsShareExtern char	*ca_message_text[];
+epicsShareExtern READONLY char	*ca_message_text[];
 #else
-char	*ca_message_text[]
+READONLY char	*ca_message_text[]
 =
 {
 "Normal successful completion",
@@ -190,7 +192,7 @@ char	*ca_message_text[]
 "A monitor by that id cant be found",
 "Remote channel has new network address",
 "New or resumed network connection",
-"Attempt to import from a task without a CA context failed",
+"Specified task isnt a member of a CA context",
 "Attempt to use defunct CA feature failed",
 "The supplied string is empty",
 "Unable to spawn the CA repeater thread- auto reconnect will fail",
@@ -206,11 +208,15 @@ char	*ca_message_text[]
 "Read access denied",
 "Write access denied",
 "Sorry, that anachronistic feature of CA is no longer supported",
-"The search request/beacon address list was empty after initialization"
+"The search request/beacon address list was empty after initialization",
+"Data conversion between client's type and the server's type failed"
 };
 #endif
 
-#define ca_message(STATUS)\
-(ca_message_text[CA_EXTRACT_MSG_NO((STATUS))])
+#ifdef __STDC__
+READONLY char * epicsShareAPI ca_message(long ca_status);
+#else /* __STDC__ */
+READONLY char *ca_message();
+#endif
 
 #endif

src/ca/catime.c

@@ -196,7 +196,9 @@ void timeIt(
 	assert (status == S_ts_OK);
 #endif
 	TsDiffAsDouble(&delay,&end_time,&start_time);
-	printf ("Elapsed Per Item = %f\n", delay/(iterations*inlineIter));
+	printf ("Elapsed Per Item = %12.8f sec (%10.1f Items per sec)\n", 
+		delay/(iterations*inlineIter),
+		(iterations*inlineIter)/delay);
 }
 
 

src/ca/conn.c

@@ -29,7 +29,16 @@
 /*	.12 110194 joh	improved search scheduling			*/
 /*			(dont send all chans in a block)		*/
 /*									*/
-/* $Log$								*/
+/* $Log$
+ * Revision 1.36  1996/09/16 16:35:22  jhill
+ * local exceptions => exception handler
+ *
+ * Revision 1.35  1996/06/19 17:59:04  jhill
+ * many 3.13 beta changes
+ *
+ * Revision 1.34  1995/08/22  00:19:21  jhill
+ * use current time var to init time stamp in a beacon hash entry
+ *								*/
 /*_begin								*/
 /************************************************************************/
 /*									*/
@@ -208,7 +217,7 @@ void manage_conn(int silent)
 	/*
 	 * set the retry interval
 	 */
-	assert(ca_static->ca_search_retry < NBBY*sizeof(idelay));
+	assert(ca_static->ca_search_retry < CHAR_BIT*sizeof(idelay));
 	idelay = 1;
 	idelay = idelay << ca_static->ca_search_retry;
 	delay = idelay * CA_RECAST_DELAY; /* sec */	
@@ -233,7 +242,7 @@ void manage_conn(int silent)
 LOCAL void retrySearchRequest (int silent)
 {
 	ELLLIST		channelsSent;
-	chid		chix;
+	ciu		chix;
 	unsigned	min_retry_num;
 	unsigned	retry_cnt = 0;
   	unsigned 	retry_cnt_no_handler = 0;
@@ -247,7 +256,7 @@ LOCAL void retrySearchRequest (int silent)
 
 	LOCK;
 	min_retry_num = MAXCONNTRIES;
-	while (chix = (chid) ellGet (&piiuCast->chidlist)) {
+	while ( (chix = (ciu) ellGet (&piiuCast->chidlist)) ) {
 
 		ellAdd (&channelsSent, &chix->node);
 
@@ -259,7 +268,7 @@ LOCAL void retrySearchRequest (int silent)
 			if (status == ECA_NORMAL) {
 				retry_cnt++;
 				if (!(silent || chix->pConnFunc)) {
-					ca_signal (
+					genLocalExcep (
 						ECA_CHIDNOTFND, 
 						(char *)(chix+1));
 					retry_cnt_no_handler++;
@@ -311,7 +320,7 @@ LOCAL void retrySearchRequest (int silent)
 				sprintf_buf, 
 				"%d channels outstanding", 
 				retry_cnt);
-      			ca_signal (ECA_CHIDRETRY, sprintf_buf);
+      			genLocalExcep (ECA_CHIDRETRY, sprintf_buf);
     		}
   	}
  	UNLOCK; 	
@@ -353,7 +362,7 @@ LOCAL void logRetryInterval(char *pFN, unsigned lineno)
  */
 void mark_server_available(const struct in_addr *pnet_addr)
 {
-	chid		chan;
+	ciu		chan;
 	ca_real		currentPeriod;
 	bhe		*pBHE;
 	unsigned	port;	
@@ -489,10 +498,10 @@ void mark_server_available(const struct in_addr *pnet_addr)
 	 * set retry count of all disconnected channels
 	 * to zero
 	 */
-	chan = (chid) ellFirst(&piiuCast->chidlist);
+	chan = (ciu) ellFirst(&piiuCast->chidlist);
 	while (chan) {
 		chan->retry = 0;
-		chan = (chid) ellNext (&chan->node);
+		chan = (ciu) ellNext (&chan->node);
 	}
 
 	UNLOCK;

src/ca/convert.c

@@ -35,6 +35,11 @@ static char	*sccsId = "@(#) $Id$";
 #include	"iocinf.h"
 #include	"net_convert.h"
 
+/*
+ * NOOP if this isnt required
+ */
+#ifdef CONVERSION_REQUIRED
+
 /*
  * if hton is true then it is a host to network conversion
  * otherwise vise-versa
@@ -156,6 +161,9 @@ unsigned long	num			/* number of values		*/
 	char		*pSrc = s;
 	char		*pDest = d;
 
+	/* convert "in place" -> nothing to do */
+	if (s == d)
+		return;
 	if(num == 1){
 		strcpy(pDest, pSrc);
 	}
@@ -212,6 +220,9 @@ unsigned long	num			/* number of values		*/
 	dbr_char_t	*pSrc = s;
 	dbr_char_t	*pDest = d;
 
+	/* convert "in place" -> nothing to do */
+	if (s == d)
+		return;
       	for(i=0; i<num; i++){
       	  	*pDest++ = *pSrc++;
 	}
@@ -377,6 +388,11 @@ unsigned long	num			/* number of values		*/
     	/* convert ieee to vax format or vax to ieee */
     	pDest->status 		= dbr_ntohs(pSrc->status);
     	pDest->severity		= dbr_ntohs(pSrc->severity);
+
+	/* convert "in place" -> nothing else to do */
+	if (s == d)
+		return;
+
     	if (num == 1)	/* if single value */
 		strcpy(pDest->value, pSrc->value);
     	else
@@ -570,6 +586,10 @@ unsigned long	num			/* number of values		*/
 
     	pDest->status 		= dbr_ntohs(pSrc->status);
     	pDest->severity		= dbr_ntohs(pSrc->severity);
+
+	if (s == d)	/* source == dest -> no more conversions */
+		return;
+
 	memcpy(pDest->units,pSrc->units,sizeof(pSrc->units));
 
     	pDest->upper_disp_limit 	= pSrc->upper_disp_limit;
@@ -1686,4 +1706,5 @@ void dbr_htonf (dbr_float_t *IEEEhost, dbr_float_t *IEEEnet)
 #endif /* IEEE float and little endian */
 
 
+#endif /* CONVERSION_REQUIRED */
 

src/ca/if_depen.c

@@ -40,6 +40,8 @@ static char	*sccsId = "@(#) $Id$";
 
 #include "iocinf.h"
 
+#include <net/if.h>
+
 /*
  * Dont use ca_static based lock macros here because this is
  * also called by the server. All locks required are applied at
@@ -79,7 +81,7 @@ int local_addr(int s, struct sockaddr_in *plcladdr)
 	if (status < 0 || ifconf.ifc_len == 0) {
 		ca_printf(
 			"CAC: ioctl failed because \"%s\"\n", 
-			strerror(MYERRNO));
+			strerror(SOCKERRNO));
 		ifconf.ifc_len = 0;
 	}
 
@@ -88,7 +90,7 @@ int local_addr(int s, struct sockaddr_in *plcladdr)
 #endif
 
 	for (	pifreq = ifconf.ifc_req;
-	    	ifconf.ifc_len >= sizeof(*pifreq);
+	    	((size_t)ifconf.ifc_len) >= sizeof(*pifreq);
 	     	pifreq++, ifconf.ifc_len -= sizeof(*pifreq)) {
 
 		status = socket_ioctl(s, SIOCGIFFLAGS, pifreq);
@@ -169,12 +171,14 @@ int local_addr (int s, struct sockaddr_in *plcladdr)
 /*
  *  	caDiscoverInterfaces()
  *
- *	This routine is provided with the address of an ELLLIST a socket
- * 	and a destination port number. When the routine returns there
- *	will be one additional inet address (a caAddrNode) in the list 
- *	for each inet interface found that is up and isnt a loop back 
- *	interface. If the interface supports broadcast then I add its
- *	broadcast address to the list. If the interface is a point to 
+ *	This routine is provided with the address of an ELLLIST, a socket
+ * 	a destination port number, and a match address. When the 
+ * 	routine returns there will be one additional inet address 
+ *	(a caAddrNode) in the list for each inet interface found that 
+ *	is up and isnt a loop back interface (match addr is INADDR_ANY)
+ *	or it matches the specified interface (match addr isnt INADDR_ANY). 
+ *	If the interface supports broadcast then I add its broadcast 
+ *	address to the list. If the interface is a point to 
  *	point link then I add the destination address of the point to
  *	point link to the list. In either case I set the port number
  *	in the address node to the port supplied in the argument
@@ -183,7 +187,8 @@ int local_addr (int s, struct sockaddr_in *plcladdr)
  * 	LOCK should be applied here for (pList)
  * 	(this is also called from the server)
  */
-void caDiscoverInterfaces(ELLLIST *pList, int socket, int port)
+void caDiscoverInterfaces(ELLLIST *pList, int socket, int port,
+	struct in_addr matchAddr)
 {
 	struct sockaddr_in 	localAddr;
 	struct sockaddr_in 	*pInetAddr;
@@ -243,6 +248,7 @@ void caDiscoverInterfaces(ELLLIST *pList, int socket, int port)
 		if (status){
 			continue;
 		}
+
 		/*
 		 * If its not an internet inteface 
 		 * then dont use it.
@@ -250,9 +256,23 @@ void caDiscoverInterfaces(ELLLIST *pList, int socket, int port)
 		if (pifreq->ifr_addr.sa_family != AF_INET) {
 			continue;
 		}
+
+		/*
+		 * save the interface's IP address
+		 */
 		pInetAddr = (struct sockaddr_in *)&pifreq->ifr_addr;
 		localAddr = *pInetAddr;
 
+		/*
+		 * if it isnt a wildcarded interface then look for
+		 * an exact match
+		 */
+		if (matchAddr.s_addr != INADDR_ANY) {
+			if (pInetAddr->sin_addr.s_addr != matchAddr.s_addr) {
+				continue;
+			}
+		}
+
 		/*
 		 * If this is an interface that supports
 		 * broadcast fetch the broadcast address.
@@ -285,9 +305,6 @@ void caDiscoverInterfaces(ELLLIST *pList, int socket, int port)
 			continue;
 		}
 
-
-
-
 		pNode = (caAddrNode *) calloc(1,sizeof(*pNode));
 		if(!pNode){
 			continue;
@@ -306,4 +323,3 @@ void caDiscoverInterfaces(ELLLIST *pList, int socket, int port)
 	free(pIfreqList);
 }
 
-

src/ca/iocinf.c

@@ -47,6 +47,26 @@
 /*			address in use so that test works on UNIX	*/
 /*			kernels that support multicast			*/
 /* $Log$
+ * Revision 1.66  1996/11/02 00:50:53  jhill
+ * many pc port, const in API, and other changes
+ *
+ * Revision 1.65  1996/09/16 16:37:02  jhill
+ * o dont print disconnect message when the last channel on a connection is
+ * 	deleted and the conn goes away
+ * o local exceptions => exception handler
+ *
+ * Revision 1.64  1996/08/13 23:15:36  jhill
+ * fixed warning
+ *
+ * Revision 1.63  1996/07/09 22:41:28  jhill
+ * silence gcc warning
+ *
+ * Revision 1.62  1996/06/19 17:59:06  jhill
+ * many 3.13 beta changes
+ *
+ * Revision 1.61  1995/12/19  19:33:02  jhill
+ * function prototype changes
+ *
  * Revision 1.60  1995/11/29  19:26:01  jhill
  * cleaned up interface to recv() and send()
  *								*/
@@ -335,7 +355,7 @@ int			net_proto
 				&pNode->destAddr.sa,
 				sizeof(pNode->destAddr.sa));
       		if(status < 0){
-			ca_printf("CAC: no conn err=\"%s\"\n", strerror(MYERRNO));
+			ca_printf("CAC: no conn err=\"%s\"\n", strerror(SOCKERRNO));
         		status = socket_close(sock);
 			if(status<0){
 				SEVCHK(ECA_INTERNAL,NULL);
@@ -393,7 +413,7 @@ int			net_proto
       		if(status<0){
 			free(piiu);
         		ca_printf("CAC: sso (err=\"%s\")\n",
-				strerror(MYERRNO));
+				strerror(SOCKERRNO));
         		status = socket_close(sock);
 			if(status < 0){
 				SEVCHK(ECA_INTERNAL,NULL);
@@ -415,8 +435,8 @@ int			net_proto
 				(struct sockaddr *) &saddr, 
 				sizeof(saddr));
       		if(status<0){
-        		ca_printf("CAC: bind (err=%s)\n",strerror(MYERRNO));
-			ca_signal(ECA_INTERNAL,"bind failed");
+        		ca_printf("CAC: bind (err=%s)\n",strerror(SOCKERRNO));
+			genLocalExcep (ECA_INTERNAL,"bind failed");
       		}
 #endif
 
@@ -442,7 +462,7 @@ int			net_proto
 
 	default:
 		free(piiu);
-      		ca_signal(ECA_INTERNAL,"alloc_ioc: ukn protocol\n");
+      		genLocalExcep (ECA_INTERNAL,"alloc_ioc: ukn protocol");
 		/*
 		 * turn off gcc warnings
 		 */
@@ -461,12 +481,12 @@ int			net_proto
 	if(status<0){
 		ca_printf(
 			"Error setting non-blocking io: %s\n",
-			strerror(MYERRNO));
+			strerror(SOCKERRNO));
 	}
 
   	if(fd_register_func){
 		LOCKEVENTS;
-		(*fd_register_func)(fd_register_arg, sock, TRUE);
+		(*fd_register_func)((void *)fd_register_arg, sock, TRUE);
 		UNLOCKEVENTS;
 	}
 
@@ -519,10 +539,13 @@ void caSetupBCastAddrList (ELLLIST *pList, SOCKET sock, unsigned port)
 	 * (lock outside because this is used by the server also)
 	 */
 	if (yes) {
+		struct in_addr addr;
+		addr.s_addr = INADDR_ANY;
 		caDiscoverInterfaces(
 			pList,
 			sock,
-			port);
+			port,
+			addr);
 	}
 
 	caAddConfiguredAddr(
@@ -532,7 +555,7 @@ void caSetupBCastAddrList (ELLLIST *pList, SOCKET sock, unsigned port)
 		port);
 
 	if (ellCount(pList)==0) {
-		ca_signal (ECA_NOSEARCHADDR, NULL);
+		genLocalExcep (ECA_NOSEARCHADDR, NULL);
 	}
 }
 
@@ -548,7 +571,7 @@ void caSetupBCastAddrList (ELLLIST *pList, SOCKET sock, unsigned port)
  */
 void notify_ca_repeater()
 {
-	struct extmsg   	msg;
+	caHdr			msg;
 	struct sockaddr_in	saddr;
 	int			status;
 	static int		once = FALSE;
@@ -617,18 +640,18 @@ void notify_ca_repeater()
        			(struct sockaddr *)&saddr, 
 			sizeof(saddr));
       		if(status < 0){
-			if(	MYERRNO != EINTR && 
-				MYERRNO != ENOBUFS && 
-				MYERRNO != EWOULDBLOCK &&
+			if(	SOCKERRNO != EINTR && 
+				SOCKERRNO != ENOBUFS && 
+				SOCKERRNO != EWOULDBLOCK &&
 				/*
 				 * This is returned from Linux when
 				 * the repeater isnt running
 				 */
-				MYERRNO != ECONNREFUSED 
+				SOCKERRNO != ECONNREFUSED 
 				){
 				ca_printf(
 				"CAC: error sending to repeater is \"%s\"\n", 
-				strerror(MYERRNO));
+				strerror(SOCKERRNO));
 			}
 		}
 		else{
@@ -690,7 +713,7 @@ LOCAL void cac_udp_send_msg_piiu(struct ioc_in_use *piiu)
 		else {
 			int	localErrno;
 
-			localErrno = MYERRNO;
+			localErrno = SOCKERRNO;
 
 			if(	localErrno != EWOULDBLOCK && 
 				localErrno != ENOBUFS && 
@@ -777,7 +800,7 @@ LOCAL void cac_tcp_send_msg_piiu(struct ioc_in_use *piiu)
 		return;
 	}
 
-	localError = MYERRNO;
+	localError = SOCKERRNO;
 
 	if(	localError == EWOULDBLOCK ||
 		localError == ENOBUFS ||
@@ -929,16 +952,16 @@ LOCAL void tcp_recv_msg(struct ioc_in_use *piiu)
 		}
 		else if(status <0){
 			/* try again on status of -1 and no luck this time */
-			if(MYERRNO == EWOULDBLOCK || MYERRNO == EINTR){
+			if(SOCKERRNO == EWOULDBLOCK || SOCKERRNO == EINTR){
 				break;
 			}
 
-			if(	MYERRNO != EPIPE && 
-				MYERRNO != ECONNRESET &&
-				MYERRNO != ETIMEDOUT){
+			if(	SOCKERRNO != EPIPE && 
+				SOCKERRNO != ECONNRESET &&
+				SOCKERRNO != ETIMEDOUT){
 				ca_printf(	
-					"CAC: unexpected recv error (err=%s)\n",
-					strerror(MYERRNO));
+					"CAC: unexpected TCP recv error (err=%s)\n",
+					strerror(SOCKERRNO));
 			}
 			TAG_CONN_DOWN(piiu);
 			break;
@@ -1051,7 +1074,7 @@ LOCAL void udp_recv_msg(struct ioc_in_use *piiu)
 		 * op would block which is ok to ignore till ready
 		 * later
 		 */
-      		if(MYERRNO == EWOULDBLOCK || MYERRNO == EINTR){
+      		if(SOCKERRNO == EWOULDBLOCK || SOCKERRNO == EINTR){
 			UNLOCK;
        			return;
 		}
@@ -1060,12 +1083,12 @@ LOCAL void udp_recv_msg(struct ioc_in_use *piiu)
 			 * Avoid spurious ECONNREFUSED bug
 			 * in linux
 			 */
-			if (MYERRNO==ECONNREFUSED) {
+			if (SOCKERRNO==ECONNREFUSED) {
 				UNLOCK;
        				return;
 			}
 #               endif
-		ca_printf("Unexpected UDP failure %s\n", strerror(MYERRNO));
+		ca_printf("Unexpected UDP failure %s\n", strerror(SOCKERRNO));
     	}
 	else if(status > 0){
 		unsigned long		bytesActual;
@@ -1152,10 +1175,10 @@ LOCAL void ca_process_udp(struct ioc_in_use *piiu)
 					pmsglog->nbytes);
 				if(status != OK || piiu->curMsgBytes){
 					ca_printf(
-						"%s: bad UDP msg from port=%d addr=%x\n",
-						__FILE__,
-						pmsglog->addr.sin_port,
-						pmsglog->addr.sin_addr.s_addr);
+					"%s: bad UDP msg from port=%d addr=%s\n",
+					__FILE__,
+					ntohs(pmsglog->addr.sin_port),
+					inet_ntoa(pmsglog->addr.sin_addr));
 					/*
 					 * resync the ring buffer
 					 * (discard existing messages)
@@ -1195,8 +1218,9 @@ LOCAL void ca_process_udp(struct ioc_in_use *piiu)
 LOCAL void close_ioc (IIU *piiu)
 {
 	caAddrNode	*pNode;
-  	chid		chix;
+  	ciu		chix;
 	int		status;
+	unsigned	chanDisconnectCount;
 
 	/*
 	 * dont close twice
@@ -1215,9 +1239,12 @@ LOCAL void close_ioc (IIU *piiu)
 
 	if (piiu == piiuCast) {
 		piiuCast = NULL;
+		chanDisconnectCount = 0u;
 	}
 	else {
-		chid	pNext;
+		ciu	pNext;
+
+		chanDisconnectCount = ellCount(&piiu->chidlist);
 
 		/*
 		 * remove IOC from the hash table
@@ -1232,23 +1259,23 @@ LOCAL void close_ioc (IIU *piiu)
 		 * handler tries to use a channel before
 		 * I mark it disconnected.
 		 */
-		chix = (chid) ellFirst(&piiu->chidlist);
+		chix = (ciu) ellFirst(&piiu->chidlist);
 		while (chix) {
 			chix->state = cs_prev_conn;
-			chix = (chid) ellNext(&chix->node);
+			chix = (ciu) ellNext(&chix->node);
 		}
 
-		chix = (chid) ellFirst(&piiu->chidlist);
+		chix = (ciu) ellFirst(&piiu->chidlist);
 		while (chix) {
-			pNext = (chid) ellNext(&chix->node);
-			cacDisconnectChannel(chix, TRUE);
+			pNext = (ciu) ellNext(&chix->node);
+			cacDisconnectChannel(chix, cs_conn);
 			chix = pNext;
 		}
 	}
 
   	if (fd_register_func) {
 		LOCKEVENTS;
-		(*fd_register_func) (fd_register_arg, piiu->sock_chan, FALSE);
+		(*fd_register_func) ((void *)fd_register_arg, piiu->sock_chan, FALSE);
 		UNLOCKEVENTS;
 	}
 
@@ -1268,7 +1295,9 @@ LOCAL void close_ioc (IIU *piiu)
 
 	ellFree (&piiu->destAddr);
 
-	ca_signal (ECA_DISCONN,piiu->host_name_str);
+	if (chanDisconnectCount) {
+		genLocalExcep (ECA_DISCONN, piiu->host_name_str);
+	}
 
 	free (piiu);
 
@@ -1278,8 +1307,9 @@ LOCAL void close_ioc (IIU *piiu)
 
 /*
  * cacDisconnectChannel()
+ * (LOCK must be applied when calling this routine)
  */
-void cacDisconnectChannel(chid chix, int fullDisconnect)
+void cacDisconnectChannel(ciu chix, enum channel_state state)
 {
 	struct ioc_in_use *piiu;
 
@@ -1297,7 +1327,7 @@ void cacDisconnectChannel(chid chix, int fullDisconnect)
 	/*
 	 * call their connection handler as required
 	 */
-	if (fullDisconnect) {
+	if (state==cs_conn) {
 		chix->state = cs_prev_conn;
 
 		/*
@@ -1393,7 +1423,7 @@ int repeater_installed()
 			(struct sockaddr *) &bd, 
 			sizeof bd);
      	if(status<0){
-		if(MYERRNO == EADDRINUSE){
+		if(SOCKERRNO == EADDRINUSE){
 			installed = TRUE;
 		}
 	}
@@ -1465,12 +1495,12 @@ unsigned long		nBytes)
  */
 unsigned long cacRingBufferWrite(
 struct ca_buffer	*pRing,
-void			*pBuf,
+const void		*pBuf,
 unsigned long		nBytes)
 {
 	unsigned long	potentialBytes;
 	unsigned long	actualBytes;
-	char		*pCharBuf;
+	const char	*pCharBuf;
 
 	actualBytes = 0;
 	pCharBuf = pBuf;
@@ -1650,12 +1680,12 @@ void caAddConfiguredAddr(ELLLIST *pList, ENV_PARAM *pEnv,
 		return;
 	}
 
-        while(pToken = getToken(&pStr)){
+        while( (pToken = getToken(&pStr)) ){
       		memset((char *)&addr,0,sizeof(addr));
 		addr.in.sin_family = AF_INET;
   		addr.in.sin_port = htons(port);
                 addr.in.sin_addr.s_addr = inet_addr(pToken);
-                if(addr.in.sin_addr.s_addr == -1){
+                if (addr.in.sin_addr.s_addr == ~0ul) {
                         ca_printf( 
 				"%s: Parsing '%s'\n",
                                 __FILE__,
@@ -1768,7 +1798,7 @@ unsigned short caFetchPortConfig(ENV_PARAM *pEnv, unsigned short defaultPort)
 	}
 
 	/*
-	 * ok to clip to int here because we checked the range
+	 * ok to clip to unsigned short here because we checked the range
 	 */
 	port = (unsigned short) epicsParam;
 

src/ca/iocinf.h

@@ -32,6 +32,27 @@
 /************************************************************************/
 
 /* $Log$
+ * Revision 1.57  1996/09/16 16:38:05  jhill
+ * local except => except handler
+ *
+ * Revision 1.56  1996/08/13 23:16:19  jhill
+ * removed os specific code
+ *
+ * Revision 1.55  1996/08/05 19:21:26  jhill
+ * removed unused proto
+ *
+ * Revision 1.54  1996/06/20 21:43:15  jhill
+ * restored io_done_sem (removed by cleanup)
+ *
+ * Revision 1.53  1996/06/20 21:19:35  jhill
+ * fixed posix signal problem with "cc -Xc"
+ *
+ * Revision 1.52  1996/06/19 17:59:07  jhill
+ * many 3.13 beta changes
+ *
+ * Revision 1.51  1995/12/19  19:33:07  jhill
+ * function prototype changes
+ *
  * Revision 1.50  1995/10/18  16:45:40  jhill
  * Use recast delay greater than one vxWorks tick
  *
@@ -98,33 +119,70 @@ HDRVERSIONID(iocinfh, "$Id$")
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <signal.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <time.h>
 
-#include <shareLib.h>
+#include "shareLib.h"
 
 /*
  * OS dependent includes
  */
+#include "osiSock.h"
 #include "os_depen.h"
 
 /*
  * EPICS includes
  */
-#include <epicsAssert.h>
-#include <cadef.h>
-#include <bucketLib.h>
-#include <ellLib.h> 
-#include <envDefs.h> 
-#include <epicsPrint.h> 
+#include "epicsAssert.h"
+#include "cadef.h"
+#include "bucketLib.h"
+#include "ellLib.h"
+#include "envDefs.h" 
+#include "epicsPrint.h" 
 
 /*
  * CA private includes 
  */
 #include "addrList.h"
-#include "iocmsg.h"
+#include "caProto.h"
+#include "net_convert.h"
+
+#ifndef NULL
+#define NULL            0
+#endif
+ 
+#ifndef FALSE
+#define FALSE           0
+#endif
+ 
+#ifndef TRUE
+#define TRUE            1
+#endif
+ 
+#ifndef OK
+#define OK            0
+#endif
+ 
+#ifndef ERROR
+#define ERROR            (-1)
+#endif
+ 
+#ifndef NELEMENTS
+#define NELEMENTS(array)    (sizeof(array)/sizeof((array)[0]))
+#endif
+ 
+#ifndef LOCAL
+#define LOCAL static
+#endif
+
+/*
+ * writable channel_in_use and pending_event pointers
+ * for internal use
+ */
+typedef struct channel_in_use *ciu;
+typedef struct pending_event *miu;
 
 #ifndef min
 #define min(A,B) ((A)>(B)?(B):(A))
@@ -134,10 +192,6 @@ HDRVERSIONID(iocinfh, "$Id$")
 #define max(A,B) ((A)<(B)?(B):(A))
 #endif
 
-#ifndef NBBY
-# define NBBY 8 /* number of bits per byte */
-#endif
-
 #define MSEC_PER_SEC 	1000L
 #define USEC_PER_SEC 	1000000L
 
@@ -159,7 +213,7 @@ if(!ca_static){ \
 #define	VALID_MSG(PIIU) (piiu->read_seq == piiu->cur_read_seq)
 
 #define SETPENDRECV		{pndrecvcnt++;}
-#define CLRPENDRECV(LOCK)	{if(--pndrecvcnt<1){cac_io_done(LOCK); POST_IO_EV;}}
+#define CLRPENDRECV		{if(--pndrecvcnt<1){POST_IO_EV;}}
 
 struct udpmsglog{
 	long                    nbytes;
@@ -179,12 +233,6 @@ struct putCvrtBuf{
 #define CA_DO_SENDS	(1<<0)
 #define CA_DO_RECVS	(1<<1)	
 
-struct pending_io_event{
-  	ELLNODE			node;
-  	void			(*io_done_sub)();
-  	void			*io_done_arg;
-};
-
 typedef struct timeval ca_time;
 
 #define LD_CA_TIME(FLOAT_TIME,PCATIME) \
@@ -287,7 +335,7 @@ typedef struct caclient_put_notify{
 #define nextFastBucketId (ca_static->ca_nextFastBucketId)
 
 #if defined(vxWorks)
-#	define io_done_sem	(ca_static->ca_io_done_sem)
+#       define io_done_sem      (ca_static->ca_io_done_sem)
 #	define evuser		(ca_static->ca_evuser)
 #	define client_lock	(ca_static->ca_client_lock)
 #	define event_lock	(ca_static->ca_event_lock)
@@ -358,7 +406,7 @@ typedef struct ioc_in_use{
 	unsigned long		curDataBytes;
 	struct ca_buffer	send;
 	struct ca_buffer	recv;
-	struct extmsg		curMsg;
+	caHdr			curMsg;
 	struct ca_static	*pcas;
 	void			*pCurData;
 	void			(*sendBytes)(struct ioc_in_use *);
@@ -430,16 +478,11 @@ struct  ca_static{
 	IIU		*ca_piiuCast;
 	void		(*ca_exception_func)
 				(struct exception_handler_args);
-	void		*ca_exception_arg;
-#if 0
-	void		(*ca_connection_func)
-				(struct connection_handler_args);
-	void		*ca_connection_arg;
-#endif
+	const void	*ca_exception_arg;
 	int		(*ca_printf_func)(const char *pformat, va_list args);
 	void		(*ca_fd_register_func)
 				(void *, SOCKET, int);
-	void		*ca_fd_register_arg;
+	const void	*ca_fd_register_arg;
 	char		*ca_pUserName;
 	char		*ca_pHostName;
 	BUCKET		*ca_pSlowBucket;
@@ -451,6 +494,7 @@ struct  ca_static{
 	unsigned short	ca_server_port;
 	unsigned short	ca_repeater_port;
 	char		ca_sprintf_buf[256];
+	char		ca_new_err_code_msg_buf[128u];
 	unsigned 	ca_post_msg_active:1; 
 	unsigned 	ca_manage_conn_active:1; 
 	unsigned 	ca_repeater_contacted:1;
@@ -470,7 +514,6 @@ struct  ca_static{
 	int		ca_event_tid;
 	int		ca_tid;
     	int		recv_tid;
-	unsigned	ca_local_ticks;
 #endif
 };
 
@@ -482,11 +525,11 @@ struct  ca_static{
  * one per outstanding op
  */
 typedef struct{
-        ELLNODE                 node;
-        WRITEABLE_CA_SYNC_GID   id;
-        void                    *pValue;
-        unsigned long           magic;
-        unsigned long           seqNo;
+        ELLNODE		node;
+        CA_SYNC_GID	id;
+        void		*pValue;
+        unsigned long	magic;
+        unsigned long	seqNo;
 }CASGOP;
 
 
@@ -495,7 +538,7 @@ typedef struct{
  */
 typedef struct{
         ELLNODE                 node;
-        WRITEABLE_CA_SYNC_GID   id;
+        CA_SYNC_GID		id;
         unsigned long           magic;
         unsigned long           opPendCount;
         unsigned long           seqNo;
@@ -524,7 +567,7 @@ struct ca_static *ca_static;
 void 	cac_send_msg(void);
 void 	cac_mux_io(struct timeval *ptimeout);
 int	repeater_installed(void);
-int	search_msg(chid chix, int reply_type);
+int	search_msg(ciu chix, int reply_type);
 int	ca_request_event(evid monix);
 void 	ca_busy_message(struct ioc_in_use *piiu);
 void	ca_ready_message(struct ioc_in_use *piiu);
@@ -541,7 +584,6 @@ void	flow_control(struct ioc_in_use *piiu);
 int	broadcast_addr(struct in_addr *pcastaddr);
 void	ca_repeater(void);
 void 	cac_recv_task(int tid);
-void 	cac_io_done(int lock);
 void 	ca_sg_init(void);
 void	ca_sg_shutdown(struct ca_static *ca_temp);
 int 	cac_select_io(struct timeval *ptimeout, int flags);
@@ -563,7 +605,7 @@ int alloc_ioc(
 );
 unsigned long cacRingBufferWrite(
 	struct ca_buffer        *pRing,
-	void                    *pBuf,
+	const void		*pBuf,
 	unsigned long           nBytes);
 
 unsigned long cacRingBufferRead(
@@ -596,8 +638,6 @@ unsigned short		port,
 int                     net_proto
 );
 
-int ca_check_for_fp(void);
-
 void caSetupBCastAddrList (ELLLIST *pList, SOCKET sock, unsigned port);
 
 int ca_os_independent_init (void);
@@ -620,17 +660,20 @@ int cac_os_depen_init(struct ca_static *pcas);
 void cac_os_depen_exit (struct ca_static *pcas);
 void ca_process_exit();
 void ca_spawn_repeater(void);
-typedef void CACVRTFUNC(void *pSrc, void *pDest, int hton, unsigned long count);
 void cac_gettimeval(struct timeval  *pt);
 /* returns A - B in floating secs */
 ca_real cac_time_diff(ca_time *pTVA, ca_time *pTVB);
 /* returns A + B in integer secs & integer usec */
 ca_time cac_time_sum(ca_time *pTVA, ca_time *pTVB);
-void caIOBlockFree(evid pIOBlock);
+void caIOBlockFree(miu pIOBlock);
 void clearChannelResources(unsigned id);
 void caSetDefaultPrintfHandler (void);
-void cacDisconnectChannel(chid chix, int fullDisconnect);
+void cacDisconnectChannel(ciu chix, enum channel_state state);
 int caSendMsgPending(void);
+void generateLocalExceptionWithFileAndLine(long stat, char *ctx, 
+	char *pFile, unsigned line);
+#define genLocalExcep(STAT, PCTX) \
+generateLocalExceptionWithFileAndLine (STAT, PCTX, __FILE__, __LINE__)
 
 /*
  * !!KLUDGE!!

src/ca/iocmsg.h

@@ -1,185 +0,0 @@
-#ifndef __IOCMSG__
-/* $Id$ */
-/*
- *	History
- * 	.01 01xx90 joh	removed status field in favor of a independent m_cmmd- 
- *			saves space on every successful operation
- *
- *	.02 041390 joh	moved server ports to above IPPORT_USERRESERVED
- *			see in.h
- *
- *	.03 060391 joh	Bumped protocol version to 4 to support changes for
- *			SPARC alignment in db_access.h
- *	
- *	.04 071291 joh	New command added - claim channel in use block
- *
- *	.05 011294 joh	New command added - write notify 
- *
- *	.06 020194 joh	New command added for CA V4.1 - client name 
- *
- *	.07 041194 joh	New command added for CA V4.2 - access rights 
- *
- *	.08 050594 joh	New command added for CA V4.3 - echo request
- *
- *	.09 050594 joh	New command added for CA V4.3 - repeater fanout register 
- *
- *	.10 050594 joh	New command added for CA V4.3 - wakeup the server
- * $Log$
- * Revision 1.23  1995/08/23  00:35:17  jhill
- * added log entries
- *
- */
-
-#define __IOCMSG__
-
-HDRVERSIONID(iocmsgh, "@(#) $Id$ CA version 4.4")
-
-/* TCP/UDP port number (bumped each protocol change) */
-#define CA_PROTOCOL_VERSION	4
-#define CA_MINOR_VERSION	6
-#define CA_UKN_MINOR_VERSION	0 /* unknown minor version */
-#if CA_PROTOCOL_VERSION == 4
-#define CA_V41(MAJOR,MINOR)	((MINOR)>=1) 
-#define CA_V42(MAJOR,MINOR)	((MINOR)>=2)
-#define CA_V43(MAJOR,MINOR)	((MINOR)>=3)
-#define CA_V44(MAJOR,MINOR)	((MINOR)>=4)
-#define CA_V45(MAJOR,MINOR)	((MINOR)>=5)
-#define CA_V46(MAJOR,MINOR)	((MINOR)>=6)
-#elif CA_PROTOCOL_VERSION > 4
-#define CA_V41(MAJOR,MINOR)	( 1 )
-#define CA_V42(MAJOR,MINOR)	( 1 )
-#define CA_V43(MAJOR,MINOR)	( 1 )
-#define CA_V44(MAJOR,MINOR)	( 1 )
-#define CA_V45(MAJOR,MINOR)	( 1 )
-#define CA_V46(MAJOR,MINOR)	( 1 )
-#else
-#define CA_V41(MAJOR,MINOR)	( 0 )
-#define CA_V42(MAJOR,MINOR)	( 0 )
-#define CA_V43(MAJOR,MINOR)	( 0 )
-#define CA_V44(MAJOR,MINOR)	( 0 )
-#define CA_V45(MAJOR,MINOR)	( 0 )
-#define CA_V46(MAJOR,MINOR)	( 0 )
-#endif 
-
-/*
- * NOTE: These port numbers are only used if the CA repeater and 
- * CA server port numbers cant be obtained from the EPICS 
- * environment variables "EPICS_CA_REPEATER_PORT" and
- * "EPICS_CA_SERVER_PORT"
- */
-#define	CA_PORT_BASE		IPPORT_USERRESERVED + 56U
-#define CA_SERVER_PORT		(CA_PORT_BASE+CA_PROTOCOL_VERSION*2)
-#define CA_REPEATER_PORT	(CA_PORT_BASE+CA_PROTOCOL_VERSION*2+1)
-
-#define MAX_UDP			1024
-#define MAX_TCP			(MAX_UDP*16) /* so waveforms fit */
-#define MAX_MSG_SIZE		(MAX_TCP) /* the larger of tcp and udp max */
-
-/*
- * architecture independent types
- *
- * (so far this works on all archs we have ported to)
- */
-typedef unsigned short  ca_uint16_t;
-typedef unsigned int	ca_uint32_t;
-typedef float           ca_float32_t;
-typedef ca_uint32_t	caResId;
-
-		/* values for m_cmmd */
-#define IOC_NOOP		0	/* do nothing, but verify TCP */
-#define IOC_EVENT_ADD		1	/* add an event */
-#define IOC_EVENT_CANCEL	2	/* cancel an event */
-#define IOC_READ		3	/* read and return a channel value*/
-#define IOC_WRITE		4	/* write a channel value */
-#define IOC_SNAPSHOT		5	/* snapshot of the system */
-#define	IOC_SEARCH		6	/* IOC channel search */
-#define IOC_BUILD		7	/* build - obsolete */
-#define IOC_EVENTS_OFF		8	/* flow control */ 
-#define IOC_EVENTS_ON		9	/* flow control */ 
-#define IOC_READ_SYNC		10	/* purge old reads */ 
-#define IOC_ERROR		11	/* an operation failed */ 
-#define IOC_CLEAR_CHANNEL	12	/* free chan resources */
-#define IOC_RSRV_IS_UP		13	/* CA server has joined the net */
-#define IOC_NOT_FOUND		14	/* channel not found */
-#define IOC_READ_NOTIFY		15	/* add a one shot event */
-#define IOC_READ_BUILD		16	/* read and build - obsolete */
-#define REPEATER_CONFIRM	17	/* registration confirmation */
-#define IOC_CLAIM_CIU		18	/* client claims resource in server */
-#define IOC_WRITE_NOTIFY	19	/* notify after write chan value */
-#define IOC_CLIENT_NAME		20	/* CA V4.1 identify client */
-#define IOC_HOST_NAME		21	/* CA V4.1 identify client */
-#define IOC_ACCESS_RIGHTS	22	/* CA V4.2 asynch access rights chg */
-#define IOC_ECHO		23	/* CA V4.3 connection verify */
-#define REPEATER_REGISTER	24	/* registr for repeater fan out */
-#define IOC_SIGNAL		25	/* knock the server out of select */
-#define IOC_CLAIM_CIU_FAILED	26	/* unable to create chan resource in server */
-
-/*
- * for use with search and not_found (if search fails and
- * its not a broadcast tell the client to look elesewhere)
- */
-#define DOREPLY		10
-#define DONTREPLY	5
-
-/* size of object in bytes rounded up to nearest oct word */
-#define	OCT_ROUND(A)	((((unsigned long)(A))+7)>>3)
-#define	OCT_SIZEOF(A)	(OCT_ROUND(sizeof(A)))
-
-/* size of object in bytes rounded up to nearest long word */
-#define	QUAD_ROUND(A)	(((unsigned long)(A))+3)>>2)
-#define	QUAD_SIZEOF(A)	(QUAD_ROUND(sizeof(A)))
-
-/* size of object in bytes rounded up to nearest short word */
-#define	BI_ROUND(A)	((((unsigned long)(A))+1)>>1)
-#define	BI_SIZEOF(A)	(BI_ROUND(sizeof(A)))
-
-/*
- * For communicating access rights to the clients
- *
- * (placed in m_available hdr field of IOC_ACCESS_RIGHTS cmmd
- */
-#define CA_ACCESS_RIGHT_READ	(1<<0)
-#define CA_ACCESS_RIGHT_WRITE	(1<<1)
-
-/*
- * All structures passed in the protocol must have individual
- * fields aligned on natural boundaries.
- *
- * NOTE: all structures declared in this file must have a
- * byte count which is evenly divisible by 8 matching
- * the largest atomic data type in db_access.h.
- */
-#define CA_MESSAGE_ALIGN(A) (OCT_ROUND(A)<<3)
-
-/*
- * the common part of each message sent/recv by the
- * CA server.
- */
-typedef struct	extmsg {
-	ca_uint16_t	m_cmmd;		/* operation to be performed */
-	ca_uint16_t	m_postsize;	/* size of message extension */	
-	ca_uint16_t	m_type;		/* operation data type */ 
-	ca_uint16_t	m_count;	/* operation data count */
-	ca_uint32_t	m_cid;		/* channel identifier */
-	ca_uint32_t	m_available;	/* undefined message location for use
-					 * by client processes */
-}caHdr;
-
-/*
- * for  monitor (event) message extension
- */
-struct  mon_info{
-	ca_float32_t	m_lval;		/* low delta */
-	ca_float32_t	m_hval;		/* high delta */ 
-	ca_float32_t	m_toval;	/* period btween samples */
-	ca_uint16_t	m_mask;		/* event select mask */
-	ca_uint16_t	m_pad;		/* extend to 32 bits */
-};
-
-struct	monops {			/* monitor req opi to ioc */
-	struct extmsg	m_header;
-	struct mon_info	m_info;
-};
-
-#endif /* __IOCMSG__ */
-

src/ca/net_convert.h

@@ -1,10 +1,18 @@
 /*
  *	$Id$	
  *
- *	N E T _ C O N V E R T . H
  *	MACROS for rapid conversion between HOST data formats and those used
  *	by the IOCs (NETWORK).
  *
+ *	Author: J. Hill 
+ *
+ *	The conversion routines are used in both ca lib
+ *	and the IOC ca server (base/rsrv).
+ *	The latter, however, cannot include os_depen.h so
+ *	I extracted the conversion specific code from there
+ *	and put it in this "now stand alone" net_convert.h
+ *	8-22-96  -kuk-
+ *
  *
  *	joh 	09-13-90	force MIT sign to zero if exponent is zero
  *				to prevent a reseved operand fault.
@@ -16,8 +24,79 @@
  *
  */
 
+#ifndef _NET_CONVERT_H
+#define _NET_CONVERT_H
+
 #include <db_access.h>
 
+/*
+ * Here are the definitions for architecture dependent byte ordering 
+ * and floating point format
+ */
+#if defined(VAX) 
+#	define CA_FLOAT_MIT
+#	define CA_LITTLE_ENDIAN
+#elif defined(_X86_)
+#	define CA_FLOAT_IEEE
+#	define CA_LITTLE_ENDIAN
+#elif (defined(__ALPHA) && defined(VMS) || defined(__alpha)) && defined(VMS)
+#	define CA_FLOAT_MIT
+#	define CA_LITTLE_ENDIAN
+#elif (defined(__ALPHA) && defined(UNIX) || defined(__alpha)) && defined(UNIX)
+#	define CA_FLOAT_IEEE
+#	define CA_LITTLE_ENDIAN
+#else
+#	define CA_FLOAT_IEEE
+#	define CA_BIG_ENDIAN
+#endif
+
+/*
+ * some architecture sanity checks
+ */
+#if defined(CA_BIG_ENDIAN) && defined(CA_LITTLE_ENDIAN)
+#error defined(CA_BIG_ENDIAN) && defined(CA_LITTLE_ENDIAN)
+#endif
+#if !defined(CA_BIG_ENDIAN) && !defined(CA_LITTLE_ENDIAN)
+#error !defined(CA_BIG_ENDIAN) && !defined(CA_LITTLE_ENDIAN)
+#endif
+#if defined(CA_FLOAT_IEEE) && defined(CA_FLOAT_MIT)
+#error defined(CA_FLOAT_IEEE) && defined(CA_FLOAT_MIT)
+#endif
+#if !defined(CA_FLOAT_IEEE) && !defined(CA_FLOAT_MIT)
+#error !defined(CA_FLOAT_IEEE) && !defined(CA_FLOAT_MIT) 
+#endif
+
+/*
+ * CONVERSION_REQUIRED is set if either the byte order
+ * or the floating point does not match
+ */
+#if !defined(CA_FLOAT_IEEE) || !defined(CA_BIG_ENDIAN)
+#define CONVERSION_REQUIRED
+#endif
+
+/*
+ * if hton is true then it is a host to network conversion
+ * otherwise vise-versa
+ *
+ * net format: big endian and IEEE float
+ */
+
+typedef void CACVRTFUNC(void *pSrc, void *pDest, int hton, unsigned long count);
+
+#ifdef CONVERSION_REQUIRED
+/*  cvrt is (array of) (pointer to) (function returning) int */
+extern CACVRTFUNC *cac_dbr_cvrt[];
+#endif
+
+
+/*
+ *	Macros ...
+ *
+ *	This is also used in the ca server on pc486 archs, 
+ *	where source and destination buffers are identical,
+ *	so we need a tmp variable in e.g. 'double' conversions.
+ */
+
 #ifdef CA_LITTLE_ENDIAN 
 #  	ifndef ntohs
 #    		define ntohs(SHORT)\
@@ -79,12 +158,20 @@
 		{*((dbr_long_t *)(HOST)) = ntohl(*((dbr_long_t *)(NET )));}
 #	define dbr_htonf(HOST,NET) \
 		{*((dbr_long_t *)(NET) ) = htonl(*((dbr_long_t *)(HOST)));}
-#	define dbr_ntohd(NET,HOST) \
-		{ ((dbr_long_t *)(HOST))[1] = ntohl(((dbr_long_t *)(NET))[0]) ; \
-		((dbr_long_t *)(HOST))[0] = ntohl(((dbr_long_t *)(NET))[1]) ;}
-#	define dbr_htond(HOST,NET) \
-		{ ((dbr_long_t *)(NET))[1] = htonl(((dbr_long_t *)(HOST))[0]) ; \
-		((dbr_long_t *)(NET))[0] = htonl(((dbr_long_t *)(HOST))[1]) ;}
+#	define dbr_ntohd(NET,HOST)					\
+		{							\
+		dbr_long_t  cvrt_tmp;					\
+		cvrt_tmp = ntohl(((dbr_long_t *)(NET))[0]);		\
+		((dbr_long_t *)(HOST))[0] = ntohl(((dbr_long_t *)(NET))[1]); \
+		((dbr_long_t *)(HOST))[1] = cvrt_tmp;			\
+		}
+#	define dbr_htond(HOST,NET)					\
+		{							\
+		dbr_long_t  cvrt_tmp;					\
+		cvrt_tmp = htonl(((dbr_long_t *)(HOST))[0]);		\
+		((dbr_long_t *)(NET))[0] = htonl(((dbr_long_t *)(HOST))[1]); \
+		((dbr_long_t *)(NET))[1] = cvrt_tmp;			\
+		}
 #else
 	void dbr_htond(dbr_double_t *pHost, dbr_double_t *pNet);
 	void dbr_ntohd(dbr_double_t *pNet, dbr_double_t *pHost);
@@ -92,3 +179,4 @@
 	void dbr_ntohf(dbr_float_t *pNet, dbr_float_t *pHost);
 #endif
 
+#endif	/* define _NET_CONVERT_H */

src/ca/os_depen.h

@@ -42,44 +42,19 @@ static char *os_depenhSccsId = "$Id$";
  * each socket library
  */
 #ifdef UNIX
-#	include <unistd.h>
 #	include <errno.h>
-#	include <sys/types.h>
-#	include <sys/time.h>
-#	include <sys/ioctl.h>
-#	include <sys/param.h>
-#	include <sys/socket.h>
-#	include <netinet/in.h>
-#	include <netinet/tcp.h>
-#	include <net/if.h>
-#	include <arpa/inet.h>
-#	include <netdb.h>
-	/*
-	 * normally these are included by ioctl.h
-	 */
-#	ifdef SOLARIS 
-#		include <sys/filio.h>
-#		include <sys/sockio.h>
-#	endif
+#	include <time.h>
 #	define CA_OS_CONFIGURED
 #endif
 
 #ifdef vxWorks
 #	include <vxWorks.h>
 #	include <errno.h>
-#	include <sys/types.h>
-#	include <sys/ioctl.h>
-#	include <sys/socket.h>
-#	include <netinet/in.h>
-#	include <netinet/tcp.h>
-#	include <net/if.h>
 
-#	include <systime.h>
 #	include <ioLib.h>
 #	include <tickLib.h>
 #	include <taskHookLib.h>
 #	include <selectLib.h>
-#	include <sockLib.h>
 #       include <errnoLib.h>
 #       include <sysLib.h>
 #       include <taskVarLib.h>
@@ -89,28 +64,16 @@ static char *os_depenhSccsId = "$Id$";
 #       include <dbgLib.h>
 #	include <inetLib.h>
 #	include <taskLib.h>
+#	include <vxLib.h>
 
 #	include <task_params.h>
 #	include <taskwd.h>
-#	include <fast_lock.h>
 
-/*
- * logistical problems prevent including this file
- */
-#if 0
-#define caClient
-#include                <dbEvent.h>
-#endif
 #	define CA_OS_CONFIGURED
 #endif
 
 #ifdef VMS
-#	include <sys/types.h>
-#	include <sys/socket.h>
-#	include <netinet/in.h>
-#	include <netinet/tcp.h>
 #if !defined(UCX) 
-#	include <sys/time.h>
 #	include <tcp/errno.h>
 #else
 #       include <errno>
@@ -136,8 +99,6 @@ static char *os_depenhSccsId = "$Id$";
 #ifdef WIN32
 #	include <errno.h>
 #	include <time.h>
-#	include <windows.h>
-#	include <winsock.h>
 #	define CA_OS_CONFIGURED
 #endif /*WIN32*/
 
@@ -145,100 +106,8 @@ static char *os_depenhSccsId = "$Id$";
 #error Please define one of vxWorks, UNIX, VMS, or WIN32 
 #endif
 
-/*
- * Here are the definitions for architecture dependent byte ordering 
- * and floating point format
- */
-#if defined(VAX) 
-#	define CA_FLOAT_MIT
-#	define CA_LITTLE_ENDIAN
-#elif defined(_X86_)
-#	define CA_FLOAT_IEEE
-#	define CA_LITTLE_ENDIAN
-#elif (defined(__ALPHA) && defined(VMS) || defined(__alpha)) && defined(VMS)
-#	define CA_FLOAT_MIT
-#	define CA_LITTLE_ENDIAN
-#elif (defined(__ALPHA) && defined(UNIX) || defined(__alpha)) && defined(UNIX)
-#	define CA_FLOAT_IEEE
-#	define CA_LITTLE_ENDIAN
-#else
-#	define CA_FLOAT_IEEE
-#	define CA_BIG_ENDIAN
-#endif
-
-/*
- * some architecture sanity checks
- */
-#if defined(CA_BIG_ENDIAN) && defined(CA_LITTLE_ENDIAN)
-#error defined(CA_BIG_ENDIAN) && defined(CA_LITTLE_ENDIAN)
-#endif
-#if !defined(CA_BIG_ENDIAN) && !defined(CA_LITTLE_ENDIAN)
-#error !defined(CA_BIG_ENDIAN) && !defined(CA_LITTLE_ENDIAN)
-#endif
-#if defined(CA_FLOAT_IEEE) && defined(CA_FLOAT_MIT)
-#error defined(CA_FLOAT_IEEE) && defined(CA_FLOAT_MIT)
-#endif
-#if !defined(CA_FLOAT_IEEE) && !defined(CA_FLOAT_MIT)
-#error !defined(CA_FLOAT_IEEE) && !defined(CA_FLOAT_MIT) 
-#endif
-
-/*
- * CONVERSION_REQUIRED is set if either the byte order
- * or the floating point does not match
- */
-#if !defined(CA_FLOAT_IEEE) || !defined(CA_BIG_ENDIAN)
-#define CONVERSION_REQUIRED
-#endif
-
-#ifndef NULL
-#define NULL            0
-#endif  
-
-#ifndef FALSE
-#define FALSE           0
-#endif  
-
-#ifndef TRUE
-#define TRUE            1
-#endif  
-
-#ifndef OK
-#define OK            0
-#endif  
-
-#ifndef ERROR
-#define ERROR            (-1)
-#endif  
-
-#ifndef NELEMENTS
-#define NELEMENTS(array)    (sizeof(array)/sizeof((array)[0]))
-#endif
-
-#ifndef LOCAL 
-#define LOCAL static
-#endif
-
-/* delay for when a poll is used	 				*/
-/*	NOTE: DELAYTICKS must be less than TICKSPERSEC	*/
-#define DELAYTICKS	50L		/* (adjust units below) */
-#define TICKSPERSEC	1000L		/* mili sec per sec	*/
-
-/*
- * BSD prototypes missing from SUNOS4, MULTINET and 
- * perhaps other environments
- */
-#include <epicsTypes.h>
-#include <bsdProto.h>
-
-/*
- * order of ops is important here
- * 
- * NOTE: large OS dependent SYFREQ might cause an overflow 
- */
-#define LOCALTICKS	((SYSFREQ*DELAYTICKS)/TICKSPERSEC)
-
-
 #if defined(vxWorks)
+#  	define POST_IO_EV semGive(io_done_sem)
 #	define VXTASKIDNONE	0
 #  	define LOCK 		semTake(client_lock, WAIT_FOREVER);
 #  	define UNLOCK  	semGive(client_lock);
@@ -250,84 +119,34 @@ static char *os_depenhSccsId = "$Id$";
 (((int)taskIdCurrent)==event_tid || ca_static->recv_tid == (int)taskIdCurrent)
 #	define VXTHISTASKID 	taskIdSelf()
 #	define abort() 		taskSuspend(VXTHISTASKID)
-#   	define socket_close(S) close(S)
-	/* vxWorks still has a brain dead func proto for ioctl */
-#   	define socket_ioctl(A,B,C) ioctl(A,B,(int)C) 
-# 	define MYERRNO	(errnoGet()&0xffff)
-#  	define POST_IO_EV semGive(io_done_sem)
-# 	define SYSFREQ		((long) sysClkRateGet())  /* usually 60 Hz */
-# 	define time(A) 		(tickGet()/SYSFREQ)
-	typedef int SOCKET;
-#	define INVALID_SOCKET (-1)
 #endif
 
 #if defined(UNIX)
+#  	define POST_IO_EV 
 #  	define LOCK
 #  	define UNLOCK  
 #  	define LOCKEVENTS
 #  	define UNLOCKEVENTS
 #	define EVENTLOCKTEST	(post_msg_active)
-#   	define socket_close(S) close(S)
-#   	define socket_ioctl(A,B,C) ioctl(A,B,C) 
-# 	define MYERRNO	errno
-#  	define POST_IO_EV 
-#	define SYSFREQ		1000000L	/* 1 MHz	*/
-	typedef int SOCKET;
-#	define INVALID_SOCKET (-1)
 #endif
 
 #if defined(VMS)
-#  if defined(WINTCP)	/* Wallangong */
-	/* (the VAXC runtime lib has its own close */
-# 		define socket_close(S) netclose(S)
-# 		define socket_ioctl(A,B,C) ioctl(A,B,C) 
-#  endif
-#  if defined(UCX)				/* GeG 09-DEC-1992 */
-# 		define socket_close(S) close(S)
-# 		define socket_ioctl(A,B,C) ioctl(A,B,C) 
-#  endif
-#	ifdef WINTCP
-  		extern int	uerrno;	
-# 		define MYERRNO	uerrno
-#	else
-#           ifdef UCX
-#               define MYERRNO errno
-#           else
-# 		define MYERRNO	socket_errno
-#           endif
-#	endif
 #  	define POST_IO_EV 
-# 	define SYSFREQ		10000000L	/* 10 MHz	*/
 #	define LOCK
 #	define UNLOCK
 #  	define LOCKEVENTS
 #  	define UNLOCKEVENTS
 #	define EVENTLOCKTEST	(post_msg_active)
-	typedef int SOCKET;
-#	define INVALID_SOCKET (-1)
 #endif
 
 #ifdef WIN32 
+#	define POST_IO_EV
 #  	define LOCK
 #  	define UNLOCK  
 #  	define LOCKEVENTS
 #  	define UNLOCKEVENTS
-#	define EVENTLOCKTEST		(post_msg_active)
-#	define MAXHOSTNAMELEN 		75
-#	define IPPORT_USERRESERVED	5000U
-#	define EWOULDBLOCK		WSAEWOULDBLOCK
-#	define ENOBUFS			WSAENOBUFS
-#	define ECONNRESET		WSAECONNRESET
-#	define ETIMEDOUT		WSAETIMEDOUT
-#	define EADDRINUSE		WSAEADDRINUSE
-#	define ECONNREFUSED		WSAECONNREFUSED
-#	define socket_close(S) 		closesocket(S)
-#	define socket_ioctl(A,B,C)	ioctlsocket(A,B,C)
-#	define MYERRNO			WSAGetLastError()
-#	define POST_IO_EV
-#	define SYSFREQ			1000000L /* 1 MHz        */
+#	define EVENTLOCKTEST	(post_msg_active)
 #endif /*WIN32*/
 
-
-#endif
+#endif /* INCos_depenh */
 

src/ca/posix_depen.c

@@ -29,6 +29,15 @@
  *      Modification Log:
  *      -----------------
  * $Log$
+ * Revision 1.19  1996/07/09 22:41:02  jhill
+ * pass nill 2nd arg to gettimeofday()
+ *
+ * Revision 1.18  1996/06/20 21:19:29  jhill
+ * fixed posix signal problem with "cc -Xc"
+ *
+ * Revision 1.17  1995/12/19  19:33:42  jhill
+ * added missing arg to execlp()
+ *
  * Revision 1.16  1995/10/12  01:35:28  jhill
  * Moved cac_mux_io() to iocinf.c
  *
@@ -40,23 +49,24 @@
 
 #include <unistd.h>
 #include <pwd.h>
-#include <sys/param.h>
 
 #include "iocinf.h"
 
+#define _POSIX_C_SOURCE 3 /* for solaris and "cc -Xc" */
+#include <signal.h>
+
 
 /*
  * cac_gettimeval
  */
 void cac_gettimeval(struct timeval  *pt)
 {
-        struct timezone tz;
 	int		status;
 
 	/*
 	 * Not POSIX but available on most of the systems that we use
 	 */
-        status = gettimeofday(pt, &tz);
+        status = gettimeofday(pt, NULL);
 	assert(status == 0);
 }
 
@@ -133,7 +143,7 @@ int cac_os_depen_init(struct ca_static *pcas)
 				ca_printf(
 				"%s: Error from signal replace was \"%s\"\n",
 				__FILE__,
-				strerror(MYERRNO));
+				strerror(errno));
 			}
 		}
 	}
@@ -141,7 +151,7 @@ int cac_os_depen_init(struct ca_static *pcas)
 		ca_printf(
 		"%s: Error from signal query was \"%s\"\n",
 		__FILE__,
-		strerror(MYERRNO));
+		strerror(errno));
 	}
 
 	status = ca_os_independent_init ();
@@ -230,7 +240,7 @@ void ca_spawn_repeater()
 	if(status<0){	
 		ca_printf("!!WARNING!!\n");
 		ca_printf("The executable \"%s\" couldnt be located\n", pImageName);
-		ca_printf("because of errno = \"%s\"\n", strerror(MYERRNO));
+		ca_printf("because of errno = \"%s\"\n", strerror(errno));
 		ca_printf("You may need to modify your PATH environment variable.\n");
 		ca_printf("Creating CA repeater with fork() system call.\n");
 		ca_printf("Repeater will inherit parents process name and resources.\n");