IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38034 for trunk/magic


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/magic
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/magic/censorObjects/src

    • Property svn:ignore

      •  

        old new  
        99censorObjects
        1010censorErrorCodes.h
         11censorVersionDefinitions.h.tmp

  • trunk/magic/censorObjects/src/Makefile.am

    r24695 r38034  
    1 if HAVE_SVNVERSION
    2 CENSOR_VERSION=`$(SVNVERSION) ..`
    3 else
    4 CENSOR_VERSION="UNKNOWN"
    5 endif
    6 
    7 if HAVE_SVN
    8 CENSOR_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 }'`
    9 CENSOR_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    10 else
    11 CENSOR_BRANCH="UNKNOWN"
    12 CENSOR_SOURCE="UNKNOWN"
    13 endif
    141
    152# Force recompilation of censorVersion.c, since it gets the version information
    163censorVersion.c: censorVersionDefinitions.h
    174censorVersionDefinitions.h: censorVersionDefinitions.h.in FORCE
    18         -$(RM) censorVersionDefinitions.h
    19         $(SED) -e "s|@CENSOR_VERSION@|\"$(CENSOR_VERSION)\"|" -e "s|@CENSOR_BRANCH@|\"$(CENSOR_BRANCH)\"|" -e "s|@CENSOR_SOURCE@|\"$(CENSOR_SOURCE)\"|" censorVersionDefinitions.h.in > censorVersionDefinitions.h
     5        pslib-setsvnversion.pl CENSOR censorVersionDefinitions.h.in censorVersionDefinitions.h
    206FORCE: ;
    217

  • trunk/magic/remove/src

    • Property svn:ignore

      •  

        old new  
        1111config.h.in
        1212stamp-h1
         13streaksVersionDefinitions.h.tmp

  • trunk/magic/remove/src/Makefile.am

    r34089 r38034  
    1 if HAVE_SVNVERSION
    2 STREAKS_VERSION=`$(SVNVERSION) ..`
    3 else
    4 STREAKS_VERSION="UNKNOWN"
    5 endif
    6 
    7 if HAVE_SVN
    8 STREAKS_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 }'`
    9 STREAKS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    10 else
    11 STREAKS_BRANCH="UNKNOWN"
    12 STREAKS_SOURCE="UNKNOWN"
    13 endif
    141
    152# Force recompilation of streaksVersion.c, since it gets the version information
    163streaksVersion.c: streaksVersionDefinitions.h
    174streaksVersionDefinitions.h: streaksVersionDefinitions.h.in FORCE
    18         -$(RM) streaksVersionDefinitions.h
    19         $(SED) -e "s|@STREAKS_VERSION@|\"$(STREAKS_VERSION)\"|" -e "s|@STREAKS_BRANCH@|\"$(STREAKS_BRANCH)\"|" -e "s|@STREAKS_SOURCE@|\"$(STREAKS_SOURCE)\"|" streaksVersionDefinitions.h.in > streaksVersionDefinitions.h
     5        pslib-setsvnversion.pl STREAKS streaksVersionDefinitions.h.in streaksVersionDefinitions.h
    206FORCE: ;
    217
Note: See TracChangeset for help on using the changeset viewer.