IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

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/ppSim/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.