Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppArith/src

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppArith/src (modified) (1 prop)
• ppArith/src/Makefile.am (modified) (1 diff)
• ppArith/src/ppArithVersion.c (modified) (3 diffs)
• ppArith/src/ppArithVersionDefinitions.h.in (copied) (copied from trunk/ppArith/src/ppArithVersionDefinitions.h.in )

branches/cnb_branches/cnb_branch_20090301/ppArith/src

@@ -7 +7 @@
 .libs
 ppArith
+ppArithVersionDefinitions.h

@@ -7 +7 @@
 .libs
 ppArith
+ppArithVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppArith/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppArith
 
-# PPARITH_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPARITH_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`
-# PPARITH_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppArithVersion.c, since it gets the version information
-# ppArithVersion.c: FORCE
-#       touch ppArith.c
-# FORCE: ;
+if HAVE_SVNVERSION
+PPARITH_VERSION=`$(SVNVERSION) ..`
+else
+PPARITH_VERSION="UNKNOWN"
+endif
 
-ppArith_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPARITH_CFLAGS) -DPPARITH_VERSION=$(SVN_VERSION) -DPPARITH_BRANCH=$(SVN_BRANCH) -DPPARITH_SOURCE=$(SVN_SOURCE)
-ppArith_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPARITH_LIBS)
+if HAVE_SVN
+PPARITH_BRANCH=`$(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 }'`
+PPARITH_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PPARITH_BRANCH="UNKNOWN"
+PPARITH_SOURCE="UNKNOWN"
+endif
+
+# Force recompilation of ppArithVersion.c, since it gets the version information
+ppArithVersion.c: ppArithVersionDefinitions.h
+ppArithVersionDefinitions.h: ppArithVersionDefinitions.h.in FORCE
+        -$(RM) ppArithVersionDefinitions.h
+        $(SED) -e "s|@PPARITH_VERSION@|\"$(PPARITH_VERSION)\"|" -e "s|@PPARITH_BRANCH@|\"$(PPARITH_BRANCH)\"|" -e "s|@PPARITH_SOURCE@|\"$(PPARITH_SOURCE)\"|" ppArithVersionDefinitions.h.in > ppArithVersionDefinitions.h
+FORCE: ;
+
+BUILT_SOURCES = ppArithVersionDefinitions.h
+
+
+ppArith_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PPARITH_CFLAGS)
+ppArith_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PPARITH_LIBS)
 
 ppArith_SOURCES =               \

branches/cnb_branches/cnb_branch_20090301/ppArith/src/ppArithVersion.c

@@ -21 +21 @@
 
 #include "ppArith.h"
+#include "ppArithVersionDefinitions.h"
 
 #ifndef PPARITH_VERSION
@@ -32 +33 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString ppArithVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PPARITH_BRANCH), xstr(PPARITH_VERSION));
+    psStringAppend(&value, "%s@%s", PPARITH_BRANCH, PPARITH_VERSION);
     return value;
 }
@@ -44 +42 @@
 psString ppArithSource(void)
 {
-    return psStringCopy(xstr(PPARITH_SOURCE));
+    return psStringCopy(PPARITH_SOURCE);
 }
 

@@ -7 +7 @@
 .libs
 ppArith
+ppArithVersionDefinitions.h