Changeset 23802

Timestamp:

Apr 9, 2009, 10:43:27 PM (17 years ago)

Author:

Paul Price

Message:

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

Location:

trunk/ppStats

Files:

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

trunk/ppStats/configure.ac

@@ -23 +23 @@
 CFLAGS="${CFLAGS=} -Wall -Werror -std=c99"
 
-IPP_VERSION(PPSTATS)
-AC_SUBST(PPSTATS_VERSION,[$PPSTATS_VERSION])
-AC_SUBST(PPSTATS_BRANCH,[$PPSTATS_BRANCH])
-AC_SUBST(PPSTATS_SOURCE,[$PPSTATS_SOURCE])
+IPP_VERSION
 
 AC_SUBST([PPSTATS_CFLAGS])

trunk/ppStats/src

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h

trunk/ppStats/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libppStats.la
 
+if HAVE_SVNVERSION
+PPSTATS_VERSION=`$(SVNVERSION) ../..`
+else
+PPSTATS_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PPSTATS_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 }'`
+PPSTATS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PPSTATS_BRANCH="UNKNOWN"
+PPSTATS_SOURCE="UNKNOWN"
+endif
+
 # Force recompilation of ppStatsVersion.c, since it gets the version information
-ppStatsVersion.c: FORCE
-        touch ppStatsVersion.c
+ppStatsVersion.c: ppStatsVersionDefinitions.h
+ppStatsVersionDefinitions.h: ppStatsVersionDefinitions.h.in FORCE
+        -$(RM) ppStatsVersionDefinitions.h
+        $(SED) -e "s|@PPSTATS_VERSION@|\"$(PPSTATS_VERSION)\"|" -e "s|@PPSTATS_BRANCH@|\"$(PPSTATS_BRANCH)\"|" -e "s|@PPSTATS_SOURCE@|\"$(PPSTATS_SOURCE)\"|" ppStatsVersionDefinitions.h.in > ppStatsVersionDefinitions.h
 FORCE: ;
 
-libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPSTATS_VERSION=$(PPSTATS_VERSION) -DPPSTATS_BRANCH=$(PPSTATS_BRANCH) -DPPSTATS_SOURCE=$(PPSTATS_SOURCE)
+libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
 libppStats_la_LDFLAGS = $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 

trunk/ppStats/src/ppStatsVersion.c

@@ -1 +1 @@
 #include "ppStatsInternal.h"
+#include "ppStatsVersionDefinitions.h"
 
 #ifndef PPSTATS_VERSION
@@ -11 +12 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString ppStatsVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PPSTATS_BRANCH), xstr(PPSTATS_VERSION));
+    psStringAppend(&value, "%s@%s", PPSTATS_BRANCH, PPSTATS_VERSION);
     return value;
 }
@@ -23 +21 @@
 psString ppStatsSource(void)
 {
-    return psStringCopy(xstr(PPSTATS_SOURCE));
+    return psStringCopy(PPSTATS_SOURCE);
 }
 

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h