diff --git a/.regression.yml b/.regression.yml deleted file mode 100644 index d70c38066..000000000 --- a/.regression.yml +++ /dev/null @@ -1,34 +0,0 @@ -# all features are built in these directories -test_dirs: - - test - -features: - - variant=test_release - - variant=test_debug - -# all build_features are built in these directories -build_dirs: - - tools - - examples - - bindings/python - -build_features: - - ipv6=off - - deprecated-functions=off - - exception-handling=off - - logging=on - - asserts=off - - asserts=production debug - - asserts=on release - - variant=test_barebones - - link=shared boost-link=shared deprecated-functions=off - -project: libtorrent - -branch: trunk - -clean: - - test_tmp_* - -time_limit: 600 - diff --git a/AUTHORS b/AUTHORS index b26128709..1c4dffbac 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -Written by Arvid Norberg. Copyright (c) 2003-2014 +Written by Arvid Norberg. Copyright (c) 2003-2015 Contributions by: Andrei Kurushin diff --git a/Makefile.am b/Makefile.am index 5d5e20bff..f19a59b83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -109,14 +109,14 @@ DOCS_PAGES = \ docs/reference.html ED25519_SOURCE = \ - ed25519/readme.md \ - ed25519/test.c \ - ed25519/src/fe.h \ - ed25519/src/fixedint.h \ - ed25519/src/ge.h \ - ed25519/src/precomp_data.h \ - ed25519/src/sc.h \ - ed25519/src/sha512.h + ed25519/readme.md \ + ed25519/test.c \ + ed25519/src/fe.h \ + ed25519/src/fixedint.h \ + ed25519/src/ge.h \ + ed25519/src/precomp_data.h \ + ed25519/src/sc.h \ + ed25519/src/sha512.h EXTRA_DIST = \ Jamfile \ diff --git a/darwin_valgrind.suppressions b/darwin_valgrind.suppressions deleted file mode 100644 index e375d562b..000000000 --- a/darwin_valgrind.suppressions +++ /dev/null @@ -1,186 +0,0 @@ -{ - localtime - Memcheck:Leak - fun:malloc - fun:tzsetwall_basic - fun:localtime -} -{ - localtime2 - Memcheck:Leak - fun:malloc - fun:tzload - fun:tzsetwall_basic - fun:localtime -} -{ - localtime3 - Memcheck:Leak - fun:malloc - fun:localtime -} -{ - localtime4 - Memcheck:Leak - fun:calloc - fun:token_table_add - fun:notify_register_check - fun:notify_register_tz - fun:tzsetwall_basic - fun:localtime -} -{ - getc - Memcheck:Leak - fun:malloc - fun:__smakebuf - fun:__srefill0 - fun:__srefill - fun:__srget - fun:getc -} -{ - putc - Memcheck:Leak - fun:malloc - fun:__smakebuf - fun:__swsetup - fun:__sfvwrite - fun:puts -} -{ - printf - Memcheck:Leak - fun:malloc - fun:__smakebuf - fun:__swsetup - fun:__vfprintf -} -{ - printf2 - Memcheck:Leak - fun:malloc - fun:__Balloc_D2A - fun:__d2b_D2A - fun:__dtoa - fun:__vfprintf -} -{ - atexit_register - Memcheck:Leak - fun:malloc - fun:atexit_register -} -{ - getipnodebyname - Memcheck:Leak - fun:malloc - fun:strdup - fun:si_module_static_file -} -{ - getipnodebyname2 - Memcheck:Leak - fun:calloc - fun:si_module_static_cache -} -{ - getipnodebyname3 - Memcheck:Leak - fun:calloc - fun:_nc_table_new -} -{ - getipnodebyname4 - Memcheck:Leak - fun:malloc - fun:dns_configuration_copy -} -{ - getipnodebyname5 - Memcheck:Leak - fun:calloc - fun:si_module_static_ds -} -{ - getipnodebyname6 - Memcheck:Leak - fun:calloc - fun:si_module_static_mdns -} -{ - getipnodebyname7 - Memcheck:Leak - fun:calloc - fun:search_alloc - fun:si_module_static_search - fun:si_module_with_name -} -{ - getipnodebyname8 - Memcheck:Leak - fun:calloc - fun:token_table_add -} -{ - mdns - Memcheck:Leak - fun:malloc - fun:ConnectToServer - fun:DNSServiceCreateConnection - fun:_mdns_query_mDNSResponder -} -{ - mdns2 - Memcheck:Leak - fun:calloc - fun:_mdns_search -} -{ - getipnodebyname9 - Memcheck:Leak - fun:malloc - fun:strdup - fun:si_module_static_ds -} -{ - getipnodebyname10 - Memcheck:Leak - fun:malloc - fun:strdup - fun:si_module_static_mdns -} -{ - getipnodebyname11 - Memcheck:Leak - fun:malloc - fun:strdup - fun:si_module_static_cache -} -{ - getipnodebyname12 - Memcheck:Leak - fun:malloc - fun:strdup - fun:search_alloc - fun:si_module_static_search -} -{ - getipnodebyname13 - Memcheck:Leak - fun:malloc - fun:_nc_table_new -} -{ - getipnodebyname14 - Memcheck:Leak - fun:malloc - fun:strdup - fun:_mdns_search -} -{ - getipbyname15 - Memcheck:Leak - fun:malloc - fun:_nc_table_insert_n -} diff --git a/list_files.py b/list_files.py deleted file mode 100755 index 1118b8cb3..000000000 --- a/list_files.py +++ /dev/null @@ -1,22 +0,0 @@ -#! /usr/bin/env python -# Copyright Arvid Norberg 2008. Use, modification and distribution is -# subject to the Boost Software License, Version 1.0. (See accompanying -# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -import os -import sys - -def list_directory(path): - tree = os.walk(path) - for i in tree: - dirs = i[0].split('/') - if 'CVS' in dirs: continue - if '.svn' in dirs: continue - - for file in i[2]: - if file.startswith('.#'): continue - if file == '.DS_Store': continue - print os.path.join(i[0], file) + ' \\' - -list_directory(sys.argv[1]) - diff --git a/parse_requests.py b/parse_requests.py deleted file mode 100644 index 5ca68cfa4..000000000 --- a/parse_requests.py +++ /dev/null @@ -1,51 +0,0 @@ - -import os, sys, time - -# logfile format: -# - -f = open(sys.argv[1], 'r') - -out = open('requests.dat', 'w+') - -peers = {} - -num_columns = 1 - -try: - for l in f: - dat = l.split('\t') - - peer = dat[2] - time = dat[0] - tor = dat[1] - piece = dat[3] - offset = dat[4] - if tor != sys.argv[2]: continue - - if peer not in peers: - num_columns += 1 - peers[peer] = num_columns - - print >>out, '%s %s %s' % (dat[0], ' -' * (peers[peer] - 2), float(piece) + float(offset) / (128.0 * 16.0 * 1024.0)) -except: - pass - -out.close() - -out = open('peer_requests.gnuplot', 'wb') -print >>out, "set term png size 12000,7000" -print >>out, 'set output "peer_requests.png"' -print >>out, 'set xrange [0:*]' -print >>out, 'set xlabel "time (ms)"' -print >>out, 'set ylabel "bytes (B)"' -print >>out, "set style data lines" -print >>out, "set key box" -print >>out, 'plot', - -for p in peers: - print >>out, ' "requests.dat" using 1:%d title "%s" with points,' % (peers[p], p), - -print >>out, 'x=0' - -os.system('gnuplot peer_requests.gnuplot') diff --git a/sanity-checker.xml b/sanity-checker.xml deleted file mode 100644 index c9e65f1fc..000000000 --- a/sanity-checker.xml +++ /dev/null @@ -1,42 +0,0 @@ - - 0.16.2 - - - - include/libtorrent - - - - include/ - include/libtorrent/ - /Users/arvid/Documents/dev/boost_1_47_0/ - - - -#define BOOST_ALL_NO_LIB 1 -#define BOOST_ASIO_DYN_LINK 1 -#define BOOST_ASIO_ENABLE_CANCELIO 1 -#define BOOST_ASIO_HASH_MAP_BUCKETS 1021 -#define BOOST_ASIO_SEPARATE_COMPILATION 1 -#define BOOST_ASIO_SOURCE 1 -#define BOOST_EXCEPTION_DISABLE 1 -#define BOOST_SYSTEM_SOURCE 1 -#define BOOST_SYSTEM_STATIC_LINK 1 -#define BOOST_THREAD_USE_LIB 1 -#define TORRENT_BUILDING_SHARED 1 -#define TORRENT_DEBUG 1 -#define TORRENT_DISABLE_GEO_IP 1 -#define TORRENT_USE_TOMMATH 1 -#define UNICODE 1 -#define _FILE_OFFSET_BITS 64 -#define _UNICODE 1 -#define TORRENT_USE_OPENSSL 1 - - - -libtorrent::aux - - - - bin/darwin-4.2.1/debug/boost-source/threading-multi/libtorrent.dylib.0.16.1 - diff --git a/set_version.py b/tools/set_version.py similarity index 100% rename from set_version.py rename to tools/set_version.py diff --git a/update_copyright.py b/tools/update_copyright.py similarity index 61% rename from update_copyright.py rename to tools/update_copyright.py index aa498a3a2..2a8bdea03 100644 --- a/update_copyright.py +++ b/tools/update_copyright.py @@ -11,13 +11,14 @@ def update_file(name): subst = '' f = open(name) for l in f: - if l.startswith('Copyright (c) ') and 'Arvid Norberg' in l: - first_year = int(l[14:18]) + if 'Copyright (c) ' in l and 'Arvid Norberg' in l: + year_idx = l.index('Copyright (c) ') + first_year = int(l[year_idx + 14: year_idx + 18]) if first_year != this_year: - if l[18] == '-': - l = l[:19] + str(this_year) + l[23:] + if l[year_idx + 18] == '-': + l = l[:year_idx + 19] + str(this_year) + l[year_idx + 23:] else: - l = l[:18] + '-' + str(this_year) + l[18:] + l = l[:year_idx + 18] + '-' + str(this_year) + l[year_idx + 18:] subst += l @@ -29,6 +30,6 @@ for i in glob.glob('src/*.cpp') + \ glob.glob('include/libtorrent/extensions/*.hpp') + \ glob.glob('include/libtorrent/kademlia/*.hpp') + \ glob.glob('src/kademlia/*.cpp') + \ - ['COPYING', 'LICENSE']: + ['COPYING', 'LICENSE', 'AUTHORS']: update_file(i)