pvaTestClient rename files

examples/getme.cpp

@@ -22,7 +22,7 @@
 #include <pv/configuration.h>
 #include <pv/clientFactory.h>
 #include <pv/caProvider.h>
-#include <pv/pvaTestClient.h>
+#include <pva/client.h>
 //! [Headers]
 
 namespace pvd = epics::pvData;

examples/miniget.cpp

@@ -7,7 +7,7 @@
 #include <iostream>
 
 #include "pv/clientFactory.h"
-#include "pv/pvaTestClient.h"
+#include "pva/client.h"
 
 int main(int argc, char *argv[])
 {

examples/monitorme.cpp

@@ -23,7 +23,7 @@
 #include <pv/clientFactory.h>
 #include <pv/caProvider.h>
 #include <pv/thread.h>
-#include <pv/pvaTestClient.h>
+#include <pva/client.h>
 
 namespace pvd = epics::pvData;
 namespace pva = epics::pvAccess;

examples/putme.cpp

@@ -24,7 +24,7 @@
 #include <pv/configuration.h>
 #include <pv/clientFactory.h>
 #include <pv/caProvider.h>
-#include <pv/pvaTestClient.h>
+#include <pva/client.h>
 //! [Headers]
 
 namespace pvd = epics::pvData;

src/Makefile

@@ -23,7 +23,6 @@ include $(PVACCESS_SRC)/rpcService/Makefile
 include $(PVACCESS_SRC)/rpcClient/Makefile
 include $(PVACCESS_SRC)/pipelineService/Makefile
 include $(PVACCESS_SRC)/ca/Makefile
-include $(PVACCESS_SRC)/testing/Makefile
 include $(PVACCESS_SRC)/mb/Makefile
 
 LIBRARY = pvAccess

src/client/Makefile

@@ -4,5 +4,11 @@ SRC_DIRS += $(PVACCESS_SRC)/client
 
 INC += pv/monitor.h
 INC += pv/pvAccess.h
+INC += pva/client.h
 
 LIBSRCS += pvAccess.cpp
+LIBSRCS += client.cpp
+LIBSRCS += clientSync.cpp
+LIBSRCS += clientGet.cpp
+LIBSRCS += clientRPC.cpp
+LIBSRCS += clientMonitor.cpp

src/client/client.cpp

@@ -11,7 +11,7 @@
 
 #define epicsExportSharedSymbols
 #include "pv/logger.h"
-#include "pv/pvaTestClient.h"
+#include "pva/client.h"
 #include "pv/pvAccess.h"
 #include "pv/configuration.h"
 

src/client/clientGet.cpp

@@ -13,7 +13,7 @@
 
 #define epicsExportSharedSymbols
 #include "pv/logger.h"
-#include "pv/pvaTestClient.h"
+#include "pva/client.h"
 #include "pv/pvAccess.h"
 
 namespace pvd = epics::pvData;

src/client/clientMonitor.cpp

@@ -12,7 +12,7 @@
 
 #define epicsExportSharedSymbols
 #include "pv/logger.h"
-#include "pv/pvaTestClient.h"
+#include "pva/client.h"
 #include "pv/pvAccess.h"
 
 namespace pvd = epics::pvData;

src/client/clientRPC.cpp

@@ -11,7 +11,7 @@
 
 #define epicsExportSharedSymbols
 #include "pv/logger.h"
-#include "pv/pvaTestClient.h"
+#include "pva/client.h"
 #include "pv/pvAccess.h"
 
 namespace pvd = epics::pvData;

src/client/clientSync.cpp

@@ -13,7 +13,7 @@
 
 #define epicsExportSharedSymbols
 #include "pv/logger.h"
-#include "pv/pvaTestClient.h"
+#include "pva/client.h"
 #include "pv/pvAccess.h"
 
 namespace pvd = epics::pvData;

src/testing/Makefile

@@ -1,11 +0,0 @@
-# This is a Makefile fragment, see ../Makefile
-
-SRC_DIRS += $(PVACCESS_SRC)/testing
-
-INC += pv/pvaTestClient.h
-
-LIBSRCS += pvaTestClient.cpp
-LIBSRCS += pvaTestClientSync.cpp
-LIBSRCS += pvaTestClientGet.cpp
-LIBSRCS += pvaTestClientRPC.cpp
-LIBSRCS += pvaTestClientMonitor.cpp