Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psModules/src/config

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)
• psModules/src/config/pmConfig.c (modified) (2 diffs)
• psModules/src/config/pmConfigDump.c (modified) (1 diff)
• psModules/src/config/pmConfigDump.h (modified) (1 diff)
• psModules/src/config/pmConfigRecipes.c (modified) (7 diffs)
• psModules/src/config/pmConfigRun.c (modified) (6 diffs)
• psModules/src/config/pmConfigRun.h (modified) (1 diff)
• psModules/src/config/pmErrorCodes.dat (modified) (1 diff)
• psModules/src/config/pmErrorCodes.h.in (modified) (1 diff)
• psModules/src/config/pmVersion.c (modified) (3 diffs)
• psModules/src/config/pmVersionDefinitions.h.in (copied) (copied from trunk/psModules/src/config/pmVersionDefinitions.h.in )

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

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfig.c

@@ -551 +551 @@
                 psWarning("Unable to resolve log destination: %s --- ignored", logDest);
             } else {
+                pmConfigRunFilenameAddWrite(config, "LOG", logDest);
                 config->logFD = psMessageDestination(resolved);
             }
@@ -609 +610 @@
                 psWarning("Unable to resolve trace destination: %s --- ignored", traceDest);
             } else {
+                pmConfigRunFilenameAddWrite(config, "TRACE", traceDest);
                 config->traceFD = psMessageDestination(resolved);
             }

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigDump.c

@@ -138 +138 @@
 
 
-bool pmConfigDump(const pmConfig *config, const pmFPA *source, const char *filename)
+bool pmConfigDump(const pmConfig *config, const char *filename)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigDump.h

@@ -31 +31 @@
 ///
 bool pmConfigDump(const pmConfig *config, ///< Configuration to dump
-                  const pmFPA *source,    ///< Source FPA, defines the level for the file rule
                   const char *filename    ///< Output file name
     );

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigRecipes.c

@@ -81 +81 @@
             psTrace ("psModules.config", 3, "read recipes from camera config");
         } else {
-            psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by camera config");
+            psTrace ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by camera config");
         }
     }
@@ -97 +97 @@
             psTrace ("psModules.config", 3, "read recipes from symbolic references");
         } else {
-            psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by symbolic reference");
+            psTrace ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by symbolic reference");
         }
 
@@ -105 +105 @@
             return false;
         }
-        psLogMsg ("psModules.config", PS_LOG_DETAIL, "merged camera recipes with system recipes");
+        psTrace ("psModules.config", PS_LOG_DETAIL, "merged camera recipes with system recipes");
 
         // load recipe-files specified on the command line
@@ -115 +115 @@
             psTrace ("psModules.config", 3, "read recipes from command-line arguments");
         } else {
-            psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied on command-line arguments");
+            psTrace ("psModules.config", PS_LOG_DETAIL, "no recipe supplied on command-line arguments");
         }
 
@@ -126 +126 @@
             psTrace ("psModules.config", 3, "read recipes from symbolic references");
         } else {
-            psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by symbolic reference");
+            psTrace ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by symbolic reference");
         }
 
@@ -137 +137 @@
             psTrace ("psModules.config", 3, "read recipes from command-line arguments");
         } else {
-            psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied on command-line arguments");
+            psTrace ("psModules.config", PS_LOG_DETAIL, "no recipe supplied on command-line arguments");
         }
     }
@@ -348 +348 @@
             psFree(recipesIter);
             return false;
-        }
+        }
     }
     psFree(recipesIter);

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigRun.c

@@ -41 +41 @@
 // Add a file to a nominated metadata in the RUN information
 static bool configRunFileAdd(pmConfig *config, // Configuration
-                             const pmFPAfile *file, // File to add
+                             const char *description, // Description of file
+                             const char *name, // Name of file
                              const char *target // Name of metadata to which to add
                              )
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
-    PS_ASSERT_PTR_NON_NULL(file, false);
+    PS_ASSERT_STRING_NON_EMPTY(description, false);
+    PS_ASSERT_STRING_NON_EMPTY(name, false);
+    PS_ASSERT_STRING_NON_EMPTY(target, false);
 
     psMetadata *run = configRun(config);// RUN information
@@ -53 +56 @@
     psAssert(files, "Require list of files");
 
