From a597381f83eebc8465fcbf174a761d3eb9561a65 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 16 Jan 2020 16:25:51 -0800 Subject: [PATCH] pvget -V show dependency versions --- pvtoolsSrc/pvcall.cpp | 17 +++++++++++------ pvtoolsSrc/pvget.cpp | 17 +++++++++++------ pvtoolsSrc/pvinfo.cpp | 11 ++++++++--- pvtoolsSrc/pvlist.cpp | 11 ++++++++--- pvtoolsSrc/pvput.cpp | 17 +++++++++++------ 5 files changed, 49 insertions(+), 24 deletions(-) diff --git a/pvtoolsSrc/pvcall.cpp b/pvtoolsSrc/pvcall.cpp index 0e6d2d3..0b57f03 100644 --- a/pvtoolsSrc/pvcall.cpp +++ b/pvtoolsSrc/pvcall.cpp @@ -93,12 +93,17 @@ int MAIN (int argc, char *argv[]) break; case 'V': /* Print version */ { - pva::Version version(EXECNAME, "cpp", - EPICS_PVA_MAJOR_VERSION, - EPICS_PVA_MINOR_VERSION, - EPICS_PVA_MAINTENANCE_VERSION, - EPICS_PVA_DEVELOPMENT_FLAG); - fprintf(stdout, "%s\n", version.getVersionString().c_str()); + fprintf(stdout, "pvAccess %u.%u.%u%s\n", + EPICS_PVA_MAJOR_VERSION, + EPICS_PVA_MINOR_VERSION, + EPICS_PVA_MAINTENANCE_VERSION, + (EPICS_PVA_DEVELOPMENT_FLAG)?"-SNAPSHOT":""); + fprintf(stdout, "pvData %u.%u.%u%s\n", + EPICS_PVD_MAJOR_VERSION, + EPICS_PVD_MINOR_VERSION, + EPICS_PVD_MAINTENANCE_VERSION, + (EPICS_PVD_DEVELOPMENT_FLAG)?"-SNAPSHOT":""); + fprintf(stdout, "Base %s\n", EPICS_VERSION_FULL); return 0; } break; diff --git a/pvtoolsSrc/pvget.cpp b/pvtoolsSrc/pvget.cpp index 141ec19..f508190 100644 --- a/pvtoolsSrc/pvget.cpp +++ b/pvtoolsSrc/pvget.cpp @@ -286,12 +286,17 @@ int MAIN (int argc, char *argv[]) break; case 'V': /* Print version */ { - pva::Version version(EXECNAME, "cpp", - EPICS_PVA_MAJOR_VERSION, - EPICS_PVA_MINOR_VERSION, - EPICS_PVA_MAINTENANCE_VERSION, - EPICS_PVA_DEVELOPMENT_FLAG); - fprintf(stdout, "%s\n", version.getVersionString().c_str()); + fprintf(stdout, "pvAccess %u.%u.%u%s\n", + EPICS_PVA_MAJOR_VERSION, + EPICS_PVA_MINOR_VERSION, + EPICS_PVA_MAINTENANCE_VERSION, + (EPICS_PVA_DEVELOPMENT_FLAG)?"-SNAPSHOT":""); + fprintf(stdout, "pvData %u.%u.%u%s\n", + EPICS_PVD_MAJOR_VERSION, + EPICS_PVD_MINOR_VERSION, + EPICS_PVD_MAINTENANCE_VERSION, + (EPICS_PVD_DEVELOPMENT_FLAG)?"-SNAPSHOT":""); + fprintf(stdout, "Base %s\n", EPICS_VERSION_FULL); return 0; } case 'R': diff --git a/pvtoolsSrc/pvinfo.cpp b/pvtoolsSrc/pvinfo.cpp index 7c3020d..4c3e464 100644 --- a/pvtoolsSrc/pvinfo.cpp +++ b/pvtoolsSrc/pvinfo.cpp @@ -114,12 +114,17 @@ int main (int argc, char *argv[]) return 0; case 'V': /* Print version */ { - pva::Version version("pvinfo", "cpp", + fprintf(stdout, "pvAccess %u.%u.%u%s\n", EPICS_PVA_MAJOR_VERSION, EPICS_PVA_MINOR_VERSION, EPICS_PVA_MAINTENANCE_VERSION, - EPICS_PVA_DEVELOPMENT_FLAG); - fprintf(stdout, "%s\n", version.getVersionString().c_str()); + (EPICS_PVA_DEVELOPMENT_FLAG)?"-SNAPSHOT":""); + fprintf(stdout, "pvData %u.%u.%u%s\n", + EPICS_PVD_MAJOR_VERSION, + EPICS_PVD_MINOR_VERSION, + EPICS_PVD_MAINTENANCE_VERSION, + (EPICS_PVD_DEVELOPMENT_FLAG)?"-SNAPSHOT":""); + fprintf(stdout, "Base %s\n", EPICS_VERSION_FULL); return 0; } case 'w': /* Set PVA timeout value */ diff --git a/pvtoolsSrc/pvlist.cpp b/pvtoolsSrc/pvlist.cpp index 3872542..632aabb 100644 --- a/pvtoolsSrc/pvlist.cpp +++ b/pvtoolsSrc/pvlist.cpp @@ -537,12 +537,17 @@ int main (int argc, char *argv[]) return 0; case 'V': /* Print version */ { - Version version("pvlist", "cpp", + fprintf(stdout, "pvAccess %u.%u.%u%s\n", EPICS_PVA_MAJOR_VERSION, EPICS_PVA_MINOR_VERSION, EPICS_PVA_MAINTENANCE_VERSION, - EPICS_PVA_DEVELOPMENT_FLAG); - fprintf(stdout, "%s\n", version.getVersionString().c_str()); + (EPICS_PVA_DEVELOPMENT_FLAG)?"-SNAPSHOT":""); + fprintf(stdout, "pvData %u.%u.%u%s\n", + EPICS_PVD_MAJOR_VERSION, + EPICS_PVD_MINOR_VERSION, + EPICS_PVD_MAINTENANCE_VERSION, + (EPICS_PVD_DEVELOPMENT_FLAG)?"-SNAPSHOT":""); + fprintf(stdout, "Base %s\n", EPICS_VERSION_FULL); return 0; } case 'w': /* Set PVA timeout value */ diff --git a/pvtoolsSrc/pvput.cpp b/pvtoolsSrc/pvput.cpp index f77c1df..454bcf1 100644 --- a/pvtoolsSrc/pvput.cpp +++ b/pvtoolsSrc/pvput.cpp @@ -240,12 +240,17 @@ int main (int argc, char *argv[]) break; case 'V': /* Print version */ { - pva::Version version("pvput", "cpp", - EPICS_PVA_MAJOR_VERSION, - EPICS_PVA_MINOR_VERSION, - EPICS_PVA_MAINTENANCE_VERSION, - EPICS_PVA_DEVELOPMENT_FLAG); - fprintf(stdout, "%s\n", version.getVersionString().c_str()); + fprintf(stdout, "pvAccess %u.%u.%u%s\n", + EPICS_PVA_MAJOR_VERSION, + EPICS_PVA_MINOR_VERSION, + EPICS_PVA_MAINTENANCE_VERSION, + (EPICS_PVA_DEVELOPMENT_FLAG)?"-SNAPSHOT":""); + fprintf(stdout, "pvData %u.%u.%u%s\n", + EPICS_PVD_MAJOR_VERSION, + EPICS_PVD_MINOR_VERSION, + EPICS_PVD_MAINTENANCE_VERSION, + (EPICS_PVD_DEVELOPMENT_FLAG)?"-SNAPSHOT":""); + fprintf(stdout, "Base %s\n", EPICS_VERSION_FULL); return 0; } case 'M':