Merge lp:~mdavidsaver/epics-base/reorg-src into lp:~epics-core/epics-base/3.15

[mdavidsaver]

Major reorganization of code and build system. This change tries to group code by function. The only user visible change is that the number of libraries build shrinks 16 to 7. However, the definition of EPICS_BASE_IOC_LIBS changes accordingly.

The groups are now:

src/tools - Build system infrastructure
src/libCom - Everything unrelated to CA and IOCs
src/ca - CA components which can be used outside an IOC
src/ioc - The IOC core processing mechanisms
src/std - The standard record and dset definitions
src/template - home to makeBaseApp and makeBaseExt

Dependencies are now strictly

tools:
template:
libCom: tools
ca: libCom
ioc: libCom
std: ioc

[Ernest Williams (ernesto-slac)]

Hi
Excellent work and re-organization

Cheers
Ernest

Sent from my iPhone

On Dec 20, 2010, at 14:34, mdavidsaver <email address hidden> wrote:

> mdavidsaver has proposed merging lp:~mdavidsaver/epics-base/reorg-src into lp:epics-base.
>
> Requested reviews:
> EPICS Core Developers (epics-core)
>
>
> Major reorganization of code and build system. This change tries to group code by function. The only user visible change is that the number of libraries build shrinks 16 to 7. However, the definition of EPICS_BASE_IOC_LIBS changes accordingly.
>
> The groups are now:
>
> src/tools - Build system infrastructure
> src/libCom - Everything unrelated to CA and IOCs
> src/ca - CA components which can be used outside an IOC
> src/ioc - The IOC core processing mechanisms
> src/std - The standard record and dset definitions
> src/template - home to makeBaseApp and makeBaseExt
>
> Dependencies are now strictly
>
> tools:
> template:
> libCom: tools
> ca: libCom
> ioc: libCom
> std: ioc
>
> --
> https://code.launchpad.net/~mdavidsaver/epics-base/reorg-src/+merge/44296
> Your team EPICS Core Developers is requested to review the proposed merge of lp:~mdavidsaver/epics-base/reorg-src into lp:epics-base.
> <review-diff.txt>

[Andrew Johnson (anj)]

Hi Michael,

I'm currently working on merging your reorganization with my branch that split the libCom/Makefile into multiple fragments that are local to the source files but that get included by the original file. I will repeat this idea in the other src/* directories, which I believe should also make it slightly easier to merge changes across this reorganization boundary.

Did you have any particular reason for putting antelope and flex under libCom/tools rather than directly under libCom? I'm currently inclined to drop the tools layer.

- Andrew (from home, via LP)

[mdavidsaver (mdavidsaver)]

> Did you have any particular reason for putting antelope and flex under
> libCom/tools rather than directly under libCom? I'm currently inclined to
> drop the tools layer.

Because antelope and e_flex use epicsTempFile which is part of libCom. So currently they have a build dependency on libCom.

At the same time asLib.y needs antelope to generate the access security file parser. Now asLib is built as part of libCom.

Thus we have a circular dependency which I currently resolve by linking antelope with epicsTempFile.o instead of the full libCom. Then using antelope to generate asLib.c for inclusion in the final Com.so library. Given this rather tangled situation it seemed appropriate to put antelope/e_flex under the libCom directory.

If you dislike the situation I would suggest looking at removing the dependency of antelope/e_flex on epicsTempFile. This seems like the best way to break the dependency loop. I didn't do this initially because, in the interest of trying not to do too much at once, I avoided any substantial source code modification.

[Andrew Johnson (anj)]

I'm just talking about moving the directories libCom/tools/flex to libCom/flex, and libCom/tools/antelope to libCom/yacc, which I have now successfully done. I had to rename the antelope directory to yacc since make thinks an antelope directory is the antelope target it's being asked to build and tries to install it as a script. After also renaming the two main.c files to get everything to build properly I'm now up to your revid 12222. I'm keeping the dependency resolution fix you described, and everything under libCom still builds in one go. I will record you as the author for these commits.

[mdavidsaver (mdavidsaver)]

> I'm just talking about moving the directories libCom/tools/flex to
> libCom/flex, and libCom/tools/antelope to libCom/yacc, which I have now
> successfully done.

Ah, I mis-read your message.

> I had to rename the antelope directory to yacc since make
> thinks an antelope directory is the antelope target it's being asked to build
> and tries to install it as a script.

Hadn't thought of that...

> After also renaming the two main.c files
> to get everything to build properly I'm now up to your revid 12222. I'm
> keeping the dependency resolution fix you described, and everything under
> libCom still builds in one go.

> I will record you as the author for these commits.

Not necessary. Just be yourself ;)

[Andrew Johnson (anj)]

Another question: Was there a reason for dropping dlload.dbd and system.dbd from softIoc.dbd, or was that a mistake?

[lp:~mdavidsaver/epics-base/reorg-src]

12222. By Andrew Johnson on 2011-02-25

Split libCom/Makefile into individual subdirectories.

The new Makefile fragments in the subdirectories are incomplete and will
not work individually. Build rules are placed in a separate RULES file.
This approach keeps the instructions for building each file local and
easier to find than in a large Makefile in the parent directory.

12223. By mdavidsaver on 2011-02-25

Fold antelope/flex and asHost into libCom

Build lexer and parser from libCom/Makefile.
Since libCom now includes asLib.c and asLib_lex.c we must build
antelope and flex without linking them to Com. This works because
they only need epicsTempFile anyway. However make doesn't like a
subdirectory with the same name as a target object, so the antelope
source directory is now called yacc. The two main.c files were also
renamed to avoid other build problems.

Merge asHost into Com and remove mentions in CONFIG_BASE

Lots of noise since SRCS must be renamed to Com_SRCS

12224. By Andrew Johnson on 2011-02-26

libCom: Ommitted to include the flex/RULES file.

12225. By mdavidsaver on 2011-02-26

