IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38034 for trunk/ppMerge/src


Ignore:
Timestamp:
Mar 28, 2015, 7:10:18 AM (11 years ago)
Author:
eugene
Message:

replace Makefile.am sed code with pslib-setsvnversion

Location:
trunk/ppMerge/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ppMerge/src

    • Property svn:ignore

      •  

        old new  
        88.libs
        99ppMergeVersionDefinitions.h
         10ppMergeVersionDefinitions.h.tmp

  • trunk/ppMerge/src/Makefile.am

    r23808 r38034  
    11bin_PROGRAMS = ppMerge
    2 
    3 if HAVE_SVNVERSION
    4 PPMERGE_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PPMERGE_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PPMERGE_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 PPMERGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PPMERGE_BRANCH="UNKNOWN"
    14 PPMERGE_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of ppMergeVersion.c, since it gets the version information
    184ppMergeVersion.c: ppMergeVersionDefinitions.h
    195ppMergeVersionDefinitions.h: ppMergeVersionDefinitions.h.in FORCE
    20         -$(RM) ppMergeVersionDefinitions.h
    21         $(SED) -e "s|@PPMERGE_VERSION@|\"$(PPMERGE_VERSION)\"|" -e "s|@PPMERGE_BRANCH@|\"$(PPMERGE_BRANCH)\"|" -e "s|@PPMERGE_SOURCE@|\"$(PPMERGE_SOURCE)\"|" ppMergeVersionDefinitions.h.in > ppMergeVersionDefinitions.h
     6        pslib-setsvnversion.pl PPMERGE ppMergeVersionDefinitions.h.in ppMergeVersionDefinitions.h
    227FORCE: ;
    23 
    248
    259ppMerge_CFLAGS = $(PPMERGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
Note: See TracChangeset for help on using the changeset viewer.