From 95a750c4f9a21368cce1457209cffa3d1d37b669 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Fri, 14 Jul 2017 16:56:47 +0200 Subject: [PATCH] pvaTestClient rename files --- examples/getme.cpp | 2 +- examples/miniget.cpp | 2 +- examples/monitorme.cpp | 2 +- examples/putme.cpp | 2 +- src/Makefile | 1 - src/client/Makefile | 6 ++++++ src/{testing/pvaTestClient.cpp => client/client.cpp} | 2 +- .../pvaTestClientGet.cpp => client/clientGet.cpp} | 2 +- .../clientMonitor.cpp} | 2 +- .../pvaTestClientRPC.cpp => client/clientRPC.cpp} | 2 +- .../pvaTestClientSync.cpp => client/clientSync.cpp} | 2 +- .../pv/pvaTestClient.h => client/pva/client.h} | 0 src/testing/Makefile | 11 ----------- 13 files changed, 15 insertions(+), 21 deletions(-) rename src/{testing/pvaTestClient.cpp => client/client.cpp} (99%) rename src/{testing/pvaTestClientGet.cpp => client/clientGet.cpp} (99%) rename src/{testing/pvaTestClientMonitor.cpp => client/clientMonitor.cpp} (99%) rename src/{testing/pvaTestClientRPC.cpp => client/clientRPC.cpp} (99%) rename src/{testing/pvaTestClientSync.cpp => client/clientSync.cpp} (98%) rename src/{testing/pv/pvaTestClient.h => client/pva/client.h} (100%) delete mode 100644 src/testing/Makefile diff --git a/examples/getme.cpp b/examples/getme.cpp index b1513bb..35fb913 100644 --- a/examples/getme.cpp +++ b/examples/getme.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include //! [Headers] namespace pvd = epics::pvData; diff --git a/examples/miniget.cpp b/examples/miniget.cpp index 6777116..a84dd4e 100644 --- a/examples/miniget.cpp +++ b/examples/miniget.cpp @@ -7,7 +7,7 @@ #include #include "pv/clientFactory.h" -#include "pv/pvaTestClient.h" +#include "pva/client.h" int main(int argc, char *argv[]) { diff --git a/examples/monitorme.cpp b/examples/monitorme.cpp index 990c58c..a2df0e7 100644 --- a/examples/monitorme.cpp +++ b/examples/monitorme.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace pvd = epics::pvData; namespace pva = epics::pvAccess; diff --git a/examples/putme.cpp b/examples/putme.cpp index 84fe852..029227b 100644 --- a/examples/putme.cpp +++ b/examples/putme.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include //! [Headers] namespace pvd = epics::pvData; diff --git a/src/Makefile b/src/Makefile index d7706d9..5b93948 100644 --- a/src/Makefile +++ b/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 diff --git a/src/client/Makefile b/src/client/Makefile index 358aae1..84e09af 100644 --- a/src/client/Makefile +++ b/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 diff --git a/src/testing/pvaTestClient.cpp b/src/client/client.cpp similarity index 99% rename from src/testing/pvaTestClient.cpp rename to src/client/client.cpp index 34ed9fa..d5d094b 100644 --- a/src/testing/pvaTestClient.cpp +++ b/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" diff --git a/src/testing/pvaTestClientGet.cpp b/src/client/clientGet.cpp similarity index 99% rename from src/testing/pvaTestClientGet.cpp rename to src/client/clientGet.cpp index 222c23e..8c8a484 100644 --- a/src/testing/pvaTestClientGet.cpp +++ b/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; diff --git a/src/testing/pvaTestClientMonitor.cpp b/src/client/clientMonitor.cpp similarity index 99% rename from src/testing/pvaTestClientMonitor.cpp rename to src/client/clientMonitor.cpp index 9a15ccb..34deb18 100644 --- a/src/testing/pvaTestClientMonitor.cpp +++ b/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; diff --git a/src/testing/pvaTestClientRPC.cpp b/src/client/clientRPC.cpp similarity index 99% rename from src/testing/pvaTestClientRPC.cpp rename to src/client/clientRPC.cpp index 3a710e8..f983f3b 100644 --- a/src/testing/pvaTestClientRPC.cpp +++ b/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; diff --git a/src/testing/pvaTestClientSync.cpp b/src/client/clientSync.cpp similarity index 98% rename from src/testing/pvaTestClientSync.cpp rename to src/client/clientSync.cpp index 662523f..63afce9 100644 --- a/src/testing/pvaTestClientSync.cpp +++ b/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; diff --git a/src/testing/pv/pvaTestClient.h b/src/client/pva/client.h similarity index 100% rename from src/testing/pv/pvaTestClient.h rename to src/client/pva/client.h diff --git a/src/testing/Makefile b/src/testing/Makefile deleted file mode 100644 index b043413..0000000 --- a/src/testing/Makefile +++ /dev/null @@ -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