Changeset 23229 for trunk/ppImage/src/ppImageVersion.c

Timestamp:

Mar 8, 2009, 4:50:46 PM (17 years ago)

Author:

eugene

Message:

merging changes from branches/eam_branches/eam_branch_20090303 (detrend normalization resequence, cleanup error state changes; SVN_VERSION from psbuild)

Location:

trunk

Files:

• . (modified) (1 prop)
• ppImage/src/ppImageVersion.c (modified) (3 diffs)

trunk/ppImage/src/ppImageVersion.c

@@ -5 +5 @@
 #include "ppImage.h"
 
-psString ppImageVersion(void)
-{
 #ifndef PPIMAGE_VERSION
 #error "PPIMAGE_VERSION is not set"
@@ -13 +11 @@
 #error "PPIMAGE_BRANCH is not set"
 #endif
-    return psStringCopy(PPIMAGE_BRANCH "@" PPIMAGE_VERSION);
+#ifndef PPIMAGE_SOURCE
+#error "PPIMAGE_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString ppImageVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PPIMAGE_BRANCH), xstr(PPIMAGE_VERSION));
+    return value;
 }
 
 psString ppImageSource(void)
 {
-#ifndef PPIMAGE_SOURCE
-#error "PPIMAGE_SOURCE is not set"
-#endif
-    return psStringCopy(PPIMAGE_SOURCE);
+    return psStringCopy (xstr(PPIMAGE_SOURCE));
 }
 
@@ -27 +33 @@
 {
     psString version = ppImageVersion();  // Version, to return
-    psString source = ppImageSource();    // Source
+    psString source = ppImageSource(); // Source
 
     psStringPrepend(&version, "ppImage ");