Changeset 23795

Timestamp:

Apr 9, 2009, 10:22:58 PM (17 years ago)

Author:

Paul Price

Message:

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

Location:

trunk/ppArith

Files:

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

trunk/ppArith/configure.ac

@@ -26 +26 @@
 CFLAGS="${CFLAGS} -Wall -Werror"
 
-IPP_VERSION(PPARITH)
-AC_SUBST(PPARITH_VERSION,[$PPARITH_VERSION])
-AC_SUBST(PPARITH_BRANCH,[$PPARITH_BRANCH])
-AC_SUBST(PPARITH_SOURCE,[$PPARITH_SOURCE])
+IPP_VERSION
 
 AC_SUBST([PPARITH_CFLAGS])

trunk/ppArith/src

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

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

trunk/ppArith/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppArith
 
+if HAVE_SVNVERSION
+PSLIB_VERSION=`$(SVNVERSION) ../..`
+else
+PSLIB_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PSLIB_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 }'`
+PSLIB_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PSLIB_BRANCH="UNKNOWN"
+PSLIB_SOURCE="UNKNOWN"
+endif
+
 # Force recompilation of ppArithVersion.c, since it gets the version information
-ppArithVersion.c: FORCE
-        touch ppArith.c
+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: ;
 
-ppArith_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPARITH_CFLAGS) -DPPARITH_VERSION=$(PPARITH_VERSION) -DPPARITH_BRANCH=$(PPARITH_BRANCH) -DPPARITH_SOURCE=$(PPARITH_SOURCE)
+BUILT_SOURCES = ppArithVersionDefinitions.h
+
+
+ppArith_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPARITH_CFLAGS)
 ppArith_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPARITH_LIBS)
 

trunk/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