bug 468:

Add support for a single program version

LCS/Common/include/Common/Version.h

@@ -35,8 +35,11 @@ namespace LOFAR {
   {
   public:
     // Add package/version to vector if not existing yet.
-    static void fillVersion (const std::string& package,
+    // It returns false if the version differs from the main version.
+    static bool fillVersion (const std::string& package,
 			     const std::string& version,
+			     const std::string& versionSuffix,
+			     const std::string& mainVersion,
 			     std::vector<std::string>& v);
 
     // Show the package or application name and the versions of the packages
@@ -49,8 +52,26 @@ namespace LOFAR {
 					   std::ostream& os)
     {
       std::vector<std::string> v;
-      T::fillVersion(v);
-      os << name << ": versions " << v << endl;
+      bool sameVers = T::fillVersion (T::getVersion(), v);
+      os << name << ": main version = " << T::getVersion();
+      if (!sameVers) os << '*';
+      os << endl;
+      os << "  packages: " << v << endl;
+    }
+
+    // Get the main version and the individual package versions being used.
+    // It returns false if a package version differs from the main version.
+    // Use like:
+    // @code
+    //  std::string mainVersion;
+    //  std::vector<std::string> packageVersions;
+    //  Version::get<BlobVersion> (mainVersion, packageVersions);
+    // @endcode
+    template<typename T> static bool get (std::string& mainVersion,
+					  std::vector<std::string>& pkgVers)
+    {
+      mainVersion = T::getVersion();
+      return T::fillVersion (mainVersion, pkgVers);
     }
   };
 

LCS/Common/src/Version.cc

@@ -24,11 +24,14 @@
 
 namespace LOFAR {
 
-  void Version::fillVersion (const std::string& package,
+  bool Version::fillVersion (const std::string& package,
 			     const std::string& version,
+			     const std::string& versionSuffix,
+			     const std::string& mainVersion,
 			     std::vector<std::string>& v)
   {
-    std::string pv = package + '/' + version;
+    bool sameVers = (version == mainVersion);
+    std::string pv = package + '/' + version + versionSuffix;
     // Only insert if not existing yet.
     // Later you might remove the existing one, so the dependencies are
     // shown in a somewhat better way.
@@ -36,10 +39,11 @@ namespace LOFAR {
 	 iter!=v.end();
 	 ++iter) {
       if (*iter == pv) {
-	return;
+	return sameVers;
       }
     }
     v.push_back (pv);
+    return sameVers;
   }
 
 }