Changeset 38041

Timestamp:

Mar 28, 2015, 7:24:32 AM (11 years ago)

Author:

eugene

Message:

removed unused option -available from difftool; add recipe value TRANSFORM.GALAXY.SHAPE.ERRORS to psastro.config; use pslib-setsvnversion; replace assert with psAssert in cases where the value is otherwise unused; add gcc 4.8 to list of version which need no-as-needed; build perl code after psLib-based programs

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/src/difftool.c (modified) (1 diff)
• ippconfig (modified) (1 prop)
• ippconfig/recipes/psastro.config (modified) (1 diff)
• ppSim/src (modified) (1 prop)
• ppSim/src/Makefile.am (modified) (1 diff)
• ppSim/src/ppSimInsertGalaxies.c (modified) (1 diff)
• psconfig/psconfig.csh.in (modified) (2 diffs)
• psconfig/tagsets/ipp-3.0.dist (modified) (2 diffs)

trunk/ippTools/src/difftool.c

@@ -1252 +1252 @@
   }
   
-  PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
+  // PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
   PXOPT_LOOKUP_BOOL(bothways, config->args, "-bothways", false);
   

trunk/ippconfig/recipes/psastro.config

@@ -187 +187 @@
 MASKSTAT.ADVISORY   U32 0x080
 
+TRANSFORM.GALAXY.SHAPE.ERRORS  BOOL F
+
 # maximum allowed fwhm_major (moved from */camera.config)
 PSASTRO.MAX.ALLOWED.FWHM    F32     0

trunk/ppSim/src

@@ -9 +9 @@
 ppSimSequence
 ppSimVersionDefinitions.h
+ppSimVersionDefinitions.h.tmp

@@ -9 +9 @@
 ppSimSequence
 ppSimVersionDefinitions.h
+ppSimVersionDefinitions.h.tmp

trunk/ppSim/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppSim ppSimSequence
-
-if HAVE_SVNVERSION
-PPSIM_VERSION=`$(SVNVERSION) ..`
-else
-PPSIM_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPSIM_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 }'`
-PPSIM_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPSIM_BRANCH="UNKNOWN"
-PPSIM_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppSimVersion.c, since it gets the version information
 ppSimVersion.c: ppSimVersionDefinitions.h
 ppSimVersionDefinitions.h: ppSimVersionDefinitions.h.in FORCE
-        -$(RM) ppSimVersionDefinitions.h
-        $(SED) -e "s|@PPSIM_VERSION@|\"$(PPSIM_VERSION)\"|" -e "s|@PPSIM_BRANCH@|\"$(PPSIM_BRANCH)\"|" -e "s|@PPSIM_SOURCE@|\"$(PPSIM_SOURCE)\"|" ppSimVersionDefinitions.h.in > ppSimVersionDefinitions.h
+        pslib-setsvnversion.pl PPSIM ppSimVersionDefinitions.h.in ppSimVersionDefinitions.h
 FORCE: ;
 

trunk/ppSim/src/ppSimInsertGalaxies.c

@@ -82 +82 @@
 
     pmPSF *psf = psMetadataLookupPtr (&mdok, chip->analysis, "PSPHOT.PSF");
-    assert (psf);
+    psAssert (psf, "missing PSPHOT.PSF on chip.analysis");
 
     int dX = PM_CELL_TO_CHIP (0.0, x0Cell, xParityCell, binning);

trunk/psconfig/psconfig.csh.in

@@ -323 +323 @@
  case linux:
  case linrh:
-   gcc --version | grep -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
+   gcc --version | grep -e 4.8 -e 4.6 -e 4.5| grep Ubuntu >& /dev/null
    if ($status == 0) then
     set xtraflags = "-Wl,--no-as-needed"
@@ -335 +335 @@
  case lin64:
  case linrh64:
-   gcc --version | grep -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
+   gcc --version | grep -e 4.8 -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
    if ($status == 0) then
     set xtraflags = "-Wl,--no-as-needed"

trunk/psconfig/tagsets/ipp-3.0.dist

@@ -31 +31 @@
   NNYYN  pclient                ipp-2-9          -0      
           
+# psLib-based code needs the nebclient library to interact with nebulous
   YNNYY  Nebulous/nebclient     ipp-2-9          -0
-  YNNYY  Nebulous               ipp-2-9          -0
-  YNNYY  Nebulous-Server        ipp-2-9          -0
-  YYYYY  PS-IPP-Metadata-Config ipp-2-9          -0
-  YYYYY  PS-IPP-Config          ipp-2-9          -0     
-          
+
   YYYYY  psLib                  ipp-2-9          -0
   YYYYY  psModules              ipp-2-9          -0
@@ -54 +51 @@
   YYYYY  ppSub                  ipp-2-9          -0
   YYYYY  ppSim                  ipp-2-9          -0
+          
+  YNNYY  Nebulous               ipp-2-9          -0
+  YNNYY  Nebulous-Server        ipp-2-9          -0
+  YYYYY  PS-IPP-Metadata-Config ipp-2-9          -0
+  YYYYY  PS-IPP-Config          ipp-2-9          -0     
           
   YNNYY  glueforge              ipp-2-9          -0

@@ -9 +9 @@
 ppSimSequence
 ppSimVersionDefinitions.h
+ppSimVersionDefinitions.h.tmp