Changeset 23145

Timestamp:

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

Author:

Paul Price

Message:

Adding version functions to match psLib.

Location:

trunk/pswarp/src

Files:

• Makefile.am (modified) (1 diff)
• pswarp.h (modified) (1 diff)
• pswarpVersion.c (modified) (1 diff)

trunk/pswarp/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = pswarp
-pswarp_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PSWARP_CFLAGS)
+
+PSWARP_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+PSWARP_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
+PSWARP_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+
+# Force recompilation of pswarpVersion.c, since it gets the version information
+pswarpVersion.c: FORCE
+        touch pswarpVersion.c
+FORCE: ;
+
+pswarp_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PSWARP_CFLAGS) -DPSWARP_VERSION=\"$(PSWARP_VERSION)\" -DPSWARP_BRANCH=\"$(PSWARP_BRANCH)\" -DPSWARP_SOURCE=\"$(PSWARP_SOURCE)\"
 pswarp_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSWARP_LIBS)
 

trunk/pswarp/src/pswarp.h

@@ -112 +112 @@
  */
 bool pswarpSetThreads ();
+
+/// Return software version
+psString pswarpVersion(void);
+
+/// Return software souce
+psString pswarpSource(void);
+
+/// Return long software version information
+psString pswarpVersionLong(void);

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;
-}
-
+};