IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

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

merge changes from trunk

Location:
branches/eam_branches/ipp-20150112/ppViz/src/ppVizPSF
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150112/ppViz/src/ppVizPSF

    • Property svn:ignore

      •  

        old new  
        44.deps
        55Makefile
         6ppVizPSFVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/ppViz/src/ppVizPSF/Makefile.am

    r26352 r38052  
    11bin_PROGRAMS = ppVizPSF
    2 
    3 if HAVE_SVNVERSION
    4 PPVIZPSF_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PPVIZPSF_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PPVIZPSF_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 PPVIZPSF_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PPVIZPSF_BRANCH="UNKNOWN"
    14 PPVIZPSF_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of ppVizPSFVersion.c, since it gets the version information
    184ppVizPSFVersion.c: ppVizPSFVersionDefinitions.h
    195ppVizPSFVersionDefinitions.h: ppVizPSFVersionDefinitions.h.in FORCE
    20         -$(RM) ppVizPSFVersionDefinitions.h
    21         $(SED) -e "s|@PPVIZPSF_VERSION@|\"$(PPVIZPSF_VERSION)\"|" -e "s|@PPVIZPSF_BRANCH@|\"$(PPVIZPSF_BRANCH)\"|" -e "s|@PPVIZPSF_SOURCE@|\"$(PPVIZPSF_SOURCE)\"|" ppVizPSFVersionDefinitions.h.in > ppVizPSFVersionDefinitions.h
     6        pslib-setsvnversion.pl PPVIZPSF ppVizPSFVersionDefinitions.h.in ppVizPSFVersionDefinitions.h
    227FORCE: ;
    238
Note: See TracChangeset for help on using the changeset viewer.