Changeset 38038 for trunk/psModules/src/config

Timestamp:

Mar 28, 2015, 7:16:10 AM (11 years ago)

Author:

eugene

Message:

replace assert with psAssert in cases where the value is otherwise unused; do not raise an error when looking for classID in detloc which is not found; add galaxy shape error propagation failure flags to pmModelStatus; read EXT_WIDTH_MAJ_ERR et al back into dPAR[SXX,etc] (careful: this only works if not real errors); read SKY_EXT in PAR[SKY]; use header for FWHM_MAJ if not found on readout->analysis

Location:

trunk/psModules/src/config

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• pmConfigRecipes.c (modified) (1 diff)

trunk/psModules/src/config

@@ -8 +8 @@
 pmErrorCodes.h
 pmVersionDefinitions.h
+pmVersionDefinitions.h.tmp

@@ -8 +8 @@
 pmErrorCodes.h
 pmVersionDefinitions.h
+pmVersionDefinitions.h.tmp

trunk/psModules/src/config/Makefile.am

@@ -1 +1 @@
 noinst_LTLIBRARIES = libpsmodulesconfig.la
-
-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: 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
+        pslib-setsvnversion.pl PSMODULES pmVersionDefinitions.h.in pmVersionDefinitions.h
 FORCE: ;
 

trunk/psModules/src/config/pmConfigRecipes.c

@@ -228 +228 @@
         }
         psFree (words);
-        assert (valid);  // flag may be: -D, -Df, -Di, -Db
+        psAssert (valid, "invalid flag: may be: -D, -Df, -Di, -Db\n");
 
         psArgumentRemove (argNum, argc, argv);

@@ -8 +8 @@
 pmErrorCodes.h
 pmVersionDefinitions.h
+pmVersionDefinitions.h.tmp