Changeset 23796 for trunk/ppImage/src

Timestamp:

Apr 9, 2009, 10:30:13 PM (17 years ago)

Author:

Paul Price

Message:

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

Location:

trunk/ppImage/src

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• ppImageVersion.c (modified) (3 diffs)
• ppImageVersionDefinitions.h.in (added)

trunk/ppImage/src

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h

trunk/ppImage/src/Makefile.am

@@ -4 +4 @@
         ppImage.h 
 
+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 ppImageVersion.c, since it gets the version information
-ppImageVersion.c: FORCE
-        touch ppImageVersion.c
+ppImageVersion.c: ppImageVersionDefinitions.h
+ppImageVersionDefinitions.h: ppImageVersionDefinitions.h.in FORCE
+        -$(RM) ppImageVersionDefinitions.h
+        $(SED) -e "s|@PPIMAGE_VERSION@|\"$(PPIMAGE_VERSION)\"|" -e "s|@PPIMAGE_BRANCH@|\"$(PPIMAGE_BRANCH)\"|" -e "s|@PPIMAGE_SOURCE@|\"$(PPIMAGE_SOURCE)\"|" ppImageVersionDefinitions.h.in > ppImageVersionDefinitions.h
 FORCE: ;
 
-ppImage_CFLAGS = $(PPIMAGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPIMAGE_VERSION=$(PPIMAGE_VERSION) -DPPIMAGE_BRANCH=$(PPIMAGE_BRANCH) -DPPIMAGE_SOURCE=$(PPIMAGE_SOURCE)
+BUILT_SOURCES = ppImageVersionDefinitions.h
+
+ppImage_CFLAGS = $(PPIMAGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
 ppImage_LDFLAGS = $(PPIMAGE_LIBS) $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 ppImage_SOURCES = \

trunk/ppImage/src/ppImageVersion.c

@@ -4 +4 @@
 
 #include "ppImage.h"
+#include "ppImageVersionDefinitions.h"
 
 #ifndef PPIMAGE_VERSION
@@ -15 +16 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString ppImageVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PPIMAGE_BRANCH), xstr(PPIMAGE_VERSION));
+    psStringAppend(&value, "%s@%s", PPIMAGE_BRANCH, PPIMAGE_VERSION);
     return value;
 }
@@ -27 +25 @@
 psString ppImageSource(void)
 {
-    return psStringCopy (xstr(PPIMAGE_SOURCE));
+    return psStringCopy(PPIMAGE_SOURCE);
 }
 

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h