Updating the Jamfiles to support the external libs, and the new location of tests.

deanberris · deanberris · commit 7e9df06f628b · 2010-12-06T17:41:12.000+08:00
diff --git a/libs/network/build/Jamfile.v2 b/libs/network/build/Jamfile.v2
@@ -7,16 +7,20 @@
 project cpp-netlib :
     requirements
         <include>../../../
-        <include>$BOOST_ROOT
+        <include>$(BOOST_ROOT)
+        <c++-template-depth>256
     : source-location ../../../
 ;
 
 cpp-pch client : boost/network/include/http/client.hpp ;
 cpp-pch server : boost/network/include/http/server.hpp ;
 lib cppnetlib-uri-parsers : libs/network/src/parse_uri_impl.cpp ;
+lib cppnetlib-server-parsers : libs/network/src/server_request_parsers_impl.cpp ;
 
 install headers : client server
    : <location>../../../boost/network/include/http ;
 
+install libraries : cppnetlib-uri-parsers cppnetlib-server-parsers ;
+
 alias all : headers ; 
 
diff --git a/libs/network/test/Jamfile.v2 b/libs/network/test/Jamfile.v2
@@ -22,6 +22,7 @@ project network_test :
         <source>/boost//regex
         <source>/boost//thread
         <source>/boost//filesystem
+        <define>BOOST_NETWORK_ENABLE_HTTPS
         <toolset>gcc:<linkflags>-lpthread
         <toolset>gcc:<linkflags>-lssl
         <toolset>gcc:<linkflags>-lcrypto
@@ -39,20 +40,24 @@ project network_test :
         <link>static
     ;
 
-unit-test http_localhost_tests : http_localhost_tests.cpp ;
-unit-test https_localhost_tests : https_localhost_tests.cpp ;
+unit-test http_localhost_tests : http_localhost_tests.cpp /cpp-netlib//cppnetlib-uri-parsers ;
+unit-test https_localhost_tests : https_localhost_tests.cpp /cpp-netlib//cppnetlib-uri-parsers ;
 unit-test message_test : message_test.cpp ;
 unit-test message_transform_test : message_transform_test.cpp ;
-unit-test http_1_0_test : http_1_0_test.cpp ;
-unit-test http_1_1_test : http_1_1_test.cpp ;
-unit-test http_message_test : http_message_test.cpp ;
-unit-test url_test : url_test.cpp ;
+unit-test http_message_test : http_message_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
+unit-test url_test : url_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
 unit-test client_server_include_failure : client_server_include_failure.cpp ;
 unit-test http_incremental_parser : http_incremental_parser.cpp ;
 unit-test http_incremental_request_parser : http_incremental_request_parser.cpp ;
-unit-test http_async_message_ready : http_async_message_ready.cpp ;
-exe http_async_server : http_async_server.cpp ;
-exe hello_world : hello_world.cpp ;
+unit-test http_async_message_ready : http_async_message_ready.cpp /cpp-netlib//cppnetlib-uri-parsers ;
+
+unit-test http_client_constructor_test : http/client_constructor_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
+unit-test http_client_get_test : http/client_get_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
+unit-test http_client_get_different_port_test : http/client_get_different_port_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
+unit-test http_client_get_timeout_test : http/client_get_timeout_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
+
+exe http_async_server : http/server_async.cpp /cpp-netlib//cppnetlib-server-parsers ;
+exe hello_world : http/server_hello_world.cpp /cpp-netlib//cppnetlib-server-parsers ;
 
 make httplib_acceptance.passed : httplib_acceptance.py hello_world : @python_runner ;
 make httplib_async_acceptance.passed : httplib_acceptance.py http_async_server : @python_runner ;
