Changeset 23145 for trunk/pswarp/src/pswarpVersion.c

Timestamp:

Mar 3, 2009, 4:01:12 PM (17 years ago)

Author:

Paul Price

Message:

Adding version functions to match psLib.

File:

• trunk/pswarp/src/pswarpVersion.c (modified) (1 diff)

trunk/pswarp/src/pswarpVersion.c

@@ -20 +20 @@
 #include "pswarp.h"
 
-static const char *cvsTag = "$Name: not supported by cvs2svn $";///< CVS tag name
 
 psString pswarpVersion(void)
 {
-    psString version = NULL;            ///< Version, to return
-    psStringAppend(&version, "%s-%s",PACKAGE_NAME,PACKAGE_VERSION);
-    return version;
+#ifndef PSWARP_VERSION
+#error "PSWARP_VERSION is not set"
+#endif
+#ifndef PSWARP_BRANCH
+#error "PSWARP_BRANCH is not set"
+#endif
+    return psStringCopy(PSWARP_BRANCH "@" PSWARP_VERSION);
+}
+
+psString pswarpSource(void)
+{
+#ifndef PSWARP_SOURCE
+#error "PSWARP_SOURCE is not set"
+#endif
+    return psStringCopy(PSWARP_SOURCE);
 }
 
 psString pswarpVersionLong(void)
 {
-    psString version = pswarpVersion(); ///< Version, to return
-    psString tag = psStringStripCVS(cvsTag, "Name"); ///< CVS tag
-    psStringAppend(&version, " (cvs tag %s) %s, %s", tag, __DATE__, __TIME__);
-    psFree(tag);
+    psString version = pswarpVersion();  // Version, to return
+    psString source = pswarpSource();    // Source
+
+    psStringPrepend(&version, "pswarp ");
+    psStringAppend(&version, " from %s, built %s, %s", source, __DATE__, __TIME__);
+    psFree(source);
+
+#ifdef __OPTIMIZE__
+    psStringAppend(&version, " optimised");
+#else
+    psStringAppend(&version, " unoptimised");
+#endif
+
     return version;
-}
-
+};