Changeset 23801

Timestamp:

Apr 9, 2009, 10:41:14 PM (17 years ago)

Author:

Paul Price

Message:

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

Location:

trunk/ppStack

Files:

• configure.ac (modified) (1 diff)
• src (modified) (1 prop)
• src/Makefile.am (modified) (1 diff)
• src/ppStackVersion.c (modified) (3 diffs)
• src/ppStackVersionDefinitions.h.in (added)

trunk/ppStack/configure.ac

@@ -25 +25 @@
 CFLAGS="${CFLAGS=} -Wall -Werror"
 
-IPP_VERSION(PPSTACK)
-AC_SUBST(PPSTACK_VERSION,[$PPSTACK_VERSION])
-AC_SUBST(PPSTACK_BRANCH,[$PPSTACK_BRANCH])
-AC_SUBST(PPSTACK_SOURCE,[$PPSTACK_SOURCE])
+IPP_VERSION
 
 AC_SUBST([PPSTACK_CFLAGS])

trunk/ppStack/src

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h

trunk/ppStack/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppStack
 
+if HAVE_SVNVERSION
+PPSTACK_VERSION=`$(SVNVERSION) ../..`
+else
+PPSTACK_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PPSTACK_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 }'`
+PPSTACK_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PPSTACK_BRANCH="UNKNOWN"
+PPSTACK_SOURCE="UNKNOWN"
+endif
+
 # Force recompilation of ppStackVersion.c, since it gets the version information
-ppStackVersion.c: FORCE
-        touch ppStackVersion.c
+ppStackVersion.c: ppStackVersionDefinitions.h
+ppStackVersionDefinitions.h: ppStackVersionDefinitions.h.in FORCE
+        -$(RM) ppStackVersionDefinitions.h
+        $(SED) -e "s|@PPSTACK_VERSION@|\"$(PPSTACK_VERSION)\"|" -e "s|@PPSTACK_BRANCH@|\"$(PPSTACK_BRANCH)\"|" -e "s|@PPSTACK_SOURCE@|\"$(PPSTACK_SOURCE)\"|" ppStackVersionDefinitions.h.in > ppStackVersionDefinitions.h
 FORCE: ;
 
-ppStack_CFLAGS  = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS) -DPPSTACK_VERSION=$(PPSTACK_VERSION) -DPPSTACK_BRANCH=$(PPSTACK_BRANCH) -DPPSTACK_SOURCE=$(PPSTACK_SOURCE)
+ppStack_CFLAGS  = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS)
 ppStack_LDFLAGS = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PSPHOT_LIBS)   $(PPSTATS_LIBS)   $(PPSTACK_LIBS)
 

trunk/ppStack/src/ppStackVersion.c

@@ -10 +10 @@
 
 #include "ppStack.h"
+#include "ppStackVersionDefinitions.h"
 
 #ifndef PPSTACK_VERSION
@@ -21 +22 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString ppStackVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PPSTACK_BRANCH), xstr(PPSTACK_VERSION));
+    psStringAppend(&value, "%s@%s", PPSTACK_BRANCH, PPSTACK_VERSION);
     return value;
 }
@@ -33 +31 @@
 psString ppStackSource(void)
 {
-    return psStringCopy(xstr(PPSTACK_SOURCE));
+    return psStringCopy(PPSTACK_SOURCE);
 }
 

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h