Experimental Physics and
Industrial Control System

"Davidsaver, Michael" <[email protected]> · Thu, 16 Dec 2010 17:58:53 -0500

Step 1 is ready.  It builds as before with the exception of std/test
(formerly dev/testDev) which is not built and will be removed.

https://code.launchpad.net/~mdavidsaver/epics-base/reorg-src

Step 2 will be:

= split up src/ioc/as

asDbLib going to src/ioc/db and the asLib files to src/libCom/as.

= break up util

Move util/ca_* to ca/client/test/

Move util/rc2.caRepeater to ca/client/

Rename libCom/logClient to libCom/log
Move iocLogServer to libCom/log/

= Remove dependencies from ca/ on ioc/dbStatic

Move some headers from ioc/dbStatic to libCom/misc.  I think this is
just alarm.h.

= ???

Anything missing?

Unless there is are comments (or I am distracted again) I plan on doing
step 2 tomorrow.

Regards,
Michael

> -----Original Message-----
> From: [email protected] [mailto:core-talk-
> [email protected]] On Behalf Of Davidsaver, Michael
> Sent: Friday, December 10, 2010 4:19 PM
> To: Andrew Johnson; [email protected]
> Subject: RE: src/ reorganization
> 
> 
> 
> > -----Original Message-----
> > From: Andrew Johnson [mailto:[email protected]]
> > ...
> > > If there aren't major changes then next week I will create a
branch
> > with
> > > these changes and request a merge.
> > >
> > > The first stage will look like:
> > > > == Full list of renames
> > > >
> > > > tools      = tools
> > > > libCom     = libCom
> > > > toolsComm  = libCom/tools
> > > > RTEMS      = libCom/RTEMS
> > > > as         = ioc/as
> > > > bpt        = ioc/bpt
> > > > db         = ioc/db
> > > > dbStatic   = ioc/dbStatic
> > > > dbtools    = ioc/dbtemplate
> > > > misc       = ioc/misc
> > > > registry   = ioc/registry
> > > > rsrv       = ioc/rsrv
> > > > dev/softDev= std/dev
> > > > dev/testDev= std/test
> > > > rec        = std/rec
> > > > softIoc    = std/softIoc
> > > > ca         = ca/client
> > > > cap5       = ca/client/perl
> > > > catools    = ca/client/tools
> > > > cas        = ca/legacy/pcas
> > > > excas      = ca/legacy/pcas/ex
> > > > gdd        = ca/legacy/gdd
> > > > makeBaseApp= template/base
> > > > makeBaseExt= template/ext
> > > > util       = util
> >
> > One question about the layout: I'm wondering whether in the final
> > structure
> > individual directories should either be a branch node or a leaf
node,
> > i.e.
> > they should either contain sub-directories and a Makefile, or they
> > contain
> > source files and a Makefile, but never both.  Your ca/client and
> > ca/legacy/pcas directories are currently mixed nodes.
> 
> Trying to adhere to this is what lead to present lib*Ioc situation.  I
> would rather start with what I want the result of the build to be, how
> I
> want the code to be organized, and then adapt the build system to
> produce it.
> 
> > Was your intention to follow the libCom model for source
directories?
> 
> Yes.  For the ioc/ and std/ directories at least.
> 
> > My
> > worry is that the libCom/Makefile is unwieldy because it has to name
> > all of
> > the files in the different sub-directories.
> 
> As long as the EPICS build system forces the distinction between
> branch/leaf node we will have this problem.
> 
> The Makefiles will be large, but there will be fewer of them.
> Basically
> all of my dislike of the current build system come from the "evil"
> include statement, and having to hunt to find anything.  It may be a
> personal preference, but in the src/ directory at least I would rather
> have a few large Makefiles.
> 
> 
> Michael
> 

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System