From 95937b28a779b3845ff44a01f5077718532a9c16 Mon Sep 17 00:00:00 2001 From: arvidn Date: Thu, 28 Mar 2019 00:35:12 +0100 Subject: [PATCH] add missing test torrent to tarball --- build_dist.sh | 10 +++++++--- test/Makefile.am | 2 ++ tools/set_version.py | 7 +++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/build_dist.sh b/build_dist.sh index 01d0f0de4..cc85ace9f 100755 --- a/build_dist.sh +++ b/build_dist.sh @@ -14,8 +14,12 @@ chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp ./autotool.sh ./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes -make V=1 -j16 check +make dist -./configure --enable-python-binding --enable-examples=yes --enable-encryption -make V=1 -j16 dist +VERSION=1.2.0 + +tar xvzf libtorrent-rasterbar-${VERSION}.tar.gz +cd libtorrent-rasterbar-${VERSION}/test + +bjam link=static $1 diff --git a/test/Makefile.am b/test/Makefile.am index ec5149757..249906115 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -108,6 +108,7 @@ TEST_TORRENTS = \ slash_path3.torrent \ string.torrent \ symlink1.torrent \ + symlink2.torrent \ symlink_zero_size.torrent \ unaligned_pieces.torrent \ unordered.torrent \ @@ -118,6 +119,7 @@ TEST_TORRENTS = \ url_seed_multi.torrent \ url_seed_multi_space.torrent \ url_seed_multi_space_nolist.torrent \ + url_seed_multi_single_file.torrent \ whitespace_url.torrent MUTABLE_TEST_TORRENTS = \ diff --git a/tools/set_version.py b/tools/set_version.py index 311c287cd..ec6704e2c 100755 --- a/tools/set_version.py +++ b/tools/set_version.py @@ -45,10 +45,12 @@ def substitute_file(name): line = ':Version: %d.%d.%d\n' % (version[0], version[1], version[2]) elif 'VERSION = ' in line and name.endswith('Jamfile'): line = 'VERSION = %d.%d.%d ;\n' % (version[0], version[1], version[2]) + elif 'VERSION=' in line and name.endswith('build_dist.sh'): + line = 'VERSION=%d.%d.%d\n' % (version[0], version[1], version[2]) elif 'version=' in line and name.endswith('setup.py'): - line = "\tversion = '%d.%d.%d',\n" % (version[0], version[1], version[2]) + line = " version='%d.%d.%d',\n" % (version[0], version[1], version[2]) elif "version = '" in line and name.endswith('setup.py'): - line = "\tversion = '%d.%d.%d',\n" % (version[0], version[1], version[2]) + line = " version='%d.%d.%d',\n" % (version[0], version[1], version[2]) elif '"-LT' in line and name.endswith('settings_pack.cpp'): line = re.sub('"-LT[0-9A-Za-z]{4}-"', '"-LT%c%c%c%c-"' % v(version), line) @@ -61,6 +63,7 @@ def substitute_file(name): substitute_file('include/libtorrent/version.hpp') substitute_file('CMakeLists.txt') substitute_file('configure.ac') +substitute_file('build_dist.sh') substitute_file('bindings/python/setup.py') substitute_file('docs/gen_reference_doc.py') substitute_file('src/settings_pack.cpp')