From e7b1bbfeabf0fcec581109925502c30317f00919 Mon Sep 17 00:00:00 2001 From: chris_kohlhoff Date: Fri, 9 Dec 2005 07:17:42 +0000 Subject: [PATCH] Fix up Jamfiles so that they work with MSVC. --- asio/src/examples/chat/Jamfile | 6 +- asio/src/examples/echo/Jamfile | 3 +- asio/src/examples/http/server/Jamfile | 4 +- asio/src/examples/iostreams/Jamfile | 5 +- asio/src/examples/multicast/Jamfile | 8 ++- asio/src/examples/services/Jamfile | 4 +- asio/src/examples/ssl/Jamfile | 6 +- asio/src/examples/timeouts/Jamfile | 3 +- asio/src/examples/tutorial/Jamfile | 3 +- asio/src/tests/unit/Jamfile | 82 +++++++++++++-------------- asio/src/tests/unit/ssl/Jamfile | 16 +++--- 11 files changed, 78 insertions(+), 62 deletions(-) diff --git a/asio/src/examples/chat/Jamfile b/asio/src/examples/chat/Jamfile index 0b03bad6..2380713d 100644 --- a/asio/src/examples/chat/Jamfile +++ b/asio/src/examples/chat/Jamfile @@ -3,7 +3,8 @@ subproject libs/asio/example/chat ; project boost : $(BOOST_ROOT) ; exe chat_client - : @boost/libs/thread/build/boost_thread + : @boost/libs/date_time/build/boost_date_time + @boost/libs/thread/build/boost_thread chat_client.cpp : $(BOOST_ROOT) ../../../.. @@ -11,7 +12,8 @@ exe chat_client ; exe chat_server - : @boost/libs/thread/build/boost_thread + : @boost/libs/date_time/build/boost_date_time + @boost/libs/thread/build/boost_thread chat_server.cpp : $(BOOST_ROOT) ../../../.. diff --git a/asio/src/examples/echo/Jamfile b/asio/src/examples/echo/Jamfile index 12678f9f..89f980e2 100644 --- a/asio/src/examples/echo/Jamfile +++ b/asio/src/examples/echo/Jamfile @@ -3,7 +3,8 @@ subproject libs/asio/example/echo ; project boost : $(BOOST_ROOT) ; template asio_echo_example - : @boost/libs/thread/build/boost_thread + : @boost/libs/date_time/build/boost_date_time + @boost/libs/thread/build/boost_thread : $(BOOST_ROOT) ../../../.. multi diff --git a/asio/src/examples/http/server/Jamfile b/asio/src/examples/http/server/Jamfile index 2f7cb45c..ec7a7b0f 100644 --- a/asio/src/examples/http/server/Jamfile +++ b/asio/src/examples/http/server/Jamfile @@ -3,8 +3,8 @@ subproject libs/asio/example/http/server ; project boost : $(BOOST_ROOT) ; exe http_server - : @boost/libs/thread/build/boost_thread - @boost/libs/date_time/build/boost_date_time + : @boost/libs/date_time/build/boost_date_time + @boost/libs/thread/build/boost_thread connection.cpp connection_manager.cpp mime_types.cpp diff --git a/asio/src/examples/iostreams/Jamfile b/asio/src/examples/iostreams/Jamfile index f86079cd..a27a4848 100644 --- a/asio/src/examples/iostreams/Jamfile +++ b/asio/src/examples/iostreams/Jamfile @@ -1,7 +1,10 @@ subproject libs/asio/example/iostreams ; +project boost : $(BOOST_ROOT) ; + exe daytime_client - : daytime_client.cpp + : @boost/libs/date_time/build/boost_date_time + daytime_client.cpp : $(BOOST_ROOT) ../../../.. multi diff --git a/asio/src/examples/multicast/Jamfile b/asio/src/examples/multicast/Jamfile index 5f55d217..7b81a62d 100644 --- a/asio/src/examples/multicast/Jamfile +++ b/asio/src/examples/multicast/Jamfile @@ -1,14 +1,18 @@ subproject libs/asio/example/multicast ; +project boost : $(BOOST_ROOT) ; + exe receiver - : receiver.cpp + : @boost/libs/date_time/build/boost_date_time + receiver.cpp : $(BOOST_ROOT) ../../../.. multi ; exe sender - : sender.cpp + : @boost/libs/date_time/build/boost_date_time + sender.cpp : $(BOOST_ROOT) ../../../.. multi diff --git a/asio/src/examples/services/Jamfile b/asio/src/examples/services/Jamfile index b3230272..7a6a9e38 100644 --- a/asio/src/examples/services/Jamfile +++ b/asio/src/examples/services/Jamfile @@ -3,8 +3,8 @@ subproject libs/asio/example/services ; project boost : $(BOOST_ROOT) ; exe daytime_client - : @boost/libs/thread/build/boost_thread - @boost/libs/date_time/build/boost_date_time + : @boost/libs/date_time/build/boost_date_time + @boost/libs/thread/build/boost_thread daytime_client.cpp : $(BOOST_ROOT) ../../../.. diff --git a/asio/src/examples/ssl/Jamfile b/asio/src/examples/ssl/Jamfile index 6e687cd3..4cb81d1a 100644 --- a/asio/src/examples/ssl/Jamfile +++ b/asio/src/examples/ssl/Jamfile @@ -1,7 +1,8 @@ subproject libs/asio/example/ssl ; exe client - : client.cpp + : @boost/libs/date_time/build/boost_date_time + client.cpp : $(BOOST_ROOT) ../../../.. multi @@ -10,7 +11,8 @@ exe client ; exe server - : server.cpp + : @boost/libs/date_time/build/boost_date_time + server.cpp : $(BOOST_ROOT) ../../../.. multi diff --git a/asio/src/examples/timeouts/Jamfile b/asio/src/examples/timeouts/Jamfile index 56260de9..3f13ad7f 100644 --- a/asio/src/examples/timeouts/Jamfile +++ b/asio/src/examples/timeouts/Jamfile @@ -3,7 +3,8 @@ subproject libs/asio/example/timeouts ; project boost : $(BOOST_ROOT) ; template asio_timeouts_example - : @boost/libs/thread/build/boost_thread + : @boost/libs/date_time/build/boost_date_time + @boost/libs/thread/build/boost_thread : $(BOOST_ROOT) ../../../.. multi diff --git a/asio/src/examples/tutorial/Jamfile b/asio/src/examples/tutorial/Jamfile index 50482260..62e18cc5 100644 --- a/asio/src/examples/tutorial/Jamfile +++ b/asio/src/examples/tutorial/Jamfile @@ -3,7 +3,8 @@ subproject libs/asio/example/tutorial ; project boost : $(BOOST_ROOT) ; template asio_tutorial - : @boost/libs/thread/build/boost_thread + : @boost/libs/date_time/build/boost_date_time + @boost/libs/thread/build/boost_thread : $(BOOST_ROOT) ../../../.. multi diff --git a/asio/src/tests/unit/Jamfile b/asio/src/tests/unit/Jamfile index bf15a8eb..0798a410 100644 --- a/asio/src/tests/unit/Jamfile +++ b/asio/src/tests/unit/Jamfile @@ -5,44 +5,44 @@ import testing ; project boost : $(BOOST_ROOT) ; -run basic_datagram_socket_test.cpp : : : ../../.. ; -run basic_deadline_timer_test.cpp : : : ../../.. ; -run basic_demuxer_test.cpp : : : ../../.. ; -run basic_locking_dispatcher_test.cpp : : : ../../.. ; -run basic_socket_acceptor_test.cpp : : : ../../.. ; -run basic_stream_socket_test.cpp : : : ../../.. ; -run buffer_test.cpp : : : ../../.. ; -run buffered_read_stream_test.cpp : : : ../../.. ; -run buffered_stream_test.cpp : : : ../../.. ; -run buffered_write_stream_test.cpp : : : ../../.. ; -run completion_condition_test.cpp : : : ../../.. ; -run datagram_socket_service_test.cpp : : : ../../.. ; -run datagram_socket_test.cpp : : : ../../.. ; -run deadline_timer_service_test.cpp : : : ../../.. ; -run deadline_timer_test.cpp : : : ../../.. ; -run demuxer_service_test.cpp : : : ../../.. ; -run demuxer_test.cpp @boost/libs/thread/build/boost_thread : : : ../../.. ; -run error_handler_test.cpp : : : ../../.. ; -run error_test.cpp : : : ../../.. ; -run ipv4/address_test.cpp : : : ../../.. ; -run ipv4/basic_host_resolver_test.cpp : : : ../../.. ; -run ipv4/host_resolver_service_test.cpp : : : ../../.. ; -run ipv4/host_resolver_test.cpp : : : ../../.. ; -run ipv4/host_test.cpp : : : ../../.. ; -run ipv4/multicast_test.cpp : : : ../../.. ; -run ipv4/tcp_test.cpp : : : ../../.. ; -run ipv4/udp_test.cpp : : : ../../.. ; -run is_read_buffered_test.cpp : : : ../../.. ; -run is_write_buffered_test.cpp : : : ../../.. ; -run locking_dispatcher_service_test.cpp : : : ../../.. ; -run locking_dispatcher_test.cpp @boost/libs/thread/build/boost_thread : : : ../../.. ; -run placeholders_test.cpp : : : ../../.. ; -run read_test.cpp : : : ../../.. ; -run service_factory_test.cpp : : : ../../.. ; -run socket_acceptor_service_test.cpp : : : ../../.. ; -run socket_acceptor_test.cpp : : : ../../.. ; -run socket_base_test.cpp : : : ../../.. ; -run stream_socket_service_test.cpp : : : ../../.. ; -run stream_socket_test.cpp : : : ../../.. ; -run time_traits_test.cpp : : : ../../.. ; -run write_test.cpp : : : ../../.. ; +run basic_datagram_socket_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run basic_deadline_timer_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run basic_demuxer_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run basic_locking_dispatcher_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run basic_socket_acceptor_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run basic_stream_socket_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run buffer_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run buffered_read_stream_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run buffered_stream_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run buffered_write_stream_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run completion_condition_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run datagram_socket_service_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run datagram_socket_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run deadline_timer_service_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run deadline_timer_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run demuxer_service_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run demuxer_test.cpp @boost/libs/date_time/build/boost_date_time @boost/libs/thread/build/boost_thread : : : ../../.. ; +run error_handler_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run error_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run ipv4/address_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run ipv4/basic_host_resolver_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run ipv4/host_resolver_service_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run ipv4/host_resolver_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run ipv4/host_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run ipv4/multicast_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run ipv4/tcp_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run ipv4/udp_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run is_read_buffered_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run is_write_buffered_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run locking_dispatcher_service_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run locking_dispatcher_test.cpp @boost/libs/date_time/build/boost_date_time @boost/libs/thread/build/boost_thread : : : ../../.. ; +run placeholders_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run read_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run service_factory_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run socket_acceptor_service_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run socket_acceptor_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run socket_base_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run stream_socket_service_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run stream_socket_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run time_traits_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; +run write_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../.. ; diff --git a/asio/src/tests/unit/ssl/Jamfile b/asio/src/tests/unit/ssl/Jamfile index 592ba57c..2d164fb9 100644 --- a/asio/src/tests/unit/ssl/Jamfile +++ b/asio/src/tests/unit/ssl/Jamfile @@ -3,10 +3,12 @@ subproject libs/asio/test/ssl ; # bring in the rules for testing import testing ; -run basic_context_test.cpp : : : ../../../.. ; -run context_base_test.cpp : : : ../../../.. ; -run context_service_test.cpp : : : ../../../.. ; -run context_test.cpp : : : ../../../.. ; -run stream_base_test.cpp : : : ../../../.. ; -run stream_service_test.cpp : : : ../../../.. ; -run stream_test.cpp : : : ../../../.. ; +project boost : $(BOOST_ROOT) ; + +run basic_context_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../../.. ; +run context_base_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../../.. ; +run context_service_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../../.. ; +run context_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../../.. ; +run stream_base_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../../.. ; +run stream_service_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../../.. ; +run stream_test.cpp @boost/libs/date_time/build/boost_date_time : : : ../../../.. ;