Changeset 23790 for trunk/ppSim

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/ppSim

Files:

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

trunk/ppSim/configure.ac

@@ -22 +22 @@
 PKG_CHECK_MODULES([PSASTRO],  [psastro >= 0.9.0])
 
+IPP_VERSION(PPSIM)
+AC_SUBST(PPSIM_VERSION,[$PPSIM_VERSION])
+AC_SUBST(PPSIM_BRANCH,[$PPSIM_BRANCH])
+AC_SUBST(PPSIM_SOURCE,[$PPSIM_SOURCE])
+
 IPP_STDOPTS
 CFLAGS="${CFLAGS=} -Wall -Werror"

trunk/ppSim/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppSim ppSimSequence
 
-# PPSIM_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPSIM_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`
-# PPSIM_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppSimVersion.c, since it gets the version information
-# ppSimVersion.c: FORCE
-#       touch ppSimVersion.c
-# FORCE: ;
+# Force recompilation of ppSimVersion.c, since it gets the version information
+ppSimVersion.c: FORCE
+        touch ppSimVersion.c
+FORCE: ;
 
-ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS) -DPPSIM_VERSION=$(SVN_VERSION) -DPPSIM_BRANCH=$(SVN_BRANCH) -DPPSIM_SOURCE=$(SVN_SOURCE)
+ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS) -DPPSIM_VERSION=$(PPSIM_VERSION) -DPPSIM_BRANCH=$(PPSIM_BRANCH) -DPPSIM_SOURCE=$(PPSIM_SOURCE)
 ppSim_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS) $(PSASTRO_LIBS)
 ppSim_SOURCES = \