pvget -V show dependency versions

epics-base · Jan 17, 2020 · a597381 · a597381
1 parent ee2e159
commit a597381
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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':