Changeset 10292

Timestamp:

Nov 29, 2006, 1:12:04 PM (19 years ago)

Author:

Paul Price

Message:

Adding functions to return version information.

Location:

trunk

Files:

• ppStats/src/Makefile.am (modified) (3 diffs)
• ppStats/src/ppStatsVersion.c (added)
• ppStats/src/ppStatsVersion.h (added)
• psastro/src/Makefile.am (modified) (1 diff)
• psastro/src/psastro.h (modified) (2 diffs)
• psastro/src/psastroVersion.c (added)
• psphot/src/psphot.h (modified) (1 diff)
• psphot/src/psphotVersion.c (modified) (1 diff)

trunk/ppStats/src/Makefile.am

@@ -12 +12 @@
         ppStatsData.c           \
         ppStatsLoop.c           \
-        ppStatsSetupFromRecipe.c
+        ppStatsSetupFromRecipe.c \
+        ppStatsVersion.c
 
 ppStats_SOURCES =               \
@@ -18 +19 @@
         ppStatsLoop.c           \
         ppStatsSetupFromArgs.c  \
-        ppStatsStandAlone.c
+        ppStatsStandAlone.c     \
+        ppStatsVersion.c
 
 include_HEADERS =               \
@@ -24 +26 @@
         ppStatsData.h           \
         ppStatsLoop.h           \
-        ppStatsSetupFromRecipe.h
+        ppStatsSetupFromRecipe.h \
+        ppStatsVersion.h
 
 noinst_HEADERS =                \

trunk/psastro/src/Makefile.am

@@ -35 +35 @@
 psastroMosaicRescaleChips.c \
 psastroWCS.c                \
-psastroErrorCodes.c
+psastroErrorCodes.c         \
+psastroVersion.c
 
 include_HEADERS = \

trunk/psastro/src/psastro.h

@@ -22 +22 @@
 
 // this structure represents a fit to the logN / logS curve for a set of stars
-// logN = offset + slope * logS 
+// logN = offset + slope * logS
 typedef struct {
   double mMin;
@@ -68 +68 @@
 bool pmAstromWriteBilevelChip (psPlaneTransform *toFPA, psMetadata *header, double plateScale);
 psMetadata *pmAstromWriteBilevelMosaic (psProjection *toSky, psPlaneDistort *toTP, double plateScale);
+
+// Return version strings.
+psString psastroVersion(void);
+psString psastroVersionLong(void);

trunk/psphot/src/psphot.h

@@ -15 +15 @@
 // top-level psphot functions
 const char *psphotCVSName(void);
+psString psphotVersion(void);
+psString psphotVersionLong(void);
 
 // XXX test functions

trunk/psphot/src/psphotVersion.c

@@ -1 @@
-# include "psphot.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include <stdio.h>
+#include <pslib.h>
+#include <psmodules.h>
+#include "psphot.h"
+
+static const char *cvsTag = "$Name: not supported by cvs2svn $";// CVS tag name
+
+psString psphotVersion(void)
+{
+    psString version = NULL;            // Version, to return
+    psStringAppend(&version, "%s-%s",PACKAGE_NAME,PACKAGE_VERSION);
+    return version;
+}
+
+psString psphotVersionLong(void)
+{
+    psString version = psphotVersion(); // Version, to return
+    psString tag = psStringStripCVS(cvsTag, "Name"); // CVS tag
+    psStringAppend(&version, " (cvs tag %s) %s, %s", tag, __DATE__, __TIME__);
+    psFree(tag);
+    return version;
+}
+
+// Defined by RHL; leaving for backwards compatibility.
 const char *psphotCVSName(void) {
-   static char *name = "$Name: not supported by cvs2svn $";
-   return(name);
+   return cvsTag;
 }