Changeset 23790 for trunk/pswarp

Timestamp:

Apr 9, 2009, 6:06:36 PM (17 years ago)

Author:

Paul Price

Message:

Fixed version information in builds: determined separately (and singly!) for each component

Location:

trunk/pswarp

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)

trunk/pswarp/configure.ac

@@ -37 +37 @@
 echo "PSWARP_LIBS: $PSWARP_LIBS"
 
+IPP_VERSION(PSWARP)
+AC_SUBST(PSWARP_VERSION,[$PSWARP_VERSION])
+AC_SUBST(PSWARP_BRANCH,[$PSWARP_BRANCH])
+AC_SUBST(PSWARP_SOURCE,[$PSWARP_SOURCE])
+
 AC_SUBST([PSWARP_CFLAGS])
 AC_SUBST([PSWARP_LIBS])

trunk/pswarp/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = pswarp
-
-PSWARP_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PSWARP_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else 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 }'; fi`
-PSWARP_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
 
 # Force recompilation of pswarpVersion.c, since it gets the version information