-    const char *name = file->name;      // Name of symbolic file
-    const char *value = file->origname ? file->origname : file->filename; // The file (system) name
-
     psString regex = NULL;              // Regular expression for iteration
-    psStringAppend(&regex, "^%s$", name);
+    psStringAppend(&regex, "^%s$", description);
     psMetadataIterator *iter = psMetadataIteratorAlloc(files, PS_LIST_HEAD, regex);
     psFree(regex);
@@ -63 +63 @@
     while ((item = psMetadataGetAndIncrement(iter))) {
         psAssert(item->type == PS_DATA_STRING, "We only put STRING types here.");
-        if (strcmp(item->data.str, value) == 0) {
+        if (strcmp(item->data.str, name) == 0) {
             // It's already present
             psFree(iter);
@@ -71 +71 @@
     psFree(iter);
 
-    return psMetadataAddStr(files, PS_LIST_TAIL, name, PS_META_DUPLICATE_OK, NULL, value);
+    return psMetadataAddStr(files, PS_LIST_TAIL, description, PS_META_DUPLICATE_OK, NULL, name);
 }
 
@@ -79 +79 @@
     PS_ASSERT_PTR_NON_NULL(file, false);
 
-    return configRunFileAdd(config, file, "FILES.INPUT");
+    return configRunFileAdd(config, file->name, file->origname ? file->origname : file->filename,
+                            "FILES.INPUT");
+}
+
+bool pmConfigRunFilenameAddRead(pmConfig *config, const char *description, const char *name)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_STRING_NON_EMPTY(description, false);
+    PS_ASSERT_STRING_NON_EMPTY(name, false);
+
+    return configRunFileAdd(config, description, name, "FILES.INPUT");
 }
 
@@ -87 +97 @@
     PS_ASSERT_PTR_NON_NULL(file, false);
 
-    return configRunFileAdd(config, file, "FILES.OUTPUT");
+    return configRunFileAdd(config, file->name, file->origname ? file->origname : file->filename,
+                            "FILES.OUTPUT");
+}
+
+bool pmConfigRunFilenameAddWrite(pmConfig *config, const char *description, const char *name)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_STRING_NON_EMPTY(description, false);
+    PS_ASSERT_STRING_NON_EMPTY(name, false);
+
+    return configRunFileAdd(config, description, name, "FILES.OUTPUT");
 }
 

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigRun.h

@@ -12 +12 @@
     );
 
+/// Add a filename to the list of files read in the run-time information
+bool pmConfigRunFilenameAddRead(
+    pmConfig *config,                   ///< Configuration
+    const char *description,            ///< Description of file
+    const char *name                    ///< Name of file
+    );
+
 /// Add a file to the list of files written in the run-time information
 bool pmConfigRunFileAddWrite(
     pmConfig *config,                   ///< Configuration
     const pmFPAfile *file               ///< File to add
+    );
+
+/// Add a filename to the list of files written in the run-time information
+bool pmConfigRunFilenameAddWrite(
+    pmConfig *config,                   ///< Configuration
+    const char *description,            ///< Description of file
+    const char *name                    ///< Name of file
     );
 

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmErrorCodes.dat

@@ -11 +11 @@
 OBJECTS                 Problem in objects
 SKY                     Problem in sky
+STAMPS                  Unable to select stamps for PSF-matching
 # these errors correspond to standard exit conditions
 ARGUMENTS               Incorrect arguments

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmErrorCodes.h.in

@@ -9 +9 @@
  */
 typedef enum {
-    PM_ERR_BASE = 1200,
+    PM_ERR_BASE = 1000,
     PM_ERR_${ErrorCode},
     PM_ERR_NERROR

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmVersion.c

@@ -7 +7 @@
 #include <pslib.h>
 #include "pmVersion.h"
+#include "pmVersionDefinitions.h"
 
 #ifndef PSMODULES_VERSION
@@ -18 +19 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString psModulesVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PSMODULES_BRANCH), xstr(PSMODULES_VERSION));
+    psStringAppend(&value, "%s@%s", PSMODULES_BRANCH, PSMODULES_VERSION);
     return value;
 }
@@ -30 +28 @@
 psString psModulesSource(void)
 {
-    return psStringCopy(xstr(PSMODULES_SOURCE));
+    return psStringCopy(PSMODULES_SOURCE);
 }
 

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