Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psModules/src/config/Makefile.am

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/config (modified) (1 prop)
• psModules/src/config/Makefile.am (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/config

@@ -7 +7 @@
 pmErrorCodes.c
 pmErrorCodes.h
+pmVersionDefinitions.h

@@ -7 +7 @@
 pmErrorCodes.c
 pmErrorCodes.h
+pmVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/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`
+if HAVE_SVNVERSION
+PSMODULES_VERSION=`$(SVNVERSION) ../..`
+else
+PSMODULES_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PSMODULES_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 }'`
+PSMODULES_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PSMODULES_BRANCH="UNKNOWN"
+PSMODULES_SOURCE="UNKNOWN"
+endif
 
 # Force recompilation of pmVersion.c, since it gets the version information
-# pmVersion.c: FORCE
-#       touch pmVersion.c
-# FORCE: ;
+pmVersion.c: pmVersionDefinitions.h
+pmVersionDefinitions.h: pmVersionDefinitions.h.in FORCE
+        -$(RM) pmVersionDefinitions.h
+        $(SED) -e "s|@PSMODULES_VERSION@|\"$(PSMODULES_VERSION)\"|" -e "s|@PSMODULES_BRANCH@|\"$(PSMODULES_BRANCH)\"|" -e "s|@PSMODULES_SOURCE@|\"$(PSMODULES_SOURCE)\"|" pmVersionDefinitions.h.in > pmVersionDefinitions.h
+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)
 libpsmodulesconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
 libpsmodulesconfig_la_SOURCES  = \
@@ -35 +47 @@
 
 # Error codes.
-BUILT_SOURCES = pmErrorCodes.h pmErrorCodes.c
-CLEANFILES = *~ pmErrorCodes.h pmErrorCodes.c
+BUILT_SOURCES = pmErrorCodes.h pmErrorCodes.c pmVersionDefinitions.h
+CLEANFILES = *~ pmErrorCodes.h pmErrorCodes.c pmVersionDefinitions.h
 
 pmErrorCodes.h : pmErrorCodes.dat pmErrorCodes.h.in

@@ -7 +7 @@
 pmErrorCodes.c
 pmErrorCodes.h
+pmVersionDefinitions.h