Changeset 23202 for branches/eam_branches/eam_branch_20090303/ppMerge/src/ppMergeVersion.c

Timestamp:

Mar 6, 2009, 10:26:32 AM (17 years ago)

Author:

eugene

Message:

passing version info from env vars defined by psbuild

File:

• branches/eam_branches/eam_branch_20090303/ppMerge/src/ppMergeVersion.c (modified) (2 diffs)

branches/eam_branches/eam_branch_20090303/ppMerge/src/ppMergeVersion.c

@@ -22 +22 @@
 #include "ppMergeVersion.h"
 
-psString ppMergeVersion(void)
-{
 #ifndef PPMERGE_VERSION
 #error "PPMERGE_VERSION is not set"
@@ -30 +28 @@
 #error "PPMERGE_BRANCH is not set"
 #endif
-    return psStringCopy(PPMERGE_BRANCH "@" PPMERGE_VERSION);
+#ifndef PPMERGE_SOURCE
+#error "PPMERGE_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString ppMergeVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PPMERGE_BRANCH), xstr(PPMERGE_VERSION));
+    return value;
 }
 
 psString ppMergeSource(void)
 {
-#ifndef PPMERGE_SOURCE
-#error "PPMERGE_SOURCE is not set"
-#endif
-    return psStringCopy(PPMERGE_SOURCE);
+    return psStringCopy(xstr(PPMERGE_SOURCE));
 }