Changeset 23805

Timestamp:

Apr 9, 2009, 10:53:55 PM (17 years ago)

Author:

Paul Price

Message:

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

Location:

trunk/psphot

Files:

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

trunk/psphot/configure.ac

@@ -204 +204 @@
 echo "PSPHOT_LIBS: $PSPHOT_LIBS"
 
-IPP_VERSION(PSPHOT)
-AC_SUBST(PSPHOT_VERSION,[$PSPHOT_VERSION])
-AC_SUBST(PSPHOT_BRANCH,[$PSPHOT_BRANCH])
-AC_SUBST(PSPHOT_SOURCE,[$PSPHOT_SOURCE])
+IPP_VERSION
 
 AC_SUBST([PSPHOT_CFLAGS])

trunk/psphot/src

@@ -16 +16 @@
 polyfitTest
 growthTest
+psphotVersionDefinitions.h

@@ -16 +16 @@
 polyfitTest
 growthTest
+psphotVersionDefinitions.h

trunk/psphot/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libpsphot.la
 
+if HAVE_SVNVERSION
+PSPHOT_VERSION=`$(SVNVERSION) ../..`
+else
+PSPHOT_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PSPHOT_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 }'`
+PSPHOT_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PSPHOT_BRANCH="UNKNOWN"
+PSPHOT_SOURCE="UNKNOWN"
+endif
+
 # Force recompilation of psphotVersion.c, since it gets the version information
-psphotVersion.c: FORCE
-        touch psphotVersion.c
+psphotVersion.c: psphotVersionDefinitions.h
+psphotVersionDefinitions.h: psphotVersionDefinitions.h.in FORCE
+        -$(RM) psphotVersionDefinitions.h
+        $(SED) -e "s|@PSPHOT_VERSION@|\"$(PSPHOT_VERSION)\"|" -e "s|@PSPHOT_BRANCH@|\"$(PSPHOT_BRANCH)\"|" -e "s|@PSPHOT_SOURCE@|\"$(PSPHOT_SOURCE)\"|" psphotVersionDefinitions.h.in > psphotVersionDefinitions.h
 FORCE: ;
 
-libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSPHOT_VERSION=$(PSPHOT_VERSION) -DPSPHOT_BRANCH=$(PSPHOT_BRANCH) -DPSPHOT_SOURCE=$(PSPHOT_SOURCE)
+libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
 libpsphot_la_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
@@ -125 +141 @@
 
 # Error codes.
-BUILT_SOURCES = psphotErrorCodes.h psphotErrorCodes.c
+BUILT_SOURCES = psphotErrorCodes.h psphotErrorCodes.c psphotVersionDefinitions.h
 CLEANFILES = psphotErrorCodes.h psphotErrorCodes.c
 EXTRA_DIST = psphotErrorCodes.dat psphotErrorCodes.c.in psphotErrorCodes.h.in \

trunk/psphot/src/psphotVersion.c

@@ -1 +1 @@
 #include "psphotInternal.h"
+#include "psphotVersionDefinitions.h"
 
 #ifdef HAVE_KAPA
@@ -15 +16 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString psphotVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PSPHOT_BRANCH), xstr(PSPHOT_VERSION));
+    psStringAppend(&value, "%s@%s", PSPHOT_BRANCH, PSPHOT_VERSION);
     return value;
 }
@@ -27 +25 @@
 psString psphotSource(void)
 {
-    return psStringCopy(xstr(PSPHOT_SOURCE));
+    return psStringCopy(PSPHOT_SOURCE);
 }
 

@@ -16 +16 @@
 polyfitTest
 growthTest
+psphotVersionDefinitions.h