EPICS_base/pvDatabase
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

correct order of dependent LIBS; update doc for latest build conventions

Browse Source
This commit is contained in:
Marty Kraimer
2014-02-19 14:35:39 -05:00
parent 228b46a622
commit 6b47485810
14 changed files with 2109 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arrayPerformance/src/Makefile
View File

@ -2,8 +2,8 @@ TOP = ..
include $(TOP)/configure/CONFIG
LIBRARY_IOC += pvDatabaseExample
pvDatabaseExample_LIBS += pvDatabase pvAccess pvData Com
pvDatabaseExample_LIBS += $(EPICS_BASE_IOC_LIBS)
pvDatabaseExample_LIBS += Com pvData pvAccess pvDatabase
INC+= arrayPerformance.h

8
configure/ExampleRELEASE.local Normal file
View File

@ -0,0 +1,8 @@
TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
EPICS_BASE=/home/install/epics/base
PVCOMMON=/home/hg/pvCommonCPP
PVDATA=/home/hg/pvDataCPP
PVACCESS=/home/hg/pvAccessCPP
PVASRV=/home/hg/pvaSrv

23
documentation/pvDatabaseCPP.html
View File

@ -38,7 +38,7 @@
<h1>pvDatabaseCPP</h1>
<!-- Maturity: Working Draft or Request for Comments, or Recommendation, and date. -->
<h2 class="nocount">EPICS v4 Working Group, Working Draft, 07-Feb-2014</h2>
<h2 class="nocount">EPICS v4 Working Group, Working Draft, 19-Feb-2014</h2>
<dl>
<dt>Latest version:</dt>
<dd><a
@ -46,11 +46,11 @@
</dd>
<dt>This version:</dt>
<dd><a
href= "pvDatabaseCPP_20140207.html">pvDatabaseCPP20140207.html</a>
href= "pvDatabaseCPP_20140219.html">pvDatabaseCPP20140219.html</a>
</dd>
<dt>Previous version:</dt>
<dd><a
href= "pvDatabaseCPP_20131121.html">pvDatabaseCPP20131121.html</a>
href= "pvDatabaseCPP_20140207.html">pvDatabaseCPP20140207.html</a>
</dd>
<dt>Editors:</dt>
<dd>Marty Kraimer, BNL</dd>
@ -79,7 +79,7 @@ V4 control system programming environment:<br />
<h2 class="nocount">Status of this Document</h2>
<p>This is the 07-Feb-2014 version of of pvDatabaseCPP.</p>
<p>This is the 19-Feb-2014 version of of pvDatabaseCPP.</p>
</p>
<p>
@ -399,9 +399,11 @@ mrk&gt; pwd
/home/hg/pvDatabaseCPP
mrk&gt; make
</pre>
<p>This builds pvDatabaseCPP and also the tests.</p>
<p>Each example and arrayPerformance is build as a completely separate top.
This is done so that:<p>
<p>This builds pvDatabaseCPP and also the tests and all examples.</p>
<p>Each example and arrayPerformance is a completely separate top,
but is also built when make is run in pvDatabaseCPP itself.</p>
<p>
Each is a separate top for the following reasons:</p>
<ol>
<li>
It is easier to understand each example including how it is built so that
@ -412,8 +414,9 @@ This is done so that:<p>
for creating a new service.
</li>
</ol>
<p>Thus to build each example just follow the same instructions as for
building pvDatabaseCPP itself.
<p>
If it is desired to build an example all by itself,
just follow the same instructions as for building pvDatabaseCPP itself.
For example:</p>
<pre>
mrk&gt; pwd
@ -422,7 +425,7 @@ mrk&gt; cp ExampleRELEASE.local RELEASE.local
</pre>
<p>Then edit <b>RELEASE.local</b> so that it has the correct location of each
product the example requires.
Than at the top level just execute <b>make</b>:</p>
Than at the top level of the example just execute <b>make</b>:</p>
<pre>
mrk&gt; cd ..
mrk&gt; pwd

