diff --git a/Jamfile b/Jamfile index 34146b25c..f22954561 100755 --- a/Jamfile +++ b/Jamfile @@ -374,9 +374,9 @@ local usage-requirements = system:$(LDFLAGS) ; -project torrent ; +project torrent-rasterbar ; -lib torrent +lib torrent-rasterbar : # sources src/$(SOURCES).cpp diff --git a/Makefile.am b/Makefile.am index cea3a053c..da17524f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ docs/moopolice_thumb.gif \ docs/qbittorrent_thumb.jpg \ docs/ziptorrent_thumb.gif \ docs/unicode_support.png docs/client_test.png docs/style.css Jamfile project-root.jam \ -src/file_win.cpp libtorrent.pc \ +src/file_win.cpp libtorrent-rasterbar.pc \ bindings/README.txt \ bindings/python/Jamfile \ bindings/python/client.py \ @@ -61,25 +61,8 @@ bindings/python/src/torrent_status.cpp \ bindings/python/src/utility.cpp \ bindings/python/src/version.cpp - - -pkginclude_HEADER = \ -debian/changelog \ -debian/compat \ -debian/control \ -debian/copyright \ -debian/files \ -debian/libtorrent0-dev.dirs \ -debian/libtorrent0-dev.docs \ -debian/libtorrent0-dev.install \ -debian/libtorrent0.dirs \ -debian/libtorrent0.docs \ -debian/libtorrent0.install \ -debian/rules - - pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libtorrent.pc +pkgconfig_DATA = libtorrent-rasterbar.pc check: test test/test_hasher \ @@ -91,6 +74,3 @@ check: test && test/test_swarm \ && test/test_primitives \ && echo && echo && echo " **** all tests passed ****" && echo && echo - -deb: - dpkg-buildpackage -rfakeroot -us -uc diff --git a/configure.in b/configure.in index 6e4201b49..a03e2585e 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,16 @@ AC_PREREQ(2.59) AC_INIT(src/torrent.cpp) -AM_INIT_AUTOMAKE(libtorrent, 0.14) +AM_INIT_AUTOMAKE(libtorrent-rasterbar, 0.14) + +dnl interface version info +VERSION_INFO_CURRENT=0 +VERSION_INFO_REVISION=0 +VERSION_INFO_AGE=0 + +INTERFACE_VERSION_INFO=$VERSION_INFO_CURRENT:$VERSION_INFO_REVISION:$VERSION_INFO_AGE + +AC_SUBST(INTERFACE_VERSION_INFO) # Nowhere in the source is config.h included, so make defines command line arguments # AM_CONFIG_HEADER(config.h) @@ -52,8 +61,8 @@ AX_BOOST_BASE([1.35],[ dnl the user can choose which Asio library to use AC_ARG_WITH([asio], - AS_HELP_STRING([--with-asio=shipped|system], - [Specify the Asio library to use, shipped or system. Default is to autodetect system and fallback to shipped.]), + AS_HELP_STRING([--with-asio=shipped|system|your_path], + [Specify the Asio library to use, shipped or system. Default is to use shipped library. You can also specify a path for your system.]), [[asio=$withval]], [[asio=shipped]] ) @@ -65,31 +74,31 @@ AX_BOOST_BASE([1.35],[ AC_MSG_RESULT(shipped) ASIO_HPP=include/libtorrent/asio.hpp ASIO_DIR=include/libtorrent/asio - AC_CHECK_FILES($ASIO_HPP $ASIO_DIR/ssl/stream.hpp $ASIO_DIR/ip/tcp.hpp,, - AC_MSG_ERROR([libtorrent depends on Asio library but it was not found.]) + AC_CHECK_FILES($ASIO_HPP $ASIO_DIR/ssl/stream.hpp $ASIO_DIR/ip/tcp.hpp, + enable_shipped_asio=yes, + AC_MSG_ERROR([libtorrent-rasterbar depends on Asio library but it was not found.]) ) ;; "system") AC_MSG_RESULT(system) ASIO_HPP=/usr/include/asio.hpp ASIO_DIR=/usr/include/asio - AC_CHECK_FILES($ASIO_HPP $ASIO_DIR/ssl/stream.hpp $ASIO_DIR/ip/tcp.hpp,, - AC_MSG_ERROR([libtorrent depends on Asio library but it was not found on your system.]) + AC_CHECK_FILES($ASIO_HPP $ASIO_DIR/ssl/stream.hpp $ASIO_DIR/ip/tcp.hpp, + enable_shipped_asio=no, + AC_MSG_ERROR([libtorrent-rasterbar depends on Asio library but it was not found on your system.]) ) - ln -sf $ASIO_HPP include/libtorrent - ln -sf $ASIO_DIR include/libtorrent ;; *) AC_MSG_RESULT(detect) ASIO_HPP=$asio/../asio.hpp ASIO_DIR=$asio - AC_CHECK_FILES($ASIO_HPP $ASIO_DIR/ssl/stream.hpp $ASIO_DIR/ip/tcp.hpp,, - AC_MSG_ERROR([libtorrent depends on Asio library but it was not found in the path you specified.]) + AC_CHECK_FILES($ASIO_HPP $ASIO_DIR/ssl/stream.hpp $ASIO_DIR/ip/tcp.hpp, + enable_shipped_asio=no, + AC_MSG_ERROR([libtorrent-rasterbar depends on Asio library but it was not found in the path you specified.]) ) - ln -sf $ASIO_HPP include/libtorrent - ln -sf $ASIO_DIR include/libtorrent ;; esac + AM_CONDITIONAL([ENABLE_SHIPPED_ASIO], [test x$enable_shipped_asio = "xyes"]) ]) ]) @@ -228,7 +237,7 @@ case "$encryption" in "on") AC_MSG_RESULT(on) CHECK_SSL() - AC_DEFINE(TORRENT_USE_OPENSSL,,[define to use openssl with libtorrent]) + AC_DEFINE(TORRENT_USE_OPENSSL,,[define to use openssl with libtorrent-rasterbar]) COMPILETIME_OPTIONS+="-DTORRENT_USE_OPENSSL " ;; @@ -267,12 +276,12 @@ case "$zlib" in "system") AC_MSG_RESULT(system) AC_CHECK_LIB(z, main, , - AC_MSG_ERROR([libtorrent depends on zlib but zlib was not found on your system.]) + AC_MSG_ERROR([libtorrent-rasterbar depends on zlib but zlib was not found on your system.]) ) ;; "no") AC_MSG_RESULT() - AC_MSG_ERROR([libtorrent depends on zlib, you must specify either "system" or "shipped".]) + AC_MSG_ERROR([libtorrent-rasterbar depends on zlib, you must specify either "system" or "shipped".]) ;; *) AC_MSG_RESULT() @@ -357,7 +366,7 @@ AC_SUBST(DEBUGFLAGS) dnl Compile time options. AC_SUBST(COMPILETIME_OPTIONS) -AC_CONFIG_FILES(Makefile src/Makefile include/Makefile test/Makefile libtorrent.pc) +AC_CONFIG_FILES(Makefile src/Makefile include/Makefile test/Makefile libtorrent-rasterbar.pc) if [[ "x$examples" == "xyes" ]]; then AC_CONFIG_FILES(examples/Makefile) fi diff --git a/examples/Makefile.am b/examples/Makefile.am index 4ee8c9a79..6b54f45bb 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -3,19 +3,19 @@ EXTRA_PROGRAMS = client_test EXTRA_DIST = Jamfile client_test_SOURCES = client_test.cpp -client_test_LDADD = $(top_builddir)/src/libtorrent.la @BOOST_REGEX_LIB@ @BOOST_PROGRAM_OPTIONS_LIB@ +client_test_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la @BOOST_REGEX_LIB@ @BOOST_PROGRAM_OPTIONS_LIB@ dump_torrent_SOURCES = dump_torrent.cpp -dump_torrent_LDADD = $(top_builddir)/src/libtorrent.la +dump_torrent_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la make_torrent_SOURCES = make_torrent.cpp -make_torrent_LDADD = $(top_builddir)/src/libtorrent.la +make_torrent_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la simple_client_SOURCES = simple_client.cpp -simple_client_LDADD = $(top_builddir)/src/libtorrent.la +simple_client_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la enum_if_SOURCES = enum_if.cpp -enum_if_LDADD = $(top_builddir)/src/libtorrent.la +enum_if_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION diff --git a/include/Makefile.am b/include/Makefile.am index 601575a80..125a7e639 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -98,8 +98,10 @@ libtorrent/kademlia/observer.hpp \ libtorrent/kademlia/refresh.hpp \ libtorrent/kademlia/routing_table.hpp \ libtorrent/kademlia/rpc_manager.hpp \ -libtorrent/kademlia/traversal_algorithm.hpp \ -\ +libtorrent/kademlia/traversal_algorithm.hpp + +if ENABLE_SHIPPED_ASIO +nobase_include_HEADERS += \ libtorrent/asio.hpp \ libtorrent/asio/basic_datagram_socket.hpp \ libtorrent/asio/basic_deadline_timer.hpp \ @@ -288,3 +290,4 @@ libtorrent/asio/windows/random_access_handle.hpp \ libtorrent/asio/windows/random_access_handle_service.hpp \ libtorrent/asio/windows/stream_handle.hpp \ libtorrent/asio/windows/stream_handle_service.hpp +endif diff --git a/libtorrent.pc.in b/libtorrent-rasterbar.pc.in similarity index 87% rename from libtorrent.pc.in rename to libtorrent-rasterbar.pc.in index 4d1f1bdca..f89f16c83 100644 --- a/libtorrent.pc.in +++ b/libtorrent-rasterbar.pc.in @@ -8,9 +8,9 @@ sysconfdir=@sysconfdir@ includedir=@includedir@ package=@PACKAGE@ -Name: libtorrent +Name: libtorrent-rasterbar Description: Bittorrent library. Version: @VERSION@ -Libs: -L${libdir} -ltorrent +Libs: -L${libdir} -ltorrent-rasterbar Libs.private: @LIBS@ @BOOST_IOSTREAMS_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@ Cflags: -I${includedir} -I${includedir}/libtorrent @COMPILETIME_OPTIONS@ @CPPFLAGS@ diff --git a/src/Makefile.am b/src/Makefile.am index e88d96f97..acb9c5204 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libtorrent.la +lib_LTLIBRARIES = libtorrent-rasterbar.la if USE_DHT kademlia_sources = kademlia/closest_nodes.cpp \ @@ -12,7 +12,7 @@ kademlia/rpc_manager.cpp \ kademlia/traversal_algorithm.cpp endif -libtorrent_la_SOURCES = entry.cpp escape_string.cpp \ +libtorrent_rasterbar_la_SOURCES = entry.cpp escape_string.cpp \ lazy_bdecode.cpp assert.cpp enum_net.cpp broadcast_socket.cpp \ peer_connection.cpp bt_peer_connection.cpp web_peer_connection.cpp \ natpmp.cpp piece_picker.cpp policy.cpp session.cpp session_impl.cpp sha1.cpp \ @@ -102,8 +102,8 @@ $(top_srcdir)/include/libtorrent/variant_stream.hpp \ $(top_srcdir)/include/libtorrent/version.hpp -libtorrent_la_LDFLAGS = $(LDFLAGS) -release @VERSION@ -libtorrent_la_LIBADD = @ZLIB@ @BOOST_SYSTEM_LIB@ @BOOST_IOSTREAMS_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@ +libtorrent_rasterbar_la_LDFLAGS = $(LDFLAGS) -version-info $(INTERFACE_VERSION_INFO) +libtorrent_rasterbar_la_LIBADD = @ZLIB@ @BOOST_SYSTEM_LIB@ @BOOST_IOSTREAMS_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@ AM_CXXFLAGS= -ftemplate-depth-100 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_CXXFLAGS@ AM_CFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ diff --git a/test/Makefile.am b/test/Makefile.am index 3f71ccb00..b272eb9fa 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -6,55 +6,55 @@ test_http_connection test_lsd EXTRA_DIST = Jamfile test_lsd_SOURCES = main.cpp setup_transfer.cpp test_lsd.cpp -test_lsd_LDADD = $(top_builddir)/src/libtorrent.la +test_lsd_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_http_connection_SOURCES = main.cpp setup_transfer.cpp test_http_connection.cpp -test_http_connection_LDADD = $(top_builddir)/src/libtorrent.la +test_http_connection_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_web_seed_SOURCES = main.cpp setup_transfer.cpp test_web_seed.cpp -test_web_seed_LDADD = $(top_builddir)/src/libtorrent.la +test_web_seed_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_pex_SOURCES = main.cpp setup_transfer.cpp test_pex.cpp -test_pex_LDADD = $(top_builddir)/src/libtorrent.la +test_pex_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_fast_extension_SOURCES = main.cpp setup_transfer.cpp test_fast_extension.cpp -test_fast_extension_LDADD = $(top_builddir)/src/libtorrent.la +test_fast_extension_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_upnp_SOURCES = test_upnp.cpp -test_upnp_LDADD = $(top_builddir)/src/libtorrent.la +test_upnp_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_hasher_SOURCES = main.cpp test_hasher.cpp -test_hasher_LDADD = $(top_builddir)/src/libtorrent.la +test_hasher_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_bencoding_SOURCES = main.cpp test_bencoding.cpp -test_bencoding_LDADD = $(top_builddir)/src/libtorrent.la +test_bencoding_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_ip_filter_SOURCES = main.cpp test_ip_filter.cpp -test_ip_filter_LDADD = $(top_builddir)/src/libtorrent.la +test_ip_filter_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_piece_picker_SOURCES = main.cpp test_piece_picker.cpp -test_piece_picker_LDADD = $(top_builddir)/src/libtorrent.la +test_piece_picker_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_storage_SOURCES = main.cpp setup_transfer.cpp test_storage.cpp -test_storage_LDADD = $(top_builddir)/src/libtorrent.la +test_storage_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_buffer_SOURCES = main.cpp test_buffer.cpp -test_buffer_LDADD = $(top_builddir)/src/libtorrent.la +test_buffer_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_metadata_extension_SOURCES = main.cpp setup_transfer.cpp test_metadata_extension.cpp -test_metadata_extension_LDADD = $(top_builddir)/src/libtorrent.la +test_metadata_extension_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_swarm_SOURCES = main.cpp setup_transfer.cpp test_swarm.cpp -test_swarm_LDADD = $(top_builddir)/src/libtorrent.la +test_swarm_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_pe_crypto_SOURCES = main.cpp test_pe_crypto.cpp -test_pe_crypto_LDADD = $(top_builddir)/src/libtorrent.la $(top_builddir)/test/setup_transfer.o +test_pe_crypto_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la $(top_builddir)/test/setup_transfer.o test_primitives_SOURCES = main.cpp test_primitives.cpp -test_primitives_LDADD = $(top_builddir)/src/libtorrent.la +test_primitives_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la test_bandwidth_limiter_SOURCES = main.cpp test_bandwidth_limiter.cpp -test_bandwidth_limiter_LDADD = $(top_builddir)/src/libtorrent.la +test_bandwidth_limiter_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la noinst_HEADERS = test.hpp setup_transfer.hpp