From 6ce8085243232ba0df11be33b4be73233b340c00 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 14 Jan 2010 14:20:49 +0000 Subject: [PATCH] (trunk) housekeeping: (1) add standard svn properties for $Id$ substitution in some files (2) add #include guards in a couple of libtransmission headers (3) refresh build instructions in README --- README | 61 +++++++++++++++++------------------- libtransmission/bitfield.h | 2 +- libtransmission/bitset.h | 2 +- libtransmission/completion.h | 6 ++-- libtransmission/fdlimit.c | 2 +- libtransmission/fdlimit.h | 4 +-- libtransmission/magnet.h | 4 +++ libtransmission/platform.h | 6 ++-- 8 files changed, 44 insertions(+), 43 deletions(-) diff --git a/README b/README index 48994381e..a8d48dcc3 100644 --- a/README +++ b/README @@ -1,32 +1,32 @@ -README for Transmission -======================= +ABOUT -Transmission is a fast, easy, and free BitTorrent client. + Transmission is a fast, easy, and free BitTorrent client. + It comes in several flavors: -It runs on Mac OS X (Cocoa interface) and -Linux/NetBSD/FreeBSD/OpenBSD (GTK+ and Qt interfaces). + * A native Mac OS X GUI application + * GTK+ and Qt GUI applications for Linux, BSD, etc. + * A headless daemon for servers and routers + * A web UI for remote controlling any of the above -Visit http://www.transmissionbt.com/ for more information. + Visit http://www.transmissionbt.com/ for more information. +BUILDING -Building Transmission -===================== + Transmission has an Xcode project file (Transmission.xcodeproj) + for building in Xcode. -Transmission has an Xcode project file (Transmission.xcodeproj) -for building in Xcode. + For a more detailed description, and dependancies, visit: + http://trac.transmissionbt.com/wiki/ -For a more detailed description, and dependancies, visit: -http://trac.transmissionbt.com/wiki/ + Building a Transmission release from the command line: -Building a Transmission release from the command line: + $ xz -d -c transmission-1.80.tar.xz | tar xf - + $ cd transmission-1.80 + $ ./configure + $ make + $ sudo make install - $ tar xvfj transmission-1.40.tar.bz2 - $ cd transmission-1.40 - $ ./configure -q && make -s - $ su (if necessary for the next line) - $ make install - -Building Transmission from the nightly builds: + Building Transmission from the nightly builds: Download a tarball from http://build.transmissionbt.com/job/trunk-linux-inc/ and follow the steps from the previous section. @@ -34,25 +34,22 @@ Building Transmission from the nightly builds: If you're new to building programs from source code, this is typically easier than building from SVN. -Building Transmission from SVN (First Time): + Building Transmission from SVN (First Time): $ svn co svn://svn.m0k.org/Transmission/trunk Transmission $ cd Transmission - $ ./autogen.sh && make -s - $ su (if necessary for the next line) - $ make install + $ ./autogen.sh + $ make + $ sudo make install -Building Transmission from SVN (Updating): + Building Transmission from SVN (Updating): $ cd Transmission $ make clean $ svn up $ ./update-version-h.sh - $ make -s - $ su (if necessary for the next line) - $ make install + $ make + $ sudo make install - - -Notes for building on Solaris' C compiler: User av reports success with -this invocation: ./configure CC=c99 CXX=CC CFLAGS='-D__EXTENSIONS__ -mt' + Notes for building on Solaris' C compiler: User av reports success with + this invocation: ./configure CC=c99 CXX=CC CFLAGS='-D__EXTENSIONS__ -mt' diff --git a/libtransmission/bitfield.h b/libtransmission/bitfield.h index 8c1448d55..178dc5913 100644 --- a/libtransmission/bitfield.h +++ b/libtransmission/bitfield.h @@ -11,7 +11,7 @@ */ #ifndef __TRANSMISSION__ -#error only libtransmission should #include this header. + #error only libtransmission should #include this header. #endif #ifndef TR_BITFIELD_H diff --git a/libtransmission/bitset.h b/libtransmission/bitset.h index 6978c697b..8b39e3bdd 100644 --- a/libtransmission/bitset.h +++ b/libtransmission/bitset.h @@ -7,7 +7,7 @@ * This exemption does not extend to derived works not owned by * the Transmission project. * - * $Id:$ + * $Id$ */ #ifndef __TRANSMISSION__ diff --git a/libtransmission/completion.h b/libtransmission/completion.h index 5f3ec90a1..65ec0e428 100644 --- a/libtransmission/completion.h +++ b/libtransmission/completion.h @@ -10,13 +10,13 @@ * $Id$ */ -#ifndef TR_COMPLETION_H -#define TR_COMPLETION_H - #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif +#ifndef TR_COMPLETION_H +#define TR_COMPLETION_H + #include #include "transmission.h" diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c index f75ab07e0..510a5f1b1 100644 --- a/libtransmission/fdlimit.c +++ b/libtransmission/fdlimit.c @@ -1,7 +1,7 @@ /****************************************************************************** * $Id$ * - * Copyright (c) 2005-2008 Transmission authors and contributors + * Copyright (c) 2005-2010 Transmission authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/libtransmission/fdlimit.h b/libtransmission/fdlimit.h index fbe788b12..044698548 100644 --- a/libtransmission/fdlimit.h +++ b/libtransmission/fdlimit.h @@ -1,7 +1,7 @@ /****************************************************************************** * $Id$ * - * Copyright (c) 2005-2008 Transmission authors and contributors + * Copyright (c) 2005-2010 Transmission authors and contributors * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -23,7 +23,7 @@ *****************************************************************************/ #ifndef __TRANSMISSION__ -#error only libtransmission should #include this header. + #error only libtransmission should #include this header. #endif #include "transmission.h" diff --git a/libtransmission/magnet.h b/libtransmission/magnet.h index 6501c172c..c03481c90 100644 --- a/libtransmission/magnet.h +++ b/libtransmission/magnet.h @@ -10,6 +10,10 @@ * $Id:$ */ +#ifndef __TRANSMISSION__ + #error only libtransmission should #include this header. +#endif + #ifndef TR_MAGNET_H #define TR_MAGNET_H 1 diff --git a/libtransmission/platform.h b/libtransmission/platform.h index fd2113da5..660a476e1 100644 --- a/libtransmission/platform.h +++ b/libtransmission/platform.h @@ -10,13 +10,13 @@ * $Id$ */ -#ifndef TR_PLATFORM_H -#define TR_PLATFORM_H - #ifndef __TRANSMISSION__ #error only libtransmission should #include this header. #endif +#ifndef TR_PLATFORM_H +#define TR_PLATFORM_H + #if defined( WIN32 ) #define TR_PATH_DELIMITER '\\' #define TR_PATH_DELIMITER_STR "\\"