Skip to content

Commit dfc95a6

Browse files
glynosglynos
committed
Updated Jamfile scripts.
1 parent b040182 commit dfc95a6

File tree

5 files changed

+43
-21
lines changed

5 files changed

+43
-21
lines changed

‎libs/network/build/Jamfile.v2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ project cpp-netlib :
1818

1919
cpp-pch client : boost/network/include/http/client.hpp ;
2020
cpp-pch server : boost/network/include/http/server.hpp ;
21-
lib cppnetlib-uri : libs/network/src/parse_uri_impl.cpp ;
21+
lib cppnetlib-uri : libs/network/src/uri/parse.cpp ;
2222
lib cppnetlib-server-parsers : libs/network/src/server_request_parsers_impl.cpp ;
23+
lib cppnetlib-client-connections : libs/network/src/client.cpp ;
2324

2425
install headers : client server
2526
: <location>../../../boost/network/include/http ;
2627

27-
install libraries : cppnetlib-uri cppnetlib-server-parsers ;
28+
install libraries : cppnetlib-uri cppnetlib-server-parsers cppnetlib-client-connections ;
2829

2930
alias all : headers ;
30-

‎libs/network/example/Jamfile.v2

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,19 @@ project network_test :
2121
<variant>debug:<define>BOOST_NETWORK_DEBUG
2222
;
2323

24-
exe http_client : http_client.cpp /cpp-netlib//cppnetlib-uri ;
24+
exe uri : uri.cpp /cpp-netlib//cppnetlib-uri ;
2525

26-
# exe dispatch_table : dispatch_table.cpp ;
26+
exe http_client : http_client.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
2727

28-
exe uri : uri.cpp /cpp-netlib//cppnetlib-uri ;
28+
exe http_client1 : http_client1.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
29+
30+
exe simple_wget : simple_wget.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
2931

30-
exe simple_wget : simple_wget.cpp /cpp-netlib//cppnetlib-uri ;
32+
exe atom_reader : atom/main.cpp atom/atom.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
33+
34+
exe rss_reader : rss/main.cpp rss/rss.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
35+
36+
exe twitter_search : twitter/search.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
3137

3238
exe hello_world_server : http/hello_world_server.cpp /cpp-netlib//cppnetlib-server-parsers ;
3339

@@ -36,4 +42,3 @@ exe hello_world_client : http/hello_world_client.cpp /cpp-netlib//cppnetlib-uri
3642
exe one_liner : http/one_liner.cpp /cpp-netlib//cppnetlib-uri ;
3743

3844
exe fileserver : http/fileserver.cpp /cpp-netlib//cppnetlib-server-parsers ;
39-

‎libs/network/test/Jamfile.v2

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ project network_test :
2323
<source>/boost//regex
2424
<source>/boost//thread
2525
<source>/boost//filesystem
26-
<define>BOOST_NETWORK_ENABLE_HTTPS
2726
<variant>debug:<define>BOOST_NETWORK_DEBUG
27+
<toolset>gcc:<define>BOOST_NETWORK_ENABLE_HTTPS
2828
<toolset>gcc:<linkflags>-lpthread
2929
<toolset>gcc:<linkflags>-lssl
3030
<toolset>gcc:<linkflags>-lcrypto
31+
<toolset>darwin:<define>BOOST_NETWORK_ENABLE_HTTPS
3132
<toolset>darwin:<linkflags>-lpthread
3233
<toolset>darwin:<linkflags>-lssl
3334
<toolset>darwin:<linkflags>-lcrypto
35+
<toolset>clang:<define>BOOST_NETWORK_ENABLE_HTTPS
3436
<toolset>clang:<linkflags>-lpthread
3537
<toolset>clang:<linkflags>-lssl
3638
<toolset>clang:<linkflags>-lcrypto
@@ -41,14 +43,13 @@ project network_test :
4143
<toolset>msvc:<define>BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN
4244
<toolset>msvc:<define>WIN32_LEAN_AND_MEAN
4345
<toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
46+
<toolset>msvc:<define>_WIN32_WINNT=0x0501
4447
<c++-template-depth>256
4548
<link>static
4649
;
4750

4851
build-project http ;
52+
build-project uri ;
4953

5054
run message_test.cpp ;
5155
run message_transform_test.cpp ;
52-
run url_test.cpp /cpp-netlib//cppnetlib-uri ;
53-
run client_server_include_failure.cpp ;
54-

‎libs/network/test/http/Jamfile.v2

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@ project network_test/http :
1515
<variant>debug:<define>BOOST_NETWORK_DEBUG
1616
;
1717

18-
run client_constructor_test.cpp /cpp-netlib//cppnetlib-uri ;
19-
run client_get_test.cpp /cpp-netlib//cppnetlib-uri ;
20-
run client_get_different_port_test.cpp /cpp-netlib//cppnetlib-uri ;
21-
run client_get_timeout_test.cpp /cpp-netlib//cppnetlib-uri ;
22-
run client_include_inlined.cpp : <define>BOOST_NETWORK_NO_LIB ;
23-
run client_localhost_normal_test.cpp /cpp-netlib//cppnetlib-uri ;
24-
run client_localhost_ssl_test.cpp /cpp-netlib//cppnetlib-uri ;
18+
run client_constructor_test.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
19+
run client_get_test.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
20+
run client_get_different_port_test.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
21+
run client_get_timeout_test.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
22+
#run client_include_inlined.cpp : <define>BOOST_NETWORK_NO_LIB ;
23+
run client_localhost_normal_test.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
24+
run client_localhost_ssl_test.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
2525
run message_async_ready_test.cpp ;
2626
run message_test.cpp /cpp-netlib//cppnetlib-uri ;
2727
run request_incremental_parser_test.cpp ;
2828
run request_linearize_test.cpp /cpp-netlib//cppnetlib-uri ;
2929
run response_incremental_parser_test.cpp /cpp-netlib//cppnetlib-server-parsers ;
3030
run server_constructor_test.cpp /cpp-netlib//cppnetlib-server-parsers ;
31-
run server_include_inlined.cpp : <define>BOOST_NETWORK_NO_LIB ;
32-
run url_test.cpp /cpp-netlib//cppnetlib-uri ;
31+
#run server_include_inlined.cpp : <define>BOOST_NETWORK_NO_LIB ;
3332

3433
exe http_async_server : server_async.cpp /cpp-netlib//cppnetlib-server-parsers ;
3534
exe hello_world : server_hello_world.cpp /cpp-netlib//cppnetlib-server-parsers ;

‎libs/network/test/uri/Jamfile.v2

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
# Copyright Glyn Matthews 2011.
3+
# Distributed under the Boost Software License, Version 1.0.
4+
# (See accompanying file LICENSE_1_0.txt or copy at
5+
# http://www.boost.org/LICENSE_1_0.txt)
6+
7+
import testing ;
8+
9+
project network_test/uri :
10+
requirements
11+
<include>../../../../
12+
<include>../
13+
;
14+
15+
run url_test.cpp /cpp-netlib//cppnetlib-uri ;
16+
run url_builder_test.cpp /cpp-netlib//cppnetlib-uri ;
17+
run url_encoding_test.cpp /cpp-netlib//cppnetlib-uri ;

0 commit comments

Comments
 (0)