IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38051


Ignore:
Timestamp:
Mar 28, 2015, 8:27:11 PM (11 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20150112
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150112/ppConfigDump/src/Makefile.am

    r12809 r38051  
    22
    33ppConfigDump_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(ppConfigDump_CFLAGS)
    4 ppConfigDump_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
     4ppConfigDump_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) -lz
    55ppConfigDump_SOURCES = ppConfigDump.c
    66

  • branches/eam_branches/ipp-20150112/ppSim/src

    • Property svn:ignore

      •  

        old new  
        99ppSimSequence
        1010ppSimVersionDefinitions.h
         11ppSimVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppSim/src/Makefile.am

    r31157 r38051  
    11bin_PROGRAMS = ppSim ppSimSequence
    2 
    3 if HAVE_SVNVERSION
    4 PPSIM_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PPSIM_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 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 }'`
    11 PPSIM_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PPSIM_BRANCH="UNKNOWN"
    14 PPSIM_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of ppSimVersion.c, since it gets the version information
    184ppSimVersion.c: ppSimVersionDefinitions.h
    195ppSimVersionDefinitions.h: ppSimVersionDefinitions.h.in FORCE
    20         -$(RM) ppSimVersionDefinitions.h
    21         $(SED) -e "s|@PPSIM_VERSION@|\"$(PPSIM_VERSION)\"|" -e "s|@PPSIM_BRANCH@|\"$(PPSIM_BRANCH)\"|" -e "s|@PPSIM_SOURCE@|\"$(PPSIM_SOURCE)\"|" ppSimVersionDefinitions.h.in > ppSimVersionDefinitions.h
     6        pslib-setsvnversion.pl PPSIM ppSimVersionDefinitions.h.in ppSimVersionDefinitions.h
    227FORCE: ;
    238

  • branches/eam_branches/ipp-20150112/ppSim/src/ppSimInsertGalaxies.c

    r36868 r38051  
    8282
    8383    pmPSF *psf = psMetadataLookupPtr (&mdok, chip->analysis, "PSPHOT.PSF");
    84     assert (psf);
     84    psAssert (psf, "missing PSPHOT.PSF on chip.analysis");
    8585
    8686    int dX = PM_CELL_TO_CHIP (0.0, x0Cell, xParityCell, binning);

  • branches/eam_branches/ipp-20150112/ppStack/src

    • Property svn:ignore

      •  

        old new  
        1313ppStackErrorCodes.c
        1414ppStackErrorCodes.h
        15 
         15ppStackVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppStack/src/Makefile.am

    r34800 r38051  
    11bin_PROGRAMS = ppStack ppStackMedian
    2 
    3 if HAVE_SVNVERSION
    4 PPSTACK_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PPSTACK_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PPSTACK_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 }'`
    11 PPSTACK_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PPSTACK_BRANCH="UNKNOWN"
    14 PPSTACK_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of ppStackVersion.c, since it gets the version information
    184ppStackVersion.c: ppStackVersionDefinitions.h
    195ppStackVersionDefinitions.h: ppStackVersionDefinitions.h.in FORCE
    20         -$(RM) ppStackVersionDefinitions.h
    21         $(SED) -e "s|@PPSTACK_VERSION@|\"$(PPSTACK_VERSION)\"|" -e "s|@PPSTACK_BRANCH@|\"$(PPSTACK_BRANCH)\"|" -e "s|@PPSTACK_SOURCE@|\"$(PPSTACK_SOURCE)\"|" ppStackVersionDefinitions.h.in > ppStackVersionDefinitions.h
     6        pslib-setsvnversion.pl PPSTACK ppStackVersionDefinitions.h.in ppStackVersionDefinitions.h
    227FORCE: ;
    238

  • branches/eam_branches/ipp-20150112/ppbgrestore/src/Makefile.am

    r25973 r38051  
    11bin_PROGRAMS = ppbgrestore
    2 
    32
    43noinst_HEADERS = \
    54        ppbgrestore.h
    65
    7 if HAVE_SVNVERSION
    8 PPBGRESTORE_VERSION=`$(SVNVERSION) ..`
    9 else
    10 PPBGRESTORE_VERSION="UNKNOWN"
    11 endif
    12 
    13 if HAVE_SVN
    14 PPBGRESTORE_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 }'`
    15 PPBGRESTORE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    16 else
    17 PPBGRESTORE_BRANCH="UNKNOWN"
    18 PPBGRESTORE_SOURCE="UNKNOWN"
    19 endif
    20 
    216# Force recompilation of ppbgrestoreVersion.c, since it gets the version information
    227ppbgrestoreVersion.c: ppbgrestoreVersionDefinitions.h
    238ppbgrestoreVersionDefinitions.h: ppbgrestoreVersionDefinitions.h.in FORCE
    24         -$(RM) ppbgrestoreVersionDefinitions.h
    25         $(SED) -e "s|@PPBGRESTORE_VERSION@|\"$(PPBGRESTORE_VERSION)\"|" -e "s|@PPBGRESTORE_BRANCH@|\"$(PPBGRESTORE_BRANCH)\"|" -e "s|@PPBGRESTORE_SOURCE@|\"$(PPBGRESTORE_SOURCE)\"|" ppbgrestoreVersionDefinitions.h.in > ppbgrestoreVersionDefinitions.h
     9        pslib-setsvnversion.pl PPBGRESTORE ppbgrestoreVersionDefinitions.h.in ppbgrestoreVersionDefinitions.h
    2610FORCE: ;
    2711

  • branches/eam_branches/ipp-20150112/psvideophot/src/Makefile.am

    r32553 r38051  
    55        psvideophot.h
    66
    7 if HAVE_SVNVERSION
    8 PSVIDEOPHOT_VERSION=`$(SVNVERSION) ..`
    9 else
    10 PSVIDEOPHOT_VERSION="UNKNOWN"
    11 endif
    12 
    13 if HAVE_SVN
    14 PSVIDEOPHOT_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 }'`
    15 PSVIDEOPHOT_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    16 else
    17 PSVIDEOPHOT_BRANCH="UNKNOWN"
    18 PSVIDEOPHOT_SOURCE="UNKNOWN"
    19 endif
    20 
    217# Force recompilation of psvideophotVersion.c, since it gets the version information
    228psvideophotVersion.c: psvideophotVersionDefinitions.h
    239psvideophotVersionDefinitions.h: psvideophotVersionDefinitions.h.in FORCE
    24         -$(RM) psvideophotVersionDefinitions.h
    25         $(SED) -e "s|@PSVIDEOPHOT_VERSION@|\"$(PSVIDEOPHOT_VERSION)\"|" -e "s|@PSVIDEOPHOT_BRANCH@|\"$(PSVIDEOPHOT_BRANCH)\"|" -e "s|@PSVIDEOPHOT_SOURCE@|\"$(PSVIDEOPHOT_SOURCE)\"|" psvideophotVersionDefinitions.h.in > psvideophotVersionDefinitions.h
     10        pslib-setsvnversion.pl PSVIDEOPHOT psvideophotVersionDefinitions.h.in psvideophotVersionDefinitions.h
    2611FORCE: ;
    2712
Note: See TracChangeset for help on using the changeset viewer.