2043
documentation/pvDatabaseCPP_20140219.html Normal file
View File

File diff suppressed because it is too large Load Diff

8
exampleDatabase/ioc/src/Makefile
View File

@ -26,11 +26,13 @@ exampleDatabase_SRCS_vxWorks += -nil-
# The following adds support from base/src/vxWorks
exampleDatabase_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
exampleDatabase_LIBS += pvData pvAccess
exampleDatabase_LIBS += pvDatabase
exampleDatabase_LIBS += pvaSrv
exampleDatabase_LIBS += exampleDatabase
exampleDatabase_LIBS += powerSupply
exampleDatabase_LIBS += pvDatabase
exampleDatabase_LIBS += pvaSrv
exampleDatabase_LIBS += pvAccess
exampleDatabase_LIBS += pvData
exampleDatabase_LIBS += Com
exampleDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
#===========================

13
exampleDatabase/src/Makefile
View File

@ -12,12 +12,12 @@ include $(TOP)/configure/CONFIG
PROD_HOST += exampleDatabaseMain
exampleDatabaseMain_SRCS += exampleDatabaseMain.cpp
exampleDatabaseMain_LIBS += Com
exampleDatabaseMain_LIBS += pvData
exampleDatabaseMain_LIBS += pvAccess
exampleDatabaseMain_LIBS += pvDatabase
exampleDatabaseMain_LIBS += exampleDatabase
exampleDatabaseMain_LIBS += powerSupply
exampleDatabaseMain_LIBS += pvDatabase
exampleDatabaseMain_LIBS += pvAccess
exampleDatabaseMain_LIBS += pvData
exampleDatabaseMain_LIBS += Com
DBD += exampleDatabase.dbd
@ -26,9 +26,10 @@ INC += exampleDatabase.h
LIBRARY_IOC += exampleDatabase
exampleDatabase_SRCS += exampleDatabase.cpp
exampleDatabase_SRCS += exampleDatabaseRegister.cpp
exampleDatabase_LIBS += pvData
exampleDatabase_LIBS += pvAccess
exampleDatabase_LIBS += pvDatabase
exampleDatabase_LIBS += pvAccess
exampleDatabase_LIBS += pvData
exampleDatabase_LIBS += Com
exampleDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
#===========================

7
exampleLink/ioc/src/Makefile
View File

@ -27,9 +27,12 @@ exampleLink_SRCS_vxWorks += -nil-
# The following adds support from base/src/vxWorks
exampleLink_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
exampleLink_LIBS += pvData pvAccess
exampleLink_LIBS += pvDatabase
exampleLink_LIBS += exampleLink
exampleLink_LIBS += pvDatabase
exampleLink_LIBS += pvaSrv
exampleLink_LIBS += pvAccess
exampleLink_LIBS += pvData
exampleLink_LIBS += Com
exampleLink_LIBS += $(EPICS_BASE_IOC_LIBS)
#===========================

5
exampleLink/src/Makefile
View File

@ -16,9 +16,10 @@ INC += exampleLink.h
LIBRARY_IOC += exampleLink
exampleLink_SRCS += exampleLink.cpp
exampleLink_SRCS += exampleLinkRegister.cpp
exampleLink_LIBS += pvData
exampleLink_LIBS += pvAccess
exampleLink_LIBS += pvDatabase
exampleLink_LIBS += pvAccess
exampleLink_LIBS += pvData
exampleLink_LIBS += Com
exampleLink_LIBS += $(EPICS_BASE_IOC_LIBS)
#===========================

5
examplePowerSupply/ioc/src/Makefile
View File

@ -26,10 +26,11 @@ powerSupply_SRCS_vxWorks += -nil-
# The following adds support from base/src/vxWorks
powerSupply_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
powerSupply_LIBS += pvData pvAccess
powerSupply_LIBS += powerSupply
powerSupply_LIBS += pvDatabase
powerSupply_LIBS += pvaSrv
powerSupply_LIBS += powerSupply
powerSupply_LIBS += pvAccess
powerSupply_LIBS += pvData
powerSupply_LIBS += $(EPICS_BASE_IOC_LIBS)
#===========================

