diff --git a/Jamfile b/Jamfile index 714535bbc..b23030d2a 100755 --- a/Jamfile +++ b/Jamfile @@ -2,12 +2,9 @@ import modules ; BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ; -ECHO $(BOOST_ROOT) - - use-project /boost/thread : $(BOOST_ROOT)/libs/thread/build ; - use-project /boost/filesystem : $(BOOST_ROOT)/libs/filesystem/build ; - use-project /boost/date_time : $(BOOST_ROOT)/libs/date_time/build ; - +use-project /boost/thread : $(BOOST_ROOT)/libs/thread/build ; +use-project /boost/filesystem : $(BOOST_ROOT)/libs/filesystem/build ; +use-project /boost/date_time : $(BOOST_ROOT)/libs/date_time/build ; project torrent @@ -28,22 +25,26 @@ project torrent ./include $(BOOST_ROOT) -# devstudio fixes +# devstudio switches /Zc:wchar_t /D"WIN32" +# gcc switches + +# -Wno-unused-variable + ; SOURCES = + alert.cpp entry.cpp identify_client.cpp peer_connection.cpp piece_picker.cpp policy.cpp session.cpp - socket_win.cpp stat.cpp storage.cpp torrent.cpp @@ -52,16 +53,23 @@ SOURCES = tracker_manager.cpp http_tracker_connection.cpp udp_tracker_connection.cpp - file_win.cpp sha1.c + +# unix versions + +# socket_bsd.cpp +# file.cpp + +# windows versions + + socket_win.cpp + file_win.cpp + ; lib torrent : -# /boost/filesystem -# /boost/thread -# /boost/date_time zlib//zlib src/$(SOURCES) : ./include @@ -75,8 +83,6 @@ exe client_test : examples/client_test.cpp torrent : -# $(BOOST_ROOT) - multi : debug release ; diff --git a/docs/manual.html b/docs/manual.html index 2b914fe50..cc3876f38 100755 --- a/docs/manual.html +++ b/docs/manual.html @@ -13,62 +13,63 @@
@@ -149,6 +150,7 @@ boost.filesystem, boost.date_time and various other boost libraries as well as z

building

To build libtorrent you need boost and bjam installed. Then you can use bjam to build libtorrent.

+

To make bjam work, you need to set the environment variable BOOST_ROOT to the path where boost is installed (e.g. c:\boost_1_30_2 on windows). Then you can just run bjam in the libtorrent directory.

@@ -671,7 +673,7 @@ all peers. The rates are given as the number of bytes per second.

get_download_queue()

-

get_download_queue() takes a non-const reference to a vector which it will fill +

get_download_queue() takes a non-const reference to a vector which it will fill with information about pieces that are partially downloaded or not downloaded at all but partially requested. The entry in the vector (partial_piece_info) looks like this:

@@ -1543,6 +1545,14 @@ with future versions of bittorrent.

 |          | Any unrecognized strings should be ignored.            |
 +- - - - - - - - - -+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -+ -->
+
+

filenames checks

+

Boost.Filesystem will by default check all its paths to make sure they conform +to filename requirements on many platforms. If you don't want this check, you can +set it to either only check for native filesystem requirements or turn it off +alltogether. You can use: boost::filesystem::path::default_name_check(boost::filesystem::native) +for example. For more information, see the Boost.Filesystem docs.

+

aknowledgements

Written by Arvid Norberg. Copyright (c) 2003

diff --git a/docs/manual.rst b/docs/manual.rst index 3e87b2fac..b1d98a703 100755 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -88,7 +88,7 @@ Then you can use ``bjam`` to build libtorrent. .. _boost: http://www.boost.org -__ http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=80982 +.. http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=80982 To make bjam work, you need to set the environment variable ``BOOST_ROOT`` to the path where boost is installed (e.g. c:\\boost_1_30_2 on windows). Then you can just run @@ -1613,6 +1613,17 @@ with future versions of bittorrent. +----------+--------------------------------------------------------+ +filenames checks +================ + +Boost.Filesystem will by default check all its paths to make sure they conform +to filename requirements on many platforms. If you don't want this check, you can +set it to either only check for native filesystem requirements or turn it off +alltogether. You can use: ``boost::filesystem::path::default_name_check(boost::filesystem::native)`` +for example. For more information, see the `Boost.Filesystem docs`__. + +__ http://www.boost.org/libs/filesystem/doc/index.htm + aknowledgements ===============