Changeset 23788

Timestamp:

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

Author:

Paul Price

Message:

Applying good way to set version information.

Location:

trunk/psModules

Files:

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

trunk/psModules/configure.ac

@@ -305 +305 @@
 echo "PSMODULES_CFLAGS: $PSMODULES_CFLAGS"
 echo "PSMODULE_LIBS: $PSMODULES_LIBS"
+
+IPP_VERSION(PSMODULES)
+AC_SUBST(PSMODULES_VERSION,[$PSMODULES_VERSION])
+AC_SUBST(PSMODULES_BRANCH,[$PSMODULES_BRANCH])
+AC_SUBST(PSMODULES_SOURCE,[$PSMODULES_SOURCE])
 
 dnl ------- enable -Werror after all of the probes have run ---------

trunk/psModules/src/config/Makefile.am

@@ -1 +1 @@
 noinst_LTLIBRARIES = libpsmodulesconfig.la
 
-# PSMODULES_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PSMODULES_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`
-# PSMODULES_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# Force recompilation of pmVersion.c, since it gets the version information
+pmVersion.c: FORCE
+        touch pmVersion.c
+FORCE: ;
 
-# Force recompilation of pmVersion.c, since it gets the version information
-# pmVersion.c: FORCE
-#       touch pmVersion.c
-# FORCE: ;
-
-libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -DPSMODULES_VERSION=$(SVN_VERSION) -DPSMODULES_BRANCH=$(SVN_BRANCH) -DPSMODULES_SOURCE=$(SVN_SOURCE)
+libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -DPSMODULES_VERSION=$(PSMODULES_VERSION) -DPSMODULES_BRANCH=$(PSMODULES_BRANCH) -DPSMODULES_SOURCE=$(PSMODULES_SOURCE)
 libpsmodulesconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
 libpsmodulesconfig_la_SOURCES  = \