Merge ioc/*.

Merge miscIoc rsrvIoc dbtoolsIoc asIoc dbIoc registryIoc dbStaticIoc
into dbCore.

Move ioc/misc/asSubRecordFunctions.c to std/dev/asSubRecordFunctions.c
since it depends on the subRecord type.

Extracted ioc variable definitions from base.dbd into dbCore.dbd

12226. By mdavidsaver on 2011-02-27

Merge std/*

Combine recIoc and softDevIoc libraries into dbRecStd

Move base.dbd from ioc/misc/ to std/softIoc/

Generate stdRecords.dbd from the std/rec/Makefile list of record
types instead of hard-coding it in base.dbd

12227. By mdavidsaver on 2011-02-27

Updated release notes.

[mdavidsaver (mdavidsaver)]

> Another question: Was there a reason for dropping dlload.dbd and system.dbd
> from softIoc.dbd, or was that a mistake?

A mistake. Thanks for catching it Andrew!

[Andrew Johnson (anj)]

My version of this reorg branch is at lp:~anj/epics-base/reorg-src for you to look at. I did include a few more changes, generating a stdRecords.dbd file in std/rec/Makefile is one obvious DRY improvement.

[mdavidsaver (mdavidsaver)]

> My version of this reorg branch is at lp:~anj/epics-base/reorg-src for you to
> look at. I did include a few more changes, generating a stdRecords.dbd file
> in std/rec/Makefile is one obvious DRY improvement.

Ok, looks fine, so I've replaced my origin branch with yours.

The diff on the merge request page seems to be confused, but from looking at the branch page directly, I think I pushed the correct version.

[Andrew Johnson (anj)]

After rebasing and a few modifications, I have now merged this code.

review: Approve

=== modified file 'configure/CONFIG_BASE'
--- configure/CONFIG_BASE	2008-08-29 21:07:04 +0000
+++ configure/CONFIG_BASE	2011-03-03 23:06:17 +0000
@@ -21,14 +21,12 @@
 #---------------------------------------------------------------
 # Epics base Ioc libraries 
 
-EPICS_BASE_IOC_LIBS += recIoc softDevIoc
-EPICS_BASE_IOC_LIBS += miscIoc rsrvIoc dbtoolsIoc asIoc
-EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com 
+EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com 
 
 #---------------------------------------------------------------
 # Epics base Host libraries 
 
-EPICS_BASE_HOST_LIBS += cas gdd asHost dbStaticHost registryIoc
+EPICS_BASE_HOST_LIBS += cas gdd dbStaticHost
 EPICS_BASE_HOST_LIBS += ca Com
 
 #---------------------------------------------------------------

=== modified file 'configure/RULES.Db'
--- configure/RULES.Db	2010-09-29 15:36:40 +0000
+++ configure/RULES.Db	2011-03-03 23:06:17 +0000
@@ -262,7 +262,7 @@
 	$(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP)
 	$(ECHO) "Expanding dbd"
 	@$(RM) $@
-	@$(DBEXPAND) $(DBDFLAGS) -o $@ $<
+	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
 
 $(COMMON_DIR)/%.dbd: %Include.dbd 
 	@$(RM) $(notdir $@)$(DEP)

=== modified file 'configure/RULES_BUILD'
--- configure/RULES_BUILD	2011-02-18 22:16:56 +0000
+++ configure/RULES_BUILD	2011-03-03 23:06:17 +0000
@@ -225,23 +225,21 @@
 	@$(RM) $@
 	$(BAFCMD) $<
 
+YACCOPT ?= $($*_YACCOPT)
 #
 # rename the y.tab.h file only if we
 # are creating it
 #
-ifeq ($(findstring -d, $(YACCOPT)),-d)
-%.h %.c: %.y
-	$(RM) $*.c y.tab.c
-	$(RM) $*.h y.tab.h
-	$(YACC) $(YACCOPT) $<
-	$(MV) y.tab.c $*.c
-	$(MV) y.tab.h $*.h
-else
 %.c: %.y
-	$(RM) $*.c y.tab.c
-	$(YACC) $(YACCOPT) $<
-	$(MV) y.tab.c $*.c
-endif
+	$(RM) $*.tab.c
+	$(RM) $*.tab.h
+	$(YACC) -b$* $(YACCOPT) $<
+	$(MV) $*.tab.c $*.c
+	$(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
+
+# must be a seperate rule since when not using '-d' the
+# prefix for .h will be different then .c
+%.h : %.c %.y
 
 %.c: %.l
 	@$(RM) lex.yy.c

=== modified file 'documentation/RELEASE_NOTES.html'
--- documentation/RELEASE_NOTES.html	2010-11-28 03:06:40 +0000
+++ documentation/RELEASE_NOTES.html	2011-03-03 23:06:17 +0000
@@ -13,6 +13,221 @@
 <h2 align="center">Changes between 3.14.x and 3.15.1</h2>
 <!-- Insert new items immediately below here ... -->
 
+<h3>Reorganization of src/</h3>
+<p>Reorganization of subdirectories of src/ to better represent the relation
+between different parts as described in the following table.</p>
+
+<p>This change also allows the number of libraries built to be reduced to:
+libCap5.so,  libca.so,   libdbCore.so,    libdbStaticHost.so,
+libCom.so,   libcas.so,  libdbRecStd.so, and  libgdd.so</p>
+
+<table border="1"><tbody>
+<tr>
+ <th>Component</th>
+ <th>Dependency</th>
+ <th>Library name</th>
+ <th>Description</th>
+</tr>
+<tr>
+ <td>src/tools</td>
+ <td></td>
+ <td></td>
+ <td>Build system scripts</td>
+</tr>
+<tr>
+ <td>src/libCom</td>
+ <td>src/tools</td>
+ <td>Com</td>
+ <td>Utility routines and OS-independant API</td>
+</tr>
+<tr>
+ <td>src/template</td>
+ <td>src/tools</td>
+ <td></td>
+ <td>User application templates (e.g. makeBaseApp)</td>
+</tr>
+<tr>
+ <td>src/ca/client</td>
+ <td>src/libCom</td>
+ <td>ca</td>
+ <td>Channel Access client</td>
+</tr>
+<tr>
+ <td>src/ca/legacy/gdd</td>
+ <td>src/ca/client</td>
+ <td>gdd</td>
+ <td>Generic data layer for PCAS</td>
+</tr>
+<tr>
+ <td>src/ca/legacy/pcas</td>
+ <td>src/ca/legacy/gdd</td>
+ <td>cas</td>
+ <td>Portable Channel Access Server</td>
+</tr>
+<tr>
+ <td>src/ioc</td>
+ <td>src/ca</td>
+ <td>dbCore</td>
+ <td>Core database processing functions</td>
+</tr>
+<tr>
+ <td>src/std</td>
+ <td>src/ioc</td>
+ <td>dbRecStd</td>
+ <td>Standard records, soft device support and the softIoc </td>
+</tr>
+</tbody></table>
+
+<p>
+In order to better reflect these relations the following
+directories and files were moved as described:</p>
+
+<table border="1"><tbody>
+<tr>
+  <th colspan="2">Relocations</th>
+</tr>
+<tr>
+  <th>Previous</th><th>New</th>
+</tr>
+<tr>
+  <th colspan="2">libCom</th>
+</tr>
+<tr>
+  <td>src/RTEMS</td>
+  <td>src/libCom/RTEMS</td>
+</tr>
+<tr>
+  <td>src/toolsComm/flex</td>
+  <td>src/libCom/flex</td>
+</tr>
+<tr>
+  <td>src/toolsComm/antelope</td>
+  <td>src/libCom/yacc</td>
+</tr>
+<tr>
+  <td align="right">src/dbStatic/alarm.h<br>.../alarmString.h</td>
+  <td>src/libCom/misc/</td>
+</tr>
+<tr>
+  <th colspan="2">IOC Core Components</th>
+</tr>
+<tr>
+  <td>src/bpt</td>
+  <td>src/ioc/bpt</td>
+</tr>
+<tr>
+  <td>src/db</td>
+  <td>src/ioc/db</td>
+</tr>
+<tr>
+  <td>src/dbStatic</td>
+  <td>src/ioc/dbStatic</td>
+</tr>
+<tr>
+  <td>src/dbtools</td>
+  <td>src/ioc/dbtemplate</td>
+</tr>
+<tr>
+  <td>src/misc</td>
+  <td>src/ioc/misc</td>
+</tr>
+<tr>
+  <td>src/registry</td>
+  <td>src/ioc/registry</td>
+</tr>
+<tr>
+  <td>src/rsrv</td>
+  <td>src/ioc/rsrv <a href="#rsrv">1</a></td>
+</tr>
+<tr>
+  <th colspan="2">Standard Record Definitions</th>
+</tr>
+<tr>
+  <td>src/dev/softDev</td>
+  <td>src/std/dev</td>
+</tr>
+<tr>
+  <td>src/rec</td>
+  <td>src/std/rec</td>
+</tr>
+<tr>
+  <td>src/softIoc</td>
+  <td>src/std/softIoc</td>
+</tr>
+<tr>
+  <th colspan="2">Channel Access</th>
+</tr>
+<tr>
+  <td>src/ca</td>
+  <td>src/ca/client</td>
+</tr>
+<tr>
+  <td>src/catools</td>
+  <td>src/ca/client/tools</td>
+</tr>
+<tr>
+  <td>src/cap5</td>
+  <td>src/ca/client/perl</td>
+</tr>
+<tr>
+  <td>src/gdd</td>
+  <td>src/ca/legacy/gdd</td>
+</tr>
+<tr>
+  <td>src/cas</td>
+  <td>src/ca/legacy/pcas</td>
+</tr>
+<tr>
+  <td>src/excas</td>
+  <td>src/ca/legacy/pcas/ex</td>
+</tr>
+<tr>
+  <th colspan="2">User Templates</th>
+</tr>
+<tr>
+  <td>src/makeBaseApp</td>
+  <td>src/template/base</td>
+</tr>
+<tr>
+  <td>src/makeBaseExt</td>
+  <td>src/template/ext</td>
+</tr>
+<tr>
+  <th colspan="2">Dispersed</th>
+</tr>
+<tr>
+  <td rowspan="3">src/util <a href="#util">2</a></td>
+  <td>src/ca/client</td>
+</tr>
+<tr>
+  <td>src/ca/client/test</td>
+</tr>
+<tr>
+  <td>src/libCom/log</td>
+</tr>
+<tr>
+  <td rowspan="2">src/as <a href="#as">3</a></td>
+  <td>src/libCom/as</td>
+</tr>
+<tr>
+  <td>src/ioc/as</td>
+</tr>
+</tbody></table>
+
+<p><a name="rsrv">1</a>
+RSRV is built as part of dbCore due to its tight (bidirectional) coupling
+with the other database code.</p>
+
+<p><a name="util">2</a>
+The contents for src/util/ moved to three locations.  The caRepeater init script
+was moved to src/ca/client/.  ca_test is now in src/ca/client/test/.
+The iocLogServer was moved into the same directory (src/libCom/log) as
+the log client code.</p>
+
+<p><a name="as">3</a>
+The Access Security code has been divided, with the parts not related to the 
+database (lexer/parser and trap registration) becoming part of libCom.
+The remaining components are included in the dbCore library</p>
 
 <h3>
 Moved src/RTEMS/base directory</h3>

=== modified file 'src/Makefile'
--- src/Makefile	2010-10-12 16:27:17 +0000
+++ src/Makefile	2011-03-03 23:06:17 +0000
@@ -15,80 +15,56 @@
 
 DIRS += tools
 
-DIRS += makeBaseApp
-makeBaseApp_DEPEND_DIRS = tools
-
-DIRS += makeBaseExt
-makeBaseExt_DEPEND_DIRS = tools
+DIRS += template/base
+template/base_DEPEND_DIRS = tools
+
+DIRS += template/ext
+template/ext_DEPEND_DIRS = tools
+
+# Common
 
 DIRS += libCom
 libCom_DEPEND_DIRS = tools
 
-DIRS += toolsComm
-toolsComm_DEPEND_DIRS = libCom
-
-DIRS += ca
-ca_DEPEND_DIRS = libCom
-
-DIRS += dbStatic
-dbStatic_DEPEND_DIRS = toolsComm
-
-DIRS += registry
-registry_DEPEND_DIRS = dbStatic
-
-DIRS += bpt
-bpt_DEPEND_DIRS = dbStatic
-
-DIRS += db
-db_DEPEND_DIRS = bpt ca
-
-DIRS += as
-as_DEPEND_DIRS = db
-
-DIRS += util
-util_DEPEND_DIRS = ca
-
-DIRS += dbtools
-dbtools_DEPEND_DIRS = db
-
-DIRS += catools
-catools_DEPEND_DIRS = ca dbStatic
-
-DIRS += rsrv
-rsrv_DEPEND_DIRS = as
-
-DIRS += rec
-rec_DEPEND_DIRS = as registry
-
-DIRS += misc
-misc_DEPEND_DIRS = dbtools rsrv rec
-
-DIRS += dev
-dev_DEPEND_DIRS = rec misc
-
-DIRS += RTEMS
-RTEMS_DEPEND_DIRS = libCom
+DIRS += libCom/RTEMS
+libCom/RTEMS_DEPEND_DIRS = libCom
 
 DIRS += libCom/test
-libCom/test_DEPEND_DIRS = ca RTEMS
-
-DIRS += db/test
-db/test_DEPEND_DIRS = db RTEMS
-
-DIRS += softIoc
-softIoc_DEPEND_DIRS = dev dbtools RTEMS
-
-DIRS += gdd
-gdd_DEPEND_DIRS = ca
-
-DIRS += cas
-cas_DEPEND_DIRS = gdd dbStatic
-
-DIRS += excas
-excas_DEPEND_DIRS = cas as registry
-
-DIRS += cap5
-cap5_DEPEND_DIRS = ca dbStatic
+libCom/test_DEPEND_DIRS = libCom/RTEMS
+
+# Channel Access
+
+DIRS += ca/client
+ca/client_DEPEND_DIRS = libCom
+
+DIRS += ca/client/tools
+ca/client/tools_DEPEND_DIRS = ca/client
+
+DIRS += ca/legacy/gdd
+ca/legacy/gdd_DEPEND_DIRS = ca/client
+
+DIRS += ca/legacy/pcas
+ca/legacy/pcas_DEPEND_DIRS = ca/legacy/gdd
+
+DIRS += ca/legacy/pcas/ex
+# needs ioc for dbStaticHost
+ca/legacy/pcas/ex_DEPEND_DIRS = ca/legacy/pcas libCom ioc
+
+DIRS += ca/client/perl
+ca/client/perl_DEPEND_DIRS = ca/client
+
+# PDB Core
+
+DIRS += ioc
+ioc_DEPEND_DIRS = libCom ca/client
+
+DIRS += ioc/db/test
+ioc/db/test_DEPEND_DIRS = ioc libCom/RTEMS
+
+# PDB Standard Record Definitions
+
+DIRS += std
+std_DEPEND_DIRS = ioc libCom/RTEMS
 
 
 include $(TOP)/configure/RULES_DIRS

=== removed file 'src/as/asHost.rc'
--- src/as/asHost.rc	2005-12-19 21:42:40 +0000
+++ src/as/asHost.rc	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#include <Winver.h>
-#include "epicsVersion.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_UNKNOWN
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments","Host Access Security Library for EPICS\0"
-            VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Host Access Security Library\0"
-            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "asHost\0"
-            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "asHost.dll\0"
-            VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

=== removed file 'src/as/asIoc.rc'
--- src/as/asIoc.rc	2005-12-19 21:42:40 +0000
+++ src/as/asIoc.rc	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#include <Winver.h>
-#include "epicsVersion.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_UNKNOWN
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments","IOC Access Security Library for EPICS\0"
-            VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "IOC Access Security Library\0"
-            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "asIoc\0"
-            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "asIoc.dll\0"
-            VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

=== added directory 'src/ca'
=== renamed directory 'src/ca' => 'src/ca/client'
=== modified file 'src/ca/client/Makefile'
--- src/ca/Makefile	2010-10-12 16:27:17 +0000
+++ src/ca/client/Makefile	2011-03-03 23:06:17 +0000
@@ -7,7 +7,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../..
+TOP=../../..
 
 include $(TOP)/configure/CONFIG
 
@@ -95,5 +95,18 @@
 
 casw_SYS_LIBS_solaris = socket
 
+SCRIPTS_solaris := S99caRepeater
+SCRIPTS_Linux := S99caRepeater
+
+SRC_DIRS += $(TOP)/src/ca/client/test
+PROD_HOST += ca_test
+ca_test_SRCS = ca_test_main.c ca_test.c
+ca_test_LIBS  = ca Com
+ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
+
+OBJS_vxWorks += ca_test
+
 include $(TOP)/configure/RULES
 
+S99%: ../rc2.%
+	sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@

=== renamed directory 'src/cap5' => 'src/ca/client/perl'
=== modified file 'src/ca/client/perl/Makefile'
--- src/cap5/Makefile	2010-05-25 20:44:38 +0000
+++ src/ca/client/perl/Makefile	2011-03-03 23:06:17 +0000
@@ -5,7 +5,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../..
+TOP=../../../..
 include $(TOP)/configure/CONFIG
 
 

=== renamed file 'src/util/rc2.caRepeater' => 'src/ca/client/rc2.caRepeater'
=== added directory 'src/ca/client/test'
=== renamed file 'src/util/ca_test.c' => 'src/ca/client/test/ca_test.c'
=== renamed file 'src/util/ca_test.h' => 'src/ca/client/test/ca_test.h'
=== renamed file 'src/util/ca_test_main.c' => 'src/ca/client/test/ca_test_main.c'
=== renamed directory 'src/catools' => 'src/ca/client/tools'
=== modified file 'src/ca/client/tools/Makefile'
--- src/catools/Makefile	2011-02-16 16:57:20 +0000
+++ src/ca/client/tools/Makefile	2011-03-03 23:06:17 +0000
@@ -8,7 +8,7 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../..
+TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 

=== added directory 'src/ca/legacy'
=== renamed directory 'src/gdd' => 'src/ca/legacy/gdd'
=== modified file 'src/ca/legacy/gdd/Makefile'
--- src/gdd/Makefile	2010-10-12 16:27:17 +0000
+++ src/ca/legacy/gdd/Makefile	2011-03-03 23:06:17 +0000
@@ -7,7 +7,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../..
+TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 

=== renamed directory 'src/cas' => 'src/ca/legacy/pcas'
=== modified file 'src/ca/legacy/pcas/Makefile'
--- src/cas/Makefile	2010-10-12 16:27:17 +0000
+++ src/ca/legacy/pcas/Makefile	2011-03-03 23:06:17 +0000
@@ -7,7 +7,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../..
+TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 

=== modified file 'src/ca/legacy/pcas/build/Makefile'
--- src/cas/build/Makefile	2010-10-29 17:15:48 +0000
+++ src/ca/legacy/pcas/build/Makefile	2011-03-03 23:06:17 +0000
@@ -7,10 +7,10 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP := ../../..
-CAS := $(TOP)/src/cas
+TOP := ../../../../..
+CAS := $(TOP)/src/ca/legacy/pcas
 SRC := $(CAS)/generic
-CA := $(CAS)/../ca
+CA := $(TOP)/src/ca/client
 IOSRC := $(CAS)/io/bsdSocket
 STSRC := $(SRC)/st
 

=== renamed directory 'src/excas' => 'src/ca/legacy/pcas/ex'
=== modified file 'src/ca/legacy/pcas/ex/Makefile'
--- src/excas/Makefile	2010-10-12 16:27:17 +0000
+++ src/ca/legacy/pcas/ex/Makefile	2011-03-03 23:06:17 +0000
@@ -7,13 +7,13 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../..
+TOP=../../../../..
 
 include $(TOP)/configure/CONFIG
 
 PROD_LIBS += $(EPICS_BASE_HOST_LIBS)
 
-SRC_DIRS += $(TOP)/src/makeBaseApp/top/caServerApp
+SRC_DIRS += $(TOP)/src/template/base/top/caServerApp
 
 #
 # Added ws2_32 winmm user32 for the non-dll build

=== modified file 'src/ca/legacy/pcas/example/Makefile'
--- src/cas/example/Makefile	2003-04-01 19:59:46 +0000
+++ src/ca/legacy/pcas/example/Makefile	2011-03-03 23:06:17 +0000
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../../..
+TOP=../../../../..
 
 include $(TOP)/configure/CONFIG
 

=== modified file 'src/ca/legacy/pcas/example/directoryService/Makefile'
--- src/cas/example/directoryService/Makefile	2008-06-11 20:50:17 +0000
+++ src/ca/legacy/pcas/example/directoryService/Makefile	2011-03-03 23:06:17 +0000
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../../../..
+TOP=../../../../../..
 
 include $(TOP)/configure/CONFIG
 

=== removed file 'src/dbStatic/dbStaticIoc.rc'
--- src/dbStatic/dbStaticIoc.rc	2005-12-19 21:42:40 +0000
+++ src/dbStatic/dbStaticIoc.rc	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#include <Winver.h>
-#include "epicsVersion.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_UNKNOWN
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments","Static Ioc Database Library for EPICS\0"
-            VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Static Ioc Database Library\0"
-            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "dbStaticIoc\0"
-            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "dbStaticIoc.dll\0"
-            VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

=== removed file 'src/dbtools/dbtoolsIoc.rc'
--- src/dbtools/dbtoolsIoc.rc	2005-12-19 21:42:40 +0000
+++ src/dbtools/dbtoolsIoc.rc	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#include <Winver.h>
-#include "epicsVersion.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_UNKNOWN
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments","Ioc Database Tools Library for EPICS\0"
-            VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Ioc Database Tools Library\0"
-            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "dbtoolsIoc\0"
-            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "dbtoolsIoc.dll\0"
-            VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

=== removed directory 'src/dev'
=== removed file 'src/dev/Makefile'
--- src/dev/Makefile	2010-10-12 16:27:17 +0000
+++ src/dev/Makefile	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-#     National Laboratory.
-# Copyright (c) 2002 The Regents of the University of California, as
-#     Operator of Los Alamos National Laboratory.
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-DIRS += softDev
-DIRS += testDev
-
-include $(TOP)/configure/RULES_DIRS
-

=== added directory 'src/ioc'
=== added file 'src/ioc/Makefile'
--- src/ioc/Makefile	1970-01-01 00:00:00 +0000
+++ src/ioc/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,40 @@
+#*************************************************************************
+# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+TOP=../..
+
+include $(TOP)/configure/CONFIG
+
+SRC = $(TOP)/src
+IOCDIR = $(SRC)/ioc
+
+LIBRARY_IOC += dbCore
+dbCore_LIBS += ca Com
+dbCore_SYS_LIBS_WIN32 += ws2_32
+
+dbCore_RCS += dbCore.rc
+dbStaticHost_RCS = dbStaticHost.rc
+
+PROD_LIBS = Com
+
+include $(IOCDIR)/as/Makefile
+include $(IOCDIR)/bpt/Makefile
+include $(IOCDIR)/db/Makefile
+include $(IOCDIR)/dbStatic/Makefile
+include $(IOCDIR)/dbtemplate/Makefile
+include $(IOCDIR)/misc/Makefile
+include $(IOCDIR)/registry/Makefile
+include $(IOCDIR)/rsrv/Makefile
+
+include $(TOP)/configure/RULES
+
+include $(IOCDIR)/dbStatic/RULES
+include $(IOCDIR)/bpt/RULES
+include $(IOCDIR)/db/RULES
+include $(IOCDIR)/dbtemplate/RULES
+

=== renamed directory 'src/as' => 'src/ioc/as'
=== modified file 'src/ioc/as/Makefile'
--- src/as/Makefile	2010-10-12 16:27:17 +0000
+++ src/ioc/as/Makefile	2011-03-03 23:06:17 +0000
@@ -1,45 +1,27 @@
 #*************************************************************************
-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
+#     Brookhaven National Lab.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../..
-include $(TOP)/configure/CONFIG
-
-INC += asLib.h
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+SRC_DIRS += $(IOCDIR)/as
+
 INC += asDbLib.h
 INC += asCa.h
-INC += asTrapWrite.h
 INC += asIocRegister.h
 
-LIB_SRCS += asLib.c
-LIB_SRCS += asTrapWrite.c
-
-asIoc_SRCS += asDbLib.c
-asIoc_SRCS += asCa.c
-asIoc_SRCS += asIocRegister.c
-
-LIBRARY_HOST = asHost
-LIBRARY_IOC = asIoc
-
-asHost_LIBS  = dbStaticHost ca Com
-asIoc_LIBS  = dbIoc dbStaticIoc ca Com
-
-asHost_RCS = asHost.rc
-asIoc_RCS = asIoc.rc
-
-PROD_HOST = ascheck
+dbCore_SRCS += asDbLib.c
+dbCore_SRCS += asCa.c
+dbCore_SRCS += asIocRegister.c
+
+PROD_HOST += ascheck
 ascheck_SRCS = ascheck.c
-PROD_LIBS = asHost dbStaticHost ca Com
-
-include $(TOP)/configure/RULES
-
-# Extra rule since asLib_lex.c is included by asLib.c
-asLib$(OBJ): asLib_lex.c
-
-clean::
-	@$(RM) asLib.c asLib_lex.c
+ascheck_LIBS = dbStaticHost
 

=== renamed directory 'src/bpt' => 'src/ioc/bpt'
=== modified file 'src/ioc/bpt/Makefile'
--- src/bpt/Makefile	2010-10-12 16:27:17 +0000
+++ src/ioc/bpt/Makefile	2011-03-03 23:06:17 +0000
@@ -1,29 +1,27 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../..
-include $(TOP)/configure/CONFIG
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+SRC_DIRS += $(IOCDIR)/bpt
 
 INC += cvtTable.h
 
 DBD += menuConvert.dbd
 INC += menuConvert.h
 
-DBD += bptTypeJdegC.dbd
-DBD += bptTypeJdegF.dbd
-DBD += bptTypeKdegC.dbd
-DBD += bptTypeKdegF.dbd
+BPT_DBD += bptTypeJdegC.dbd
+BPT_DBD += bptTypeJdegF.dbd
+BPT_DBD += bptTypeKdegC.dbd
+BPT_DBD += bptTypeKdegF.dbd
+DBD += $(BPT_DBD)
 
-PROD_LIBS = Com
 PROD_HOST += makeBpt
 makeBpt_SRCS=makeBpt
 
-include $(TOP)/configure/RULES
-
-$(COMMON_DBDS): $(TOOLS)/makeBpt$(HOSTEXE)
-

=== added file 'src/ioc/bpt/RULES'
--- src/ioc/bpt/RULES	1970-01-01 00:00:00 +0000
+++ src/ioc/bpt/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,16 @@
+#*************************************************************************
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
+#     Brookhaven National Lab.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+$(patsubst %,$(COMMON_DIR)/%,$(BPT_DBD)) : \
+$(COMMON_DIR)/bpt%.dbd : $(call PATH_FILTER, $(TOOLS)/makeBpt$(HOSTEXE))
+

=== renamed directory 'src/db' => 'src/ioc/db'
=== modified file 'src/ioc/db/Makefile'
--- src/db/Makefile	2010-10-12 16:27:17 +0000
+++ src/ioc/db/Makefile	2011-03-03 23:06:17 +0000
@@ -1,16 +1,16 @@
 #*************************************************************************
-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../..
-include $(TOP)/configure/CONFIG
-
-#       includes to install from this sub-project
-#
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+SRC_DIRS += $(IOCDIR)/db
+
 INC += callback.h
 INC += dbAccess.h
 INC += dbAccessDefs.h
@@ -49,43 +49,28 @@
 DBDINC += dbCommon
 DBD+=  menuGlobal.dbd
 
-LIB_SRCS += dbLock.c
-LIB_SRCS += dbAccess.c
-LIB_SRCS += dbBkpt.c
-LIB_SRCS += dbConvert.c
-LIB_SRCS += dbFastLinkConv.c
-LIB_SRCS += dbNotify.c
-LIB_SRCS += dbScan.c
-LIB_SRCS += dbEvent.c
-LIB_SRCS += dbTest.c
-LIB_SRCS += db_access.c
-LIB_SRCS += db_test.c
-LIB_SRCS += recGbl.c
-LIB_SRCS += callback.c
-LIB_SRCS += dbCa.c
-LIB_SRCS += dbCaTest.c
-LIB_SRCS += initHooks.c
-LIB_SRCS += cvtBpt.c
-LIB_SRCS += dbContext.cpp
-LIB_SRCS += dbChannelIO.cpp
-LIB_SRCS += dbSubscriptionIO.cpp
-LIB_SRCS += dbPutNotifyBlocker.cpp
-LIB_SRCS += dbContextReadNotifyCache.cpp
-LIB_SRCS += templateInstances.cpp
-LIB_SRCS += dbIocRegister.c
-
-LIBRARY_IOC = dbIoc
-dbIoc_LIBS = dbStaticIoc ca Com
-
-dbIoc_RCS = dbIoc.rc
-
-include $(TOP)/configure/RULES
-
-dbCommon.h$(DEP): ../dbCommonRecord.dbd ../dbCommon.dbd
-	@$(RM) $@
-	@-$(MKMF) -m $@ ..  $(COMMON_DIR)/dbCommon.h $<
-
-$(COMMON_DIR)/dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd
-	$(RM) $@
-	$(DBTORECORDTYPEH) -I .. $< $@
+dbCore_SRCS += dbLock.c
+dbCore_SRCS += dbAccess.c
+dbCore_SRCS += dbBkpt.c
+dbCore_SRCS += dbConvert.c
+dbCore_SRCS += dbFastLinkConv.c
+dbCore_SRCS += dbNotify.c
+dbCore_SRCS += dbScan.c
+dbCore_SRCS += dbEvent.c
+dbCore_SRCS += dbTest.c
+dbCore_SRCS += db_access.c
+dbCore_SRCS += db_test.c
+dbCore_SRCS += recGbl.c
+dbCore_SRCS += callback.c
+dbCore_SRCS += dbCa.c
+dbCore_SRCS += dbCaTest.c
+dbCore_SRCS += initHooks.c
+dbCore_SRCS += cvtBpt.c
+dbCore_SRCS += dbContext.cpp
+dbCore_SRCS += dbChannelIO.cpp
+dbCore_SRCS += dbSubscriptionIO.cpp
+dbCore_SRCS += dbPutNotifyBlocker.cpp
+dbCore_SRCS += dbContextReadNotifyCache.cpp
+dbCore_SRCS += templateInstances.cpp
+dbCore_SRCS += dbIocRegister.c
 

=== added file 'src/ioc/db/RULES'
--- src/ioc/db/RULES	1970-01-01 00:00:00 +0000
+++ src/ioc/db/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,28 @@
+#*************************************************************************
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
+#     Brookhaven National Lab.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+$(filter-out $(STATIC_SRCS),$(dbCore_SRCS)) : $(COMMON_DIR)/dbCommon.h
+
+dbCommon.h$(DEP): $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/dbCommon.dbd
+	@$(RM) $@
+	@-$(MKMF) -m $@ ../db  $(COMMON_DIR)/dbCommon.h $<
+
+$(COMMON_DIR)/dbCommon.h: $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/dbCommon.dbd
+	$(RM) $@
+	$(DBTORECORDTYPEH) -I ../db $< $@
+
+$(COMMON_DIR)/dbCommon.h: $(DBTORECORDTYPEH)
+
+$(patsubst %,$(COMMON_DIR)/%.h,$(DBDINC) menuConvert menuGlobal) : \
+$(COMMON_DIR)/%.h : $(DBTOMENUH)
+

=== modified file 'src/ioc/db/test/Makefile'
--- src/db/test/Makefile	2010-09-29 21:00:46 +0000
+++ src/ioc/db/test/Makefile	2011-03-03 23:06:17 +0000
@@ -6,11 +6,11 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../../..
+TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 
-callbackTest_LIBS = dbIoc
+callbackTest_LIBS = dbCore
 callbackTest_LIBS_DEFAULT = dbStaticHost
 callbackTest_LIBS_vxWorks = dbStaticIoc
 callbackTest_LIBS_RTEMS   = dbStaticIoc

=== renamed file 'src/db/dbIoc.rc' => 'src/ioc/dbCore.rc'
--- src/db/dbIoc.rc	2005-12-19 21:42:40 +0000
+++ src/ioc/dbCore.rc	2011-03-03 23:06:17 +0000
@@ -18,13 +18,13 @@
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments","Database Library for EPICS\0"
+            VALUE "Comments","Database Core Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Database Library\0"
+            VALUE "FileDescription", "Database Core Library\0"
             VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "dbIoc\0"
-            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "dbIoc.dll\0"
+            VALUE "InternalName", "dbCore\0"
+            VALUE "LegalCopyright", "Copyright (C) Univ. of California, UChicago Argonne LLC\0"
+            VALUE "OriginalFilename", "dbCore.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
             VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END

=== renamed directory 'src/dbStatic' => 'src/ioc/dbStatic'
=== modified file 'src/ioc/dbStatic/Makefile'
--- src/dbStatic/Makefile	2010-10-12 16:27:17 +0000
+++ src/ioc/dbStatic/Makefile	2011-03-03 23:06:17 +0000
@@ -1,17 +1,16 @@
 #*************************************************************************
-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-INC += alarm.h
-INC += alarmString.h
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+SRC_DIRS += $(IOCDIR)/dbStatic
+
 INC += dbBase.h
 INC += dbFldTypes.h
 INC += dbStaticLib.h
@@ -24,35 +23,34 @@
 INC += recSup.h
 INC += dbStaticIocRegister.h
 
-LIBSRCS += dbStaticLib.c
-LIBSRCS += dbYacc.c
-LIBSRCS += dbPvdLib.c
-
+STATIC_SRCS += dbStaticLib.c
+STATIC_SRCS += dbYacc.c
+STATIC_SRCS += dbPvdLib.c
+
+dbCore_SRCS += $(STATIC_SRCS)
+dbCore_SRCS += dbStaticRun.c
+dbCore_SRCS += dbStaticIocRegister.c
+
+dbStaticHost_SRCS += $(STATIC_SRCS)
 dbStaticHost_SRCS += dbStaticNoRun.c 
-dbStaticIoc_SRCS += dbStaticRun.c
-dbStaticIoc_SRCS += dbStaticIocRegister.c
 
 LIBRARY_HOST += dbStaticHost
-LIBRARY_IOC += dbStaticIoc
 
 dbStaticHost_LIBS = Com
-dbStaticIoc_LIBS = Com
-
-dbStaticHost_RCS = dbStaticHost.rc
-dbStaticIoc_RCS = dbStaticIoc.rc
-
-PROD_LIBS := dbStaticHost Com
-PROD_HOST = dbReadTest dbExpand dbToMenuH dbToRecordtypeH
+
+PROD_HOST += dbReadTest dbExpand dbToMenuH dbToRecordtypeH
 
 dbReadTest_SRCS = dbReadTest.c
 dbExpand_SRCS = dbExpand.c
 dbToMenuH_SRCS = dbToMenuH.c
 dbToRecordtypeH_SRCS = dbToRecordtypeH.c
 
-include $(TOP)/configure/RULES
-
-# Extra rule since dbLexRoutines.c is included in dbYacc.c
-dbYacc.c: dbLex.c ../dbLexRoutines.c
-
-clean::
-	@$(RM) dbLex.c dbYacc.c 
+# Include dbStaticHost objects directly in executables
+# because of a Circular dependency induced by a rule
+#  $(INSTALL_LIBS): $(INSTALL_SHRLIBS)
+# in RULES_BUILD
+dbReadTest_SRCS += $(dbStaticHost_SRCS)
+dbExpand_SRCS += $(dbStaticHost_SRCS)
+dbToMenuH_SRCS += $(dbStaticHost_SRCS)
+dbToRecordtypeH_SRCS += $(dbStaticHost_SRCS)
+

=== added file 'src/ioc/dbStatic/RULES'
--- src/ioc/dbStatic/RULES	1970-01-01 00:00:00 +0000
+++ src/ioc/dbStatic/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,16 @@
+#*************************************************************************
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+# dbLexRoutines.c is included in dbYacc.c
+dbYacc.c: dbLex.c $(IOCDIR)/dbStatic/dbLexRoutines.c
+
+clean::
+	@$(RM) dbLex.c dbYacc.c 

=== renamed file 'src/dbStatic/dbStaticHost.rc' => 'src/ioc/dbStaticHost.rc'
=== renamed directory 'src/dbtools' => 'src/ioc/dbtemplate'
=== modified file 'src/ioc/dbtemplate/Makefile'
--- src/dbtools/Makefile	2010-10-12 16:27:17 +0000
+++ src/ioc/dbtemplate/Makefile	2011-03-03 23:06:17 +0000
@@ -1,37 +1,21 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../..
-
-include $(TOP)/configure/CONFIG
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+SRC_DIRS += $(IOCDIR)/dbtemplate
 
 INC += dbLoadTemplate.h
 INC += dbtoolsIocRegister.h
 
-LIB_SRCS += dbLoadTemplate.c
-LIB_SRCS += dbtoolsIocRegister.c
-
-LIBRARY_IOC = dbtoolsIoc
-
-dbtoolsIoc_LIBS = dbIoc dbStaticIoc Com
-
-dbtoolsIoc_RCS = dbtoolsIoc.rc
-
-HTMLS += dbLoadTemplate.html
-
-include $(TOP)/configure/RULES
- 
-#
-#	These lex sources are included in some C sources,
-#	so they have to be created in time:
-#
-dbLoadTemplate.c: dbLoadTemplate_lex.c ../dbLoadTemplate.h
-
-clean::
-	@$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c 
+dbCore_SRCS += dbLoadTemplate.c
+dbCore_SRCS += dbtoolsIocRegister.c
+
+HTMLS += dbtemplate/dbLoadTemplate.html
 

=== added file 'src/ioc/dbtemplate/RULES'
--- src/ioc/dbtemplate/RULES	1970-01-01 00:00:00 +0000
+++ src/ioc/dbtemplate/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,17 @@
+#*************************************************************************
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+# dbLoadTemplate_lex.c is included by dbLoadTemplate.c
+dbLoadTemplate.c: dbLoadTemplate_lex.c $(IOCDIR)/dbtemplate/dbLoadTemplate.h
+
+clean::
+	@$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c 
+

=== renamed directory 'src/misc' => 'src/ioc/misc'
=== modified file 'src/ioc/misc/Makefile'
--- src/misc/Makefile	2010-10-12 16:27:17 +0000
+++ src/ioc/misc/Makefile	2011-03-03 23:06:17 +0000
@@ -1,5 +1,5 @@
 #*************************************************************************
-# Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
@@ -7,30 +7,22 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-TOP=../..
-include $(TOP)/configure/CONFIG
-
-DBD += base.dbd
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+SRC_DIRS += $(IOCDIR)/misc
+
 DBD += system.dbd
 DBD += dlload.dbd
+DBD += dbCore.dbd
 
 INC += epicsRelease.h
 INC += iocInit.h
 INC += miscIocRegister.h
 INC += iocshRegisterCommon.h
 
-LIB_SRCS += epicsRelease.c
-LIB_SRCS += iocInit.c
-LIB_SRCS += asSubRecordFunctions.c
-LIB_SRCS += miscIocRegister.c
-LIB_SRCS += dlload.c
-LIB_SRCS += iocshRegisterCommon.c
-
-
-LIBRARY_IOC = miscIoc
-
-miscIoc_RCS = miscIoc.rc
-miscIoc_LIBS  = rsrvIoc asIoc dbtoolsIoc dbIoc registryIoc dbStaticIoc ca Com
-
-include $(TOP)/configure/RULES
+dbCore_SRCS += epicsRelease.c
+dbCore_SRCS += iocInit.c
+dbCore_SRCS += miscIocRegister.c
+dbCore_SRCS += dlload.c
+dbCore_SRCS += iocshRegisterCommon.c
 

=== added file 'src/ioc/misc/dbCore.dbd'
--- src/ioc/misc/dbCore.dbd	1970-01-01 00:00:00 +0000
+++ src/ioc/misc/dbCore.dbd	2011-03-03 23:06:17 +0000
@@ -0,0 +1,14 @@
+# dbCore.dbd
+#
+# $Revision-Id$
+#
+# This file provides iocsh access to variables that control some lesser-used
+# and debugging features of the IOC database code.
+
+# Access security subroutines
+variable(asCaDebug,int)
+
+# Static database access variables
+variable(dbRecordsOnceOnly,int)
+variable(dbBptNotMonotonic,int)
+

=== renamed directory 'src/registry' => 'src/ioc/registry'
=== modified file 'src/ioc/registry/Makefile'
--- src/registry/Makefile	2010-10-12 16:27:17 +0000
+++ src/ioc/registry/Makefile	2011-03-03 23:06:17 +0000
@@ -1,14 +1,15 @@
 #*************************************************************************
-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../..
-
-include $(TOP)/configure/CONFIG
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+SRC_DIRS += $(IOCDIR)/registry
 
 INC += registryRecordType.h
 INC += registryDeviceSupport.h
@@ -17,19 +18,12 @@
 INC += registryCommon.h
 INC += registryIocRegister.h
 
-SCRIPTS_HOST += registerRecordDeviceDriver.pl
-
-LIB_SRCS += registryRecordType.c
-LIB_SRCS += registryDeviceSupport.c
-LIB_SRCS += registryDriverSupport.c
-LIB_SRCS += registryFunction.c
-LIB_SRCS += registryCommon.c
-LIB_SRCS += registryIocRegister.c
-
-LIBRARY_IOC = registryIoc
-registryIoc_LIBS  = dbStaticIoc Com
-
-registryIoc_RCS = registryIoc.rc
-
-include $(TOP)/configure/RULES
+SCRIPTS_HOST += registry/registerRecordDeviceDriver.pl
+
+dbCore_SRCS += registryRecordType.c
+dbCore_SRCS += registryDeviceSupport.c
+dbCore_SRCS += registryDriverSupport.c
+dbCore_SRCS += registryFunction.c
+dbCore_SRCS += registryCommon.c
+dbCore_SRCS += registryIocRegister.c
 

=== renamed directory 'src/rsrv' => 'src/ioc/rsrv'
=== modified file 'src/ioc/rsrv/Makefile'
--- src/rsrv/Makefile	2010-10-12 16:27:17 +0000
+++ src/ioc/rsrv/Makefile	2011-03-03 23:06:17 +0000
@@ -1,33 +1,28 @@
 #*************************************************************************
-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-USR_INCLUDES = -I../../ca
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+SRC_DIRS += $(IOCDIR)/rsrv
+
+# These need access to net_convert.h from the CA client
+caserverio_INCLUDES = -I$(SRC)/ca/client
+camessage_INCLUDES = -I$(SRC)/ca/client
 
 INC += rsrv.h
 INC += rsrvIocRegister.h
 
-LIB_SRCS += caserverio.c
-LIB_SRCS += caservertask.c
-LIB_SRCS += camsgtask.c
-LIB_SRCS += camessage.c
-LIB_SRCS += cast_server.c
-LIB_SRCS += online_notify.c
-LIB_SRCS += rsrvIocRegister.c
-
-LIBRARY_IOC = rsrvIoc
-
-rsrvIoc_LIBS = asIoc dbIoc ca Com
-
-rsrvIoc_SYS_LIBS_WIN32 := ws2_32
-rsrvIoc_RCS = rsrvIoc.rc
-
-include $(TOP)/configure/RULES
+dbCore_SRCS += caserverio.c
+dbCore_SRCS += caservertask.c
+dbCore_SRCS += camsgtask.c
+dbCore_SRCS += camessage.c
+dbCore_SRCS += cast_server.c
+dbCore_SRCS += online_notify.c
+dbCore_SRCS += rsrvIocRegister.c
+

=== modified file 'src/libCom/Makefile'
--- src/libCom/Makefile	2010-10-12 16:27:17 +0000
+++ src/libCom/Makefile	2011-03-03 23:06:17 +0000
@@ -1,5 +1,5 @@
 #*************************************************************************
-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
@@ -9,318 +9,48 @@
 TOP = ../..
 include $(TOP)/configure/CONFIG
 
-LIBCOM = $(TOP)/src/libCom
-
-# Command-line input support
-epicsReadline_CFLAGS += -DEPICS_COMMANDLINE_LIBRARY=EPICS_COMMANDLINE_LIBRARY_$(COMMANDLINE_LIBRARY)
-epicsReadline_INCLUDES += $(INCLUDES_$(COMMANDLINE_LIBRARY))
-
-#POSIX thread priority scheduling flag
-THREAD_CPPFLAGS_NO += -DDONT_USE_POSIX_THREAD_PRIORITY_SCHEDULING
-osdThread_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING))
-
-#epicsVersion is created by this Makefile
-INC += epicsVersion.h
-
-SRC_DIRS += $(LIBCOM)/bucketLib
-INC += bucketLib.h
-SRCS += bucketLib.c
-
-SRC_DIRS += $(LIBCOM)/ring
-#following needed for locating epicsRingPointer.h and epicsRingBytes.h
-INC += epicsRingPointer.h
-INC += epicsRingBytes.h
-SRCS += epicsRingPointer.cpp
-SRCS += epicsRingBytes.c
-
-SRC_DIRS += $(LIBCOM)/calc
-INC += postfix.h
-SRCS += postfix.c
-SRCS += calcPerform.c
-
-SRC_DIRS += $(LIBCOM)/cvtFast
-INC += cvtFast.h
-SRCS += cvtFast.c
-
-# From cppStd
-SRC_DIRS += $(LIBCOM)/cppStd
-INC += epicsAlgorithm.h
-INC += epicsExcept.h
-INC += epicsMemory.h
-
-# From cxxTemplates
-SRC_DIRS += $(LIBCOM)/cxxTemplates
-INC += resourceLib.h
-INC += tsDLList.h
-INC += tsSLList.h
-INC += tsMinMax.h
-INC += tsBTree.h
-INC += tsFreeList.h
-INC += epicsSingleton.h
-INC += epicsGuard.h
-INC += epicsOnce.h
-SRCS += resourceLib.cpp
-SRCS += epicsOnce.cpp
-SRCS += epicsSingletonMutex.cpp
-
-SRC_DIRS += $(LIBCOM)/dbmf
-INC += dbmf.h
-SRCS += dbmf.c
-
-SRC_DIRS += $(LIBCOM)/ellLib
-INC += ellLib.h
-SRCS += ellLib.c
-
-SRC_DIRS += $(LIBCOM)/env
-INC += envDefs.h
-SRCS += envSubr.c
-SRCS += envData.c
-
-SRC_DIRS += $(LIBCOM)/error
-INC += epicsPrint.h
-INC += errMdef.h
-INC += errSymTbl.h
-INC += errlog.h
-INC += error.h
-SRCS += errlog.c
-SRCS += errSymLib.c
-SRCS += errSymTbl.c
-
-SRC_DIRS += $(LIBCOM)/fdmgr
-INC += fdManager.h
-INC += fdmgr.h
-SRCS += fdmgr.cpp
-SRCS += fdManager.cpp
-
-SRC_DIRS += $(LIBCOM)/freeList
-INC += freeList.h
-SRCS += freeListLib.c
-HTMLS += freeList/freeList.html
-
-SRC_DIRS += $(LIBCOM)/gpHash
-INC += gpHash.h
-SRCS += gpHashLib.c
-HTMLS += gpHash/gpHash.html
-
-SRC_DIRS += $(LIBCOM)/iocsh
-INC += iocsh.h
-INC += registry.h
-INC += libComRegister.h
-SRCS += iocsh.cpp
-SRCS += registry.c
-SRCS += libComRegister.c
-
-SRC_DIRS += $(LIBCOM)/logClient
-INC += iocLog.h
-INC += logClient.h
-SRCS += iocLog.c
-SRCS += logClient.c
-
-SRC_DIRS += $(LIBCOM)/macLib
-INC += macLib.h
-SRCS += macCore.c
-SRCS += macEnv.c
-SRCS += macUtil.c
-
-SRC_DIRS += $(LIBCOM)/misc
-INC += adjustment.h
-INC += cantProceed.h
-INC += dbDefs.h
-INC += epicsConvert.h
-INC += epicsExit.h
-INC += epicsStdlib.h
-INC += epicsString.h
-INC += epicsTypes.h
-INC += shareLib.h
-INC += epicsExport.h
-INC += unixFileName.h
-INC += locationException.h
-INC += ipAddrToAsciiAsynchronous.h
-INC += compilerDependencies.h
-INC += epicsUnitTest.h
-INC += testMain.h
-SRCS += aToIPAddr.c
-SRCS += adjustment.c
-SRCS += cantProceed.c
-SRCS += epicsConvert.c
-SRCS += epicsExit.c
-SRCS += epicsStdlib.c
-SRCS += epicsString.c
-SRCS += truncateFile.c
-SRCS += ipAddrToAsciiAsynchronous.cpp
-SRCS += epicsUnitTest.c
-
-# From osi
-SRC_DIRS += $(LIBCOM)/osi
-INC += osiFileName.h
-INC += osiSock.h
-INC += osdSock.h
-INC += epicsInterrupt.h
-INC += osdInterrupt.h
-
-INC += epicsMutex.h
-INC += osdMutex.h
-INC += epicsEvent.h
-INC += osdEvent.h
-INC += epicsMath.h
-INC += osdMessageQueue.h
-INC += osdStrtod.h
-
-INC += epicsAssert.h
-INC += epicsFindSymbol.h
-INC += osiPoolStatus.h
-INC += osdPoolStatus.h
-INC += osdThread.h
-
-INC += epicsThread.h
-INC += epicsTime.h
-INC += epicsGeneralTime.h
-INC += osdTime.h
-INC += generalTimeSup.h
-INC += osiClockTime.h
-INC += epicsSignal.h
-INC += osiProcess.h
-INC += osiUnistd.h
-INC += osiWireFormat.h
-INC += osdWireFormat.h
-INC += osdWireConfig.h
-INC += epicsEndian.h
-INC += epicsReadline.h
-INC += epicsMessageQueue.h
-INC += epicsStdio.h
-INC += epicsStdioRedirect.h
-INC += epicsGetopt.h
-
-INC += devLib.h
-INC += devLibVME.h
-INC += devLibVMEImpl.h
-INC += osdVME.h
-
-SRCS += epicsThread.cpp
-SRCS += epicsMutex.cpp
-SRCS += epicsEvent.cpp
-SRCS += epicsTime.cpp
-SRCS += epicsMessageQueue.cpp
-SRCS += epicsMath.cpp
-
-SRCS += epicsGeneralTime.c
-SRCS += osiClockTime.c
-
-SRCS += osdSock.c
-SRCS += osdSockAddrReuse.cpp
-SRCS += osiSock.c
-SRCS += systemCallIntMech.cpp
-SRCS += epicsSocketConvertErrnoToString.cpp
-SRCS += osdAssert.c
-SRCS += osdFindSymbol.c
-SRCS += osdInterrupt.c
-SRCS += osdPoolStatus.c
-SRCS += osdSignal.cpp
-SRCS += osdEnv.c
-SRCS += epicsReadline.c
-SRCS += epicsTempFile.cpp
-SRCS += epicsStdio.c
-SRCS += osdStdio.c
-
-osdEnv_CFLAGS_WIN32= -U__STDC__
-
-SRCS += osdThread.c
-SRCS += osdMutex.c
-SRCS += osdEvent.c
-SRCS += osdTime.cpp
-SRCS += osdProcess.c
-SRCS += osdNetIntf.c
-SRCS += osdMessageQueue.c
-
-SRCS += devLibVME.c
-SRCS += devLibVMEOSD.c
-
-SRC_DIRS += $(LIBCOM)/taskwd
-INC += taskwd.h
-SRCS += taskwd.c
-
-SRC_DIRS += $(LIBCOM)/timer
-INC += epicsTimer.h
-SRCS += epicsTimer.cpp
-SRCS += timer.cpp
-SRCS += timerQueue.cpp
-SRCS += timerQueueActive.cpp
-SRCS += timerQueueActiveMgr.cpp
-SRCS += timerQueuePassive.cpp
-
-#tsDefs contains R3.13 compatibility tsStamp code
-SRC_DIRS += $(LIBCOM)/tsDefs
-INC += tsDefs.h
-SRCS += tsDefs.c
-
-# Time providers, in osi
-SRCS_vxWorks += osiNTPTime.c
-SRCS_RTEMS += osiNTPTime.c
-
-# These files are in osi/os/vxWorks
-# Special reboot hook
-SRCS_vxWorks += atReboot.cpp
-# For old vxWorks applications
-INC_vxWorks += camacLib.h
-INC_vxWorks += epicsDynLink.h
-INC_vxWorks += module_types.h
-INC_vxWorks += task_params.h
-SRCS_vxWorks += epicsDynLink.c
-SRCS_vxWorks += veclist.c
-SRCS_vxWorks += logMsgToErrlog.cpp
-
-#This forces the vxWorks compatibility stuff to be loaded
-OBJS_vxWorks = vxComLibrary
-
-# These files are in osi/os/WIN32
-SRCS_WIN32 += epicsGetopt.c 
-SRCS_WIN32 += setThreadName.cpp
-#SRCS_WIN32 += dllmain.cpp
-SRCS_WIN32 += forceBadAllocException.cpp
-
-#       Library to build:
-#       lib$(LIBRARY).a  or   ..dll/..exp/..lib
-#
+SRC = $(TOP)/src
+LIBCOM = $(SRC)/libCom
+
+include $(LIBCOM)/as/Makefile
+include $(LIBCOM)/bucketLib/Makefile
+include $(LIBCOM)/calc/Makefile
+include $(LIBCOM)/cvtFast/Makefile
+include $(LIBCOM)/cppStd/Makefile
+include $(LIBCOM)/cxxTemplates/Makefile
+include $(LIBCOM)/dbmf/Makefile
+include $(LIBCOM)/ellLib/Makefile
+include $(LIBCOM)/env/Makefile
+include $(LIBCOM)/error/Makefile
+include $(LIBCOM)/fdmgr/Makefile
+include $(LIBCOM)/flex/Makefile
+include $(LIBCOM)/freeList/Makefile
+include $(LIBCOM)/gpHash/Makefile
+include $(LIBCOM)/iocsh/Makefile
+include $(LIBCOM)/log/Makefile
+include $(LIBCOM)/macLib/Makefile
+include $(LIBCOM)/misc/Makefile
+include $(LIBCOM)/osi/Makefile
+include $(LIBCOM)/ring/Makefile
+include $(LIBCOM)/taskwd/Makefile
+include $(LIBCOM)/timer/Makefile
+include $(LIBCOM)/tsDefs/Makefile
+include $(LIBCOM)/yacc/Makefile
+
+# Library to build:
 LIBRARY=Com
 
 Com_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
 
 Com_RCS = Com.rc
 
-#   libs needed for PROD and TESTPRODUCT
-PROD_LIBS = Com
-PROD_SYS_LIBS_WIN32 = ws2_32 advapi32
-
-#	for bldErrSymTbl:
-#
-ERR_S_FILES += $(TOP)/src/libCom/osi/devLib.h
-ERR_S_FILES += $(TOP)/src/as/asLib.h
-ERR_S_FILES += $(TOP)/src/db/dbAccessDefs.h
-ERR_S_FILES += $(TOP)/src/dbStatic/devSup.h
-ERR_S_FILES += $(TOP)/src/dbStatic/drvSup.h
-ERR_S_FILES += $(TOP)/src/dbStatic/recSup.h
-ERR_S_FILES += $(TOP)/src/dbStatic/dbStaticLib.h
-ERR_S_FILES += $(LIBCOM)/error/errMdef.h
-ERR_S_FILES += $(TOP)/src/cas/generic/casdef.h
-ERR_S_FILES += $(TOP)/src/gdd/gddAppFuncTable.h
-
 include $(TOP)/configure/RULES
 
-osdAssert$(OBJ): $(COMMON_DIR)/epicsVersion.h
-epicsTime$(OBJ): $(COMMON_DIR)/epicsVersion.h
-osdNetIntf$(OBJ): $(COMMON_DIR)/epicsVersion.h
-osdSock$(OBJ): $(COMMON_DIR)/epicsVersion.h
-
-envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \
-	$(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV
-	$(PERL) $(LIBCOM)/env/bldEnvData.pl $(CONFIG)
-
-errSymTbl.c: $(ERR_S_FILES) $(LIBCOM)/error/makeStatTbl.pl
-	$(PERL) $(LIBCOM)/error/makeStatTbl.pl  $(ERR_S_FILES)
-
-$(COMMON_DIR)/epicsVersion.h: $(CONFIG)/CONFIG_BASE_VERSION $(CONFIG)/CONFIG_SITE
-	$(PERL) $(LIBCOM)/misc/makeEpicsVersion.pl $(CONFIG)/CONFIG_BASE_VERSION $(@D) $(EPICS_SITE_VERSION)
-
-clean::
-	@$(RM) errSymTbl.c envData.c
+include $(LIBCOM)/as/RULES
+include $(LIBCOM)/env/RULES
+include $(LIBCOM)/error/RULES
+include $(LIBCOM)/flex/RULES
+include $(LIBCOM)/log/RULES
+include $(LIBCOM)/misc/RULES
+include $(LIBCOM)/osi/RULES
 

=== renamed directory 'src/RTEMS' => 'src/libCom/RTEMS'
=== modified file 'src/libCom/RTEMS/Makefile'
--- src/RTEMS/Makefile	2010-11-17 22:55:22 +0000
+++ src/libCom/RTEMS/Makefile	2011-03-03 23:06:17 +0000
@@ -6,7 +6,7 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../..
+TOP=../../..
 include $(TOP)/configure/CONFIG
 
 INC += epicsRtemsInitHooks.h

=== added directory 'src/libCom/as'
=== added file 'src/libCom/as/Makefile'
--- src/libCom/as/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/as/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,21 @@
+#*************************************************************************
+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
+#     Brookhaven National Lab.
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/as
+
+INC += asLib.h
+INC += asTrapWrite.h
+
+LIB_SRCS += asLib.c
+LIB_SRCS += asTrapWrite.c
+

=== added file 'src/libCom/as/RULES'
--- src/libCom/as/RULES	1970-01-01 00:00:00 +0000
+++ src/libCom/as/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,22 @@
+#*************************************************************************
+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
+#     Brookhaven National Lab.
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+# Extra rule since asLib_lex.c is included by asLib.c
+asLib$(OBJ): asLib_lex.c
+
+# Ensure that lexer and parser are built before they are needed
+asLib.c: $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE))
+asLib_lex.c: $(call PATH_FILTER, $(TOOLS)/e_flex$(HOSTEXE))
+
+clean::
+	@$(RM) asLib.c asLib_lex.c

=== renamed file 'src/as/asLib.h' => 'src/libCom/as/asLib.h'
=== renamed file 'src/as/asLib.y' => 'src/libCom/as/asLib.y'
=== renamed file 'src/as/asLibRoutines.c' => 'src/libCom/as/asLibRoutines.c'
=== renamed file 'src/as/asLib_lex.l' => 'src/libCom/as/asLib_lex.l'
=== renamed file 'src/as/asTrapWrite.c' => 'src/libCom/as/asTrapWrite.c'
=== renamed file 'src/as/asTrapWrite.h' => 'src/libCom/as/asTrapWrite.h'
=== added file 'src/libCom/bucketLib/Makefile'
--- src/libCom/bucketLib/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/bucketLib/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/bucketLib
+INC += bucketLib.h
+Com_SRCS += bucketLib.c

=== added file 'src/libCom/calc/Makefile'
--- src/libCom/calc/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/calc/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/calc
+INC += postfix.h
+Com_SRCS += postfix.c
+Com_SRCS += calcPerform.c
+

=== added file 'src/libCom/cppStd/Makefile'
--- src/libCom/cppStd/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/cppStd/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/cppStd
+INC += epicsAlgorithm.h
+INC += epicsExcept.h
+INC += epicsMemory.h
+

=== added file 'src/libCom/cvtFast/Makefile'
--- src/libCom/cvtFast/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/cvtFast/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/cvtFast
+INC += cvtFast.h
+Com_SRCS += cvtFast.c
+

=== added file 'src/libCom/cxxTemplates/Makefile'
--- src/libCom/cxxTemplates/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/cxxTemplates/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,23 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/cxxTemplates
+INC += resourceLib.h
+INC += tsDLList.h
+INC += tsSLList.h
+INC += tsMinMax.h
+INC += tsBTree.h
+INC += tsFreeList.h
+INC += epicsSingleton.h
+INC += epicsGuard.h
+INC += epicsOnce.h
+Com_SRCS += resourceLib.cpp
+Com_SRCS += epicsOnce.cpp
+Com_SRCS += epicsSingletonMutex.cpp
+

=== added file 'src/libCom/dbmf/Makefile'
--- src/libCom/dbmf/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/dbmf/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/dbmf
+INC += dbmf.h
+Com_SRCS += dbmf.c
+

=== added file 'src/libCom/ellLib/Makefile'
--- src/libCom/ellLib/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/ellLib/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/ellLib
+INC += ellLib.h
+Com_SRCS += ellLib.c

=== added file 'src/libCom/env/Makefile'
--- src/libCom/env/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/env/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,16 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/env
+
+INC += envDefs.h
+
+Com_SRCS += envSubr.c
+Com_SRCS += envData.c
+

=== added file 'src/libCom/env/RULES'
--- src/libCom/env/RULES	1970-01-01 00:00:00 +0000
+++ src/libCom/env/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \
+	$(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV
+	$(PERL) $(LIBCOM)/env/bldEnvData.pl $(CONFIG)
+
+clean::
+	@$(RM) envData.c

=== added file 'src/libCom/error/Makefile'
--- src/libCom/error/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/error/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,34 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/error
+
+INC += epicsPrint.h
+INC += errMdef.h
+INC += errSymTbl.h
+INC += errlog.h
+INC += error.h
+
+Com_SRCS += errlog.c
+Com_SRCS += errSymLib.c
+Com_SRCS += errSymTbl.c
+
+# For bldErrSymTbl
+#
+ERR_S_FILES += $(LIBCOM)/osi/devLib.h
+ERR_S_FILES += $(LIBCOM)/as/asLib.h
+ERR_S_FILES += $(SRC)/ioc/db/dbAccessDefs.h
+ERR_S_FILES += $(SRC)/ioc/dbStatic/devSup.h
+ERR_S_FILES += $(SRC)/ioc/dbStatic/drvSup.h
+ERR_S_FILES += $(SRC)/ioc/dbStatic/recSup.h
+ERR_S_FILES += $(SRC)/ioc/dbStatic/dbStaticLib.h
+ERR_S_FILES += $(LIBCOM)/error/errMdef.h
+ERR_S_FILES += $(SRC)/ca/legacy/pcas/generic/casdef.h
+ERR_S_FILES += $(SRC)/ca/legacy/gdd/gddAppFuncTable.h
+

=== added file 'src/libCom/error/RULES'
--- src/libCom/error/RULES	1970-01-01 00:00:00 +0000
+++ src/libCom/error/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+errSymTbl.c: $(ERR_S_FILES) $(LIBCOM)/error/makeStatTbl.pl
+	$(PERL) $(LIBCOM)/error/makeStatTbl.pl  $(ERR_S_FILES)
+
+clean::
+	@$(RM) errSymTbl.c

=== added file 'src/libCom/fdmgr/Makefile'
--- src/libCom/fdmgr/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/fdmgr/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/fdmgr
+INC += fdManager.h
+INC += fdmgr.h
+Com_SRCS += fdmgr.cpp
+Com_SRCS += fdManager.cpp

=== renamed directory 'src/toolsComm/flex' => 'src/libCom/flex'
=== modified file 'src/libCom/flex/Makefile'
--- src/toolsComm/flex/Makefile	2009-07-22 20:41:09 +0000
+++ src/libCom/flex/Makefile	2011-03-03 23:06:17 +0000
@@ -1,44 +1,35 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../../..
-
-include $(TOP)/configure/CONFIG
-
-HOST_WARN=NO
-
-YACC = $(EYACC)
-YACCOPT = -l -d
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/flex
+
+parse_YACCOPT = -l -d
 
 SKELETON_FILE = include/flex.skel.static
 
-USR_CPPFLAGS = -DDEFAULT_SKELETON_FILE=$(SKELETON_FILE)
+parse_CPPFLAGS = -DDEFAULT_SKELETON_FILE=$(SKELETON_FILE)
 
 INC += flex.skel.static
 
-# main.c is included in parse.c
-#
-SRCS += ccl.c
-SRCS += dfa.c
-SRCS += ecs.c
-SRCS += gen.c
-SRCS += misc.c
-SRCS += nfa.c
-SRCS += sym.c
-SRCS += tblcmp.c
-SRCS += parse.c
-
-PROD_HOST = e_flex
-PROD_LIBS = Com
-
-include $(TOP)/configure/RULES
-
-clean::
-	$(RM) parse.c parse.h
-
-#	EOF Makefile.Host for base/src/toolsComm/flex
+# flex.c is included in parse.c
+e_flex_SRCS += ccl.c
+e_flex_SRCS += dfa.c
+e_flex_SRCS += ecs.c
+e_flex_SRCS += gen.c
+e_flex_SRCS += misc.c
+e_flex_SRCS += nfa.c
+e_flex_SRCS += sym.c
+e_flex_SRCS += tblcmp.c
+e_flex_SRCS += parse.c
+e_flex_OBJS += epicsTempFile$(OBJ)
+
+PROD_HOST += e_flex
+

=== added file 'src/libCom/flex/RULES'
--- src/libCom/flex/RULES	1970-01-01 00:00:00 +0000
+++ src/libCom/flex/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,16 @@
+#*************************************************************************
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+# Ensure that the lexer is built before it is needed
+parse.c: $(YACC)
+
+clean::
+	$(RM) parse.c parse.h

=== renamed file 'src/toolsComm/flex/main.c' => 'src/libCom/flex/flex.c'
=== modified file 'src/libCom/flex/parse.y'
--- src/toolsComm/flex/parse.y	2010-10-05 19:27:37 +0000
+++ src/libCom/flex/parse.y	2011-03-03 23:06:17 +0000
@@ -703,5 +703,5 @@
 
 #include "scan.c"
 #include "yylex.c"
-#include "main.c"
+#include "flex.c"
 

=== added file 'src/libCom/freeList/Makefile'
--- src/libCom/freeList/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/freeList/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/freeList
+INC += freeList.h
+Com_SRCS += freeListLib.c
+HTMLS += freeList/freeList.html

=== added file 'src/libCom/gpHash/Makefile'
--- src/libCom/gpHash/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/gpHash/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/gpHash
+INC += gpHash.h
+Com_SRCS += gpHashLib.c
+HTMLS += gpHash/gpHash.html

=== added file 'src/libCom/iocsh/Makefile'
--- src/libCom/iocsh/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/iocsh/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,16 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/iocsh
+INC += iocsh.h
+INC += registry.h
+INC += libComRegister.h
+Com_SRCS += iocsh.cpp
+Com_SRCS += registry.c
+Com_SRCS += libComRegister.c

=== renamed directory 'src/libCom/logClient' => 'src/libCom/log'
=== added file 'src/libCom/log/Makefile'
--- src/libCom/log/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/log/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,26 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/log
+INC += iocLog.h
+INC += logClient.h
+Com_SRCS += iocLog.c
+Com_SRCS += logClient.c
+
+PROD_HOST += iocLogServer
+
+iocLogServer_SRCS = iocLogServer.c
+iocLogServer_LIBS = Com
+
+iocLogServer_SYS_LIBS_solaris += socket
+iocLogServer_SYS_LIBS_WIN32   += user32
+
+SCRIPTS_solaris := S99logServer
+SCRIPTS_Linux := S99logServer
+

=== added file 'src/libCom/log/RULES'
--- src/libCom/log/RULES	1970-01-01 00:00:00 +0000
+++ src/libCom/log/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+S99%: ../log/rc2.%
+	sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@
+

=== renamed file 'src/util/iocLogServer.c' => 'src/libCom/log/iocLogServer.c'
=== renamed file 'src/util/rc2.logServer' => 'src/libCom/log/rc2.logServer'
=== added file 'src/libCom/macLib/Makefile'
--- src/libCom/macLib/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/macLib/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/macLib
+INC += macLib.h
+Com_SRCS += macCore.c
+Com_SRCS += macEnv.c
+Com_SRCS += macUtil.c

=== added file 'src/libCom/misc/Makefile'
--- src/libCom/misc/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/misc/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,43 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/misc
+
+INC += alarm.h
+INC += alarmString.h
+INC += adjustment.h
+INC += cantProceed.h
+INC += dbDefs.h
+INC += epicsConvert.h
+INC += epicsExit.h
+INC += epicsStdlib.h
+INC += epicsString.h
+INC += epicsTypes.h
+INC += shareLib.h
+INC += epicsExport.h
+INC += unixFileName.h
+INC += locationException.h
+INC += ipAddrToAsciiAsynchronous.h
+INC += compilerDependencies.h
+INC += epicsUnitTest.h
+INC += testMain.h
+
+# epicsVersion.h is created by this Makefile
+INC += epicsVersion.h
+
+Com_SRCS += aToIPAddr.c
+Com_SRCS += adjustment.c
+Com_SRCS += cantProceed.c
+Com_SRCS += epicsConvert.c
+Com_SRCS += epicsExit.c
+Com_SRCS += epicsStdlib.c
+Com_SRCS += epicsString.c
+Com_SRCS += truncateFile.c
+Com_SRCS += ipAddrToAsciiAsynchronous.cpp
+Com_SRCS += epicsUnitTest.c

=== added file 'src/libCom/misc/RULES'
--- src/libCom/misc/RULES	1970-01-01 00:00:00 +0000
+++ src/libCom/misc/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+$(COMMON_DIR)/epicsVersion.h: $(CONFIG)/CONFIG_BASE_VERSION $(CONFIG)/CONFIG_SITE
+	$(PERL) $(LIBCOM)/misc/makeEpicsVersion.pl $(CONFIG)/CONFIG_BASE_VERSION $(@D) $(EPICS_SITE_VERSION)
+

=== renamed file 'src/dbStatic/alarm.h' => 'src/libCom/misc/alarm.h'
=== renamed file 'src/dbStatic/alarmString.h' => 'src/libCom/misc/alarmString.h'
=== added file 'src/libCom/osi/Makefile'
--- src/libCom/osi/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,127 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/osi
+INC += osiFileName.h
+INC += osiSock.h
+INC += osdSock.h
+INC += epicsInterrupt.h
+INC += osdInterrupt.h
+
+INC += epicsMutex.h
+INC += osdMutex.h
+INC += epicsEvent.h
+INC += osdEvent.h
+INC += epicsMath.h
+INC += osdMessageQueue.h
+INC += osdStrtod.h
+
+INC += epicsAssert.h
+INC += epicsFindSymbol.h
+INC += osiPoolStatus.h
+INC += osdPoolStatus.h
+INC += osdThread.h
+
+INC += epicsThread.h
+INC += epicsTime.h
+INC += epicsGeneralTime.h
+INC += osdTime.h
+INC += generalTimeSup.h
+INC += osiClockTime.h
+INC += epicsSignal.h
+INC += osiProcess.h
+INC += osiUnistd.h
+INC += osiWireFormat.h
+INC += osdWireFormat.h
+INC += osdWireConfig.h
+INC += epicsEndian.h
+INC += epicsReadline.h
+INC += epicsMessageQueue.h
+INC += epicsStdio.h
+INC += epicsStdioRedirect.h
+INC += epicsGetopt.h
+
+INC += devLib.h
+INC += devLibVME.h
+INC += devLibVMEImpl.h
+INC += osdVME.h
+
+Com_SRCS += epicsThread.cpp
+Com_SRCS += epicsMutex.cpp
+Com_SRCS += epicsEvent.cpp
+Com_SRCS += epicsTime.cpp
+Com_SRCS += epicsMessageQueue.cpp
+Com_SRCS += epicsMath.cpp
+
+Com_SRCS += epicsGeneralTime.c
+
+# Time providers
+Com_SRCS += osiClockTime.c
+Com_SRCS_vxWorks += osiNTPTime.c
+Com_SRCS_RTEMS += osiNTPTime.c
+
+Com_SRCS += osdSock.c
+Com_SRCS += osdSockAddrReuse.cpp
+Com_SRCS += osiSock.c
+Com_SRCS += systemCallIntMech.cpp
+Com_SRCS += epicsSocketConvertErrnoToString.cpp
+Com_SRCS += osdAssert.c
+Com_SRCS += osdFindSymbol.c
+Com_SRCS += osdInterrupt.c
+Com_SRCS += osdPoolStatus.c
+Com_SRCS += osdSignal.cpp
+
+osdEnv_CFLAGS_WIN32= -U__STDC__
+
+Com_SRCS += osdEnv.c
+
+# Command-line input support
+epicsReadline_CFLAGS += -DEPICS_COMMANDLINE_LIBRARY=EPICS_COMMANDLINE_LIBRARY_$(COMMANDLINE_LIBRARY)
+epicsReadline_INCLUDES += $(INCLUDES_$(COMMANDLINE_LIBRARY))
+
+Com_SRCS += epicsReadline.c
+
+Com_SRCS += epicsTempFile.cpp
+Com_SRCS += epicsStdio.c
+Com_SRCS += osdStdio.c
+
+#POSIX thread priority scheduling flag
+THREAD_CPPFLAGS_NO += -DDONT_USE_POSIX_THREAD_PRIORITY_SCHEDULING
+osdThread_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING))
+
+Com_SRCS += osdThread.c
+Com_SRCS += osdMutex.c
+Com_SRCS += osdEvent.c
+Com_SRCS += osdTime.cpp
+Com_SRCS += osdProcess.c
+Com_SRCS += osdNetIntf.c
+Com_SRCS += osdMessageQueue.c
+
+Com_SRCS += devLibVME.c
+Com_SRCS += devLibVMEOSD.c
+
+Com_SRCS_vxWorks += atReboot.cpp
+
+# For old vxWorks applications
+INC_vxWorks += camacLib.h
+INC_vxWorks += epicsDynLink.h
+INC_vxWorks += module_types.h
+INC_vxWorks += task_params.h
+
+Com_SRCS_vxWorks += epicsDynLink.c
+Com_SRCS_vxWorks += veclist.c
+Com_SRCS_vxWorks += logMsgToErrlog.cpp
+
+#This forces the vxWorks compatibility stuff to be loaded
+OBJS_vxWorks = vxComLibrary
+
+Com_SRCS_WIN32 += epicsGetopt.c 
+Com_SRCS_WIN32 += setThreadName.cpp
+#Com_SRCS_WIN32 += dllmain.cpp
+Com_SRCS_WIN32 += forceBadAllocException.cpp

=== added file 'src/libCom/osi/RULES'
--- src/libCom/osi/RULES	1970-01-01 00:00:00 +0000
+++ src/libCom/osi/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+# Ensure epicsVersion.h gets built first
+osdAssert$(OBJ): $(COMMON_DIR)/epicsVersion.h
+epicsTime$(OBJ): $(COMMON_DIR)/epicsVersion.h
+osdNetIntf$(OBJ): $(COMMON_DIR)/epicsVersion.h
+osdSock$(OBJ): $(COMMON_DIR)/epicsVersion.h
+

=== added file 'src/libCom/ring/Makefile'
--- src/libCom/ring/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/ring/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/ring
+#following needed for locating epicsRingPointer.h and epicsRingBytes.h
+INC += epicsRingPointer.h
+INC += epicsRingBytes.h
+Com_SRCS += epicsRingPointer.cpp
+Com_SRCS += epicsRingBytes.c

=== added file 'src/libCom/taskwd/Makefile'
--- src/libCom/taskwd/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/taskwd/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/taskwd
+INC += taskwd.h
+Com_SRCS += taskwd.c

=== added file 'src/libCom/timer/Makefile'
--- src/libCom/timer/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/timer/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,17 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/timer
+INC += epicsTimer.h
+Com_SRCS += epicsTimer.cpp
+Com_SRCS += timer.cpp
+Com_SRCS += timerQueue.cpp
+Com_SRCS += timerQueueActive.cpp
+Com_SRCS += timerQueueActiveMgr.cpp
+Com_SRCS += timerQueuePassive.cpp

=== renamed directory 'src/toolsComm' => 'src/libCom/tools'
=== added file 'src/libCom/tsDefs/Makefile'
--- src/libCom/tsDefs/Makefile	1970-01-01 00:00:00 +0000
+++ src/libCom/tsDefs/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+#tsDefs contains R3.13 compatibility tsStamp code
+SRC_DIRS += $(LIBCOM)/tsDefs
+INC += tsDefs.h
+Com_SRCS += tsDefs.c

=== renamed directory 'src/toolsComm/antelope' => 'src/libCom/yacc'
=== modified file 'src/libCom/yacc/Makefile'
--- src/toolsComm/antelope/Makefile	2009-07-10 22:00:18 +0000
+++ src/libCom/yacc/Makefile	2011-03-03 23:06:17 +0000
@@ -6,24 +6,24 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../../..
-include $(TOP)/configure/CONFIG
-
-SRCS += closure.c
-SRCS += error.c
-SRCS += lalr.c
-SRCS += lr0.c
-SRCS += main.c
-SRCS += mkpar.c
-SRCS += output.c
-SRCS += reader.c
-SRCS += skeleton.c
-SRCS += symtab.c
-SRCS += verbose.c
-SRCS += warshall.c
-
-PROD_HOST = antelope
-PROD_LIBS = Com
-
-include $(TOP)/configure/RULES
+
+# This is a Makefile fragment, see src/libCom/Makefile.
+
+SRC_DIRS += $(LIBCOM)/yacc
+
+antelope_SRCS += closure.c
+antelope_SRCS += error.c
+antelope_SRCS += lalr.c
+antelope_SRCS += lr0.c
+antelope_SRCS += antelope.c
+antelope_SRCS += mkpar.c
+antelope_SRCS += output.c
+antelope_SRCS += reader.c
+antelope_SRCS += skeleton.c
+antelope_SRCS += symtab.c
+antelope_SRCS += verbose.c
+antelope_SRCS += warshall.c
+antelope_OBJS += epicsTempFile$(OBJ)
+
+PROD_HOST += antelope
 

=== renamed file 'src/toolsComm/antelope/main.c' => 'src/libCom/yacc/antelope.c'
=== removed file 'src/misc/misc.rc'
--- src/misc/misc.rc	2005-12-19 21:42:40 +0000
+++ src/misc/misc.rc	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#include <Winver.h>
-#include "epicsVersion.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_UNKNOWN
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments","Miscellaneous Tools Library for EPICS\0"
-            VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Miscellaneous Tools Library\0"
-            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "misc\0"
-            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "misc.dll\0"
-            VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

=== removed file 'src/misc/miscIoc.rc'
--- src/misc/miscIoc.rc	2005-12-19 21:42:40 +0000
+++ src/misc/miscIoc.rc	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#include <Winver.h>
-#include "epicsVersion.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_UNKNOWN
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments","Miscellaneous Ioc Tools Library for EPICS\0"
-            VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Miscellaneous Ioc Tools Library\0"
-            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "miscIoc\0"
-            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "miscIoc.dll\0"
-            VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

=== removed file 'src/registry/registryIoc.rc'
--- src/registry/registryIoc.rc	2005-12-19 21:42:40 +0000
+++ src/registry/registryIoc.rc	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#include <Winver.h>
-#include "epicsVersion.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_UNKNOWN
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments","Registry Ioc Library for EPICS\0"
-            VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Registry Ioc Library\0"
-            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "registryIoc\0"
-            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "registryIoc.dll\0"
-            VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

=== removed file 'src/rsrv/rsrvIoc.rc'
--- src/rsrv/rsrvIoc.rc	2005-12-19 21:42:40 +0000
+++ src/rsrv/rsrvIoc.rc	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#include <Winver.h>
-#include "epicsVersion.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_UNKNOWN
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments","Channel Access Ioc Resource Server Library for EPICS\0"
-            VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Channel Access Ioc Resource Server Library\0"
-            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "rsrv\0"
-            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "rsrv.dll\0"
-            VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

=== added directory 'src/std'
=== added file 'src/std/Makefile'
--- src/std/Makefile	1970-01-01 00:00:00 +0000
+++ src/std/Makefile	2011-03-03 23:06:17 +0000
@@ -0,0 +1,30 @@
+#*************************************************************************
+# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+TOP=../..
+
+include $(TOP)/configure/CONFIG
+
+STDDIR=$(TOP)/src/std
+
+USR_DBDFLAGS += -I ../rec -I ../dev -I ../softIoc
+
+LIBRARY_IOC += dbRecStd
+dbRecStd_LIBS = dbCore ca Com
+
+dbRecStd_RCS += dbRecStd.rc
+
+include $(STDDIR)/dev/Makefile
+include $(STDDIR)/rec/Makefile
+include $(STDDIR)/softIoc/Makefile
+
+include $(TOP)/configure/RULES
+
+include $(STDDIR)/rec/RULES
+include $(STDDIR)/softIoc/RULES
+

=== renamed file 'src/rec/recIoc.rc' => 'src/std/dbRecStd.rc'
--- src/rec/recIoc.rc	2005-12-19 21:42:40 +0000
+++ src/std/dbRecStd.rc	2011-03-03 23:06:17 +0000
@@ -18,13 +18,13 @@
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments","Record Support Library for EPICS\0"
+            VALUE "Comments","Record and Soft Device Support Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Record Support Library\0"
+            VALUE "FileDescription", "Record and Soft Device Support Library\0"
             VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "rec\0"
+            VALUE "InternalName", "dbRecStd\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "rec.dll\0"
+            VALUE "OriginalFilename", "dbRecStd.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
             VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END

=== renamed directory 'src/dev/softDev' => 'src/std/dev'
=== modified file 'src/std/dev/Makefile'
--- src/dev/softDev/Makefile	2010-10-12 16:27:17 +0000
+++ src/std/dev/Makefile	2011-03-03 23:06:17 +0000
@@ -1,61 +1,57 @@
 #*************************************************************************
-# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../../..
-
-include $(TOP)/configure/CONFIG
+
+# This is a Makefile fragment, see src/std/Makefile.
+
+SRC_DIRS += $(STDDIR)/dev
 
 DBD += devSoft.dbd
 
-LIBSRCS += devAaiSoft.c
-LIBSRCS += devAaoSoft.c
-LIBSRCS += devAiSoft.c
-LIBSRCS += devAiSoftRaw.c
-LIBSRCS += devAoSoft.c
-LIBSRCS += devAoSoftRaw.c
-LIBSRCS += devBiSoft.c
-LIBSRCS += devBiSoftRaw.c
-LIBSRCS += devBoSoft.c
-LIBSRCS += devBoSoftRaw.c
-LIBSRCS += devCalcoutSoft.c
-LIBSRCS += devEventSoft.c
-LIBSRCS += devHistogramSoft.c
-LIBSRCS += devLiSoft.c
-LIBSRCS += devLoSoft.c
-LIBSRCS += devMbbiDirectSoft.c
-LIBSRCS += devMbbiDirectSoftRaw.c
-LIBSRCS += devMbbiSoft.c
-LIBSRCS += devMbbiSoftRaw.c
-LIBSRCS += devMbboDirectSoft.c
-LIBSRCS += devMbboDirectSoftRaw.c
-LIBSRCS += devMbboSoft.c
-LIBSRCS += devMbboSoftRaw.c
-LIBSRCS += devSASoft.c
-LIBSRCS += devSiSoft.c
-LIBSRCS += devSoSoft.c
-LIBSRCS += devWfSoft.c
-LIBSRCS += devGeneralTime.c
-
-LIBSRCS += devAoSoftCallback.c
-LIBSRCS += devBoSoftCallback.c
-LIBSRCS += devCalcoutSoftCallback.c
-LIBSRCS += devLoSoftCallback.c
-LIBSRCS += devMbboSoftCallback.c
-LIBSRCS += devMbboDirectSoftCallback.c
-LIBSRCS += devSoSoftCallback.c
-
-LIBSRCS += devTimestamp.c
-LIBSRCS += devSoStdio.c
-
-LIBRARY_IOC += softDevIoc
-softDevIoc_LIBS += miscIoc recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
-softDevIoc_RCS = softDevIoc.rc
-
-include $(TOP)/configure/RULES
-
+dbRecStd_SRCS += devAaiSoft.c
+dbRecStd_SRCS += devAaoSoft.c
+dbRecStd_SRCS += devAiSoft.c
+dbRecStd_SRCS += devAiSoftRaw.c
+dbRecStd_SRCS += devAoSoft.c
+dbRecStd_SRCS += devAoSoftRaw.c
+dbRecStd_SRCS += devBiSoft.c
+dbRecStd_SRCS += devBiSoftRaw.c
+dbRecStd_SRCS += devBoSoft.c
+dbRecStd_SRCS += devBoSoftRaw.c
+dbRecStd_SRCS += devCalcoutSoft.c
+dbRecStd_SRCS += devEventSoft.c
+dbRecStd_SRCS += devHistogramSoft.c
+dbRecStd_SRCS += devLiSoft.c
+dbRecStd_SRCS += devLoSoft.c
+dbRecStd_SRCS += devMbbiDirectSoft.c
+dbRecStd_SRCS += devMbbiDirectSoftRaw.c
+dbRecStd_SRCS += devMbbiSoft.c
+dbRecStd_SRCS += devMbbiSoftRaw.c
+dbRecStd_SRCS += devMbboDirectSoft.c
+dbRecStd_SRCS += devMbboDirectSoftRaw.c
+dbRecStd_SRCS += devMbboSoft.c
+dbRecStd_SRCS += devMbboSoftRaw.c
+dbRecStd_SRCS += devSASoft.c
+dbRecStd_SRCS += devSiSoft.c
+dbRecStd_SRCS += devSoSoft.c
+dbRecStd_SRCS += devWfSoft.c
+dbRecStd_SRCS += devGeneralTime.c
+
+dbRecStd_SRCS += devAoSoftCallback.c
+dbRecStd_SRCS += devBoSoftCallback.c
+dbRecStd_SRCS += devCalcoutSoftCallback.c
+dbRecStd_SRCS += devLoSoftCallback.c
+dbRecStd_SRCS += devMbboSoftCallback.c
+dbRecStd_SRCS += devMbboDirectSoftCallback.c
+dbRecStd_SRCS += devSoSoftCallback.c
+
+dbRecStd_SRCS += devTimestamp.c
+dbRecStd_SRCS += devSoStdio.c
+
+dbRecStd_SRCS += asSubRecordFunctions.c
 

=== renamed file 'src/misc/asSubRecordFunctions.c' => 'src/std/dev/asSubRecordFunctions.c'
=== renamed directory 'src/rec' => 'src/std/rec'
=== modified file 'src/std/rec/Makefile'
--- src/rec/Makefile	2010-10-12 16:27:17 +0000
+++ src/std/rec/Makefile	2011-03-03 23:06:17 +0000
@@ -1,13 +1,15 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 The University of Chicago, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../..
-include $(TOP)/configure/CONFIG
+
+# This is a Makefile fragment, see src/std/Makefile.
+
+SRC_DIRS += $(STDDIR)/rec
 
 DBDINC += aaiRecord
 DBDINC += aaoRecord
@@ -39,40 +41,37 @@
 DBDINC += subArrayRecord
 DBDINC += waveformRecord
 
-LIBSRCS += aaiRecord.c
-LIBSRCS += aaoRecord.c
-LIBSRCS += aiRecord.c
-LIBSRCS += aoRecord.c
-LIBSRCS += aSubRecord.c
-LIBSRCS += biRecord.c
-LIBSRCS += boRecord.c
-LIBSRCS += calcRecord.c
-LIBSRCS += calcoutRecord.c
-LIBSRCS += compressRecord.c
-LIBSRCS += dfanoutRecord.c
-LIBSRCS += eventRecord.c
-LIBSRCS += fanoutRecord.c
-LIBSRCS += histogramRecord.c
-LIBSRCS += longinRecord.c
-LIBSRCS += longoutRecord.c
-LIBSRCS += mbbiRecord.c
-LIBSRCS += mbbiDirectRecord.c
-LIBSRCS += mbboRecord.c
-LIBSRCS += mbboDirectRecord.c
-LIBSRCS += permissiveRecord.c
-LIBSRCS += selRecord.c
-LIBSRCS += seqRecord.c
-LIBSRCS += stateRecord.c
-LIBSRCS += stringinRecord.c
-LIBSRCS += stringoutRecord.c
-LIBSRCS += subRecord.c
-LIBSRCS += subArrayRecord.c
-LIBSRCS += waveformRecord.c
-
-LIBRARY_IOC += recIoc
-
-recIoc_LIBS = asIoc dbIoc registryIoc dbStaticIoc ca Com
-recIoc_RCS = recIoc.rc
-
-include $(TOP)/configure/RULES
+DBD += stdRecords.dbd
+
+stdRecords_DBD = $(patsubst %,%.dbd,$(DBDINC))
+
+dbRecStd_SRCS += aaiRecord.c
+dbRecStd_SRCS += aaoRecord.c
+dbRecStd_SRCS += aiRecord.c
+dbRecStd_SRCS += aoRecord.c
+dbRecStd_SRCS += aSubRecord.c
+dbRecStd_SRCS += biRecord.c
+dbRecStd_SRCS += boRecord.c
+dbRecStd_SRCS += calcRecord.c
+dbRecStd_SRCS += calcoutRecord.c
+dbRecStd_SRCS += compressRecord.c
+dbRecStd_SRCS += dfanoutRecord.c
+dbRecStd_SRCS += eventRecord.c
+dbRecStd_SRCS += fanoutRecord.c
+dbRecStd_SRCS += histogramRecord.c
+dbRecStd_SRCS += longinRecord.c
+dbRecStd_SRCS += longoutRecord.c
+dbRecStd_SRCS += mbbiRecord.c
+dbRecStd_SRCS += mbbiDirectRecord.c
+dbRecStd_SRCS += mbboRecord.c
+dbRecStd_SRCS += mbboDirectRecord.c
+dbRecStd_SRCS += permissiveRecord.c
+dbRecStd_SRCS += selRecord.c
+dbRecStd_SRCS += seqRecord.c
+dbRecStd_SRCS += stateRecord.c
+dbRecStd_SRCS += stringinRecord.c
+dbRecStd_SRCS += stringoutRecord.c
+dbRecStd_SRCS += subRecord.c
+dbRecStd_SRCS += subArrayRecord.c
+dbRecStd_SRCS += waveformRecord.c
 

=== added file 'src/std/rec/RULES'
--- src/std/rec/RULES	1970-01-01 00:00:00 +0000
+++ src/std/rec/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2011 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/std/Makefile.
+
+$(COMMON_DIR)/stdRecords.dbd:
+	$(RM) $@
+	$(PERL) $(TOOLS)/makeIncludeDbd.pl $(stdRecords_DBD) $@
+

=== renamed directory 'src/softIoc' => 'src/std/softIoc'
=== modified file 'src/std/softIoc/Makefile'
--- src/softIoc/Makefile	2010-10-22 22:02:40 +0000
+++ src/std/softIoc/Makefile	2011-03-03 23:06:17 +0000
@@ -1,17 +1,19 @@
 ##########################################################################
-# Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 ##########################################################################
 
-TOP=../..
+# This is a Makefile fragment, see src/ioc/Makefile.
 
-include $(TOP)/configure/CONFIG
+SRC_DIRS += $(STDDIR)/softIoc
 
 PROD_IOC = softIoc
 
+DBD += base.dbd
 DBD += softIoc.dbd
+
 softIoc_DBD += base.dbd
 softIoc_DBD += dlload.dbd
 softIoc_DBD += system.dbd
@@ -26,14 +28,3 @@
 
 FINAL_LOCATION ?= $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
 
-include $(TOP)/configure/RULES
-
-softMain$(OBJ) : epicsInstallDir.h
-
-epicsInstallDir.h:
-	$(ECHO) "FINAL_LOCATION=$(FINAL_LOCATION)"
-	$(PERL) ../makeInstallDir.pl '$(FINAL_LOCATION)' > $@
-
-clean::
-	@$(RM) epicsInstallDir.h
-

=== added file 'src/std/softIoc/RULES'
--- src/std/softIoc/RULES	1970-01-01 00:00:00 +0000
+++ src/std/softIoc/RULES	2011-03-03 23:06:17 +0000
@@ -0,0 +1,20 @@
+##########################################################################
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
+##########################################################################
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+$(COMMON_DIR)/softIoc.dbd: $(INSTALL_DBD)/stdRecords.dbd
+
+softMain$(OBJ): epicsInstallDir.h
+
+epicsInstallDir.h:
+	$(ECHO) "FINAL_LOCATION=$(FINAL_LOCATION)"
+	$(PERL) $(STDDIR)/softIoc/makeInstallDir.pl '$(FINAL_LOCATION)' > $@
+
+clean::
+	@$(RM) epicsInstallDir.h
+

=== renamed file 'src/misc/base.dbd' => 'src/std/softIoc/base.dbd'
--- src/misc/base.dbd	2010-10-05 19:27:37 +0000
+++ src/std/softIoc/base.dbd	2011-03-03 23:06:17 +0000
@@ -8,43 +8,13 @@
 include "menuConvert.dbd"
 
 # Record types
-include "aaiRecord.dbd"
-include "aaoRecord.dbd"
-include "aiRecord.dbd"
-include "aoRecord.dbd"
-include "aSubRecord.dbd"
-include "biRecord.dbd"
-include "boRecord.dbd"
-include "calcRecord.dbd"
-include "calcoutRecord.dbd"
-include "compressRecord.dbd"
-include "dfanoutRecord.dbd"
-include "eventRecord.dbd"
-include "fanoutRecord.dbd"
-include "longinRecord.dbd"
-include "longoutRecord.dbd"
-include "mbbiRecord.dbd"
-include "mbbiDirectRecord.dbd"
-include "mbboRecord.dbd"
-include "mbboDirectRecord.dbd"
-include "permissiveRecord.dbd"
-include "selRecord.dbd"
-include "seqRecord.dbd"
-include "stateRecord.dbd"
-include "stringinRecord.dbd"
-include "stringoutRecord.dbd"
-include "subRecord.dbd"
-include "subArrayRecord.dbd"
-include "waveformRecord.dbd"
+include "stdRecords.dbd"
 
 # "Soft Channel", "Raw Soft Channel", and "Async Soft Channel" device support
 include "devSoft.dbd"
 
 # Access security subroutines
 registrar(asSub)
-variable(asCaDebug,int)
 
-# dbStaticLib settings
-variable(dbRecordsOnceOnly,int)
-variable(dbBptNotMonotonic,int)
+include "dbCore.dbd"
 

=== renamed directory 'src/dev/testDev' => 'src/std/test'
=== added directory 'src/template'
=== renamed directory 'src/makeBaseApp' => 'src/template/base'
=== modified file 'src/template/base/Makefile'
--- src/makeBaseApp/Makefile	2008-10-08 22:42:49 +0000
+++ src/template/base/Makefile	2011-03-03 23:06:17 +0000
@@ -1,4 +1,4 @@
-TOP=../..
+TOP=../../..
 
 include $(TOP)/configure/CONFIG
 

=== renamed directory 'src/makeBaseExt' => 'src/template/ext'
=== modified file 'src/template/ext/Makefile'
--- src/makeBaseExt/Makefile	2006-03-29 17:09:24 +0000
+++ src/template/ext/Makefile	2011-03-03 23:06:17 +0000
@@ -1,4 +1,4 @@
-TOP=../..
+TOP=../../..
 
 include $(TOP)/configure/CONFIG
 

=== removed file 'src/toolsComm/Makefile'
--- src/toolsComm/Makefile	2010-10-12 16:27:17 +0000
+++ src/toolsComm/Makefile	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-#     National Laboratory.
-# Copyright (c) 2002 The Regents of the University of California, as
-#     Operator of Los Alamos National Laboratory.
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-DIRS = antelope flex 
-
-flex_DEPEND_DIRS += antelope
-
-include $(TOP)/configure/RULES_DIRS
-

=== removed directory 'src/util'
=== removed file 'src/util/Makefile'
--- src/util/Makefile	2010-10-12 16:27:17 +0000
+++ src/util/Makefile	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-#     National Laboratory.
-# Copyright (c) 2002 The Regents of the University of California, as
-#     Operator of Los Alamos National Laboratory.
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_LIBS  = ca Com
-
-#
-# Added winmm user32 for the non-dll build
-#
-PROD_HOST_DEFAULT = ca_test iocLogServer
-PROD_HOST_WIN32   = ca_test iocLogServer
-PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
-
-iocLogServer_SYS_LIBS_solaris = socket
-
-ca_test_SRCS = ca_test_main.c ca_test.c
-iocLogServer_SRCS = iocLogServer.c
-
-OBJS_vxWorks = ca_test
-
-SCRIPTS_solaris := S99logServer S99caRepeater 
-SCRIPTS_Linux := S99logServer S99caRepeater 
-
-include $(TOP)/configure/RULES
- 
-S99%: ../rc2.%
-	sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@