Changeset 23239 for branches/cnb_branches/cnb_branch_20090215/psModules/src/config/pmVersion.c

Timestamp:

Mar 9, 2009, 3:41:26 PM (17 years ago)

Author:

beaumont

Message:

sync with trunk

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

• . (modified) (1 prop)
• psModules/src/config/pmVersion.c (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090215/psModules/src/config/pmVersion.c

@@ -8 +8 @@
 #include "pmVersion.h"
 
-psString psModulesVersion(void)
-{
 #ifndef PSMODULES_VERSION
 #error "PSMODULES_VERSION is not set"
@@ -16 +14 @@
 #error "PSMODULES_BRANCH is not set"
 #endif
-    return psStringCopy(PSMODULES_BRANCH "@" PSMODULES_VERSION);
+#ifndef PSMODULES_SOURCE
+#error "PSMODULES_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString psModulesVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PSMODULES_BRANCH), xstr(PSMODULES_VERSION));
+    return value;
 }
 
 psString psModulesSource(void)
 {
-#ifndef PSMODULES_SOURCE
-#error "PSMODULES_SOURCE is not set"
-#endif
-    return psStringCopy(PSMODULES_SOURCE);
+    return psStringCopy(xstr(PSMODULES_SOURCE));
 }