6
examplePowerSupply/src/Makefile
View File

@ -13,10 +13,10 @@ include $(TOP)/configure/CONFIG
PROD_HOST += powerSupplyMain
powerSupplyMain_SRCS += powerSupplyMain.cpp
powerSupplyMain_LIBS += Com
powerSupplyMain_LIBS += pvData
powerSupplyMain_LIBS += pvAccess
powerSupplyMain_LIBS += pvDatabase
powerSupplyMain_LIBS += pvAccess
powerSupplyMain_LIBS += pvData
powerSupplyMain_LIBS += Com
powerSupplyMain_LIBS += powerSupply
#===========================

5
exampleServer/ioc/src/Makefile
View File

@ -26,10 +26,11 @@ exampleServer_SRCS_vxWorks += -nil-
# The following adds support from base/src/vxWorks
exampleServer_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
exampleServer_LIBS += pvData pvAccess
exampleServer_LIBS += exampleServer
exampleServer_LIBS += pvDatabase
exampleServer_LIBS += pvaSrv
exampleServer_LIBS += exampleServer
exampleServer_LIBS += pvAccess
exampleServer_LIBS += pvData
exampleServer_LIBS += $(EPICS_BASE_IOC_LIBS)
#===========================

21
exampleServer/src/Makefile
View File

@ -10,14 +10,6 @@ include $(TOP)/configure/CONFIG
#
PROD_HOST += exampleServerMain
exampleServerMain_SRCS += exampleServerMain.cpp
exampleServerMain_LIBS += Com
exampleServerMain_LIBS += pvData
exampleServerMain_LIBS += pvAccess
exampleServerMain_LIBS += pvDatabase
exampleServerMain_LIBS += exampleServer
DBD += exampleServer.dbd
INC += exampleServer.h
@ -25,11 +17,20 @@ INC += exampleServer.h
LIBRARY_IOC += exampleServer
exampleServer_SRCS += exampleServer.cpp
exampleServer_SRCS += exampleServerRegister.cpp
exampleServer_LIBS += pvData
exampleServer_LIBS += pvAccess
exampleServer_LIBS += pvDatabase
exampleServer_LIBS += pvAccess
exampleServer_LIBS += pvData
exampleServer_LIBS += Com
exampleServer_LIBS += $(EPICS_BASE_IOC_LIBS)
PROD_HOST += exampleServerMain
exampleServerMain_SRCS += exampleServerMain.cpp
exampleServerMain_LIBS += exampleServer
exampleServerMain_LIBS += pvDatabase
exampleServerMain_LIBS += pvAccess
exampleServerMain_LIBS += pvData
exampleServerMain_LIBS += Com
#===========================
include $(TOP)/configure/RULES

2
src/Makefile
View File

@ -4,8 +4,8 @@ include $(TOP)/configure/CONFIG
DATABASE = $(TOP)/src/
LIBRARY_IOC += pvDatabase
pvDatabase_LIBS += pvAccess pvData Com
pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
pvDatabase_LIBS += Com pvData pvAccess
SRC_DIRS += $(DATABASE)/database
INC += pvDatabase.h

5
test/src/Makefile
View File

@ -9,9 +9,10 @@ INC += powerSupply.h
LIBRARY_IOC += powerSupply
powerSupply_SRCS += powerSupply.cpp
powerSupply_SRCS += powerSupplyRegister.cpp
powerSupply_LIBS += pvData
powerSupply_LIBS += pvAccess
powerSupply_LIBS += pvDatabase
powerSupply_LIBS += pvAccess
powerSupply_LIBS += pvData
powerSupply_LIBS += Com
powerSupply_LIBS += $(EPICS_BASE_IOC_LIBS)