Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psLib/src/sys

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)
• psLib/src/sys (modified) (1 prop)
• psLib/src/sys/Makefile.am (modified) (2 diffs)
• psLib/src/sys/psConfigure.c (modified) (3 diffs)
• psLib/src/sys/psVersionDefinitions.h.in (copied) (copied from trunk/psLib/src/sys/psVersionDefinitions.h.in )

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys

@@ -11 +11 @@
 *.bbg
 *.da
+psVersionDefinitions.h

@@ -11 +11 @@
 *.bbg
 *.da
+psVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys/Makefile.am

@@ -3 +3 @@
 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`
+if HAVE_SVNVERSION
+PSLIB_VERSION=`$(SVNVERSION) ../..`
+else
+PSLIB_VERSION="UNKNOWN"
+endif
+
+if HAVE_SVN
+PSLIB_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 }'`
+PSLIB_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PSLIB_BRANCH="UNKNOWN"
+PSLIB_SOURCE="UNKNOWN"
+endif
 
 # Force recompilation of psConfigure.c, since it gets the version information
-psConfigure.c: FORCE
-        touch psConfigure.c
+psConfigure.c: psVersionDefinitions.h
+psVersionDefinitions.h: psVersionDefinitions.h.in FORCE
+        -$(RM) psVersionDefinitions.h
+        $(SED) -e "s|@PSLIB_VERSION@|\"$(PSLIB_VERSION)\"|" -e "s|@PSLIB_BRANCH@|\"$(PSLIB_BRANCH)\"|" -e "s|@PSLIB_SOURCE@|\"$(PSLIB_SOURCE)\"|" psVersionDefinitions.h.in > psVersionDefinitions.h
 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)
 libpslibsys_la_SOURCES = \
         psAbort.c \
@@ -28 +40 @@
         strcasestr.c
 
-EXTRA_DIST = sys.i psErrorCodes.c.in psErrorCodes.h.in
+EXTRA_DIST = sys.i psErrorCodes.c.in psErrorCodes.h.in psVersionDefinitions.h
 
-BUILT_SOURCES = psErrorCodes.c
+BUILT_SOURCES = psErrorCodes.c psVersionDefinitions.h
 
 psErrorCodes.c: ../psErrorCodes_$(PS_LANG).dat psErrorCodes.c.in psErrorCodes.h

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys/psConfigure.c

@@ -44 +44 @@
 #include "psMemory.h"
 
+#include "psVersionDefinitions.h"
+
 static char *memCheckName = NULL;       // Filename to which to write results of mem check
 static FILE *memCheckFile = NULL;       // File to which to write results of mem check
@@ -57 +59 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString psLibVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PSLIB_BRANCH), xstr(PSLIB_VERSION));
+    psStringAppend(&value, "%s@%s", PSLIB_BRANCH, PSLIB_VERSION);
     return value;
 }
@@ -69 +68 @@
 psString psLibSource(void)
 {
-    return psStringCopy(xstr(PSLIB_SOURCE));
+    return psStringCopy(PSLIB_SOURCE);
 }
 

@@ -11 +11 @@
 *.bbg
 *.da
+psVersionDefinitions.h