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

Proposed by mdavidsaver on 2010-12-20
Status: Merged
Merge reported by: Andrew Johnson
Merged at revision: not available
Proposed branch: lp:~mdavidsaver/epics-base/reorg-src
Merge into: lp:~epics-core/epics-base/3.15
Diff against target: 3419 lines (+1409/-1167)
85 files modified
configure/CONFIG_BASE (+2/-4)
configure/RULES.Db (+1/-1)
configure/RULES_BUILD (+10/-12)
documentation/RELEASE_NOTES.html (+215/-0)
src/Makefile (+44/-68)
src/as/asHost.rc (+0/-36)
src/as/asIoc.rc (+0/-36)
src/ca/client/Makefile (+14/-1)
src/ca/client/perl/Makefile (+1/-1)
src/ca/client/tools/Makefile (+1/-1)
src/ca/legacy/gdd/Makefile (+1/-1)
src/ca/legacy/pcas/Makefile (+1/-1)
src/ca/legacy/pcas/build/Makefile (+3/-3)
src/ca/legacy/pcas/ex/Makefile (+2/-2)
src/ca/legacy/pcas/example/Makefile (+1/-1)
src/ca/legacy/pcas/example/directoryService/Makefile (+1/-1)
src/dbStatic/dbStaticIoc.rc (+0/-36)
src/dbtools/dbtoolsIoc.rc (+0/-36)
src/dev/Makefile (+0/-18)
src/ioc/Makefile (+40/-0)
src/ioc/as/Makefile (+14/-32)
src/ioc/bpt/Makefile (+10/-12)
src/ioc/bpt/RULES (+16/-0)
src/ioc/db/Makefile (+30/-45)
src/ioc/db/RULES (+28/-0)
src/ioc/db/test/Makefile (+2/-2)
src/ioc/dbCore.rc (+5/-5)
src/ioc/dbStatic/Makefile (+26/-28)
src/ioc/dbStatic/RULES (+16/-0)
src/ioc/dbtemplate/Makefile (+9/-25)
src/ioc/dbtemplate/RULES (+17/-0)
src/ioc/misc/Makefile (+11/-19)
src/ioc/misc/dbCore.dbd (+14/-0)
src/ioc/registry/Makefile (+13/-19)
src/ioc/rsrv/Makefile (+17/-22)
src/libCom/Makefile (+37/-307)
src/libCom/RTEMS/Makefile (+1/-1)
src/libCom/as/Makefile (+21/-0)
src/libCom/as/RULES (+22/-0)
src/libCom/bucketLib/Makefile (+12/-0)
src/libCom/calc/Makefile (+14/-0)
src/libCom/cppStd/Makefile (+14/-0)
src/libCom/cvtFast/Makefile (+13/-0)
src/libCom/cxxTemplates/Makefile (+23/-0)
src/libCom/dbmf/Makefile (+13/-0)
src/libCom/ellLib/Makefile (+12/-0)
src/libCom/env/Makefile (+16/-0)
src/libCom/env/RULES (+15/-0)
src/libCom/error/Makefile (+34/-0)
src/libCom/error/RULES (+14/-0)
src/libCom/fdmgr/Makefile (+14/-0)
src/libCom/flex/Makefile (+22/-31)
src/libCom/flex/RULES (+16/-0)
src/libCom/flex/parse.y (+1/-1)
src/libCom/freeList/Makefile (+13/-0)
src/libCom/gpHash/Makefile (+13/-0)
src/libCom/iocsh/Makefile (+16/-0)
src/libCom/log/Makefile (+26/-0)
src/libCom/log/RULES (+12/-0)
src/libCom/macLib/Makefile (+14/-0)
src/libCom/misc/Makefile (+43/-0)
src/libCom/misc/RULES (+12/-0)
src/libCom/osi/Makefile (+127/-0)
src/libCom/osi/RULES (+15/-0)
src/libCom/ring/Makefile (+15/-0)
src/libCom/taskwd/Makefile (+12/-0)
src/libCom/timer/Makefile (+17/-0)
src/libCom/tsDefs/Makefile (+13/-0)
src/libCom/yacc/Makefile (+20/-20)
src/misc/misc.rc (+0/-36)
src/misc/miscIoc.rc (+0/-36)
src/registry/registryIoc.rc (+0/-36)
src/rsrv/rsrvIoc.rc (+0/-36)
src/std/Makefile (+30/-0)
src/std/dbRecStd.rc (+4/-4)
src/std/dev/Makefile (+46/-50)
src/std/rec/Makefile (+38/-39)
src/std/rec/RULES (+15/-0)
src/std/softIoc/Makefile (+5/-14)
src/std/softIoc/RULES (+20/-0)
src/std/softIoc/base.dbd (+2/-32)
src/template/base/Makefile (+1/-1)
src/template/ext/Makefile (+1/-1)
src/toolsComm/Makefile (+0/-19)
src/util/Makefile (+0/-35)
To merge this branch: bzr merge lp:~mdavidsaver/epics-base/reorg-src
Reviewer Review Type Date Requested Status
Andrew Johnson 2010-12-20 Approve on 2011-08-23
Review via email: mp+44296@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Ernest Williams (ernesto-slac) wrote :

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) wrote :

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) wrote :

> 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) wrote :

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) wrote :

> 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) wrote :

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 updated on 2011-02-27
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) wrote :

> 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) wrote :

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) wrote :

