Changeset 3536


Ignore:
Timestamp:
Oct 24, 2007, 7:57:47 PM (15 years ago)
Author:
charles
Message:

don't require the user to have svn installed when building from tarball

Location:
trunk
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure.ac

    r3528 r3536  
    22PEERID_PREFIX="-TR0900-"
    33USERAGENT_PREFIX="0.90"
     4AC_SUBST(PEERID_PREFIX,[$PEERID_PREFIX])
     5AC_SUBST(USERAGENT_PREFIX,[$USERAGENT_PREFIX])
    46
    57AC_PREREQ(2.54)
    … …  
    180182dnl ----------------------------------------------------------------------------
    181183dnl
    182 dnl  Version files
    183 
    184 
    185 dnl constraint: strlen(MAJOR MINOR MAINT BETA) must be 4
    186 dnl convention: BETA: "Z" for a beta, "0" for a stable
    187 SVN_REVISION=`svn info . | sed -ne "s/^Revision: \(.*\:\)\{0,1\}\(.*\)$/\2/p"`
    188 AC_SUBST(PEERID_PREFIX,[$PEERID_PREFIX])
    189 AC_SUBST(USERAGENT_PREFIX,[$USERAGENT_PREFIX])
    190 AC_SUBST(SVN_REVISION,[$SVN_REVISION])
    191 AC_SUBST(BUNDLE_VERSION,[$SVN_REVISION])
    192 AC_SUBST(VERSION_PACKAGE,$USERAGENT_PREFIX-r$SVN_REVISION)
    193 
    194 
    195 dnl ----------------------------------------------------------------------------
    196 dnl
    197184dnl  Generate the output
    198185

  • trunk/libtransmission/Makefile.am

    r3533 r3536  
    7676    xml.h
    7777
    78 BUILT_SOURCES = version.h
     78dist_libtransmission_a_SOURCES = \
     79    version.h
    7980
    80 EXTRA_DIST = \
    81         version.h \
    82         version.h.in
    83 
    84 do_subst = sed \
    85         -e 's,[@]PEERID_PREFIX[@],$(PEERID_PREFIX),g' \
    86         -e 's,[@]USERAGENT_PREFIX[@],$(USERAGENT_PREFIX),g' \
    87         -e 's,[@]SVN_REVISION[@],$(SVN_REVISION),g' \
    88         -e 's,[@]SHORT_VERSION_STRING[@],$(SHORT_VERSION_STRING),g' \
    89         -e 's,[@]LONG_VERSION_STRING[@],$(LONG_VERSION_STRING),g'
    90 
    91 version.h: version.h.in
    92         $(do_subst) < $(srcdir)/version.h.in > version.h
    93 
    94 CLEANFILES = \
    95         version.h
     81version.h:
     82        echo '#define PEERID_PREFIX         "'@PEERID_PREFIX@'"' > version.h
     83        echo '#define USERAGENT_PREFIX      "'@USERAGENT_PREFIX@'"' >> version.h
     84        echo '#define SVN_REVISION          "'`svn info | grep "Revision" | awk -F': ' '{print $$2}'`'"' >> version.h
     85        echo '#define SHORT_VERSION_STRING  "'@USERAGENT_PREFIX@'"' >> version.h
     86        echo '#define LONG_VERSION_STRING   "'@USERAGENT_PREFIX@' ('`svn info | grep "Revision" | awk -F': ' '{print $$2}'`')"' >> version.h

  • trunk/macosx/Makefile.am

    r3528 r3536  
    8585    TorrentTableView.m
    8686
     87dist-hook:
     88        rm -rf `find $(distdir)/macosx -name ".svn"`
     89
    8790# Use Xcode do make the actual build
    8891all:
Note: See TracChangeset for help on using the changeset viewer.