Changeset 23787

Timestamp:

Apr 9, 2009, 5:22:35 PM (17 years ago)

Author:

Paul Price

Message:

Found good way to set version information.

Location:

trunk/psLib

Files:

• configure.ac (modified) (1 diff)
• m4/ipp_stdopts.m4 (modified) (1 diff)
• src/sys/Makefile.am (modified) (2 diffs)

trunk/psLib/configure.ac

@@ -340 +340 @@
 LDFLAGS=${TMP_LDFLAGS}
 CPPFLAGS=${TMP_CPPFLAGS}
+
+IPP_VERSION(PSLIB)
+AC_SUBST(PSLIB_VERSION,[$PSLIB_VERSION])
+AC_SUBST(PSLIB_BRANCH,[$PSLIB_BRANCH])
+AC_SUBST(PSLIB_SOURCE,[$PSLIB_SOURCE])
 
 dnl ------- enable -Werror after all of the probes have run ---------

trunk/psLib/m4/ipp_stdopts.m4

@@ -37 +37 @@
     )
 ])
+
+
+AC_DEFUN([IPP_VERSION],
+[
+        AC_ARG_ENABLE(version,
+                [AS_HELP_STRING(--disable-version,Disable dynamic version information)],
+                [case "${enableval}" in
+                      yes) enable_version=true ;;
+                      no)  enable_version=false ;;
+                      *)   AC_MSG_ERROR(bad value ${enableval} for --disable-version) ;;
+                 esac], [enable_version=true]
+        )
+        
+        [$1]_VERSION="UNKNOWN"
+        [$1]_BRANCH="UNKNOWN"
+        [$1]_SOURCE="UNKNOWN"
+        AS_IF([test "x$enable_version" = xtrue],
+                [AC_PATH_PROG([SVNVERSION], [svnversion])
+                AC_PATH_PROG([SVN], [svn])
+                AC_PROG_SED
+                AS_IF([test "x$SVNVERSION" != x], [$1]_VERSION=`$SVNVERSION`)
+                AS_IF([test "x$SVN" != x],
+                        [[$1]_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 }'`
+                        [$1]_SOURCE=`$SVN info | $SED -n -e 's/Repository UUID: // p'`])
+                ]
+        )
+        
+dnl     AC_SUBST([$1]_VERSION,[[$1]_VERSION])
+dnl     AC_SUBST([$1]_BRANCH,[[$1]_BRANCH])
+dnl     AC_SUBST([$1]_SOURCE,[[$1]_SOURCE])
+])

trunk/psLib/src/sys/Makefile.am

@@ -2 +2 @@
 #
 noinst_LTLIBRARIES = libpslibsys.la
-
-# PSLIB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PSLIB_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`
-# PSLIB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
 
 # Force recompilation of psConfigure.c, since it gets the version information
@@ -12 +8 @@
 FORCE: ;
 
-libpslibsys_la_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) $(CFITSIO_CFLAGS) -DPSLIB_VERSION=$(SVN_VERSION) -DPSLIB_BRANCH=$(SVN_BRANCH) -DPSLIB_SOURCE=$(SVN_SOURCE)
+libpslibsys_la_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) $(CFITSIO_CFLAGS) -DPSLIB_VERSION=$(PSLIB_VERSION) -DPSLIB_BRANCH=$(PSLIB_BRANCH) -DPSLIB_SOURCE=$(PSLIB_SOURCE)
 libpslibsys_la_SOURCES = \
         psAbort.c \