Changeset 23351 for branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmVersion.c

Timestamp:

Mar 17, 2009, 12:07:42 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301/psModules

Files:

• . (modified) (1 prop)
• src/config/pmVersion.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmVersion.c

@@ -8 +8 @@
 #include "pmVersion.h"
 
-static const char *cvsTag = "$Name: not supported by cvs2svn $";// CVS tag name
+#ifndef PSMODULES_VERSION
+#error "PSMODULES_VERSION is not set"
+#endif
+#ifndef PSMODULES_BRANCH
+#error "PSMODULES_BRANCH is not set"
+#endif
+#ifndef PSMODULES_SOURCE
+#error "PSMODULES_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
 
 psString psModulesVersion(void)
 {
-    psString version = NULL;            // Version, to return
-    psStringAppend(&version, "%s-%s",PACKAGE_NAME,PACKAGE_VERSION);
-    return version;
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PSMODULES_BRANCH), xstr(PSMODULES_VERSION));
+    return value;
 }
+
+psString psModulesSource(void)
+{
+    return psStringCopy(xstr(PSMODULES_SOURCE));
+}
+
 
 psString psModulesVersionLong(void)
 {
-    psString version = psModulesVersion(); // Version, to return
-    psString tag = psStringStripCVS(cvsTag, "Name"); // CVS tag
+    psString version = psModulesVersion();  // Version, to return
+    psString source = psModulesSource();    // Source
 
-    psStringAppend(&version, " (cvs tag %s) %s, %s", tag, __DATE__, __TIME__);
+    psStringPrepend(&version, "psModules ");
+    psStringAppend(&version, " from %s, built %s, %s", source, __DATE__, __TIME__);
+    psFree(source);
 
-    psFree(tag);
+#ifdef __OPTIMIZE__
+    psStringAppend(&version, " optimised");
+#else
+    psStringAppend(&version, " unoptimised");
+#endif
+
+#ifdef HAVE_NEBCLIENT
+    psStringAppend(&version, " with nebclient");
+#else
+    psStringAppend(&version, " without nebclient");
+#endif
+
     return version;
+};
+
+
+bool psModulesVersionHeader(psMetadata *header)
+{
+    PS_ASSERT_METADATA_NON_NULL(header, false);
+
+    psString version = psModulesVersion(); // Software version
+    psString source = psModulesSource();   // Software source
+
+    psStringPrepend(&version, "psModules version: ");
+    psStringPrepend(&source, "psModules source: ");
+
+    psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, version);
+    psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, source);
+
+    psFree(version);
+    psFree(source);
+
+    return true;
 }