> 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) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure/CONFIG_BASE'
2--- configure/CONFIG_BASE 2008-08-29 21:07:04 +0000
3+++ configure/CONFIG_BASE 2011-03-03 23:06:17 +0000
4@@ -21,14 +21,12 @@
5 #---------------------------------------------------------------
6 # Epics base Ioc libraries
7
8-EPICS_BASE_IOC_LIBS += recIoc softDevIoc
9-EPICS_BASE_IOC_LIBS += miscIoc rsrvIoc dbtoolsIoc asIoc
10-EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com
11+EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com
12
13 #---------------------------------------------------------------
14 # Epics base Host libraries
15
16-EPICS_BASE_HOST_LIBS += cas gdd asHost dbStaticHost registryIoc
17+EPICS_BASE_HOST_LIBS += cas gdd dbStaticHost
18 EPICS_BASE_HOST_LIBS += ca Com
19
20 #---------------------------------------------------------------
21
22=== modified file 'configure/RULES.Db'
23--- configure/RULES.Db 2010-09-29 15:36:40 +0000
24+++ configure/RULES.Db 2011-03-03 23:06:17 +0000
25@@ -262,7 +262,7 @@
26 $(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP)
27 $(ECHO) "Expanding dbd"
28 @$(RM) $@
29- @$(DBEXPAND) $(DBDFLAGS) -o $@ $<
30+ $(DBEXPAND) $(DBDFLAGS) -o $@ $<
31
32 $(COMMON_DIR)/%.dbd: %Include.dbd
33 @$(RM) $(notdir $@)$(DEP)
34
35=== modified file 'configure/RULES_BUILD'
36--- configure/RULES_BUILD 2011-02-18 22:16:56 +0000
37+++ configure/RULES_BUILD 2011-03-03 23:06:17 +0000
38@@ -225,23 +225,21 @@
39 @$(RM) $@
40 $(BAFCMD) $<
41
42+YACCOPT ?= $($*_YACCOPT)
43 #
44 # rename the y.tab.h file only if we
45 # are creating it
46 #
47-ifeq ($(findstring -d, $(YACCOPT)),-d)
48-%.h %.c: %.y
49- $(RM) $*.c y.tab.c
50- $(RM) $*.h y.tab.h
51- $(YACC) $(YACCOPT) $<
52- $(MV) y.tab.c $*.c
53- $(MV) y.tab.h $*.h
54-else
55 %.c: %.y
56- $(RM) $*.c y.tab.c
57- $(YACC) $(YACCOPT) $<
58- $(MV) y.tab.c $*.c
59-endif
60+ $(RM) $*.tab.c
61+ $(RM) $*.tab.h
62+ $(YACC) -b$* $(YACCOPT) $<
63+ $(MV) $*.tab.c $*.c
64+ $(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
65+
66+# must be a seperate rule since when not using '-d' the
67+# prefix for .h will be different then .c
68+%.h : %.c %.y
69
70 %.c: %.l
71 @$(RM) lex.yy.c
72
73=== modified file 'documentation/RELEASE_NOTES.html'
74--- documentation/RELEASE_NOTES.html 2010-11-28 03:06:40 +0000
75+++ documentation/RELEASE_NOTES.html 2011-03-03 23:06:17 +0000
76@@ -13,6 +13,221 @@
77 <h2 align="center">Changes between 3.14.x and 3.15.1</h2>
78 <!-- Insert new items immediately below here ... -->
79
80+<h3>Reorganization of src/</h3>
81+<p>Reorganization of subdirectories of src/ to better represent the relation
82+between different parts as described in the following table.</p>
83+
84+<p>This change also allows the number of libraries built to be reduced to:
85+libCap5.so, libca.so, libdbCore.so, libdbStaticHost.so,
86+libCom.so, libcas.so, libdbRecStd.so, and libgdd.so</p>
87+
88+<table border="1"><tbody>
89+<tr>
90+ <th>Component</th>
91+ <th>Dependency</th>
92+ <th>Library name</th>
93+ <th>Description</th>
94+</tr>
95+<tr>
96+ <td>src/tools</td>
97+ <td></td>
98+ <td></td>
99+ <td>Build system scripts</td>
100+</tr>
101+<tr>
102+ <td>src/libCom</td>
103+ <td>src/tools</td>
104+ <td>Com</td>
105+ <td>Utility routines and OS-independant API</td>
106+</tr>
107+<tr>
108+ <td>src/template</td>
109+ <td>src/tools</td>
110+ <td></td>
111+ <td>User application templates (e.g. makeBaseApp)</td>
112+</tr>
113+<tr>
114+ <td>src/ca/client</td>
115+ <td>src/libCom</td>
116+ <td>ca</td>
117+ <td>Channel Access client</td>
118+</tr>
119+<tr>
120+ <td>src/ca/legacy/gdd</td>
121+ <td>src/ca/client</td>
122+ <td>gdd</td>
123+ <td>Generic data layer for PCAS</td>
124+</tr>
125+<tr>
126+ <td>src/ca/legacy/pcas</td>
127+ <td>src/ca/legacy/gdd</td>
128+ <td>cas</td>
129+ <td>Portable Channel Access Server</td>
130+</tr>
131+<tr>
132+ <td>src/ioc</td>
133+ <td>src/ca</td>
134+ <td>dbCore</td>
135+ <td>Core database processing functions</td>
136+</tr>
137+<tr>
138+ <td>src/std</td>
139+ <td>src/ioc</td>
140+ <td>dbRecStd</td>
141+ <td>Standard records, soft device support and the softIoc </td>
142+</tr>
143+</tbody></table>
144+
145+<p>
146+In order to better reflect these relations the following
147+directories and files were moved as described:</p>
148+
149+<table border="1"><tbody>
150+<tr>
151+ <th colspan="2">Relocations</th>
152+</tr>
153+<tr>
154+ <th>Previous</th><th>New</th>
155+</tr>
156+<tr>
157+ <th colspan="2">libCom</th>
158+</tr>
159+<tr>
160+ <td>src/RTEMS</td>
161+ <td>src/libCom/RTEMS</td>
162+</tr>
163+<tr>
164+ <td>src/toolsComm/flex</td>
165+ <td>src/libCom/flex</td>
166+</tr>
167+<tr>
168+ <td>src/toolsComm/antelope</td>
169+ <td>src/libCom/yacc</td>
170+</tr>
171+<tr>
172+ <td align="right">src/dbStatic/alarm.h<br>.../alarmString.h</td>
173+ <td>src/libCom/misc/</td>
174+</tr>
175+<tr>
176+ <th colspan="2">IOC Core Components</th>
177+</tr>
178+<tr>
179+ <td>src/bpt</td>
180+ <td>src/ioc/bpt</td>
181+</tr>
182+<tr>
183+ <td>src/db</td>
184+ <td>src/ioc/db</td>
185+</tr>
186+<tr>
187+ <td>src/dbStatic</td>
188+ <td>src/ioc/dbStatic</td>
189+</tr>
190+<tr>
191+ <td>src/dbtools</td>
192+ <td>src/ioc/dbtemplate</td>
193+</tr>
194+<tr>
195+ <td>src/misc</td>
196+ <td>src/ioc/misc</td>
197+</tr>
198+<tr>
199+ <td>src/registry</td>
200+ <td>src/ioc/registry</td>
201+</tr>
202+<tr>
203+ <td>src/rsrv</td>
204+ <td>src/ioc/rsrv <a href="#rsrv">1</a></td>
205+</tr>
206+<tr>
207+ <th colspan="2">Standard Record Definitions</th>
208+</tr>
209+<tr>
210+ <td>src/dev/softDev</td>
211+ <td>src/std/dev</td>
212+</tr>
213+<tr>
214+ <td>src/rec</td>
215+ <td>src/std/rec</td>
216+</tr>
217+<tr>
218+ <td>src/softIoc</td>
219+ <td>src/std/softIoc</td>
220+</tr>
221+<tr>
222+ <th colspan="2">Channel Access</th>
223+</tr>
224+<tr>
225+ <td>src/ca</td>
226+ <td>src/ca/client</td>
227+</tr>
228+<tr>
229+ <td>src/catools</td>
230+ <td>src/ca/client/tools</td>
231+</tr>
232+<tr>
233+ <td>src/cap5</td>
234+ <td>src/ca/client/perl</td>
235+</tr>
236+<tr>
237+ <td>src/gdd</td>
238+ <td>src/ca/legacy/gdd</td>
239+</tr>
240+<tr>
241+ <td>src/cas</td>
242+ <td>src/ca/legacy/pcas</td>
243+</tr>
244+<tr>
245+ <td>src/excas</td>
246+ <td>src/ca/legacy/pcas/ex</td>
247+</tr>
248+<tr>
249+ <th colspan="2">User Templates</th>
250+</tr>
251+<tr>
252+ <td>src/makeBaseApp</td>
253+ <td>src/template/base</td>
254+</tr>
255+<tr>
256+ <td>src/makeBaseExt</td>
257+ <td>src/template/ext</td>
258+</tr>
259+<tr>
260+ <th colspan="2">Dispersed</th>
261+</tr>
262+<tr>
263+ <td rowspan="3">src/util <a href="#util">2</a></td>
264+ <td>src/ca/client</td>
265+</tr>
266+<tr>
267+ <td>src/ca/client/test</td>
268+</tr>
269+<tr>
270+ <td>src/libCom/log</td>
271+</tr>
272+<tr>
273+ <td rowspan="2">src/as <a href="#as">3</a></td>
274+ <td>src/libCom/as</td>
275+</tr>
276+<tr>
277+ <td>src/ioc/as</td>
278+</tr>
279+</tbody></table>
280+
281+<p><a name="rsrv">1</a>
282+RSRV is built as part of dbCore due to its tight (bidirectional) coupling
283+with the other database code.</p>
284+
285+<p><a name="util">2</a>
286+The contents for src/util/ moved to three locations. The caRepeater init script
287+was moved to src/ca/client/. ca_test is now in src/ca/client/test/.
288+The iocLogServer was moved into the same directory (src/libCom/log) as
289+the log client code.</p>
290+
291+<p><a name="as">3</a>
292+The Access Security code has been divided, with the parts not related to the
293+database (lexer/parser and trap registration) becoming part of libCom.
294+The remaining components are included in the dbCore library</p>
295
296 <h3>
297 Moved src/RTEMS/base directory</h3>
298
299=== modified file 'src/Makefile'
300--- src/Makefile 2010-10-12 16:27:17 +0000
301+++ src/Makefile 2011-03-03 23:06:17 +0000
302@@ -15,80 +15,56 @@
303
304 DIRS += tools
305
306-DIRS += makeBaseApp
307-makeBaseApp_DEPEND_DIRS = tools
308-
309-DIRS += makeBaseExt
310-makeBaseExt_DEPEND_DIRS = tools
311+DIRS += template/base
312+template/base_DEPEND_DIRS = tools
313+
314+DIRS += template/ext
315+template/ext_DEPEND_DIRS = tools
316+
317+# Common
318
319 DIRS += libCom
320 libCom_DEPEND_DIRS = tools
321
322-DIRS += toolsComm
323-toolsComm_DEPEND_DIRS = libCom
324-
325-DIRS += ca
326-ca_DEPEND_DIRS = libCom
327-
328-DIRS += dbStatic
329-dbStatic_DEPEND_DIRS = toolsComm
330-
331-DIRS += registry
332-registry_DEPEND_DIRS = dbStatic
333-
334-DIRS += bpt
335-bpt_DEPEND_DIRS = dbStatic
336-
337-DIRS += db
338-db_DEPEND_DIRS = bpt ca
339-
340-DIRS += as
341-as_DEPEND_DIRS = db
342-
343-DIRS += util
344-util_DEPEND_DIRS = ca
345-
346-DIRS += dbtools
347-dbtools_DEPEND_DIRS = db
348-
349-DIRS += catools
350-catools_DEPEND_DIRS = ca dbStatic
351-
352-DIRS += rsrv
353-rsrv_DEPEND_DIRS = as
354-
355-DIRS += rec
356-rec_DEPEND_DIRS = as registry
357-
358-DIRS += misc
359-misc_DEPEND_DIRS = dbtools rsrv rec
360-
361-DIRS += dev
362-dev_DEPEND_DIRS = rec misc
363-
364-DIRS += RTEMS
365-RTEMS_DEPEND_DIRS = libCom
366+DIRS += libCom/RTEMS
367+libCom/RTEMS_DEPEND_DIRS = libCom
368
369 DIRS += libCom/test
370-libCom/test_DEPEND_DIRS = ca RTEMS
371-
372-DIRS += db/test
373-db/test_DEPEND_DIRS = db RTEMS
374-
375-DIRS += softIoc
376-softIoc_DEPEND_DIRS = dev dbtools RTEMS
377-
378-DIRS += gdd
379-gdd_DEPEND_DIRS = ca
380-
381-DIRS += cas
382-cas_DEPEND_DIRS = gdd dbStatic
383-
384-DIRS += excas
385-excas_DEPEND_DIRS = cas as registry
386-
387-DIRS += cap5
388-cap5_DEPEND_DIRS = ca dbStatic
389+libCom/test_DEPEND_DIRS = libCom/RTEMS
390+
391+# Channel Access
392+
393+DIRS += ca/client
394+ca/client_DEPEND_DIRS = libCom
395+
396+DIRS += ca/client/tools
397+ca/client/tools_DEPEND_DIRS = ca/client
398+
399+DIRS += ca/legacy/gdd
400+ca/legacy/gdd_DEPEND_DIRS = ca/client
401+
402+DIRS += ca/legacy/pcas
403+ca/legacy/pcas_DEPEND_DIRS = ca/legacy/gdd
404+
405+DIRS += ca/legacy/pcas/ex
406+# needs ioc for dbStaticHost
407+ca/legacy/pcas/ex_DEPEND_DIRS = ca/legacy/pcas libCom ioc
408+
409+DIRS += ca/client/perl
410+ca/client/perl_DEPEND_DIRS = ca/client
411+
412+# PDB Core
413+
414+DIRS += ioc
415+ioc_DEPEND_DIRS = libCom ca/client
416+
417+DIRS += ioc/db/test
418+ioc/db/test_DEPEND_DIRS = ioc libCom/RTEMS
419+
420+# PDB Standard Record Definitions
421+
422+DIRS += std
423+std_DEPEND_DIRS = ioc libCom/RTEMS
424
425
426 include $(TOP)/configure/RULES_DIRS
427
428=== removed file 'src/as/asHost.rc'
429--- src/as/asHost.rc 2005-12-19 21:42:40 +0000
430+++ src/as/asHost.rc 1970-01-01 00:00:00 +0000
431@@ -1,36 +0,0 @@
432-#include <Winver.h>
433-#include "epicsVersion.h"
434-
435-VS_VERSION_INFO VERSIONINFO
436- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
437- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
438- FILEFLAGSMASK 0x3fL
439-#ifdef _DEBUG
440- FILEFLAGS 0x1L
441-#else
442- FILEFLAGS 0x0L
443-#endif
444- FILEOS VOS__WINDOWS32
445- FILETYPE VFT_UNKNOWN
446- FILESUBTYPE 0x0L
447-BEGIN
448- BLOCK "StringFileInfo"
449- BEGIN
450- BLOCK "040904b0"
451- BEGIN
452- VALUE "Comments","Host Access Security Library for EPICS\0"
453- VALUE "CompanyName", "The EPICS collaboration\0"
454- VALUE "FileDescription", "Host Access Security Library\0"
455- VALUE "FileVersion", EPICS_VERSION_STRING "\0"
456- VALUE "InternalName", "asHost\0"
457- VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
458- VALUE "OriginalFilename", "asHost.dll\0"
459- VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
460- VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
461- END
462- END
463- BLOCK "VarFileInfo"
464- BEGIN
465- VALUE "Translation", 0x409, 1200
466- END
467-END
468
469=== removed file 'src/as/asIoc.rc'
470--- src/as/asIoc.rc 2005-12-19 21:42:40 +0000
471+++ src/as/asIoc.rc 1970-01-01 00:00:00 +0000
472@@ -1,36 +0,0 @@
473-#include <Winver.h>
474-#include "epicsVersion.h"
475-
476-VS_VERSION_INFO VERSIONINFO
477- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
478- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
479- FILEFLAGSMASK 0x3fL
480-#ifdef _DEBUG
481- FILEFLAGS 0x1L
482-#else
483- FILEFLAGS 0x0L
484-#endif
485- FILEOS VOS__WINDOWS32
486- FILETYPE VFT_UNKNOWN
487- FILESUBTYPE 0x0L
488-BEGIN
489- BLOCK "StringFileInfo"
490- BEGIN
491- BLOCK "040904b0"
492- BEGIN
493- VALUE "Comments","IOC Access Security Library for EPICS\0"
494- VALUE "CompanyName", "The EPICS collaboration\0"
495- VALUE "FileDescription", "IOC Access Security Library\0"
496- VALUE "FileVersion", EPICS_VERSION_STRING "\0"
497- VALUE "InternalName", "asIoc\0"
498- VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
499- VALUE "OriginalFilename", "asIoc.dll\0"
500- VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
501- VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
502- END
503- END
504- BLOCK "VarFileInfo"
505- BEGIN
506- VALUE "Translation", 0x409, 1200
507- END
508-END
509
510=== added directory 'src/ca'
511=== renamed directory 'src/ca' => 'src/ca/client'
512=== modified file 'src/ca/client/Makefile'
513--- src/ca/Makefile 2010-10-12 16:27:17 +0000
514+++ src/ca/client/Makefile 2011-03-03 23:06:17 +0000
515@@ -7,7 +7,7 @@
516 # in file LICENSE that is included with this distribution.
517 #*************************************************************************
518
519-TOP=../..
520+TOP=../../..
521
522 include $(TOP)/configure/CONFIG
523
524@@ -95,5 +95,18 @@
525
526 casw_SYS_LIBS_solaris = socket
527
528+SCRIPTS_solaris := S99caRepeater
529+SCRIPTS_Linux := S99caRepeater
530+
531+SRC_DIRS += $(TOP)/src/ca/client/test
532+PROD_HOST += ca_test
533+ca_test_SRCS = ca_test_main.c ca_test.c
534+ca_test_LIBS = ca Com
535+ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
536+
537+OBJS_vxWorks += ca_test
538+
539 include $(TOP)/configure/RULES
540
541+S99%: ../rc2.%
542+ sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@
543
544=== renamed directory 'src/cap5' => 'src/ca/client/perl'
545=== modified file 'src/ca/client/perl/Makefile'
546--- src/cap5/Makefile 2010-05-25 20:44:38 +0000
547+++ src/ca/client/perl/Makefile 2011-03-03 23:06:17 +0000
548@@ -5,7 +5,7 @@
549 # in file LICENSE that is included with this distribution.
550 #*************************************************************************
551
552-TOP=../..
553+TOP=../../../..
554 include $(TOP)/configure/CONFIG
555
556
557
558=== renamed file 'src/util/rc2.caRepeater' => 'src/ca/client/rc2.caRepeater'
559=== added directory 'src/ca/client/test'
560=== renamed file 'src/util/ca_test.c' => 'src/ca/client/test/ca_test.c'
561=== renamed file 'src/util/ca_test.h' => 'src/ca/client/test/ca_test.h'
562=== renamed file 'src/util/ca_test_main.c' => 'src/ca/client/test/ca_test_main.c'
563=== renamed directory 'src/catools' => 'src/ca/client/tools'
564=== modified file 'src/ca/client/tools/Makefile'
565--- src/catools/Makefile 2011-02-16 16:57:20 +0000
566+++ src/ca/client/tools/Makefile 2011-03-03 23:06:17 +0000
567@@ -8,7 +8,7 @@
568 # EPICS BASE is distributed subject to a Software License Agreement found
569 # in file LICENSE that is included with this distribution.
570 #*************************************************************************
571-TOP=../..
572+TOP=../../../..
573
574 include $(TOP)/configure/CONFIG
575
576
577=== added directory 'src/ca/legacy'
578=== renamed directory 'src/gdd' => 'src/ca/legacy/gdd'
579=== modified file 'src/ca/legacy/gdd/Makefile'
580--- src/gdd/Makefile 2010-10-12 16:27:17 +0000
581+++ src/ca/legacy/gdd/Makefile 2011-03-03 23:06:17 +0000
582@@ -7,7 +7,7 @@
583 # in file LICENSE that is included with this distribution.
584 #*************************************************************************
585
586-TOP=../..
587+TOP=../../../..
588
589 include $(TOP)/configure/CONFIG
590
591
592=== renamed directory 'src/cas' => 'src/ca/legacy/pcas'
593=== modified file 'src/ca/legacy/pcas/Makefile'
594--- src/cas/Makefile 2010-10-12 16:27:17 +0000
595+++ src/ca/legacy/pcas/Makefile 2011-03-03 23:06:17 +0000
596@@ -7,7 +7,7 @@
597 # in file LICENSE that is included with this distribution.
598 #*************************************************************************
599
600-TOP=../..
601+TOP=../../../..
602
603 include $(TOP)/configure/CONFIG
604
605
606=== modified file 'src/ca/legacy/pcas/build/Makefile'
607--- src/cas/build/Makefile 2010-10-29 17:15:48 +0000
608+++ src/ca/legacy/pcas/build/Makefile 2011-03-03 23:06:17 +0000
609@@ -7,10 +7,10 @@
610 # and higher are distributed subject to a Software License Agreement found
611 # in file LICENSE that is included with this distribution.
612 #*************************************************************************
613-TOP := ../../..
614-CAS := $(TOP)/src/cas
615+TOP := ../../../../..
616+CAS := $(TOP)/src/ca/legacy/pcas
617 SRC := $(CAS)/generic
618-CA := $(CAS)/../ca
619+CA := $(TOP)/src/ca/client
620 IOSRC := $(CAS)/io/bsdSocket
621 STSRC := $(SRC)/st
622
623
624=== renamed directory 'src/excas' => 'src/ca/legacy/pcas/ex'
625=== modified file 'src/ca/legacy/pcas/ex/Makefile'
626--- src/excas/Makefile 2010-10-12 16:27:17 +0000
627+++ src/ca/legacy/pcas/ex/Makefile 2011-03-03 23:06:17 +0000
628@@ -7,13 +7,13 @@
629 # in file LICENSE that is included with this distribution.
630 #*************************************************************************
631
632-TOP=../..
633+TOP=../../../../..
634
635 include $(TOP)/configure/CONFIG
636
637 PROD_LIBS += $(EPICS_BASE_HOST_LIBS)
638
639-SRC_DIRS += $(TOP)/src/makeBaseApp/top/caServerApp
640+SRC_DIRS += $(TOP)/src/template/base/top/caServerApp
641
642 #
643 # Added ws2_32 winmm user32 for the non-dll build
644
645=== modified file 'src/ca/legacy/pcas/example/Makefile'
646--- src/cas/example/Makefile 2003-04-01 19:59:46 +0000
647+++ src/ca/legacy/pcas/example/Makefile 2011-03-03 23:06:17 +0000
648@@ -8,7 +8,7 @@
649 # in file LICENSE that is included with this distribution.
650 #*************************************************************************
651
652-TOP=../../..
653+TOP=../../../../..
654
655 include $(TOP)/configure/CONFIG
656
657
658=== modified file 'src/ca/legacy/pcas/example/directoryService/Makefile'
659--- src/cas/example/directoryService/Makefile 2008-06-11 20:50:17 +0000
660+++ src/ca/legacy/pcas/example/directoryService/Makefile 2011-03-03 23:06:17 +0000
661@@ -8,7 +8,7 @@
662 # in file LICENSE that is included with this distribution.
663 #*************************************************************************
664
665-TOP=../../../..
666+TOP=../../../../../..
667
668 include $(TOP)/configure/CONFIG
669
670
671=== removed file 'src/dbStatic/dbStaticIoc.rc'
672--- src/dbStatic/dbStaticIoc.rc 2005-12-19 21:42:40 +0000
673+++ src/dbStatic/dbStaticIoc.rc 1970-01-01 00:00:00 +0000
674@@ -1,36 +0,0 @@
675-#include <Winver.h>
676-#include "epicsVersion.h"
677-
678-VS_VERSION_INFO VERSIONINFO
679- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
680- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
681- FILEFLAGSMASK 0x3fL
682-#ifdef _DEBUG
683- FILEFLAGS 0x1L
684-#else
685- FILEFLAGS 0x0L
686-#endif
687- FILEOS VOS__WINDOWS32
688- FILETYPE VFT_UNKNOWN
689- FILESUBTYPE 0x0L
690-BEGIN
691- BLOCK "StringFileInfo"
692- BEGIN
693- BLOCK "040904b0"
694- BEGIN
695- VALUE "Comments","Static Ioc Database Library for EPICS\0"
696- VALUE "CompanyName", "The EPICS collaboration\0"
697- VALUE "FileDescription", "Static Ioc Database Library\0"
698- VALUE "FileVersion", EPICS_VERSION_STRING "\0"
699- VALUE "InternalName", "dbStaticIoc\0"
700- VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
701- VALUE "OriginalFilename", "dbStaticIoc.dll\0"
702- VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
703- VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
704- END
705- END
706- BLOCK "VarFileInfo"
707- BEGIN
708- VALUE "Translation", 0x409, 1200
709- END
710-END
711
712=== removed file 'src/dbtools/dbtoolsIoc.rc'
713--- src/dbtools/dbtoolsIoc.rc 2005-12-19 21:42:40 +0000
714+++ src/dbtools/dbtoolsIoc.rc 1970-01-01 00:00:00 +0000
715@@ -1,36 +0,0 @@
716-#include <Winver.h>
717-#include "epicsVersion.h"
718-
719-VS_VERSION_INFO VERSIONINFO
720- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
721- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
722- FILEFLAGSMASK 0x3fL
723-#ifdef _DEBUG
724- FILEFLAGS 0x1L
725-#else
726- FILEFLAGS 0x0L
727-#endif
728- FILEOS VOS__WINDOWS32
729- FILETYPE VFT_UNKNOWN
730- FILESUBTYPE 0x0L
731-BEGIN
732- BLOCK "StringFileInfo"
733- BEGIN
734- BLOCK "040904b0"
735- BEGIN
736- VALUE "Comments","Ioc Database Tools Library for EPICS\0"
737- VALUE "CompanyName", "The EPICS collaboration\0"
738- VALUE "FileDescription", "Ioc Database Tools Library\0"
739- VALUE "FileVersion", EPICS_VERSION_STRING "\0"
740- VALUE "InternalName", "dbtoolsIoc\0"
741- VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
742- VALUE "OriginalFilename", "dbtoolsIoc.dll\0"
743- VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
744- VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
745- END
746- END
747- BLOCK "VarFileInfo"
748- BEGIN
749- VALUE "Translation", 0x409, 1200
750- END
751-END
752
753=== removed directory 'src/dev'
754=== removed file 'src/dev/Makefile'
755--- src/dev/Makefile 2010-10-12 16:27:17 +0000
756+++ src/dev/Makefile 1970-01-01 00:00:00 +0000
757@@ -1,18 +0,0 @@
758-#*************************************************************************
759-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
760-# National Laboratory.
761-# Copyright (c) 2002 The Regents of the University of California, as
762-# Operator of Los Alamos National Laboratory.
763-# EPICS BASE is distributed subject to a Software License Agreement found
764-# in file LICENSE that is included with this distribution.
765-#*************************************************************************
766-
767-TOP=../..
768-
769-include $(TOP)/configure/CONFIG
770-
771-DIRS += softDev
772-DIRS += testDev
773-
774-include $(TOP)/configure/RULES_DIRS
775-
776
777=== added directory 'src/ioc'
778=== added file 'src/ioc/Makefile'
779--- src/ioc/Makefile 1970-01-01 00:00:00 +0000
780+++ src/ioc/Makefile 2011-03-03 23:06:17 +0000
781@@ -0,0 +1,40 @@
782+#*************************************************************************
783+# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
784+# National Laboratory.
785+# Copyright (c) 2002 The Regents of the University of California, as
786+# Operator of Los Alamos National Laboratory.
787+# EPICS BASE is distributed subject to a Software License Agreement found
788+# in file LICENSE that is included with this distribution.
789+#*************************************************************************
790+TOP=../..
791+
792+include $(TOP)/configure/CONFIG
793+
794+SRC = $(TOP)/src
795+IOCDIR = $(SRC)/ioc
796+
797+LIBRARY_IOC += dbCore
798+dbCore_LIBS += ca Com
799+dbCore_SYS_LIBS_WIN32 += ws2_32
800+
801+dbCore_RCS += dbCore.rc
802+dbStaticHost_RCS = dbStaticHost.rc
803+
804+PROD_LIBS = Com
805+
806+include $(IOCDIR)/as/Makefile
807+include $(IOCDIR)/bpt/Makefile
808+include $(IOCDIR)/db/Makefile
809+include $(IOCDIR)/dbStatic/Makefile
810+include $(IOCDIR)/dbtemplate/Makefile
811+include $(IOCDIR)/misc/Makefile
812+include $(IOCDIR)/registry/Makefile
813+include $(IOCDIR)/rsrv/Makefile
814+
815+include $(TOP)/configure/RULES
816+
817+include $(IOCDIR)/dbStatic/RULES
818+include $(IOCDIR)/bpt/RULES
819+include $(IOCDIR)/db/RULES
820+include $(IOCDIR)/dbtemplate/RULES
821+
822
823=== renamed directory 'src/as' => 'src/ioc/as'
824=== modified file 'src/ioc/as/Makefile'
825--- src/as/Makefile 2010-10-12 16:27:17 +0000
826+++ src/ioc/as/Makefile 2011-03-03 23:06:17 +0000
827@@ -1,45 +1,27 @@
828 #*************************************************************************
829-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
830+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
831 # National Laboratory.
832+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
833+# Brookhaven National Lab.
834 # Copyright (c) 2002 The Regents of the University of California, as
835 # Operator of Los Alamos National Laboratory.
836 # EPICS BASE is distributed subject to a Software License Agreement found
837 # in file LICENSE that is included with this distribution.
838 #*************************************************************************
839-TOP=../..
840-include $(TOP)/configure/CONFIG
841-
842-INC += asLib.h
843+
844+# This is a Makefile fragment, see src/ioc/Makefile.
845+
846+SRC_DIRS += $(IOCDIR)/as
847+
848 INC += asDbLib.h
849 INC += asCa.h
850-INC += asTrapWrite.h
851 INC += asIocRegister.h
852
853-LIB_SRCS += asLib.c
854-LIB_SRCS += asTrapWrite.c
855-
856-asIoc_SRCS += asDbLib.c
857-asIoc_SRCS += asCa.c
858-asIoc_SRCS += asIocRegister.c
859-
860-LIBRARY_HOST = asHost
861-LIBRARY_IOC = asIoc
862-
863-asHost_LIBS = dbStaticHost ca Com
864-asIoc_LIBS = dbIoc dbStaticIoc ca Com
865-
866-asHost_RCS = asHost.rc
867-asIoc_RCS = asIoc.rc
868-
869-PROD_HOST = ascheck
870+dbCore_SRCS += asDbLib.c
871+dbCore_SRCS += asCa.c
872+dbCore_SRCS += asIocRegister.c
873+
874+PROD_HOST += ascheck
875 ascheck_SRCS = ascheck.c
876-PROD_LIBS = asHost dbStaticHost ca Com
877-
878-include $(TOP)/configure/RULES
879-
880-# Extra rule since asLib_lex.c is included by asLib.c
881-asLib$(OBJ): asLib_lex.c
882-
883-clean::
884- @$(RM) asLib.c asLib_lex.c
885+ascheck_LIBS = dbStaticHost
886
887
888=== renamed directory 'src/bpt' => 'src/ioc/bpt'
889=== modified file 'src/ioc/bpt/Makefile'
890--- src/bpt/Makefile 2010-10-12 16:27:17 +0000
891+++ src/ioc/bpt/Makefile 2011-03-03 23:06:17 +0000
892@@ -1,29 +1,27 @@
893 #*************************************************************************
894-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
895+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
896 # National Laboratory.
897 # Copyright (c) 2002 The Regents of the University of California, as
898 # Operator of Los Alamos National Laboratory.
899 # EPICS BASE is distributed subject to a Software License Agreement found
900 # in file LICENSE that is included with this distribution.
901 #*************************************************************************
902-TOP=../..
903-include $(TOP)/configure/CONFIG
904+
905+# This is a Makefile fragment, see src/ioc/Makefile.
906+
907+SRC_DIRS += $(IOCDIR)/bpt
908
909 INC += cvtTable.h
910
911 DBD += menuConvert.dbd
912 INC += menuConvert.h
913
914-DBD += bptTypeJdegC.dbd
915-DBD += bptTypeJdegF.dbd
916-DBD += bptTypeKdegC.dbd
917-DBD += bptTypeKdegF.dbd
918+BPT_DBD += bptTypeJdegC.dbd
919+BPT_DBD += bptTypeJdegF.dbd
920+BPT_DBD += bptTypeKdegC.dbd
921+BPT_DBD += bptTypeKdegF.dbd
922+DBD += $(BPT_DBD)
923
924-PROD_LIBS = Com
925 PROD_HOST += makeBpt
926 makeBpt_SRCS=makeBpt
927
928-include $(TOP)/configure/RULES
929-
930-$(COMMON_DBDS): $(TOOLS)/makeBpt$(HOSTEXE)
931-
932
933=== added file 'src/ioc/bpt/RULES'
934--- src/ioc/bpt/RULES 1970-01-01 00:00:00 +0000
935+++ src/ioc/bpt/RULES 2011-03-03 23:06:17 +0000
936@@ -0,0 +1,16 @@
937+#*************************************************************************
938+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
939+# National Laboratory.
940+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
941+# Brookhaven National Lab.
942+# Copyright (c) 2002 The Regents of the University of California, as
943+# Operator of Los Alamos National Laboratory.
944+# EPICS BASE is distributed subject to a Software License Agreement found
945+# in file LICENSE that is included with this distribution.
946+#*************************************************************************
947+
948+# This is a Makefile fragment, see src/ioc/Makefile.
949+
950+$(patsubst %,$(COMMON_DIR)/%,$(BPT_DBD)) : \
951+$(COMMON_DIR)/bpt%.dbd : $(call PATH_FILTER, $(TOOLS)/makeBpt$(HOSTEXE))
952+
953
954=== renamed directory 'src/db' => 'src/ioc/db'
955=== modified file 'src/ioc/db/Makefile'
956--- src/db/Makefile 2010-10-12 16:27:17 +0000
957+++ src/ioc/db/Makefile 2011-03-03 23:06:17 +0000
958@@ -1,16 +1,16 @@
959 #*************************************************************************
960-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
961+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
962 # National Laboratory.
963 # Copyright (c) 2002 The Regents of the University of California, as
964 # Operator of Los Alamos National Laboratory.
965 # EPICS BASE is distributed subject to a Software License Agreement found
966 # in file LICENSE that is included with this distribution.
967 #*************************************************************************
968-TOP=../..
969-include $(TOP)/configure/CONFIG
970-
971-# includes to install from this sub-project
972-#
973+
974+# This is a Makefile fragment, see src/ioc/Makefile.
975+
976+SRC_DIRS += $(IOCDIR)/db
977+
978 INC += callback.h
979 INC += dbAccess.h
980 INC += dbAccessDefs.h
981@@ -49,43 +49,28 @@
982 DBDINC += dbCommon
983 DBD+= menuGlobal.dbd
984
985-LIB_SRCS += dbLock.c
986-LIB_SRCS += dbAccess.c
987-LIB_SRCS += dbBkpt.c
988-LIB_SRCS += dbConvert.c
989-LIB_SRCS += dbFastLinkConv.c
990-LIB_SRCS += dbNotify.c
991-LIB_SRCS += dbScan.c
992-LIB_SRCS += dbEvent.c
993-LIB_SRCS += dbTest.c
994-LIB_SRCS += db_access.c
995-LIB_SRCS += db_test.c
996-LIB_SRCS += recGbl.c
997-LIB_SRCS += callback.c
998-LIB_SRCS += dbCa.c
999-LIB_SRCS += dbCaTest.c
1000-LIB_SRCS += initHooks.c
1001-LIB_SRCS += cvtBpt.c
1002-LIB_SRCS += dbContext.cpp
1003-LIB_SRCS += dbChannelIO.cpp
1004-LIB_SRCS += dbSubscriptionIO.cpp
1005-LIB_SRCS += dbPutNotifyBlocker.cpp
1006-LIB_SRCS += dbContextReadNotifyCache.cpp
1007-LIB_SRCS += templateInstances.cpp
1008-LIB_SRCS += dbIocRegister.c
1009-
1010-LIBRARY_IOC = dbIoc
1011-dbIoc_LIBS = dbStaticIoc ca Com
1012-
1013-dbIoc_RCS = dbIoc.rc
1014-
1015-include $(TOP)/configure/RULES
1016-
1017-dbCommon.h$(DEP): ../dbCommonRecord.dbd ../dbCommon.dbd
1018- @$(RM) $@
1019- @-$(MKMF) -m $@ .. $(COMMON_DIR)/dbCommon.h $<
1020-
1021-$(COMMON_DIR)/dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd
1022- $(RM) $@
1023- $(DBTORECORDTYPEH) -I .. $< $@
1024+dbCore_SRCS += dbLock.c
1025+dbCore_SRCS += dbAccess.c
1026+dbCore_SRCS += dbBkpt.c
1027+dbCore_SRCS += dbConvert.c
1028+dbCore_SRCS += dbFastLinkConv.c
1029+dbCore_SRCS += dbNotify.c
1030+dbCore_SRCS += dbScan.c
1031+dbCore_SRCS += dbEvent.c
1032+dbCore_SRCS += dbTest.c
1033+dbCore_SRCS += db_access.c
1034+dbCore_SRCS += db_test.c
1035+dbCore_SRCS += recGbl.c
1036+dbCore_SRCS += callback.c
1037+dbCore_SRCS += dbCa.c
1038+dbCore_SRCS += dbCaTest.c
1039+dbCore_SRCS += initHooks.c
1040+dbCore_SRCS += cvtBpt.c
1041+dbCore_SRCS += dbContext.cpp
1042+dbCore_SRCS += dbChannelIO.cpp
1043+dbCore_SRCS += dbSubscriptionIO.cpp
1044+dbCore_SRCS += dbPutNotifyBlocker.cpp
1045+dbCore_SRCS += dbContextReadNotifyCache.cpp
1046+dbCore_SRCS += templateInstances.cpp
1047+dbCore_SRCS += dbIocRegister.c
1048
1049
1050=== added file 'src/ioc/db/RULES'
1051--- src/ioc/db/RULES 1970-01-01 00:00:00 +0000
1052+++ src/ioc/db/RULES 2011-03-03 23:06:17 +0000
1053@@ -0,0 +1,28 @@
1054+#*************************************************************************
1055+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
1056+# National Laboratory.
1057+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
1058+# Brookhaven National Lab.
1059+# Copyright (c) 2002 The Regents of the University of California, as
1060+# Operator of Los Alamos National Laboratory.
1061+# EPICS BASE is distributed subject to a Software License Agreement found
1062+# in file LICENSE that is included with this distribution.
1063+#*************************************************************************
1064+
1065+# This is a Makefile fragment, see src/ioc/Makefile.
1066+
1067+$(filter-out $(STATIC_SRCS),$(dbCore_SRCS)) : $(COMMON_DIR)/dbCommon.h
1068+
1069+dbCommon.h$(DEP): $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/dbCommon.dbd
1070+ @$(RM) $@
1071+ @-$(MKMF) -m $@ ../db $(COMMON_DIR)/dbCommon.h $<
1072+
1073+$(COMMON_DIR)/dbCommon.h: $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/dbCommon.dbd
1074+ $(RM) $@
1075+ $(DBTORECORDTYPEH) -I ../db $< $@
1076+
1077+$(COMMON_DIR)/dbCommon.h: $(DBTORECORDTYPEH)
1078+
1079+$(patsubst %,$(COMMON_DIR)/%.h,$(DBDINC) menuConvert menuGlobal) : \
1080+$(COMMON_DIR)/%.h : $(DBTOMENUH)
1081+
1082
1083=== modified file 'src/ioc/db/test/Makefile'
1084--- src/db/test/Makefile 2010-09-29 21:00:46 +0000
1085+++ src/ioc/db/test/Makefile 2011-03-03 23:06:17 +0000
1086@@ -6,11 +6,11 @@
1087 # EPICS BASE is distributed subject to a Software License Agreement found
1088 # in the file LICENSE that is included with this distribution.
1089 #*************************************************************************
1090-TOP=../../..
1091+TOP=../../../..
1092
1093 include $(TOP)/configure/CONFIG
1094
1095-callbackTest_LIBS = dbIoc
1096+callbackTest_LIBS = dbCore
1097 callbackTest_LIBS_DEFAULT = dbStaticHost
1098 callbackTest_LIBS_vxWorks = dbStaticIoc
1099 callbackTest_LIBS_RTEMS = dbStaticIoc
1100
1101=== renamed file 'src/db/dbIoc.rc' => 'src/ioc/dbCore.rc'
1102--- src/db/dbIoc.rc 2005-12-19 21:42:40 +0000
1103+++ src/ioc/dbCore.rc 2011-03-03 23:06:17 +0000
1104@@ -18,13 +18,13 @@
1105 BEGIN
1106 BLOCK "040904b0"
1107 BEGIN
1108- VALUE "Comments","Database Library for EPICS\0"
1109+ VALUE "Comments","Database Core Library for EPICS\0"
1110 VALUE "CompanyName", "The EPICS collaboration\0"
1111- VALUE "FileDescription", "Database Library\0"
1112+ VALUE "FileDescription", "Database Core Library\0"
1113 VALUE "FileVersion", EPICS_VERSION_STRING "\0"
1114- VALUE "InternalName", "dbIoc\0"
1115- VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
1116- VALUE "OriginalFilename", "dbIoc.dll\0"
1117+ VALUE "InternalName", "dbCore\0"
1118+ VALUE "LegalCopyright", "Copyright (C) Univ. of California, UChicago Argonne LLC\0"
1119+ VALUE "OriginalFilename", "dbCore.dll\0"
1120 VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
1121 VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
1122 END
1123
1124=== renamed directory 'src/dbStatic' => 'src/ioc/dbStatic'
1125=== modified file 'src/ioc/dbStatic/Makefile'
1126--- src/dbStatic/Makefile 2010-10-12 16:27:17 +0000
1127+++ src/ioc/dbStatic/Makefile 2011-03-03 23:06:17 +0000
1128@@ -1,17 +1,16 @@
1129 #*************************************************************************
1130-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
1131+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
1132 # National Laboratory.
1133 # Copyright (c) 2002 The Regents of the University of California, as
1134 # Operator of Los Alamos National Laboratory.
1135 # EPICS BASE is distributed subject to a Software License Agreement found
1136 # in file LICENSE that is included with this distribution.
1137 #*************************************************************************
1138-TOP=../..
1139-
1140-include $(TOP)/configure/CONFIG
1141-
1142-INC += alarm.h
1143-INC += alarmString.h
1144+
1145+# This is a Makefile fragment, see src/ioc/Makefile.
1146+
1147+SRC_DIRS += $(IOCDIR)/dbStatic
1148+
1149 INC += dbBase.h
1150 INC += dbFldTypes.h
1151 INC += dbStaticLib.h
1152@@ -24,35 +23,34 @@
1153 INC += recSup.h
1154 INC += dbStaticIocRegister.h
1155
1156-LIBSRCS += dbStaticLib.c
1157-LIBSRCS += dbYacc.c
1158-LIBSRCS += dbPvdLib.c
1159-
1160+STATIC_SRCS += dbStaticLib.c
1161+STATIC_SRCS += dbYacc.c
1162+STATIC_SRCS += dbPvdLib.c
1163+
1164+dbCore_SRCS += $(STATIC_SRCS)
1165+dbCore_SRCS += dbStaticRun.c
1166+dbCore_SRCS += dbStaticIocRegister.c
1167+
1168+dbStaticHost_SRCS += $(STATIC_SRCS)
1169 dbStaticHost_SRCS += dbStaticNoRun.c
1170-dbStaticIoc_SRCS += dbStaticRun.c
1171-dbStaticIoc_SRCS += dbStaticIocRegister.c
1172
1173 LIBRARY_HOST += dbStaticHost
1174-LIBRARY_IOC += dbStaticIoc
1175
1176 dbStaticHost_LIBS = Com
1177-dbStaticIoc_LIBS = Com
1178-
1179-dbStaticHost_RCS = dbStaticHost.rc
1180-dbStaticIoc_RCS = dbStaticIoc.rc
1181-
1182-PROD_LIBS := dbStaticHost Com
1183-PROD_HOST = dbReadTest dbExpand dbToMenuH dbToRecordtypeH
1184+
1185+PROD_HOST += dbReadTest dbExpand dbToMenuH dbToRecordtypeH
1186
1187 dbReadTest_SRCS = dbReadTest.c
1188 dbExpand_SRCS = dbExpand.c
1189 dbToMenuH_SRCS = dbToMenuH.c
1190 dbToRecordtypeH_SRCS = dbToRecordtypeH.c
1191
1192-include $(TOP)/configure/RULES
1193-
1194-# Extra rule since dbLexRoutines.c is included in dbYacc.c
1195-dbYacc.c: dbLex.c ../dbLexRoutines.c
1196-
1197-clean::
1198- @$(RM) dbLex.c dbYacc.c
1199+# Include dbStaticHost objects directly in executables
1200+# because of a Circular dependency induced by a rule
1201+# $(INSTALL_LIBS): $(INSTALL_SHRLIBS)
1202+# in RULES_BUILD
1203+dbReadTest_SRCS += $(dbStaticHost_SRCS)
1204+dbExpand_SRCS += $(dbStaticHost_SRCS)
1205+dbToMenuH_SRCS += $(dbStaticHost_SRCS)
1206+dbToRecordtypeH_SRCS += $(dbStaticHost_SRCS)
1207+
1208
1209=== added file 'src/ioc/dbStatic/RULES'
1210--- src/ioc/dbStatic/RULES 1970-01-01 00:00:00 +0000
1211+++ src/ioc/dbStatic/RULES 2011-03-03 23:06:17 +0000
1212@@ -0,0 +1,16 @@
1213+#*************************************************************************
1214+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
1215+# National Laboratory.
1216+# Copyright (c) 2002 The Regents of the University of California, as
1217+# Operator of Los Alamos National Laboratory.
1218+# EPICS BASE is distributed subject to a Software License Agreement found
1219+# in file LICENSE that is included with this distribution.
1220+#*************************************************************************
1221+
1222+# This is a Makefile fragment, see src/ioc/Makefile.
1223+
1224+# dbLexRoutines.c is included in dbYacc.c
1225+dbYacc.c: dbLex.c $(IOCDIR)/dbStatic/dbLexRoutines.c
1226+
1227+clean::
1228+ @$(RM) dbLex.c dbYacc.c
1229
1230=== renamed file 'src/dbStatic/dbStaticHost.rc' => 'src/ioc/dbStaticHost.rc'
1231=== renamed directory 'src/dbtools' => 'src/ioc/dbtemplate'
1232=== modified file 'src/ioc/dbtemplate/Makefile'
1233--- src/dbtools/Makefile 2010-10-12 16:27:17 +0000
1234+++ src/ioc/dbtemplate/Makefile 2011-03-03 23:06:17 +0000
1235@@ -1,37 +1,21 @@
1236 #*************************************************************************
1237-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
1238+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
1239 # National Laboratory.
1240 # Copyright (c) 2002 The Regents of the University of California, as
1241 # Operator of Los Alamos National Laboratory.
1242 # EPICS BASE is distributed subject to a Software License Agreement found
1243 # in file LICENSE that is included with this distribution.
1244 #*************************************************************************
1245-TOP=../..
1246-
1247-include $(TOP)/configure/CONFIG
1248+
1249+# This is a Makefile fragment, see src/ioc/Makefile.
1250+
1251+SRC_DIRS += $(IOCDIR)/dbtemplate
1252
1253 INC += dbLoadTemplate.h
1254 INC += dbtoolsIocRegister.h
1255
1256-LIB_SRCS += dbLoadTemplate.c
1257-LIB_SRCS += dbtoolsIocRegister.c
1258-
1259-LIBRARY_IOC = dbtoolsIoc
1260-
1261-dbtoolsIoc_LIBS = dbIoc dbStaticIoc Com
1262-
1263-dbtoolsIoc_RCS = dbtoolsIoc.rc
1264-
1265-HTMLS += dbLoadTemplate.html
1266-
1267-include $(TOP)/configure/RULES
1268-
1269-#
1270-# These lex sources are included in some C sources,
1271-# so they have to be created in time:
1272-#
1273-dbLoadTemplate.c: dbLoadTemplate_lex.c ../dbLoadTemplate.h
1274-
1275-clean::
1276- @$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c
1277+dbCore_SRCS += dbLoadTemplate.c
1278+dbCore_SRCS += dbtoolsIocRegister.c
1279+
1280+HTMLS += dbtemplate/dbLoadTemplate.html
1281
1282
1283=== added file 'src/ioc/dbtemplate/RULES'
1284--- src/ioc/dbtemplate/RULES 1970-01-01 00:00:00 +0000
1285+++ src/ioc/dbtemplate/RULES 2011-03-03 23:06:17 +0000
1286@@ -0,0 +1,17 @@
1287+#*************************************************************************
1288+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
1289+# National Laboratory.
1290+# Copyright (c) 2002 The Regents of the University of California, as
1291+# Operator of Los Alamos National Laboratory.
1292+# EPICS BASE is distributed subject to a Software License Agreement found
1293+# in file LICENSE that is included with this distribution.
1294+#*************************************************************************
1295+
1296+# This is a Makefile fragment, see src/ioc/Makefile.
1297+
1298+# dbLoadTemplate_lex.c is included by dbLoadTemplate.c
1299+dbLoadTemplate.c: dbLoadTemplate_lex.c $(IOCDIR)/dbtemplate/dbLoadTemplate.h
1300+
1301+clean::
1302+ @$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c
1303+
1304
1305=== renamed directory 'src/misc' => 'src/ioc/misc'
1306=== modified file 'src/ioc/misc/Makefile'
1307--- src/misc/Makefile 2010-10-12 16:27:17 +0000
1308+++ src/ioc/misc/Makefile 2011-03-03 23:06:17 +0000
1309@@ -1,5 +1,5 @@
1310 #*************************************************************************
1311-# Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne
1312+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
1313 # National Laboratory.
1314 # Copyright (c) 2002 The Regents of the University of California, as
1315 # Operator of Los Alamos National Laboratory.
1316@@ -7,30 +7,22 @@
1317 # in file LICENSE that is included with this distribution.
1318 #*************************************************************************
1319
1320-TOP=../..
1321-include $(TOP)/configure/CONFIG
1322-
1323-DBD += base.dbd
1324+# This is a Makefile fragment, see src/ioc/Makefile.
1325+
1326+SRC_DIRS += $(IOCDIR)/misc
1327+
1328 DBD += system.dbd
1329 DBD += dlload.dbd
1330+DBD += dbCore.dbd
1331
1332 INC += epicsRelease.h
1333 INC += iocInit.h
1334 INC += miscIocRegister.h
1335 INC += iocshRegisterCommon.h
1336
1337-LIB_SRCS += epicsRelease.c
1338-LIB_SRCS += iocInit.c
1339-LIB_SRCS += asSubRecordFunctions.c
1340-LIB_SRCS += miscIocRegister.c
1341-LIB_SRCS += dlload.c
1342-LIB_SRCS += iocshRegisterCommon.c
1343-
1344-
1345-LIBRARY_IOC = miscIoc
1346-
1347-miscIoc_RCS = miscIoc.rc
1348-miscIoc_LIBS = rsrvIoc asIoc dbtoolsIoc dbIoc registryIoc dbStaticIoc ca Com
1349-
1350-include $(TOP)/configure/RULES
1351+dbCore_SRCS += epicsRelease.c
1352+dbCore_SRCS += iocInit.c
1353+dbCore_SRCS += miscIocRegister.c
1354+dbCore_SRCS += dlload.c
1355+dbCore_SRCS += iocshRegisterCommon.c
1356
1357
1358=== added file 'src/ioc/misc/dbCore.dbd'
1359--- src/ioc/misc/dbCore.dbd 1970-01-01 00:00:00 +0000
1360+++ src/ioc/misc/dbCore.dbd 2011-03-03 23:06:17 +0000
1361@@ -0,0 +1,14 @@
1362+# dbCore.dbd
1363+#
1364+# $Revision-Id$
1365+#
1366+# This file provides iocsh access to variables that control some lesser-used
1367+# and debugging features of the IOC database code.
1368+
1369+# Access security subroutines
1370+variable(asCaDebug,int)
1371+
1372+# Static database access variables
1373+variable(dbRecordsOnceOnly,int)
1374+variable(dbBptNotMonotonic,int)
1375+
1376
1377=== renamed directory 'src/registry' => 'src/ioc/registry'
1378=== modified file 'src/ioc/registry/Makefile'
1379--- src/registry/Makefile 2010-10-12 16:27:17 +0000
1380+++ src/ioc/registry/Makefile 2011-03-03 23:06:17 +0000
1381@@ -1,14 +1,15 @@
1382 #*************************************************************************
1383-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
1384+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
1385 # National Laboratory.
1386 # Copyright (c) 2002 The Regents of the University of California, as
1387 # Operator of Los Alamos National Laboratory.
1388 # EPICS BASE is distributed subject to a Software License Agreement found
1389 # in file LICENSE that is included with this distribution.
1390 #*************************************************************************
1391-TOP=../..
1392-
1393-include $(TOP)/configure/CONFIG
1394+
1395+# This is a Makefile fragment, see src/ioc/Makefile.
1396+
1397+SRC_DIRS += $(IOCDIR)/registry
1398
1399 INC += registryRecordType.h
1400 INC += registryDeviceSupport.h
1401@@ -17,19 +18,12 @@
1402 INC += registryCommon.h
1403 INC += registryIocRegister.h
1404
1405-SCRIPTS_HOST += registerRecordDeviceDriver.pl
1406-
1407-LIB_SRCS += registryRecordType.c
1408-LIB_SRCS += registryDeviceSupport.c
1409-LIB_SRCS += registryDriverSupport.c
1410-LIB_SRCS += registryFunction.c
1411-LIB_SRCS += registryCommon.c
1412-LIB_SRCS += registryIocRegister.c
1413-
1414-LIBRARY_IOC = registryIoc
1415-registryIoc_LIBS = dbStaticIoc Com
1416-
1417-registryIoc_RCS = registryIoc.rc
1418-
1419-include $(TOP)/configure/RULES
1420+SCRIPTS_HOST += registry/registerRecordDeviceDriver.pl
1421+
1422+dbCore_SRCS += registryRecordType.c
1423+dbCore_SRCS += registryDeviceSupport.c
1424+dbCore_SRCS += registryDriverSupport.c
1425+dbCore_SRCS += registryFunction.c
1426+dbCore_SRCS += registryCommon.c
1427+dbCore_SRCS += registryIocRegister.c
1428
1429
1430=== renamed directory 'src/rsrv' => 'src/ioc/rsrv'
1431=== modified file 'src/ioc/rsrv/Makefile'
1432--- src/rsrv/Makefile 2010-10-12 16:27:17 +0000
1433+++ src/ioc/rsrv/Makefile 2011-03-03 23:06:17 +0000
1434@@ -1,33 +1,28 @@
1435 #*************************************************************************
1436-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
1437+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
1438 # National Laboratory.
1439 # Copyright (c) 2002 The Regents of the University of California, as
1440 # Operator of Los Alamos National Laboratory.
1441 # EPICS BASE is distributed subject to a Software License Agreement found
1442 # in file LICENSE that is included with this distribution.
1443 #*************************************************************************
1444-TOP=../..
1445-
1446-include $(TOP)/configure/CONFIG
1447-
1448-USR_INCLUDES = -I../../ca
1449+
1450+# This is a Makefile fragment, see src/ioc/Makefile.
1451+
1452+SRC_DIRS += $(IOCDIR)/rsrv
1453+
1454+# These need access to net_convert.h from the CA client
1455+caserverio_INCLUDES = -I$(SRC)/ca/client
1456+camessage_INCLUDES = -I$(SRC)/ca/client
1457
1458 INC += rsrv.h
1459 INC += rsrvIocRegister.h
1460
1461-LIB_SRCS += caserverio.c
1462-LIB_SRCS += caservertask.c
1463-LIB_SRCS += camsgtask.c
1464-LIB_SRCS += camessage.c
1465-LIB_SRCS += cast_server.c
1466-LIB_SRCS += online_notify.c
1467-LIB_SRCS += rsrvIocRegister.c
1468-
1469-LIBRARY_IOC = rsrvIoc
1470-
1471-rsrvIoc_LIBS = asIoc dbIoc ca Com
1472-
1473-rsrvIoc_SYS_LIBS_WIN32 := ws2_32
1474-rsrvIoc_RCS = rsrvIoc.rc
1475-
1476-include $(TOP)/configure/RULES
1477+dbCore_SRCS += caserverio.c
1478+dbCore_SRCS += caservertask.c
1479+dbCore_SRCS += camsgtask.c
1480+dbCore_SRCS += camessage.c
1481+dbCore_SRCS += cast_server.c
1482+dbCore_SRCS += online_notify.c
1483+dbCore_SRCS += rsrvIocRegister.c
1484+
1485
1486=== modified file 'src/libCom/Makefile'
1487--- src/libCom/Makefile 2010-10-12 16:27:17 +0000
1488+++ src/libCom/Makefile 2011-03-03 23:06:17 +0000
1489@@ -1,5 +1,5 @@
1490 #*************************************************************************
1491-# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
1492+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
1493 # National Laboratory.
1494 # Copyright (c) 2002 The Regents of the University of California, as
1495 # Operator of Los Alamos National Laboratory.
1496@@ -9,318 +9,48 @@
1497 TOP = ../..
1498 include $(TOP)/configure/CONFIG
1499
1500-LIBCOM = $(TOP)/src/libCom
1501-
1502-# Command-line input support
1503-epicsReadline_CFLAGS += -DEPICS_COMMANDLINE_LIBRARY=EPICS_COMMANDLINE_LIBRARY_$(COMMANDLINE_LIBRARY)
1504-epicsReadline_INCLUDES += $(INCLUDES_$(COMMANDLINE_LIBRARY))
1505-
1506-#POSIX thread priority scheduling flag
1507-THREAD_CPPFLAGS_NO += -DDONT_USE_POSIX_THREAD_PRIORITY_SCHEDULING
1508-osdThread_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING))
1509-
1510-#epicsVersion is created by this Makefile
1511-INC += epicsVersion.h
1512-
1513-SRC_DIRS += $(LIBCOM)/bucketLib
1514-INC += bucketLib.h
1515-SRCS += bucketLib.c
1516-
1517-SRC_DIRS += $(LIBCOM)/ring
1518-#following needed for locating epicsRingPointer.h and epicsRingBytes.h
1519-INC += epicsRingPointer.h
1520-INC += epicsRingBytes.h
1521-SRCS += epicsRingPointer.cpp
1522-SRCS += epicsRingBytes.c
1523-
1524-SRC_DIRS += $(LIBCOM)/calc
1525-INC += postfix.h
1526-SRCS += postfix.c
1527-SRCS += calcPerform.c
1528-
1529-SRC_DIRS += $(LIBCOM)/cvtFast
1530-INC += cvtFast.h
1531-SRCS += cvtFast.c
1532-
1533-# From cppStd
1534-SRC_DIRS += $(LIBCOM)/cppStd
1535-INC += epicsAlgorithm.h
1536-INC += epicsExcept.h
1537-INC += epicsMemory.h
1538-
1539-# From cxxTemplates
1540-SRC_DIRS += $(LIBCOM)/cxxTemplates
1541-INC += resourceLib.h
1542-INC += tsDLList.h
1543-INC += tsSLList.h
1544-INC += tsMinMax.h
1545-INC += tsBTree.h
1546-INC += tsFreeList.h
1547-INC += epicsSingleton.h
1548-INC += epicsGuard.h
1549-INC += epicsOnce.h
1550-SRCS += resourceLib.cpp
1551-SRCS += epicsOnce.cpp
1552-SRCS += epicsSingletonMutex.cpp
1553-
1554-SRC_DIRS += $(LIBCOM)/dbmf
1555-INC += dbmf.h
1556-SRCS += dbmf.c
1557-
1558-SRC_DIRS += $(LIBCOM)/ellLib
1559-INC += ellLib.h
1560-SRCS += ellLib.c
1561-
1562-SRC_DIRS += $(LIBCOM)/env
1563-INC += envDefs.h
1564-SRCS += envSubr.c
1565-SRCS += envData.c
1566-
1567-SRC_DIRS += $(LIBCOM)/error
1568-INC += epicsPrint.h
1569-INC += errMdef.h
1570-INC += errSymTbl.h
1571-INC += errlog.h
1572-INC += error.h
1573-SRCS += errlog.c
1574-SRCS += errSymLib.c
1575-SRCS += errSymTbl.c
1576-
1577-SRC_DIRS += $(LIBCOM)/fdmgr
1578-INC += fdManager.h
1579-INC += fdmgr.h
1580-SRCS += fdmgr.cpp
1581-SRCS += fdManager.cpp
1582-
1583-SRC_DIRS += $(LIBCOM)/freeList
1584-INC += freeList.h
1585-SRCS += freeListLib.c
1586-HTMLS += freeList/freeList.html
1587-
1588-SRC_DIRS += $(LIBCOM)/gpHash
1589-INC += gpHash.h
1590-SRCS += gpHashLib.c
1591-HTMLS += gpHash/gpHash.html
1592-
1593-SRC_DIRS += $(LIBCOM)/iocsh
1594-INC += iocsh.h
1595-INC += registry.h
1596-INC += libComRegister.h
1597-SRCS += iocsh.cpp
1598-SRCS += registry.c
1599-SRCS += libComRegister.c
1600-
1601-SRC_DIRS += $(LIBCOM)/logClient
1602-INC += iocLog.h
1603-INC += logClient.h
1604-SRCS += iocLog.c
1605-SRCS += logClient.c
1606-
1607-SRC_DIRS += $(LIBCOM)/macLib
1608-INC += macLib.h
1609-SRCS += macCore.c
1610-SRCS += macEnv.c
1611-SRCS += macUtil.c
1612-
1613-SRC_DIRS += $(LIBCOM)/misc
1614-INC += adjustment.h
1615-INC += cantProceed.h
1616-INC += dbDefs.h
1617-INC += epicsConvert.h
1618-INC += epicsExit.h
1619-INC += epicsStdlib.h
1620-INC += epicsString.h
1621-INC += epicsTypes.h
1622-INC += shareLib.h
1623-INC += epicsExport.h
1624-INC += unixFileName.h
1625-INC += locationException.h
1626-INC += ipAddrToAsciiAsynchronous.h
1627-INC += compilerDependencies.h
1628-INC += epicsUnitTest.h
1629-INC += testMain.h
1630-SRCS += aToIPAddr.c
1631-SRCS += adjustment.c
1632-SRCS += cantProceed.c
1633-SRCS += epicsConvert.c
1634-SRCS += epicsExit.c
1635-SRCS += epicsStdlib.c
1636-SRCS += epicsString.c
1637-SRCS += truncateFile.c
1638-SRCS += ipAddrToAsciiAsynchronous.cpp
1639-SRCS += epicsUnitTest.c
1640-
1641-# From osi
1642-SRC_DIRS += $(LIBCOM)/osi
1643-INC += osiFileName.h
1644-INC += osiSock.h
1645-INC += osdSock.h
1646-INC += epicsInterrupt.h
1647-INC += osdInterrupt.h
1648-
1649-INC += epicsMutex.h
1650-INC += osdMutex.h
1651-INC += epicsEvent.h
1652-INC += osdEvent.h
1653-INC += epicsMath.h
1654-INC += osdMessageQueue.h
1655-INC += osdStrtod.h
1656-
1657-INC += epicsAssert.h
1658-INC += epicsFindSymbol.h
1659-INC += osiPoolStatus.h
1660-INC += osdPoolStatus.h
1661-INC += osdThread.h
1662-
1663-INC += epicsThread.h
1664-INC += epicsTime.h
1665-INC += epicsGeneralTime.h
1666-INC += osdTime.h
1667-INC += generalTimeSup.h
1668-INC += osiClockTime.h
1669-INC += epicsSignal.h
1670-INC += osiProcess.h
1671-INC += osiUnistd.h
1672-INC += osiWireFormat.h
1673-INC += osdWireFormat.h
1674-INC += osdWireConfig.h
1675-INC += epicsEndian.h
1676-INC += epicsReadline.h
1677-INC += epicsMessageQueue.h
1678-INC += epicsStdio.h
1679-INC += epicsStdioRedirect.h
1680-INC += epicsGetopt.h
1681-
1682-INC += devLib.h
1683-INC += devLibVME.h
1684-INC += devLibVMEImpl.h
1685-INC += osdVME.h
1686-
1687-SRCS += epicsThread.cpp
1688-SRCS += epicsMutex.cpp
1689-SRCS += epicsEvent.cpp
1690-SRCS += epicsTime.cpp
1691-SRCS += epicsMessageQueue.cpp
1692-SRCS += epicsMath.cpp
1693-
1694-SRCS += epicsGeneralTime.c
1695-SRCS += osiClockTime.c
1696-
1697-SRCS += osdSock.c
1698-SRCS += osdSockAddrReuse.cpp
1699-SRCS += osiSock.c
1700-SRCS += systemCallIntMech.cpp
1701-SRCS += epicsSocketConvertErrnoToString.cpp
1702-SRCS += osdAssert.c
1703-SRCS += osdFindSymbol.c
1704-SRCS += osdInterrupt.c
1705-SRCS += osdPoolStatus.c
1706-SRCS += osdSignal.cpp
1707-SRCS += osdEnv.c
1708-SRCS += epicsReadline.c
1709-SRCS += epicsTempFile.cpp
1710-SRCS += epicsStdio.c
1711-SRCS += osdStdio.c
1712-
1713-osdEnv_CFLAGS_WIN32= -U__STDC__
1714-
1715-SRCS += osdThread.c
1716-SRCS += osdMutex.c
1717-SRCS += osdEvent.c
1718-SRCS += osdTime.cpp
1719-SRCS += osdProcess.c
1720-SRCS += osdNetIntf.c
1721-SRCS += osdMessageQueue.c
1722-
1723-SRCS += devLibVME.c
1724-SRCS += devLibVMEOSD.c
1725-
1726-SRC_DIRS += $(LIBCOM)/taskwd
1727-INC += taskwd.h
1728-SRCS += taskwd.c
1729-
1730-SRC_DIRS += $(LIBCOM)/timer
1731-INC += epicsTimer.h
1732-SRCS += epicsTimer.cpp
1733-SRCS += timer.cpp
1734-SRCS += timerQueue.cpp
1735-SRCS += timerQueueActive.cpp
1736-SRCS += timerQueueActiveMgr.cpp
1737-SRCS += timerQueuePassive.cpp
1738-
1739-#tsDefs contains R3.13 compatibility tsStamp code
1740-SRC_DIRS += $(LIBCOM)/tsDefs
1741-INC += tsDefs.h
1742-SRCS += tsDefs.c
1743-
1744-# Time providers, in osi
1745-SRCS_vxWorks += osiNTPTime.c
1746-SRCS_RTEMS += osiNTPTime.c
1747-
1748-# These files are in osi/os/vxWorks
1749-# Special reboot hook
1750-SRCS_vxWorks += atReboot.cpp
1751-# For old vxWorks applications
1752-INC_vxWorks += camacLib.h
1753-INC_vxWorks += epicsDynLink.h
1754-INC_vxWorks += module_types.h
1755-INC_vxWorks += task_params.h
1756-SRCS_vxWorks += epicsDynLink.c
1757-SRCS_vxWorks += veclist.c
1758-SRCS_vxWorks += logMsgToErrlog.cpp
1759-
1760-#This forces the vxWorks compatibility stuff to be loaded
1761-OBJS_vxWorks = vxComLibrary
1762-
1763-# These files are in osi/os/WIN32
1764-SRCS_WIN32 += epicsGetopt.c
1765-SRCS_WIN32 += setThreadName.cpp
1766-#SRCS_WIN32 += dllmain.cpp
1767-SRCS_WIN32 += forceBadAllocException.cpp
1768-
1769-# Library to build:
1770-# lib$(LIBRARY).a or ..dll/..exp/..lib
1771-#
1772+SRC = $(TOP)/src
1773+LIBCOM = $(SRC)/libCom
1774+
1775+include $(LIBCOM)/as/Makefile
1776+include $(LIBCOM)/bucketLib/Makefile
1777+include $(LIBCOM)/calc/Makefile
1778+include $(LIBCOM)/cvtFast/Makefile
1779+include $(LIBCOM)/cppStd/Makefile
1780+include $(LIBCOM)/cxxTemplates/Makefile
1781+include $(LIBCOM)/dbmf/Makefile
1782+include $(LIBCOM)/ellLib/Makefile
1783+include $(LIBCOM)/env/Makefile
1784+include $(LIBCOM)/error/Makefile
1785+include $(LIBCOM)/fdmgr/Makefile
1786+include $(LIBCOM)/flex/Makefile
1787+include $(LIBCOM)/freeList/Makefile
1788+include $(LIBCOM)/gpHash/Makefile
1789+include $(LIBCOM)/iocsh/Makefile
1790+include $(LIBCOM)/log/Makefile
1791+include $(LIBCOM)/macLib/Makefile
1792+include $(LIBCOM)/misc/Makefile
1793+include $(LIBCOM)/osi/Makefile
1794+include $(LIBCOM)/ring/Makefile
1795+include $(LIBCOM)/taskwd/Makefile
1796+include $(LIBCOM)/timer/Makefile
1797+include $(LIBCOM)/tsDefs/Makefile
1798+include $(LIBCOM)/yacc/Makefile
1799+
1800+# Library to build:
1801 LIBRARY=Com
1802
1803 Com_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
1804
1805 Com_RCS = Com.rc
1806
1807-# libs needed for PROD and TESTPRODUCT
1808-PROD_LIBS = Com
1809-PROD_SYS_LIBS_WIN32 = ws2_32 advapi32
1810-
1811-# for bldErrSymTbl:
1812-#
1813-ERR_S_FILES += $(TOP)/src/libCom/osi/devLib.h
1814-ERR_S_FILES += $(TOP)/src/as/asLib.h
1815-ERR_S_FILES += $(TOP)/src/db/dbAccessDefs.h
1816-ERR_S_FILES += $(TOP)/src/dbStatic/devSup.h
1817-ERR_S_FILES += $(TOP)/src/dbStatic/drvSup.h
1818-ERR_S_FILES += $(TOP)/src/dbStatic/recSup.h
1819-ERR_S_FILES += $(TOP)/src/dbStatic/dbStaticLib.h
1820-ERR_S_FILES += $(LIBCOM)/error/errMdef.h
1821-ERR_S_FILES += $(TOP)/src/cas/generic/casdef.h
1822-ERR_S_FILES += $(TOP)/src/gdd/gddAppFuncTable.h
1823-
1824 include $(TOP)/configure/RULES
1825
1826-osdAssert$(OBJ): $(COMMON_DIR)/epicsVersion.h
1827-epicsTime$(OBJ): $(COMMON_DIR)/epicsVersion.h
1828-osdNetIntf$(OBJ): $(COMMON_DIR)/epicsVersion.h
1829-osdSock$(OBJ): $(COMMON_DIR)/epicsVersion.h
1830-
1831-envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \
1832- $(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV
1833- $(PERL) $(LIBCOM)/env/bldEnvData.pl $(CONFIG)
1834-
1835-errSymTbl.c: $(ERR_S_FILES) $(LIBCOM)/error/makeStatTbl.pl
1836- $(PERL) $(LIBCOM)/error/makeStatTbl.pl $(ERR_S_FILES)
1837-
1838-$(COMMON_DIR)/epicsVersion.h: $(CONFIG)/CONFIG_BASE_VERSION $(CONFIG)/CONFIG_SITE
1839- $(PERL) $(LIBCOM)/misc/makeEpicsVersion.pl $(CONFIG)/CONFIG_BASE_VERSION $(@D) $(EPICS_SITE_VERSION)
1840-
1841-clean::
1842- @$(RM) errSymTbl.c envData.c
1843+include $(LIBCOM)/as/RULES
1844+include $(LIBCOM)/env/RULES
1845+include $(LIBCOM)/error/RULES
1846+include $(LIBCOM)/flex/RULES
1847+include $(LIBCOM)/log/RULES
1848+include $(LIBCOM)/misc/RULES
1849+include $(LIBCOM)/osi/RULES
1850
1851
1852=== renamed directory 'src/RTEMS' => 'src/libCom/RTEMS'
1853=== modified file 'src/libCom/RTEMS/Makefile'
1854--- src/RTEMS/Makefile 2010-11-17 22:55:22 +0000
1855+++ src/libCom/RTEMS/Makefile 2011-03-03 23:06:17 +0000
1856@@ -6,7 +6,7 @@
1857 # EPICS BASE is distributed subject to a Software License Agreement found
1858 # in file LICENSE that is included with this distribution.
1859 #*************************************************************************
1860-TOP=../..
1861+TOP=../../..
1862 include $(TOP)/configure/CONFIG
1863
1864 INC += epicsRtemsInitHooks.h
1865
1866=== added directory 'src/libCom/as'
1867=== added file 'src/libCom/as/Makefile'
1868--- src/libCom/as/Makefile 1970-01-01 00:00:00 +0000
1869+++ src/libCom/as/Makefile 2011-03-03 23:06:17 +0000
1870@@ -0,0 +1,21 @@
1871+#*************************************************************************
1872+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
1873+# Brookhaven National Lab.
1874+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
1875+# National Laboratory.
1876+# Copyright (c) 2002 The Regents of the University of California, as
1877+# Operator of Los Alamos National Laboratory.
1878+# EPICS BASE is distributed subject to a Software License Agreement found
1879+# in file LICENSE that is included with this distribution.
1880+#************************************************************************
1881+
1882+# This is a Makefile fragment, see src/libCom/Makefile.
1883+
1884+SRC_DIRS += $(LIBCOM)/as
1885+
1886+INC += asLib.h
1887+INC += asTrapWrite.h
1888+
1889+LIB_SRCS += asLib.c
1890+LIB_SRCS += asTrapWrite.c
1891+
1892
1893=== added file 'src/libCom/as/RULES'
1894--- src/libCom/as/RULES 1970-01-01 00:00:00 +0000
1895+++ src/libCom/as/RULES 2011-03-03 23:06:17 +0000
1896@@ -0,0 +1,22 @@
1897+#*************************************************************************
1898+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
1899+# Brookhaven National Lab.
1900+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
1901+# National Laboratory.
1902+# Copyright (c) 2002 The Regents of the University of California, as
1903+# Operator of Los Alamos National Laboratory.
1904+# EPICS BASE is distributed subject to a Software License Agreement found
1905+# in file LICENSE that is included with this distribution.
1906+#************************************************************************
1907+
1908+# This is a Makefile fragment, see src/libCom/Makefile.
1909+
1910+# Extra rule since asLib_lex.c is included by asLib.c
1911+asLib$(OBJ): asLib_lex.c
1912+
1913+# Ensure that lexer and parser are built before they are needed
1914+asLib.c: $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE))
1915+asLib_lex.c: $(call PATH_FILTER, $(TOOLS)/e_flex$(HOSTEXE))
1916+
1917+clean::
1918+ @$(RM) asLib.c asLib_lex.c
1919
1920=== renamed file 'src/as/asLib.h' => 'src/libCom/as/asLib.h'
1921=== renamed file 'src/as/asLib.y' => 'src/libCom/as/asLib.y'
1922=== renamed file 'src/as/asLibRoutines.c' => 'src/libCom/as/asLibRoutines.c'
1923=== renamed file 'src/as/asLib_lex.l' => 'src/libCom/as/asLib_lex.l'
1924=== renamed file 'src/as/asTrapWrite.c' => 'src/libCom/as/asTrapWrite.c'
1925=== renamed file 'src/as/asTrapWrite.h' => 'src/libCom/as/asTrapWrite.h'
1926=== added file 'src/libCom/bucketLib/Makefile'
1927--- src/libCom/bucketLib/Makefile 1970-01-01 00:00:00 +0000
1928+++ src/libCom/bucketLib/Makefile 2011-03-03 23:06:17 +0000
1929@@ -0,0 +1,12 @@
1930+#*************************************************************************
1931+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
1932+# National Laboratory.
1933+# EPICS BASE is distributed subject to a Software License Agreement found
1934+# in file LICENSE that is included with this distribution.
1935+#*************************************************************************
1936+
1937+# This is a Makefile fragment, see src/libCom/Makefile.
1938+
1939+SRC_DIRS += $(LIBCOM)/bucketLib
1940+INC += bucketLib.h
1941+Com_SRCS += bucketLib.c
1942
1943=== added file 'src/libCom/calc/Makefile'
1944--- src/libCom/calc/Makefile 1970-01-01 00:00:00 +0000
1945+++ src/libCom/calc/Makefile 2011-03-03 23:06:17 +0000
1946@@ -0,0 +1,14 @@
1947+#*************************************************************************
1948+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
1949+# National Laboratory.
1950+# EPICS BASE is distributed subject to a Software License Agreement found
1951+# in file LICENSE that is included with this distribution.
1952+#*************************************************************************
1953+
1954+# This is a Makefile fragment, see src/libCom/Makefile.
1955+
1956+SRC_DIRS += $(LIBCOM)/calc
1957+INC += postfix.h
1958+Com_SRCS += postfix.c
1959+Com_SRCS += calcPerform.c
1960+
1961
1962=== added file 'src/libCom/cppStd/Makefile'
1963--- src/libCom/cppStd/Makefile 1970-01-01 00:00:00 +0000
1964+++ src/libCom/cppStd/Makefile 2011-03-03 23:06:17 +0000
1965@@ -0,0 +1,14 @@
1966+#*************************************************************************
1967+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
1968+# National Laboratory.
1969+# EPICS BASE is distributed subject to a Software License Agreement found
1970+# in file LICENSE that is included with this distribution.
1971+#*************************************************************************
1972+
1973+# This is a Makefile fragment, see src/libCom/Makefile.
1974+
1975+SRC_DIRS += $(LIBCOM)/cppStd
1976+INC += epicsAlgorithm.h
1977+INC += epicsExcept.h
1978+INC += epicsMemory.h
1979+
1980
1981=== added file 'src/libCom/cvtFast/Makefile'
1982--- src/libCom/cvtFast/Makefile 1970-01-01 00:00:00 +0000
1983+++ src/libCom/cvtFast/Makefile 2011-03-03 23:06:17 +0000
1984@@ -0,0 +1,13 @@
1985+#*************************************************************************
1986+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
1987+# National Laboratory.
1988+# EPICS BASE is distributed subject to a Software License Agreement found
1989+# in file LICENSE that is included with this distribution.
1990+#*************************************************************************
1991+
1992+# This is a Makefile fragment, see src/libCom/Makefile.
1993+
1994+SRC_DIRS += $(LIBCOM)/cvtFast
1995+INC += cvtFast.h
1996+Com_SRCS += cvtFast.c
1997+
1998
1999=== added file 'src/libCom/cxxTemplates/Makefile'
2000--- src/libCom/cxxTemplates/Makefile 1970-01-01 00:00:00 +0000
2001+++ src/libCom/cxxTemplates/Makefile 2011-03-03 23:06:17 +0000
2002@@ -0,0 +1,23 @@
2003+#*************************************************************************
2004+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2005+# National Laboratory.
2006+# EPICS BASE is distributed subject to a Software License Agreement found
2007+# in file LICENSE that is included with this distribution.
2008+#*************************************************************************
2009+
2010+# This is a Makefile fragment, see src/libCom/Makefile.
2011+
2012+SRC_DIRS += $(LIBCOM)/cxxTemplates
2013+INC += resourceLib.h
2014+INC += tsDLList.h
2015+INC += tsSLList.h
2016+INC += tsMinMax.h
2017+INC += tsBTree.h
2018+INC += tsFreeList.h
2019+INC += epicsSingleton.h
2020+INC += epicsGuard.h
2021+INC += epicsOnce.h
2022+Com_SRCS += resourceLib.cpp
2023+Com_SRCS += epicsOnce.cpp
2024+Com_SRCS += epicsSingletonMutex.cpp
2025+
2026
2027=== added file 'src/libCom/dbmf/Makefile'
2028--- src/libCom/dbmf/Makefile 1970-01-01 00:00:00 +0000
2029+++ src/libCom/dbmf/Makefile 2011-03-03 23:06:17 +0000
2030@@ -0,0 +1,13 @@
2031+#*************************************************************************
2032+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2033+# National Laboratory.
2034+# EPICS BASE is distributed subject to a Software License Agreement found
2035+# in file LICENSE that is included with this distribution.
2036+#*************************************************************************
2037+
2038+# This is a Makefile fragment, see src/libCom/Makefile.
2039+
2040+SRC_DIRS += $(LIBCOM)/dbmf
2041+INC += dbmf.h
2042+Com_SRCS += dbmf.c
2043+
2044
2045=== added file 'src/libCom/ellLib/Makefile'
2046--- src/libCom/ellLib/Makefile 1970-01-01 00:00:00 +0000
2047+++ src/libCom/ellLib/Makefile 2011-03-03 23:06:17 +0000
2048@@ -0,0 +1,12 @@
2049+#*************************************************************************
2050+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2051+# National Laboratory.
2052+# EPICS BASE is distributed subject to a Software License Agreement found
2053+# in file LICENSE that is included with this distribution.
2054+#*************************************************************************
2055+
2056+# This is a Makefile fragment, see src/libCom/Makefile.
2057+
2058+SRC_DIRS += $(LIBCOM)/ellLib
2059+INC += ellLib.h
2060+Com_SRCS += ellLib.c
2061
2062=== added file 'src/libCom/env/Makefile'
2063--- src/libCom/env/Makefile 1970-01-01 00:00:00 +0000
2064+++ src/libCom/env/Makefile 2011-03-03 23:06:17 +0000
2065@@ -0,0 +1,16 @@
2066+#*************************************************************************
2067+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2068+# National Laboratory.
2069+# EPICS BASE is distributed subject to a Software License Agreement found
2070+# in file LICENSE that is included with this distribution.
2071+#*************************************************************************
2072+
2073+# This is a Makefile fragment, see src/libCom/Makefile.
2074+
2075+SRC_DIRS += $(LIBCOM)/env
2076+
2077+INC += envDefs.h
2078+
2079+Com_SRCS += envSubr.c
2080+Com_SRCS += envData.c
2081+
2082
2083=== added file 'src/libCom/env/RULES'
2084--- src/libCom/env/RULES 1970-01-01 00:00:00 +0000
2085+++ src/libCom/env/RULES 2011-03-03 23:06:17 +0000
2086@@ -0,0 +1,15 @@
2087+#*************************************************************************
2088+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2089+# National Laboratory.
2090+# EPICS BASE is distributed subject to a Software License Agreement found
2091+# in file LICENSE that is included with this distribution.
2092+#*************************************************************************
2093+
2094+# This is a Makefile fragment, see src/libCom/Makefile.
2095+
2096+envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \
2097+ $(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV
2098+ $(PERL) $(LIBCOM)/env/bldEnvData.pl $(CONFIG)
2099+
2100+clean::
2101+ @$(RM) envData.c
2102
2103=== added file 'src/libCom/error/Makefile'
2104--- src/libCom/error/Makefile 1970-01-01 00:00:00 +0000
2105+++ src/libCom/error/Makefile 2011-03-03 23:06:17 +0000
2106@@ -0,0 +1,34 @@
2107+#*************************************************************************
2108+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2109+# National Laboratory.
2110+# EPICS BASE is distributed subject to a Software License Agreement found
2111+# in file LICENSE that is included with this distribution.
2112+#*************************************************************************
2113+
2114+# This is a Makefile fragment, see src/libCom/Makefile.
2115+
2116+SRC_DIRS += $(LIBCOM)/error
2117+
2118+INC += epicsPrint.h
2119+INC += errMdef.h
2120+INC += errSymTbl.h
2121+INC += errlog.h
2122+INC += error.h
2123+
2124+Com_SRCS += errlog.c
2125+Com_SRCS += errSymLib.c
2126+Com_SRCS += errSymTbl.c
2127+
2128+# For bldErrSymTbl
2129+#
2130+ERR_S_FILES += $(LIBCOM)/osi/devLib.h
2131+ERR_S_FILES += $(LIBCOM)/as/asLib.h
2132+ERR_S_FILES += $(SRC)/ioc/db/dbAccessDefs.h
2133+ERR_S_FILES += $(SRC)/ioc/dbStatic/devSup.h
2134+ERR_S_FILES += $(SRC)/ioc/dbStatic/drvSup.h
2135+ERR_S_FILES += $(SRC)/ioc/dbStatic/recSup.h
2136+ERR_S_FILES += $(SRC)/ioc/dbStatic/dbStaticLib.h
2137+ERR_S_FILES += $(LIBCOM)/error/errMdef.h
2138+ERR_S_FILES += $(SRC)/ca/legacy/pcas/generic/casdef.h
2139+ERR_S_FILES += $(SRC)/ca/legacy/gdd/gddAppFuncTable.h
2140+
2141
2142=== added file 'src/libCom/error/RULES'
2143--- src/libCom/error/RULES 1970-01-01 00:00:00 +0000
2144+++ src/libCom/error/RULES 2011-03-03 23:06:17 +0000
2145@@ -0,0 +1,14 @@
2146+#*************************************************************************
2147+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2148+# National Laboratory.
2149+# EPICS BASE is distributed subject to a Software License Agreement found
2150+# in file LICENSE that is included with this distribution.
2151+#*************************************************************************
2152+
2153+# This is a Makefile fragment, see src/libCom/Makefile.
2154+
2155+errSymTbl.c: $(ERR_S_FILES) $(LIBCOM)/error/makeStatTbl.pl
2156+ $(PERL) $(LIBCOM)/error/makeStatTbl.pl $(ERR_S_FILES)
2157+
2158+clean::
2159+ @$(RM) errSymTbl.c
2160
2161=== added file 'src/libCom/fdmgr/Makefile'
2162--- src/libCom/fdmgr/Makefile 1970-01-01 00:00:00 +0000
2163+++ src/libCom/fdmgr/Makefile 2011-03-03 23:06:17 +0000
2164@@ -0,0 +1,14 @@
2165+#*************************************************************************
2166+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2167+# National Laboratory.
2168+# EPICS BASE is distributed subject to a Software License Agreement found
2169+# in file LICENSE that is included with this distribution.
2170+#*************************************************************************
2171+
2172+# This is a Makefile fragment, see src/libCom/Makefile.
2173+
2174+SRC_DIRS += $(LIBCOM)/fdmgr
2175+INC += fdManager.h
2176+INC += fdmgr.h
2177+Com_SRCS += fdmgr.cpp
2178+Com_SRCS += fdManager.cpp
2179
2180=== renamed directory 'src/toolsComm/flex' => 'src/libCom/flex'
2181=== modified file 'src/libCom/flex/Makefile'
2182--- src/toolsComm/flex/Makefile 2009-07-22 20:41:09 +0000
2183+++ src/libCom/flex/Makefile 2011-03-03 23:06:17 +0000
2184@@ -1,44 +1,35 @@
2185 #*************************************************************************
2186-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
2187+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
2188 # National Laboratory.
2189 # Copyright (c) 2002 The Regents of the University of California, as
2190 # Operator of Los Alamos National Laboratory.
2191 # EPICS BASE is distributed subject to a Software License Agreement found
2192 # in file LICENSE that is included with this distribution.
2193 #*************************************************************************
2194-TOP=../../..
2195-
2196-include $(TOP)/configure/CONFIG
2197-
2198-HOST_WARN=NO
2199-
2200-YACC = $(EYACC)
2201-YACCOPT = -l -d
2202+
2203+# This is a Makefile fragment, see src/libCom/Makefile.
2204+
2205+SRC_DIRS += $(LIBCOM)/flex
2206+
2207+parse_YACCOPT = -l -d
2208
2209 SKELETON_FILE = include/flex.skel.static
2210
2211-USR_CPPFLAGS = -DDEFAULT_SKELETON_FILE=$(SKELETON_FILE)
2212+parse_CPPFLAGS = -DDEFAULT_SKELETON_FILE=$(SKELETON_FILE)
2213
2214 INC += flex.skel.static
2215
2216-# main.c is included in parse.c
2217-#
2218-SRCS += ccl.c
2219-SRCS += dfa.c
2220-SRCS += ecs.c
2221-SRCS += gen.c
2222-SRCS += misc.c
2223-SRCS += nfa.c
2224-SRCS += sym.c
2225-SRCS += tblcmp.c
2226-SRCS += parse.c
2227-
2228-PROD_HOST = e_flex
2229-PROD_LIBS = Com
2230-
2231-include $(TOP)/configure/RULES
2232-
2233-clean::
2234- $(RM) parse.c parse.h
2235-
2236-# EOF Makefile.Host for base/src/toolsComm/flex
2237+# flex.c is included in parse.c
2238+e_flex_SRCS += ccl.c
2239+e_flex_SRCS += dfa.c
2240+e_flex_SRCS += ecs.c
2241+e_flex_SRCS += gen.c
2242+e_flex_SRCS += misc.c
2243+e_flex_SRCS += nfa.c
2244+e_flex_SRCS += sym.c
2245+e_flex_SRCS += tblcmp.c
2246+e_flex_SRCS += parse.c
2247+e_flex_OBJS += epicsTempFile$(OBJ)
2248+
2249+PROD_HOST += e_flex
2250+
2251
2252=== added file 'src/libCom/flex/RULES'
2253--- src/libCom/flex/RULES 1970-01-01 00:00:00 +0000
2254+++ src/libCom/flex/RULES 2011-03-03 23:06:17 +0000
2255@@ -0,0 +1,16 @@
2256+#*************************************************************************
2257+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
2258+# National Laboratory.
2259+# Copyright (c) 2002 The Regents of the University of California, as
2260+# Operator of Los Alamos National Laboratory.
2261+# EPICS BASE is distributed subject to a Software License Agreement found
2262+# in file LICENSE that is included with this distribution.
2263+#*************************************************************************
2264+
2265+# This is a Makefile fragment, see src/libCom/Makefile.
2266+
2267+# Ensure that the lexer is built before it is needed
2268+parse.c: $(YACC)
2269+
2270+clean::
2271+ $(RM) parse.c parse.h
2272
2273=== renamed file 'src/toolsComm/flex/main.c' => 'src/libCom/flex/flex.c'
2274=== modified file 'src/libCom/flex/parse.y'
2275--- src/toolsComm/flex/parse.y 2010-10-05 19:27:37 +0000
2276+++ src/libCom/flex/parse.y 2011-03-03 23:06:17 +0000
2277@@ -703,5 +703,5 @@
2278
2279 #include "scan.c"
2280 #include "yylex.c"
2281-#include "main.c"
2282+#include "flex.c"
2283
2284
2285=== added file 'src/libCom/freeList/Makefile'
2286--- src/libCom/freeList/Makefile 1970-01-01 00:00:00 +0000
2287+++ src/libCom/freeList/Makefile 2011-03-03 23:06:17 +0000
2288@@ -0,0 +1,13 @@
2289+#*************************************************************************
2290+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2291+# National Laboratory.
2292+# EPICS BASE is distributed subject to a Software License Agreement found
2293+# in file LICENSE that is included with this distribution.
2294+#*************************************************************************
2295+
2296+# This is a Makefile fragment, see src/libCom/Makefile.
2297+
2298+SRC_DIRS += $(LIBCOM)/freeList
2299+INC += freeList.h
2300+Com_SRCS += freeListLib.c
2301+HTMLS += freeList/freeList.html
2302
2303=== added file 'src/libCom/gpHash/Makefile'
2304--- src/libCom/gpHash/Makefile 1970-01-01 00:00:00 +0000
2305+++ src/libCom/gpHash/Makefile 2011-03-03 23:06:17 +0000
2306@@ -0,0 +1,13 @@
2307+#*************************************************************************
2308+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2309+# National Laboratory.
2310+# EPICS BASE is distributed subject to a Software License Agreement found
2311+# in file LICENSE that is included with this distribution.
2312+#*************************************************************************
2313+
2314+# This is a Makefile fragment, see src/libCom/Makefile.
2315+
2316+SRC_DIRS += $(LIBCOM)/gpHash
2317+INC += gpHash.h
2318+Com_SRCS += gpHashLib.c
2319+HTMLS += gpHash/gpHash.html
2320
2321=== added file 'src/libCom/iocsh/Makefile'
2322--- src/libCom/iocsh/Makefile 1970-01-01 00:00:00 +0000
2323+++ src/libCom/iocsh/Makefile 2011-03-03 23:06:17 +0000
2324@@ -0,0 +1,16 @@
2325+#*************************************************************************
2326+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2327+# National Laboratory.
2328+# EPICS BASE is distributed subject to a Software License Agreement found
2329+# in file LICENSE that is included with this distribution.
2330+#*************************************************************************
2331+
2332+# This is a Makefile fragment, see src/libCom/Makefile.
2333+
2334+SRC_DIRS += $(LIBCOM)/iocsh
2335+INC += iocsh.h
2336+INC += registry.h
2337+INC += libComRegister.h
2338+Com_SRCS += iocsh.cpp
2339+Com_SRCS += registry.c
2340+Com_SRCS += libComRegister.c
2341
2342=== renamed directory 'src/libCom/logClient' => 'src/libCom/log'
2343=== added file 'src/libCom/log/Makefile'
2344--- src/libCom/log/Makefile 1970-01-01 00:00:00 +0000
2345+++ src/libCom/log/Makefile 2011-03-03 23:06:17 +0000
2346@@ -0,0 +1,26 @@
2347+#*************************************************************************
2348+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2349+# National Laboratory.
2350+# EPICS BASE is distributed subject to a Software License Agreement found
2351+# in file LICENSE that is included with this distribution.
2352+#*************************************************************************
2353+
2354+# This is a Makefile fragment, see src/libCom/Makefile.
2355+
2356+SRC_DIRS += $(LIBCOM)/log
2357+INC += iocLog.h
2358+INC += logClient.h
2359+Com_SRCS += iocLog.c
2360+Com_SRCS += logClient.c
2361+
2362+PROD_HOST += iocLogServer
2363+
2364+iocLogServer_SRCS = iocLogServer.c
2365+iocLogServer_LIBS = Com
2366+
2367+iocLogServer_SYS_LIBS_solaris += socket
2368+iocLogServer_SYS_LIBS_WIN32 += user32
2369+
2370+SCRIPTS_solaris := S99logServer
2371+SCRIPTS_Linux := S99logServer
2372+
2373
2374=== added file 'src/libCom/log/RULES'
2375--- src/libCom/log/RULES 1970-01-01 00:00:00 +0000
2376+++ src/libCom/log/RULES 2011-03-03 23:06:17 +0000
2377@@ -0,0 +1,12 @@
2378+#*************************************************************************
2379+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2380+# National Laboratory.
2381+# EPICS BASE is distributed subject to a Software License Agreement found
2382+# in file LICENSE that is included with this distribution.
2383+#*************************************************************************
2384+
2385+# This is a Makefile fragment, see src/libCom/Makefile.
2386+
2387+S99%: ../log/rc2.%
2388+ sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@
2389+
2390
2391=== renamed file 'src/util/iocLogServer.c' => 'src/libCom/log/iocLogServer.c'
2392=== renamed file 'src/util/rc2.logServer' => 'src/libCom/log/rc2.logServer'
2393=== added file 'src/libCom/macLib/Makefile'
2394--- src/libCom/macLib/Makefile 1970-01-01 00:00:00 +0000
2395+++ src/libCom/macLib/Makefile 2011-03-03 23:06:17 +0000
2396@@ -0,0 +1,14 @@
2397+#*************************************************************************
2398+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2399+# National Laboratory.
2400+# EPICS BASE is distributed subject to a Software License Agreement found
2401+# in file LICENSE that is included with this distribution.
2402+#*************************************************************************
2403+
2404+# This is a Makefile fragment, see src/libCom/Makefile.
2405+
2406+SRC_DIRS += $(LIBCOM)/macLib
2407+INC += macLib.h
2408+Com_SRCS += macCore.c
2409+Com_SRCS += macEnv.c
2410+Com_SRCS += macUtil.c
2411
2412=== added file 'src/libCom/misc/Makefile'
2413--- src/libCom/misc/Makefile 1970-01-01 00:00:00 +0000
2414+++ src/libCom/misc/Makefile 2011-03-03 23:06:17 +0000
2415@@ -0,0 +1,43 @@
2416+#*************************************************************************
2417+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2418+# National Laboratory.
2419+# EPICS BASE is distributed subject to a Software License Agreement found
2420+# in file LICENSE that is included with this distribution.
2421+#*************************************************************************
2422+
2423+# This is a Makefile fragment, see src/libCom/Makefile.
2424+
2425+SRC_DIRS += $(LIBCOM)/misc
2426+
2427+INC += alarm.h
2428+INC += alarmString.h
2429+INC += adjustment.h
2430+INC += cantProceed.h
2431+INC += dbDefs.h
2432+INC += epicsConvert.h
2433+INC += epicsExit.h
2434+INC += epicsStdlib.h
2435+INC += epicsString.h
2436+INC += epicsTypes.h
2437+INC += shareLib.h
2438+INC += epicsExport.h
2439+INC += unixFileName.h
2440+INC += locationException.h
2441+INC += ipAddrToAsciiAsynchronous.h
2442+INC += compilerDependencies.h
2443+INC += epicsUnitTest.h
2444+INC += testMain.h
2445+
2446+# epicsVersion.h is created by this Makefile
2447+INC += epicsVersion.h
2448+
2449+Com_SRCS += aToIPAddr.c
2450+Com_SRCS += adjustment.c
2451+Com_SRCS += cantProceed.c
2452+Com_SRCS += epicsConvert.c
2453+Com_SRCS += epicsExit.c
2454+Com_SRCS += epicsStdlib.c
2455+Com_SRCS += epicsString.c
2456+Com_SRCS += truncateFile.c
2457+Com_SRCS += ipAddrToAsciiAsynchronous.cpp
2458+Com_SRCS += epicsUnitTest.c
2459
2460=== added file 'src/libCom/misc/RULES'
2461--- src/libCom/misc/RULES 1970-01-01 00:00:00 +0000
2462+++ src/libCom/misc/RULES 2011-03-03 23:06:17 +0000
2463@@ -0,0 +1,12 @@
2464+#*************************************************************************
2465+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2466+# National Laboratory.
2467+# EPICS BASE is distributed subject to a Software License Agreement found
2468+# in file LICENSE that is included with this distribution.
2469+#*************************************************************************
2470+
2471+# This is a Makefile fragment, see src/libCom/Makefile.
2472+
2473+$(COMMON_DIR)/epicsVersion.h: $(CONFIG)/CONFIG_BASE_VERSION $(CONFIG)/CONFIG_SITE
2474+ $(PERL) $(LIBCOM)/misc/makeEpicsVersion.pl $(CONFIG)/CONFIG_BASE_VERSION $(@D) $(EPICS_SITE_VERSION)
2475+
2476
2477=== renamed file 'src/dbStatic/alarm.h' => 'src/libCom/misc/alarm.h'
2478=== renamed file 'src/dbStatic/alarmString.h' => 'src/libCom/misc/alarmString.h'
2479=== added file 'src/libCom/osi/Makefile'
2480--- src/libCom/osi/Makefile 1970-01-01 00:00:00 +0000
2481+++ src/libCom/osi/Makefile 2011-03-03 23:06:17 +0000
2482@@ -0,0 +1,127 @@
2483+#*************************************************************************
2484+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2485+# National Laboratory.
2486+# EPICS BASE is distributed subject to a Software License Agreement found
2487+# in file LICENSE that is included with this distribution.
2488+#*************************************************************************
2489+
2490+# This is a Makefile fragment, see src/libCom/Makefile.
2491+
2492+SRC_DIRS += $(LIBCOM)/osi
2493+INC += osiFileName.h
2494+INC += osiSock.h
2495+INC += osdSock.h
2496+INC += epicsInterrupt.h
2497+INC += osdInterrupt.h
2498+
2499+INC += epicsMutex.h
2500+INC += osdMutex.h
2501+INC += epicsEvent.h
2502+INC += osdEvent.h
2503+INC += epicsMath.h
2504+INC += osdMessageQueue.h
2505+INC += osdStrtod.h
2506+
2507+INC += epicsAssert.h
2508+INC += epicsFindSymbol.h
2509+INC += osiPoolStatus.h
2510+INC += osdPoolStatus.h
2511+INC += osdThread.h
2512+
2513+INC += epicsThread.h
2514+INC += epicsTime.h
2515+INC += epicsGeneralTime.h
2516+INC += osdTime.h
2517+INC += generalTimeSup.h
2518+INC += osiClockTime.h
2519+INC += epicsSignal.h
2520+INC += osiProcess.h
2521+INC += osiUnistd.h
2522+INC += osiWireFormat.h
2523+INC += osdWireFormat.h
2524+INC += osdWireConfig.h
2525+INC += epicsEndian.h
2526+INC += epicsReadline.h
2527+INC += epicsMessageQueue.h
2528+INC += epicsStdio.h
2529+INC += epicsStdioRedirect.h
2530+INC += epicsGetopt.h
2531+
2532+INC += devLib.h
2533+INC += devLibVME.h
2534+INC += devLibVMEImpl.h
2535+INC += osdVME.h
2536+
2537+Com_SRCS += epicsThread.cpp
2538+Com_SRCS += epicsMutex.cpp
2539+Com_SRCS += epicsEvent.cpp
2540+Com_SRCS += epicsTime.cpp
2541+Com_SRCS += epicsMessageQueue.cpp
2542+Com_SRCS += epicsMath.cpp
2543+
2544+Com_SRCS += epicsGeneralTime.c
2545+
2546+# Time providers
2547+Com_SRCS += osiClockTime.c
2548+Com_SRCS_vxWorks += osiNTPTime.c
2549+Com_SRCS_RTEMS += osiNTPTime.c
2550+
2551+Com_SRCS += osdSock.c
2552+Com_SRCS += osdSockAddrReuse.cpp
2553+Com_SRCS += osiSock.c
2554+Com_SRCS += systemCallIntMech.cpp
2555+Com_SRCS += epicsSocketConvertErrnoToString.cpp
2556+Com_SRCS += osdAssert.c
2557+Com_SRCS += osdFindSymbol.c
2558+Com_SRCS += osdInterrupt.c
2559+Com_SRCS += osdPoolStatus.c
2560+Com_SRCS += osdSignal.cpp
2561+
2562+osdEnv_CFLAGS_WIN32= -U__STDC__
2563+
2564+Com_SRCS += osdEnv.c
2565+
2566+# Command-line input support
2567+epicsReadline_CFLAGS += -DEPICS_COMMANDLINE_LIBRARY=EPICS_COMMANDLINE_LIBRARY_$(COMMANDLINE_LIBRARY)
2568+epicsReadline_INCLUDES += $(INCLUDES_$(COMMANDLINE_LIBRARY))
2569+
2570+Com_SRCS += epicsReadline.c
2571+
2572+Com_SRCS += epicsTempFile.cpp
2573+Com_SRCS += epicsStdio.c
2574+Com_SRCS += osdStdio.c
2575+
2576+#POSIX thread priority scheduling flag
2577+THREAD_CPPFLAGS_NO += -DDONT_USE_POSIX_THREAD_PRIORITY_SCHEDULING
2578+osdThread_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING))
2579+
2580+Com_SRCS += osdThread.c
2581+Com_SRCS += osdMutex.c
2582+Com_SRCS += osdEvent.c
2583+Com_SRCS += osdTime.cpp
2584+Com_SRCS += osdProcess.c
2585+Com_SRCS += osdNetIntf.c
2586+Com_SRCS += osdMessageQueue.c
2587+
2588+Com_SRCS += devLibVME.c
2589+Com_SRCS += devLibVMEOSD.c
2590+
2591+Com_SRCS_vxWorks += atReboot.cpp
2592+
2593+# For old vxWorks applications
2594+INC_vxWorks += camacLib.h
2595+INC_vxWorks += epicsDynLink.h
2596+INC_vxWorks += module_types.h
2597+INC_vxWorks += task_params.h
2598+
2599+Com_SRCS_vxWorks += epicsDynLink.c
2600+Com_SRCS_vxWorks += veclist.c
2601+Com_SRCS_vxWorks += logMsgToErrlog.cpp
2602+
2603+#This forces the vxWorks compatibility stuff to be loaded
2604+OBJS_vxWorks = vxComLibrary
2605+
2606+Com_SRCS_WIN32 += epicsGetopt.c
2607+Com_SRCS_WIN32 += setThreadName.cpp
2608+#Com_SRCS_WIN32 += dllmain.cpp
2609+Com_SRCS_WIN32 += forceBadAllocException.cpp
2610
2611=== added file 'src/libCom/osi/RULES'
2612--- src/libCom/osi/RULES 1970-01-01 00:00:00 +0000
2613+++ src/libCom/osi/RULES 2011-03-03 23:06:17 +0000
2614@@ -0,0 +1,15 @@
2615+#*************************************************************************
2616+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2617+# National Laboratory.
2618+# EPICS BASE is distributed subject to a Software License Agreement found
2619+# in file LICENSE that is included with this distribution.
2620+#*************************************************************************
2621+
2622+# This is a Makefile fragment, see src/libCom/Makefile.
2623+
2624+# Ensure epicsVersion.h gets built first
2625+osdAssert$(OBJ): $(COMMON_DIR)/epicsVersion.h
2626+epicsTime$(OBJ): $(COMMON_DIR)/epicsVersion.h
2627+osdNetIntf$(OBJ): $(COMMON_DIR)/epicsVersion.h
2628+osdSock$(OBJ): $(COMMON_DIR)/epicsVersion.h
2629+
2630
2631=== added file 'src/libCom/ring/Makefile'
2632--- src/libCom/ring/Makefile 1970-01-01 00:00:00 +0000
2633+++ src/libCom/ring/Makefile 2011-03-03 23:06:17 +0000
2634@@ -0,0 +1,15 @@
2635+#*************************************************************************
2636+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2637+# National Laboratory.
2638+# EPICS BASE is distributed subject to a Software License Agreement found
2639+# in file LICENSE that is included with this distribution.
2640+#*************************************************************************
2641+
2642+# This is a Makefile fragment, see src/libCom/Makefile.
2643+
2644+SRC_DIRS += $(LIBCOM)/ring
2645+#following needed for locating epicsRingPointer.h and epicsRingBytes.h
2646+INC += epicsRingPointer.h
2647+INC += epicsRingBytes.h
2648+Com_SRCS += epicsRingPointer.cpp
2649+Com_SRCS += epicsRingBytes.c
2650
2651=== added file 'src/libCom/taskwd/Makefile'
2652--- src/libCom/taskwd/Makefile 1970-01-01 00:00:00 +0000
2653+++ src/libCom/taskwd/Makefile 2011-03-03 23:06:17 +0000
2654@@ -0,0 +1,12 @@
2655+#*************************************************************************
2656+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2657+# National Laboratory.
2658+# EPICS BASE is distributed subject to a Software License Agreement found
2659+# in file LICENSE that is included with this distribution.
2660+#*************************************************************************
2661+
2662+# This is a Makefile fragment, see src/libCom/Makefile.
2663+
2664+SRC_DIRS += $(LIBCOM)/taskwd
2665+INC += taskwd.h
2666+Com_SRCS += taskwd.c
2667
2668=== added file 'src/libCom/timer/Makefile'
2669--- src/libCom/timer/Makefile 1970-01-01 00:00:00 +0000
2670+++ src/libCom/timer/Makefile 2011-03-03 23:06:17 +0000
2671@@ -0,0 +1,17 @@
2672+#*************************************************************************
2673+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2674+# National Laboratory.
2675+# EPICS BASE is distributed subject to a Software License Agreement found
2676+# in file LICENSE that is included with this distribution.
2677+#*************************************************************************
2678+
2679+# This is a Makefile fragment, see src/libCom/Makefile.
2680+
2681+SRC_DIRS += $(LIBCOM)/timer
2682+INC += epicsTimer.h
2683+Com_SRCS += epicsTimer.cpp
2684+Com_SRCS += timer.cpp
2685+Com_SRCS += timerQueue.cpp
2686+Com_SRCS += timerQueueActive.cpp
2687+Com_SRCS += timerQueueActiveMgr.cpp
2688+Com_SRCS += timerQueuePassive.cpp
2689
2690=== renamed directory 'src/toolsComm' => 'src/libCom/tools'
2691=== added file 'src/libCom/tsDefs/Makefile'
2692--- src/libCom/tsDefs/Makefile 1970-01-01 00:00:00 +0000
2693+++ src/libCom/tsDefs/Makefile 2011-03-03 23:06:17 +0000
2694@@ -0,0 +1,13 @@
2695+#*************************************************************************
2696+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
2697+# National Laboratory.
2698+# EPICS BASE is distributed subject to a Software License Agreement found
2699+# in file LICENSE that is included with this distribution.
2700+#*************************************************************************
2701+
2702+# This is a Makefile fragment, see src/libCom/Makefile.
2703+
2704+#tsDefs contains R3.13 compatibility tsStamp code
2705+SRC_DIRS += $(LIBCOM)/tsDefs
2706+INC += tsDefs.h
2707+Com_SRCS += tsDefs.c
2708
2709=== renamed directory 'src/toolsComm/antelope' => 'src/libCom/yacc'
2710=== modified file 'src/libCom/yacc/Makefile'
2711--- src/toolsComm/antelope/Makefile 2009-07-10 22:00:18 +0000
2712+++ src/libCom/yacc/Makefile 2011-03-03 23:06:17 +0000
2713@@ -6,24 +6,24 @@
2714 # EPICS BASE is distributed subject to a Software License Agreement found
2715 # in file LICENSE that is included with this distribution.
2716 #*************************************************************************
2717-TOP=../../..
2718-include $(TOP)/configure/CONFIG
2719-
2720-SRCS += closure.c
2721-SRCS += error.c
2722-SRCS += lalr.c
2723-SRCS += lr0.c
2724-SRCS += main.c
2725-SRCS += mkpar.c
2726-SRCS += output.c
2727-SRCS += reader.c
2728-SRCS += skeleton.c
2729-SRCS += symtab.c
2730-SRCS += verbose.c
2731-SRCS += warshall.c
2732-
2733-PROD_HOST = antelope
2734-PROD_LIBS = Com
2735-
2736-include $(TOP)/configure/RULES
2737+
2738+# This is a Makefile fragment, see src/libCom/Makefile.
2739+
2740+SRC_DIRS += $(LIBCOM)/yacc
2741+
2742+antelope_SRCS += closure.c
2743+antelope_SRCS += error.c
2744+antelope_SRCS += lalr.c
2745+antelope_SRCS += lr0.c
2746+antelope_SRCS += antelope.c
2747+antelope_SRCS += mkpar.c
2748+antelope_SRCS += output.c
2749+antelope_SRCS += reader.c
2750+antelope_SRCS += skeleton.c
2751+antelope_SRCS += symtab.c
2752+antelope_SRCS += verbose.c
2753+antelope_SRCS += warshall.c
2754+antelope_OBJS += epicsTempFile$(OBJ)
2755+
2756+PROD_HOST += antelope
2757
2758
2759=== renamed file 'src/toolsComm/antelope/main.c' => 'src/libCom/yacc/antelope.c'
2760=== removed file 'src/misc/misc.rc'
2761--- src/misc/misc.rc 2005-12-19 21:42:40 +0000
2762+++ src/misc/misc.rc 1970-01-01 00:00:00 +0000
2763@@ -1,36 +0,0 @@
2764-#include <Winver.h>
2765-#include "epicsVersion.h"
2766-
2767-VS_VERSION_INFO VERSIONINFO
2768- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
2769- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
2770- FILEFLAGSMASK 0x3fL
2771-#ifdef _DEBUG
2772- FILEFLAGS 0x1L
2773-#else
2774- FILEFLAGS 0x0L
2775-#endif
2776- FILEOS VOS__WINDOWS32
2777- FILETYPE VFT_UNKNOWN
2778- FILESUBTYPE 0x0L
2779-BEGIN
2780- BLOCK "StringFileInfo"
2781- BEGIN
2782- BLOCK "040904b0"
2783- BEGIN
2784- VALUE "Comments","Miscellaneous Tools Library for EPICS\0"
2785- VALUE "CompanyName", "The EPICS collaboration\0"
2786- VALUE "FileDescription", "Miscellaneous Tools Library\0"
2787- VALUE "FileVersion", EPICS_VERSION_STRING "\0"
2788- VALUE "InternalName", "misc\0"
2789- VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
2790- VALUE "OriginalFilename", "misc.dll\0"
2791- VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
2792- VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
2793- END
2794- END
2795- BLOCK "VarFileInfo"
2796- BEGIN
2797- VALUE "Translation", 0x409, 1200
2798- END
2799-END
2800
2801=== removed file 'src/misc/miscIoc.rc'
2802--- src/misc/miscIoc.rc 2005-12-19 21:42:40 +0000
2803+++ src/misc/miscIoc.rc 1970-01-01 00:00:00 +0000
2804@@ -1,36 +0,0 @@
2805-#include <Winver.h>
2806-#include "epicsVersion.h"
2807-
2808-VS_VERSION_INFO VERSIONINFO
2809- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
2810- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
2811- FILEFLAGSMASK 0x3fL
2812-#ifdef _DEBUG
2813- FILEFLAGS 0x1L
2814-#else
2815- FILEFLAGS 0x0L
2816-#endif
2817- FILEOS VOS__WINDOWS32
2818- FILETYPE VFT_UNKNOWN
2819- FILESUBTYPE 0x0L
2820-BEGIN
2821- BLOCK "StringFileInfo"
2822- BEGIN
2823- BLOCK "040904b0"
2824- BEGIN
2825- VALUE "Comments","Miscellaneous Ioc Tools Library for EPICS\0"
2826- VALUE "CompanyName", "The EPICS collaboration\0"
2827- VALUE "FileDescription", "Miscellaneous Ioc Tools Library\0"
2828- VALUE "FileVersion", EPICS_VERSION_STRING "\0"
2829- VALUE "InternalName", "miscIoc\0"
2830- VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
2831- VALUE "OriginalFilename", "miscIoc.dll\0"
2832- VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
2833- VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
2834- END
2835- END
2836- BLOCK "VarFileInfo"
2837- BEGIN
2838- VALUE "Translation", 0x409, 1200
2839- END
2840-END
2841
2842=== removed file 'src/registry/registryIoc.rc'
2843--- src/registry/registryIoc.rc 2005-12-19 21:42:40 +0000
2844+++ src/registry/registryIoc.rc 1970-01-01 00:00:00 +0000
2845@@ -1,36 +0,0 @@
2846-#include <Winver.h>
2847-#include "epicsVersion.h"
2848-
2849-VS_VERSION_INFO VERSIONINFO
2850- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
2851- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
2852- FILEFLAGSMASK 0x3fL
2853-#ifdef _DEBUG
2854- FILEFLAGS 0x1L
2855-#else
2856- FILEFLAGS 0x0L
2857-#endif
2858- FILEOS VOS__WINDOWS32
2859- FILETYPE VFT_UNKNOWN
2860- FILESUBTYPE 0x0L
2861-BEGIN
2862- BLOCK "StringFileInfo"
2863- BEGIN
2864- BLOCK "040904b0"
2865- BEGIN
2866- VALUE "Comments","Registry Ioc Library for EPICS\0"
2867- VALUE "CompanyName", "The EPICS collaboration\0"
2868- VALUE "FileDescription", "Registry Ioc Library\0"
2869- VALUE "FileVersion", EPICS_VERSION_STRING "\0"
2870- VALUE "InternalName", "registryIoc\0"
2871- VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
2872- VALUE "OriginalFilename", "registryIoc.dll\0"
2873- VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
2874- VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
2875- END
2876- END
2877- BLOCK "VarFileInfo"
2878- BEGIN
2879- VALUE "Translation", 0x409, 1200
2880- END
2881-END
2882
2883=== removed file 'src/rsrv/rsrvIoc.rc'
2884--- src/rsrv/rsrvIoc.rc 2005-12-19 21:42:40 +0000
2885+++ src/rsrv/rsrvIoc.rc 1970-01-01 00:00:00 +0000
2886@@ -1,36 +0,0 @@
2887-#include <Winver.h>
2888-#include "epicsVersion.h"
2889-
2890-VS_VERSION_INFO VERSIONINFO
2891- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
2892- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
2893- FILEFLAGSMASK 0x3fL
2894-#ifdef _DEBUG
2895- FILEFLAGS 0x1L
2896-#else
2897- FILEFLAGS 0x0L
2898-#endif
2899- FILEOS VOS__WINDOWS32
2900- FILETYPE VFT_UNKNOWN
2901- FILESUBTYPE 0x0L
2902-BEGIN
2903- BLOCK "StringFileInfo"
2904- BEGIN
2905- BLOCK "040904b0"
2906- BEGIN
2907- VALUE "Comments","Channel Access Ioc Resource Server Library for EPICS\0"
2908- VALUE "CompanyName", "The EPICS collaboration\0"
2909- VALUE "FileDescription", "Channel Access Ioc Resource Server Library\0"
2910- VALUE "FileVersion", EPICS_VERSION_STRING "\0"
2911- VALUE "InternalName", "rsrv\0"
2912- VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
2913- VALUE "OriginalFilename", "rsrv.dll\0"
2914- VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
2915- VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
2916- END
2917- END
2918- BLOCK "VarFileInfo"
2919- BEGIN
2920- VALUE "Translation", 0x409, 1200
2921- END
2922-END
2923
2924=== added directory 'src/std'
2925=== added file 'src/std/Makefile'
2926--- src/std/Makefile 1970-01-01 00:00:00 +0000
2927+++ src/std/Makefile 2011-03-03 23:06:17 +0000
2928@@ -0,0 +1,30 @@
2929+#*************************************************************************
2930+# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
2931+# National Laboratory.
2932+# Copyright (c) 2002 The Regents of the University of California, as
2933+# Operator of Los Alamos National Laboratory.
2934+# EPICS BASE is distributed subject to a Software License Agreement found
2935+# in file LICENSE that is included with this distribution.
2936+#*************************************************************************
2937+TOP=../..
2938+
2939+include $(TOP)/configure/CONFIG
2940+
2941+STDDIR=$(TOP)/src/std
2942+
2943+USR_DBDFLAGS += -I ../rec -I ../dev -I ../softIoc
2944+
2945+LIBRARY_IOC += dbRecStd
2946+dbRecStd_LIBS = dbCore ca Com
2947+
2948+dbRecStd_RCS += dbRecStd.rc
2949+
2950+include $(STDDIR)/dev/Makefile
2951+include $(STDDIR)/rec/Makefile
2952+include $(STDDIR)/softIoc/Makefile
2953+
2954+include $(TOP)/configure/RULES
2955+
2956+include $(STDDIR)/rec/RULES
2957+include $(STDDIR)/softIoc/RULES
2958+
2959
2960=== renamed file 'src/rec/recIoc.rc' => 'src/std/dbRecStd.rc'
2961--- src/rec/recIoc.rc 2005-12-19 21:42:40 +0000
2962+++ src/std/dbRecStd.rc 2011-03-03 23:06:17 +0000
2963@@ -18,13 +18,13 @@
2964 BEGIN
2965 BLOCK "040904b0"
2966 BEGIN
2967- VALUE "Comments","Record Support Library for EPICS\0"
2968+ VALUE "Comments","Record and Soft Device Support Library for EPICS\0"
2969 VALUE "CompanyName", "The EPICS collaboration\0"
2970- VALUE "FileDescription", "Record Support Library\0"
2971+ VALUE "FileDescription", "Record and Soft Device Support Library\0"
2972 VALUE "FileVersion", EPICS_VERSION_STRING "\0"
2973- VALUE "InternalName", "rec\0"
2974+ VALUE "InternalName", "dbRecStd\0"
2975 VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
2976- VALUE "OriginalFilename", "rec.dll\0"
2977+ VALUE "OriginalFilename", "dbRecStd.dll\0"
2978 VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
2979 VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
2980 END
2981
2982=== renamed directory 'src/dev/softDev' => 'src/std/dev'
2983=== modified file 'src/std/dev/Makefile'
2984--- src/dev/softDev/Makefile 2010-10-12 16:27:17 +0000
2985+++ src/std/dev/Makefile 2011-03-03 23:06:17 +0000
2986@@ -1,61 +1,57 @@
2987 #*************************************************************************
2988-# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
2989+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
2990 # National Laboratory.
2991 # Copyright (c) 2002 The Regents of the University of California, as
2992 # Operator of Los Alamos National Laboratory.
2993 # EPICS BASE is distributed subject to a Software License Agreement found
2994 # in file LICENSE that is included with this distribution.
2995 #*************************************************************************
2996-TOP=../../..
2997-
2998-include $(TOP)/configure/CONFIG
2999+
3000+# This is a Makefile fragment, see src/std/Makefile.
3001+
3002+SRC_DIRS += $(STDDIR)/dev
3003
3004 DBD += devSoft.dbd
3005
3006-LIBSRCS += devAaiSoft.c
3007-LIBSRCS += devAaoSoft.c
3008-LIBSRCS += devAiSoft.c
3009-LIBSRCS += devAiSoftRaw.c
3010-LIBSRCS += devAoSoft.c
3011-LIBSRCS += devAoSoftRaw.c
3012-LIBSRCS += devBiSoft.c
3013-LIBSRCS += devBiSoftRaw.c
3014-LIBSRCS += devBoSoft.c
3015-LIBSRCS += devBoSoftRaw.c
3016-LIBSRCS += devCalcoutSoft.c
3017-LIBSRCS += devEventSoft.c
3018-LIBSRCS += devHistogramSoft.c
3019-LIBSRCS += devLiSoft.c
3020-LIBSRCS += devLoSoft.c
3021-LIBSRCS += devMbbiDirectSoft.c
3022-LIBSRCS += devMbbiDirectSoftRaw.c
3023-LIBSRCS += devMbbiSoft.c
3024-LIBSRCS += devMbbiSoftRaw.c
3025-LIBSRCS += devMbboDirectSoft.c
3026-LIBSRCS += devMbboDirectSoftRaw.c
3027-LIBSRCS += devMbboSoft.c
3028-LIBSRCS += devMbboSoftRaw.c
3029-LIBSRCS += devSASoft.c
3030-LIBSRCS += devSiSoft.c
3031-LIBSRCS += devSoSoft.c
3032-LIBSRCS += devWfSoft.c
3033-LIBSRCS += devGeneralTime.c
3034-
3035-LIBSRCS += devAoSoftCallback.c
3036-LIBSRCS += devBoSoftCallback.c
3037-LIBSRCS += devCalcoutSoftCallback.c
3038-LIBSRCS += devLoSoftCallback.c
3039-LIBSRCS += devMbboSoftCallback.c
3040-LIBSRCS += devMbboDirectSoftCallback.c
3041-LIBSRCS += devSoSoftCallback.c
3042-
3043-LIBSRCS += devTimestamp.c
3044-LIBSRCS += devSoStdio.c
3045-
3046-LIBRARY_IOC += softDevIoc
3047-softDevIoc_LIBS += miscIoc recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
3048-softDevIoc_RCS = softDevIoc.rc
3049-
3050-include $(TOP)/configure/RULES
3051-
3052+dbRecStd_SRCS += devAaiSoft.c
3053+dbRecStd_SRCS += devAaoSoft.c
3054+dbRecStd_SRCS += devAiSoft.c
3055+dbRecStd_SRCS += devAiSoftRaw.c
3056+dbRecStd_SRCS += devAoSoft.c
3057+dbRecStd_SRCS += devAoSoftRaw.c
3058+dbRecStd_SRCS += devBiSoft.c
3059+dbRecStd_SRCS += devBiSoftRaw.c
3060+dbRecStd_SRCS += devBoSoft.c
3061+dbRecStd_SRCS += devBoSoftRaw.c
3062+dbRecStd_SRCS += devCalcoutSoft.c
3063+dbRecStd_SRCS += devEventSoft.c
3064+dbRecStd_SRCS += devHistogramSoft.c
3065+dbRecStd_SRCS += devLiSoft.c
3066+dbRecStd_SRCS += devLoSoft.c
3067+dbRecStd_SRCS += devMbbiDirectSoft.c
3068+dbRecStd_SRCS += devMbbiDirectSoftRaw.c
3069+dbRecStd_SRCS += devMbbiSoft.c
3070+dbRecStd_SRCS += devMbbiSoftRaw.c
3071+dbRecStd_SRCS += devMbboDirectSoft.c
3072+dbRecStd_SRCS += devMbboDirectSoftRaw.c
3073+dbRecStd_SRCS += devMbboSoft.c
3074+dbRecStd_SRCS += devMbboSoftRaw.c
3075+dbRecStd_SRCS += devSASoft.c
3076+dbRecStd_SRCS += devSiSoft.c
3077+dbRecStd_SRCS += devSoSoft.c
3078+dbRecStd_SRCS += devWfSoft.c
3079+dbRecStd_SRCS += devGeneralTime.c
3080+
3081+dbRecStd_SRCS += devAoSoftCallback.c
3082+dbRecStd_SRCS += devBoSoftCallback.c
3083+dbRecStd_SRCS += devCalcoutSoftCallback.c
3084+dbRecStd_SRCS += devLoSoftCallback.c
3085+dbRecStd_SRCS += devMbboSoftCallback.c
3086+dbRecStd_SRCS += devMbboDirectSoftCallback.c
3087+dbRecStd_SRCS += devSoSoftCallback.c
3088+
3089+dbRecStd_SRCS += devTimestamp.c
3090+dbRecStd_SRCS += devSoStdio.c
3091+
3092+dbRecStd_SRCS += asSubRecordFunctions.c
3093
3094
3095=== renamed file 'src/misc/asSubRecordFunctions.c' => 'src/std/dev/asSubRecordFunctions.c'
3096=== renamed directory 'src/rec' => 'src/std/rec'
3097=== modified file 'src/std/rec/Makefile'
3098--- src/rec/Makefile 2010-10-12 16:27:17 +0000
3099+++ src/std/rec/Makefile 2011-03-03 23:06:17 +0000
3100@@ -1,13 +1,15 @@
3101 #*************************************************************************
3102-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
3103+# Copyright (c) 2011 The University of Chicago, as Operator of Argonne
3104 # National Laboratory.
3105 # Copyright (c) 2002 The Regents of the University of California, as
3106 # Operator of Los Alamos National Laboratory.
3107 # EPICS BASE is distributed subject to a Software License Agreement found
3108 # in file LICENSE that is included with this distribution.
3109 #*************************************************************************
3110-TOP=../..
3111-include $(TOP)/configure/CONFIG
3112+
3113+# This is a Makefile fragment, see src/std/Makefile.
3114+
3115+SRC_DIRS += $(STDDIR)/rec
3116
3117 DBDINC += aaiRecord
3118 DBDINC += aaoRecord
3119@@ -39,40 +41,37 @@
3120 DBDINC += subArrayRecord
3121 DBDINC += waveformRecord
3122
3123-LIBSRCS += aaiRecord.c
3124-LIBSRCS += aaoRecord.c
3125-LIBSRCS += aiRecord.c
3126-LIBSRCS += aoRecord.c
3127-LIBSRCS += aSubRecord.c
3128-LIBSRCS += biRecord.c
3129-LIBSRCS += boRecord.c
3130-LIBSRCS += calcRecord.c
3131-LIBSRCS += calcoutRecord.c
3132-LIBSRCS += compressRecord.c
3133-LIBSRCS += dfanoutRecord.c
3134-LIBSRCS += eventRecord.c
3135-LIBSRCS += fanoutRecord.c
3136-LIBSRCS += histogramRecord.c
3137-LIBSRCS += longinRecord.c
3138-LIBSRCS += longoutRecord.c
3139-LIBSRCS += mbbiRecord.c
3140-LIBSRCS += mbbiDirectRecord.c
3141-LIBSRCS += mbboRecord.c
3142-LIBSRCS += mbboDirectRecord.c
3143-LIBSRCS += permissiveRecord.c
3144-LIBSRCS += selRecord.c
3145-LIBSRCS += seqRecord.c
3146-LIBSRCS += stateRecord.c
3147-LIBSRCS += stringinRecord.c
3148-LIBSRCS += stringoutRecord.c
3149-LIBSRCS += subRecord.c
3150-LIBSRCS += subArrayRecord.c
3151-LIBSRCS += waveformRecord.c
3152-
3153-LIBRARY_IOC += recIoc
3154-
3155-recIoc_LIBS = asIoc dbIoc registryIoc dbStaticIoc ca Com
3156-recIoc_RCS = recIoc.rc
3157-
3158-include $(TOP)/configure/RULES
3159+DBD += stdRecords.dbd
3160+
3161+stdRecords_DBD = $(patsubst %,%.dbd,$(DBDINC))
3162+
3163+dbRecStd_SRCS += aaiRecord.c
3164+dbRecStd_SRCS += aaoRecord.c
3165+dbRecStd_SRCS += aiRecord.c
3166+dbRecStd_SRCS += aoRecord.c
3167+dbRecStd_SRCS += aSubRecord.c
3168+dbRecStd_SRCS += biRecord.c
3169+dbRecStd_SRCS += boRecord.c
3170+dbRecStd_SRCS += calcRecord.c
3171+dbRecStd_SRCS += calcoutRecord.c
3172+dbRecStd_SRCS += compressRecord.c
3173+dbRecStd_SRCS += dfanoutRecord.c
3174+dbRecStd_SRCS += eventRecord.c
3175+dbRecStd_SRCS += fanoutRecord.c
3176+dbRecStd_SRCS += histogramRecord.c
3177+dbRecStd_SRCS += longinRecord.c
3178+dbRecStd_SRCS += longoutRecord.c
3179+dbRecStd_SRCS += mbbiRecord.c
3180+dbRecStd_SRCS += mbbiDirectRecord.c
3181+dbRecStd_SRCS += mbboRecord.c
3182+dbRecStd_SRCS += mbboDirectRecord.c
3183+dbRecStd_SRCS += permissiveRecord.c
3184+dbRecStd_SRCS += selRecord.c
3185+dbRecStd_SRCS += seqRecord.c
3186+dbRecStd_SRCS += stateRecord.c
3187+dbRecStd_SRCS += stringinRecord.c
3188+dbRecStd_SRCS += stringoutRecord.c
3189+dbRecStd_SRCS += subRecord.c
3190+dbRecStd_SRCS += subArrayRecord.c
3191+dbRecStd_SRCS += waveformRecord.c
3192
3193
3194=== added file 'src/std/rec/RULES'
3195--- src/std/rec/RULES 1970-01-01 00:00:00 +0000
3196+++ src/std/rec/RULES 2011-03-03 23:06:17 +0000
3197@@ -0,0 +1,15 @@
3198+#*************************************************************************
3199+# Copyright (c) 2011 The University of Chicago, as Operator of Argonne
3200+# National Laboratory.
3201+# Copyright (c) 2002 The Regents of the University of California, as
3202+# Operator of Los Alamos National Laboratory.
3203+# EPICS BASE is distributed subject to a Software License Agreement found
3204+# in file LICENSE that is included with this distribution.
3205+#*************************************************************************
3206+
3207+# This is a Makefile fragment, see src/std/Makefile.
3208+
3209+$(COMMON_DIR)/stdRecords.dbd:
3210+ $(RM) $@
3211+ $(PERL) $(TOOLS)/makeIncludeDbd.pl $(stdRecords_DBD) $@
3212+
3213
3214=== renamed directory 'src/softIoc' => 'src/std/softIoc'
3215=== modified file 'src/std/softIoc/Makefile'
3216--- src/softIoc/Makefile 2010-10-22 22:02:40 +0000
3217+++ src/std/softIoc/Makefile 2011-03-03 23:06:17 +0000
3218@@ -1,17 +1,19 @@
3219 ##########################################################################
3220-# Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne
3221+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
3222 # National Laboratory.
3223 # EPICS BASE is distributed subject to a Software License Agreement found
3224 # in the file LICENSE that is included with this distribution.
3225 ##########################################################################
3226
3227-TOP=../..
3228+# This is a Makefile fragment, see src/ioc/Makefile.
3229
3230-include $(TOP)/configure/CONFIG
3231+SRC_DIRS += $(STDDIR)/softIoc
3232
3233 PROD_IOC = softIoc
3234
3235+DBD += base.dbd
3236 DBD += softIoc.dbd
3237+
3238 softIoc_DBD += base.dbd
3239 softIoc_DBD += dlload.dbd
3240 softIoc_DBD += system.dbd
3241@@ -26,14 +28,3 @@
3242
3243 FINAL_LOCATION ?= $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
3244
3245-include $(TOP)/configure/RULES
3246-
3247-softMain$(OBJ) : epicsInstallDir.h
3248-
3249-epicsInstallDir.h:
3250- $(ECHO) "FINAL_LOCATION=$(FINAL_LOCATION)"
3251- $(PERL) ../makeInstallDir.pl '$(FINAL_LOCATION)' > $@
3252-
3253-clean::
3254- @$(RM) epicsInstallDir.h
3255-
3256
3257=== added file 'src/std/softIoc/RULES'
3258--- src/std/softIoc/RULES 1970-01-01 00:00:00 +0000
3259+++ src/std/softIoc/RULES 2011-03-03 23:06:17 +0000
3260@@ -0,0 +1,20 @@
3261+##########################################################################
3262+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
3263+# National Laboratory.
3264+# EPICS BASE is distributed subject to a Software License Agreement found
3265+# in the file LICENSE that is included with this distribution.
3266+##########################################################################
3267+
3268+# This is a Makefile fragment, see src/ioc/Makefile.
3269+
3270+$(COMMON_DIR)/softIoc.dbd: $(INSTALL_DBD)/stdRecords.dbd
3271+
3272+softMain$(OBJ): epicsInstallDir.h
3273+
3274+epicsInstallDir.h:
3275+ $(ECHO) "FINAL_LOCATION=$(FINAL_LOCATION)"
3276+ $(PERL) $(STDDIR)/softIoc/makeInstallDir.pl '$(FINAL_LOCATION)' > $@
3277+
3278+clean::
3279+ @$(RM) epicsInstallDir.h
3280+
3281
3282=== renamed file 'src/misc/base.dbd' => 'src/std/softIoc/base.dbd'
3283--- src/misc/base.dbd 2010-10-05 19:27:37 +0000
3284+++ src/std/softIoc/base.dbd 2011-03-03 23:06:17 +0000
3285@@ -8,43 +8,13 @@
3286 include "menuConvert.dbd"
3287
3288 # Record types
3289-include "aaiRecord.dbd"
3290-include "aaoRecord.dbd"
3291-include "aiRecord.dbd"
3292-include "aoRecord.dbd"
3293-include "aSubRecord.dbd"
3294-include "biRecord.dbd"
3295-include "boRecord.dbd"
3296-include "calcRecord.dbd"
3297-include "calcoutRecord.dbd"
3298-include "compressRecord.dbd"
3299-include "dfanoutRecord.dbd"
3300-include "eventRecord.dbd"
3301-include "fanoutRecord.dbd"
3302-include "longinRecord.dbd"
3303-include "longoutRecord.dbd"
3304-include "mbbiRecord.dbd"
3305-include "mbbiDirectRecord.dbd"
3306-include "mbboRecord.dbd"
3307-include "mbboDirectRecord.dbd"
3308-include "permissiveRecord.dbd"
3309-include "selRecord.dbd"
3310-include "seqRecord.dbd"
3311-include "stateRecord.dbd"
3312-include "stringinRecord.dbd"
3313-include "stringoutRecord.dbd"
3314-include "subRecord.dbd"
3315-include "subArrayRecord.dbd"
3316-include "waveformRecord.dbd"
3317+include "stdRecords.dbd"
3318
3319 # "Soft Channel", "Raw Soft Channel", and "Async Soft Channel" device support
3320 include "devSoft.dbd"
3321
3322 # Access security subroutines
3323 registrar(asSub)
3324-variable(asCaDebug,int)
3325
3326-# dbStaticLib settings
3327-variable(dbRecordsOnceOnly,int)
3328-variable(dbBptNotMonotonic,int)
3329+include "dbCore.dbd"
3330
3331
3332=== renamed directory 'src/dev/testDev' => 'src/std/test'
3333=== added directory 'src/template'
3334=== renamed directory 'src/makeBaseApp' => 'src/template/base'
3335=== modified file 'src/template/base/Makefile'
3336--- src/makeBaseApp/Makefile 2008-10-08 22:42:49 +0000
3337+++ src/template/base/Makefile 2011-03-03 23:06:17 +0000
3338@@ -1,4 +1,4 @@
3339-TOP=../..
3340+TOP=../../..
3341
3342 include $(TOP)/configure/CONFIG
3343
3344
3345=== renamed directory 'src/makeBaseExt' => 'src/template/ext'
3346=== modified file 'src/template/ext/Makefile'
3347--- src/makeBaseExt/Makefile 2006-03-29 17:09:24 +0000
3348+++ src/template/ext/Makefile 2011-03-03 23:06:17 +0000
3349@@ -1,4 +1,4 @@
3350-TOP=../..
3351+TOP=../../..
3352
3353 include $(TOP)/configure/CONFIG
3354
3355
3356=== removed file 'src/toolsComm/Makefile'
3357--- src/toolsComm/Makefile 2010-10-12 16:27:17 +0000
3358+++ src/toolsComm/Makefile 1970-01-01 00:00:00 +0000
3359@@ -1,19 +0,0 @@
3360-#*************************************************************************
3361-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
3362-# National Laboratory.
3363-# Copyright (c) 2002 The Regents of the University of California, as
3364-# Operator of Los Alamos National Laboratory.
3365-# EPICS BASE is distributed subject to a Software License Agreement found
3366-# in file LICENSE that is included with this distribution.
3367-#*************************************************************************
3368-
3369-TOP=../..
3370-
3371-include $(TOP)/configure/CONFIG
3372-
3373-DIRS = antelope flex
3374-
3375-flex_DEPEND_DIRS += antelope
3376-
3377-include $(TOP)/configure/RULES_DIRS
3378-
3379
3380=== removed directory 'src/util'
3381=== removed file 'src/util/Makefile'
3382--- src/util/Makefile 2010-10-12 16:27:17 +0000
3383+++ src/util/Makefile 1970-01-01 00:00:00 +0000
3384@@ -1,35 +0,0 @@
3385-#*************************************************************************
3386-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
3387-# National Laboratory.
3388-# Copyright (c) 2002 The Regents of the University of California, as
3389-# Operator of Los Alamos National Laboratory.
3390-# EPICS BASE is distributed subject to a Software License Agreement found
3391-# in file LICENSE that is included with this distribution.
3392-#*************************************************************************
3393-TOP=../..
3394-
3395-include $(TOP)/configure/CONFIG
3396-
3397-PROD_LIBS = ca Com
3398-
3399-#
3400-# Added winmm user32 for the non-dll build
3401-#
3402-PROD_HOST_DEFAULT = ca_test iocLogServer
3403-PROD_HOST_WIN32 = ca_test iocLogServer
3404-PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
3405-
3406-iocLogServer_SYS_LIBS_solaris = socket
3407-
3408-ca_test_SRCS = ca_test_main.c ca_test.c
3409-iocLogServer_SRCS = iocLogServer.c
3410-
3411-OBJS_vxWorks = ca_test
3412-
3413-SCRIPTS_solaris := S99logServer S99caRepeater
3414-SCRIPTS_Linux := S99logServer S99caRepeater
3415-
3416-include $(TOP)/configure/RULES
3417-
3418-S99%: ../rc2.%
3419- sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@

Subscribers

People subscribed via source and target branches