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

Timestamp:

Apr 9, 2009, 10:57:59 PM (17 years ago)

Author:

Paul Price

Message:

Making version information not dependent upon running configure, but on make.

Location:

trunk/pswarp/src

Files:

• . (modified) (1 prop)
• pswarpVersion.c (modified) (2 diffs)

trunk/pswarp/src

@@ -13 +13 @@
 config.h.in
 stamp-h1
+pswarpVersionDefinitions.h

@@ -13 +13 @@
 config.h.in
 stamp-h1
+pswarpVersionDefinitions.h

trunk/pswarp/src/pswarpVersion.c

@@ -20 +20 @@
 #include <ppStats.h>
 
-psString pswarpVersion(void)
-{
+#include "pswarp.h"
+#include "pswarpVersionDefinitions.h"
+
 #ifndef PSWARP_VERSION
 #error "PSWARP_VERSION is not set"
@@ -28 +29 @@
 #error "PSWARP_BRANCH is not set"
 #endif
-    return psStringCopy(PSWARP_BRANCH "@" PSWARP_VERSION);
+#ifndef PSWARP_SOURCE
+#error "PSWARP_SOURCE is not set"
+#endif
+
+psString pswarpVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", PSWARP_BRANCH, PSWARP_VERSION);
+    return value;
 }
 
 psString pswarpSource(void)
 {
-#ifndef PSWARP_SOURCE
-#error "PSWARP_SOURCE is not set"
-#endif
     return psStringCopy(PSWARP_SOURCE);
 }

@@ -13 +13 @@
 config.h.in
 stamp-h1
+pswarpVersionDefinitions.h