Changeset 2325


Ignore:
Timestamp:
Jul 10, 2007, 7:40:21 PM (15 years ago)
Author:
charles
Message:

update versioning scheme as per consensus between TMT, John_Clay, Gimp_, and charles_

Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/transmissioncli.c

    r2245 r2325  
    100100    tr_handle_status_t * hstat;
    101101
    102     printf( "Transmission %s (%d) - http://transmission.m0k.org/\n\n",
    103             VERSION_STRING, VERSION_REVISION );
     102    printf( "Transmission %s - http://transmission.m0k.org/\n\n",
     103            LONG_VERSION_STRING );
    104104
    105105    /* Get options */
  • trunk/daemon/client.c

    r2227 r2325  
    858858    size_t      len;
    859859
    860     buf = ipc_mkvers( &len, "Transmission remote" VERSION_STRING );
     860    buf = ipc_mkvers( &len, "Transmission remote" LONG_VERSION_STRING );
    861861    if( NULL == buf )
    862862    {
  • trunk/daemon/daemon.c

    r2224 r2325  
    120120  "usage: %s [-dfh]\n"
    121121  "\n"
    122   "Transmission %s (r%d) http://transmission.m0k.org/\n"
     122  "Transmission %s http://transmission.m0k.org/\n"
    123123  "A free, lightweight BitTorrent client with a simple, intuitive interface\n"
    124124  "\n"
     
    129129  "\n"
    130130  "To add torrents or set options, use the transmission-remote program.\n",
    131             getmyname(), VERSION_STRING, VERSION_REVISION );
     131            getmyname(), LONG_VERSION_STRING );
    132132    exit( 0 );
    133133}
  • trunk/daemon/proxy.c

    r1965 r2325  
    128128  "usage: %s [options] [files]...\n"
    129129  "\n"
    130   "Transmission %s (r%d) http://transmission.m0k.org/\n"
     130  "Transmission %s http://transmission.m0k.org/\n"
    131131  "A free, lightweight BitTorrent client with a simple, intuitive interface.\n"
    132132  "\n"
     
    135135  "  -t --type gtk             Use the GTK+ frontend, transmission-gtk\n"
    136136  "  -t --type mac             Use the Mac OS X frontend\n",
    137             getmyname(), VERSION_STRING, VERSION_REVISION );
     137            getmyname(), LONG_VERSION_STRING );
    138138    exit( EXIT_SUCCESS );
    139139}
  • trunk/daemon/remote.c

    r1965 r2325  
    225225  "usage: %s [options]\n"
    226226  "\n"
    227   "Transmission %s (r%d) http://transmission.m0k.org/\n"
     227  "Transmission %s http://transmission.m0k.org/\n"
    228228  "A free, lightweight BitTorrent client with a simple, intuitive interface.\n"
    229229  "\n"
     
    253253  "  -U --upload-unlimited     No upload rate limit\n"
    254254  "  -x --proxy                Use proxy command to connect to frontend\n",
    255             getmyname(), VERSION_STRING, VERSION_REVISION );
     255            getmyname(), LONG_VERSION_STRING );
    256256    exit( 0 );
    257257}
  • trunk/daemon/server.c

    r2245 r2325  
    256256
    257257        bufferevent_enable( clev, EV_READ );
    258         buf = ipc_mkvers( &buflen, "Transmission daemon " VERSION_STRING );
     258        buf = ipc_mkvers( &buflen, "Transmission daemon " LONG_VERSION_STRING );
    259259        if( 0 > queuemsg( client, buf, buflen ) )
    260260        {
  • trunk/gtk/ipc.c

    r2245 r2325  
    341341  }
    342342
    343   buf = ipc_mkvers( &size, "Transmission GTK+ " VERSION_STRING );
     343  buf = ipc_mkvers( &size, "Transmission GTK+ " LONG_VERSION_STRING );
    344344  if( NULL == buf )
    345345  {
     
    382382  }
    383383
    384   buf = ipc_mkvers( &size, "Transmission GTK+ " VERSION_STRING );
     384  buf = ipc_mkvers( &size, "Transmission GTK+ " LONG_VERSION_STRING );
    385385  if( NULL == buf )
    386386  {
  • trunk/gtk/main.c

    r2202 r2325  
    299299_("usage: %s [-hpq] [files...]\n"
    300300  "\n"
    301   "Transmission %s (r%d) http://transmission.m0k.org/\n"
     301  "Transmission %s http://transmission.m0k.org/\n"
    302302  "A free, lightweight BitTorrent client with a simple, intuitive interface\n"
    303303  "\n"
     
    310310  "line. If %s is already running, those torrents will be\n"
    311311  "opened in the running instance.\n"),
    312                         name, VERSION_STRING, VERSION_REVISION,
     312                        name, LONG_VERSION_STRING,
    313313                        name, name, name );
    314314                exit(0);
     
    889889about ( void )
    890890{
    891   char buf[128];
    892891  GtkWidget * w = gtk_about_dialog_new ();
    893892  GtkAboutDialog * a = GTK_ABOUT_DIALOG (w);
     
    898897                            "Bryan Varner (BeOS)",
    899898                            NULL };
    900   g_snprintf (buf, sizeof(buf), _("%s (%d)"), VERSION_STRING, VERSION_REVISION);
    901   gtk_about_dialog_set_version (a, buf);
     899  gtk_about_dialog_set_version (a, LONG_VERSION_STRING );
    902900#ifdef SHOW_LICENSE
    903901  gtk_about_dialog_set_license (a, LICENSE);
  • trunk/gtk/torrent-inspector.c

    r2317 r2325  
    13061306    GtkCellRenderer     * rend;
    13071307    GtkCellRenderer     * priority_rend;
     1308    GtkCellRenderer     * enabled_rend;
    13081309    GtkTreeViewColumn   * col;
    13091310    GtkTreeSelection    * sel;
     
    13671368    fileSelectionChangedCB( sel, NULL );
    13681369
     1370    /* add "download" checkbox column */
     1371    col = gtk_tree_view_column_new ();
     1372    gtk_tree_view_column_set_sort_column_id( col, FC_ENABLED );
     1373    rend = enabled_rend = gtk_cell_renderer_toggle_new  ();
     1374    col = gtk_tree_view_column_new_with_attributes (_("Download"),
     1375                                                    rend,
     1376                                                    "active", FC_ENABLED,
     1377                                                    NULL);
     1378    gtk_tree_view_append_column( GTK_TREE_VIEW( view ), col );
     1379
    13691380    /* add priority column */
    13701381    model = priority_model_new ();
     
    13831394    gtk_tree_view_append_column( GTK_TREE_VIEW( view ), col );
    13841395
    1385     /* download enabled column */
    1386     col = gtk_tree_view_column_new ();
    1387     gtk_tree_view_column_set_sort_column_id( col, FC_ENABLED );
    1388     rend = gtk_cell_renderer_toggle_new  ();
    1389     col = gtk_tree_view_column_new_with_attributes (_("Enabled"),
    1390                                                     rend,
    1391                                                     "active", FC_ENABLED,
    1392                                                     NULL);
    1393     gtk_tree_view_append_column( GTK_TREE_VIEW( view ), col );
    1394 
    13951396    /* create the scrolled window and stick the view in it */
    13961397    scroll = gtk_scrolled_window_new( NULL, NULL );
     
    14111412    g_object_set_data_full (G_OBJECT(ret), "file-data", data, g_free);
    14121413    g_signal_connect (G_OBJECT(priority_rend), "edited", G_CALLBACK(priority_changed_cb), data);
    1413     g_signal_connect( rend, "toggled", G_CALLBACK(enabled_toggled), data );
     1414    g_signal_connect(enabled_rend, "toggled", G_CALLBACK(enabled_toggled), data );
    14141415    return ret;
    14151416}
  • trunk/libtransmission/http.c

    r2311 r2325  
    452452    if( tr_sprintf( EXPANDBUF( http->header ), " HTTP/1.1" CR LF
    453453                    "Host: %s:%d" CR LF
    454                     "User-Agent: %s/%d.%d%d" CR LF
     454                    "User-Agent: " TR_NAME "/" LONG_VERSION_STRING CR LF
    455455                    "Connection: close" CR LF,
    456                     http->host, http->port, TR_NAME, VERSION_MAJOR, VERSION_MINOR, VERSION_MAINTENANCE ) )
     456                    http->host, http->port ) )
    457457    {
    458458        goto err;
  • trunk/libtransmission/makemeta.c

    r2322 r2325  
    358358
    359359        val = tr_bencDictAdd( &top, "created by" );
    360         tr_bencInitStrDup( val, TR_NAME " " VERSION_STRING );
     360        tr_bencInitStrDup( val, TR_NAME "/" LONG_VERSION_STRING );
    361361
    362362        val = tr_bencDictAdd( &top, "creation date" );
  • trunk/libtransmission/peeraz.h

    r1727 r2325  
    134134                    tor->azId, TR_AZ_ID_LEN, 1 );
    135135    tr_bencInitStr( tr_bencDictAdd( &val, "client" ),   TR_NAME, 0, 1 );
    136     tr_bencInitStr( tr_bencDictAdd( &val, "version" ),  VERSION_STRING, 0, 1 );
     136    tr_bencInitStr( tr_bencDictAdd( &val, "version" ),  SHORT_VERSION_STRING, 0, 1 );
    137137    if( 0 < tor->publicPort )
    138138    {
  • trunk/libtransmission/peerext.h

    r1998 r2325  
    121121{
    122122    benc_val_t val, * msgsval;
    123     char * buf, * vers;
    124 
    125     /* get human-readable version string */
    126     vers = NULL;
    127     asprintf( &vers, "%s %s", TR_NAME, VERSION_STRING );
    128     if( NULL == vers )
    129     {
    130         return NULL;
    131     }
     123    char * buf;
     124    char * vers = tr_strdup( TR_NAME " " SHORT_VERSION_STRING );
    132125
    133126    /* reserve space in toplevel dictionary for v, m, and possibly p */
     
    135128    if( tr_bencDictReserve( &val, ( 0 < tor->publicPort ? 3 : 2 ) ) )
    136129    {
    137         free( vers );
    138130        tr_bencFree( &val );
    139131        return NULL;
  • trunk/libtransmission/transmission.c

    r2311 r2325  
    5757       characters, where xx is the major version number, y is the
    5858       minor version number, and z is the maintenance number (Azureus-style) */
    59     snprintf( h->id, sizeof h->id, "-TR%02d%01d%01d-",
    60               VERSION_MAJOR, VERSION_MINOR, VERSION_MAINTENANCE );
     59    snprintf( h->id, sizeof h->id, "-TR" VERSION_MAJOR VERSION_MINOR VERSION_MAINTENANCE VERSION_BETA "-" );
     60    assert( strlen(h->id) == 8 );
    6161    for( i=8; i<TR_ID_LEN; ++i )
    6262    {
     
    8989    h->shared = tr_sharedInit( h );
    9090
    91     tr_inf( TR_NAME " " VERSION_STRING " started" );
     91    tr_inf( TR_NAME " " LONG_VERSION_STRING " started" );
    9292
    9393    return h;
  • trunk/mk/lib.mk

    r2322 r2325  
    44include ../mk/common.mk
    55
    6 SRCS = bencode.c choking.c clients.c completion.c fastresume.c fdlimit.c \
    7        http.c inout.c ipcparse.c list.c makemeta.c metainfo.c natpmp.c \
    8        net.c peer.c platform.c ratecontrol.c sha1.c shared.c strlcat.c \
    9        strlcpy.c torrent.c tracker.c transmission.c upnp.c utils.c xml.c \
    10        basename.c dirname.c
     6SRCS = basename.c bencode.c choking.c clients.c completion.c dirname.c \
     7       fastresume.c fdlimit.c http.c inout.c ipcparse.c list.c makemeta.c \
     8       metainfo.c natpmp.c net.c peer.c platform.c ratecontrol.c sha1.c \
     9       shared.c strlcat.c strlcpy.c torrent.c tracker.c transmission.c \
     10       upnp.c utils.c xml.c
    1111
    1212OBJS = $(SRCS:%.c=%.o)
  • trunk/version.sh

    r2313 r2325  
    33# $Id$
    44
    5 MAJOR=0
    6 MINOR=7
    7 MAINT=2
     5# constraint: strlen(MAJOR MINOR MAINT BETA) must be 4
     6# convention: BETA: "Z" for a beta, "0" for a stable
     7MAJOR="0"
     8MINOR="7"
     9MAINT="2"
     10BETA="Z"
    811STRING=0.80-svn
    912
     
    3134# Generate version.mk
    3235cat > mk/version.mk.new << EOF
    33 VERSION_MAJOR       = $MAJOR
    34 VERSION_MINOR       = $MINOR
    35 VERSION_MAINTENANCE = $MAINT
    36 VERSION_STRING      = $STRING
    37 VERSION_REVISION    = $REV
     36VERSION_MAJOR       = "$MAJOR"
     37VERSION_MINOR       = "$MINOR"
     38VERSION_MAINTENANCE = "$MAINT"
     39VERSION_REVISION    = "$REV"
     40VERSION_STRING      = "$MAJOR.$MINOR$MAINT$BETA (r$REV)"
    3841EOF
    3942replace_if_differs mk/version.mk.new mk/version.mk
     
    4144# Generate version.h
    4245cat > libtransmission/version.h.new << EOF
    43 #define VERSION_MAJOR       $MAJOR
    44 #define VERSION_MINOR       $MINOR
    45 #define VERSION_MAINTENANCE $MAINT
    46 #define VERSION_STRING      "$STRING"
    47 #define VERSION_REVISION    $REV
     46#define VERSION_MAJOR        "$MAJOR"
     47#define VERSION_MINOR        "$MINOR"
     48#define VERSION_MAINTENANCE  "$MAINT"
     49#define VERSION_REVISION     "$REV"
     50#define VERSION_BETA         "$BETA"
     51#define SHORT_VERSION_STRING "$MAJOR.$MINOR$MAINT$BETA"
     52#define LONG_VERSION_STRING  "$MAJOR.$MINOR$MAINT$BETA (r$REV)"
    4853EOF
    4954replace_if_differs libtransmission/version.h.new libtransmission/version.h
Note: See TracChangeset for help on using the changeset viewer.