Changeset 23803

Timestamp:

Apr 9, 2009, 10:46:25 PM (17 years ago)

Author:

Paul Price

Message:

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

Location:

trunk/ppSub

Files:

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

trunk/ppSub/configure.ac

@@ -32 +32 @@
 CFLAGS="${CFLAGS} -Wall -Werror"
 
-IPP_VERSION(PPSUB)
-AC_SUBST(PPSUB_VERSION,[$PPSUB_VERSION])
-AC_SUBST(PPSUB_BRANCH,[$PPSUB_BRANCH])
-AC_SUBST(PPSUB_SOURCE,[$PPSUB_SOURCE])
+IPP_VERSION
 
 AC_SUBST([PPSUB_CFLAGS])

trunk/ppSub/src

@@ -12 +12 @@
 ppSubErrorCodes.h
 ppSubErrorCodes.c
+ppSubVersionDefinitions.h

@@ -12 +12 @@
 ppSubErrorCodes.h
 ppSubErrorCodes.c
+ppSubVersionDefinitions.h

trunk/ppSub/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppSub ppSubKernel
 
+if HAVE_SVNVERSION
+PPSUB_VERSION=`$(SVNVERSION) ../..`
+else
+PPSUB_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PPSUB_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 }'`
+PPSUB_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PPSUB_BRANCH="UNKNOWN"
+PPSUB_SOURCE="UNKNOWN"
+endif
+
 # Force recompilation of ppSubVersion.c, since it gets the version information
-ppSubVersion.c: FORCE
-        touch ppSubVersion.c
+ppSubVersion.c: ppSubVersionDefinitions.h
+ppSubVersionDefinitions.h: ppSubVersionDefinitions.h.in FORCE
+        -$(RM) ppSubVersionDefinitions.h
+        $(SED) -e "s|@PPSUB_VERSION@|\"$(PPSUB_VERSION)\"|" -e "s|@PPSUB_BRANCH@|\"$(PPSUB_BRANCH)\"|" -e "s|@PPSUB_SOURCE@|\"$(PPSUB_SOURCE)\"|" ppSubVersionDefinitions.h.in > ppSubVersionDefinitions.h
 FORCE: ;
 
-ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS) -DPPSUB_VERSION=$(PPSUB_VERSION) -DPPSUB_BRANCH=$(PPSUB_BRANCH) -DPPSUB_SOURCE=$(PPSUB_SOURCE)
+ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS)
 ppSub_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPSUB_LIBS)
 

trunk/ppSub/src/ppSubVersion.c

@@ -22 +22 @@
 
 #include "ppSub.h"
+#include "ppSubVersionDefinitions.h"
 
 #ifndef PPSUB_VERSION
@@ -33 +34 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString ppSubVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PPSUB_BRANCH), xstr(PPSUB_VERSION));
+    psStringAppend(&value, "%s@%s", PPSUB_BRANCH, PPSUB_VERSION);
     return value;
 }
@@ -45 +43 @@
 psString ppSubSource(void)
 {
-    return psStringCopy(xstr(PPSUB_SOURCE));
+    return psStringCopy(PPSUB_SOURCE);
 }
 

@@ -12 +12 @@
 ppSubErrorCodes.h
 ppSubErrorCodes.c
+ppSubVersionDefinitions.h