Build system improvements

Author: sgerbino

.gitignore

@@ -1,5 +1,6 @@
 /.vscode/
-/build/
+/.cache/
+/build/*
 !/build/Jamfile
 !/build/wolfssl.jam
 /out/

build/Jamfile

@@ -16,8 +16,6 @@ constant c20-requires :
     ]
     ;
 
-path-constant COROSIO_ROOT : .. ;
-
 project boost/corosio
   : requirements
     $(c20-requires)
@@ -28,18 +26,13 @@ project boost/corosio
     <link>static:<define>BOOST_COROSIO_STATIC_LINK
   : usage-requirements
     <define>BOOST_COROSIO_NO_LIB
-  : source-location $(COROSIO_ROOT)
+  : source-location ..
   ;
 
 # System libraries
 lib ws2_32 ;
 
-local COROSIO_SRC =
-    [ glob $(COROSIO_ROOT)/src/corosio/src/*.cpp ]
-    [ glob $(COROSIO_ROOT)/src/corosio/src/detail/*.cpp ]
-    ;
-
-alias corosio_sources : $(COROSIO_SRC) ;
+alias corosio_sources : [ glob-tree-ex src/corosio/src : *.cpp ] ;
 
 lib boost_corosio
   : corosio_sources
@@ -49,21 +42,20 @@ lib boost_corosio
     <library>/boost/system//boost_system
     <target-os>windows:<library>ws2_32
     <target-os>windows:<define>_WIN32_WINNT=0x0602
-    <include>$(COROSIO_ROOT)/include
-    <include>$(COROSIO_ROOT)/src/corosio
-    <include>$(COROSIO_ROOT)/src/corosio/src
+    <include>../include
+    <include>../src/corosio
   : usage-requirements
     <library>/boost/capy//boost_capy
     <library>/boost/url//boost_url
     <library>/boost/system//boost_system
     <target-os>windows:<library>ws2_32
-    <include>$(COROSIO_ROOT)/include
+    <include>../include
   ;
 
 # WolfSSL
 using wolfssl ;
 
-alias corosio_wolfssl_sources : [ glob-tree-ex $(COROSIO_ROOT)/src/wolfssl/src : *.cpp ] ;
+alias corosio_wolfssl_sources : [ glob-tree-ex src/wolfssl/src : *.cpp ] ;
 
 lib boost_corosio_wolfssl
   : corosio_wolfssl_sources

src/corosio/src/detail/posix_scheduler.cpp

@@ -9,8 +9,8 @@
 
 #ifndef _WIN32
 
-#include "detail/posix_scheduler.hpp"
-#include "detail/posix_op.hpp"
+#include "posix_scheduler.hpp"
+#include "posix_op.hpp"
 
 #include <boost/corosio/detail/except.hpp>
 #include <boost/capy/core/thread_local_ptr.hpp>

src/corosio/src/detail/posix_sockets.hpp

@@ -18,9 +18,9 @@
 #include <boost/capy/ex/execution_context.hpp>
 #include <boost/capy/core/intrusive_list.hpp>
 
-#include "detail/posix_op.hpp"
-#include "detail/posix_scheduler.hpp"
-#include "detail/endpoint_convert.hpp"
+#include "posix_op.hpp"
+#include "posix_scheduler.hpp"
+#include "endpoint_convert.hpp"
 
 #include <mutex>
 

src/corosio/src/detail/win_iocp_resolver_service.cpp

@@ -9,9 +9,9 @@
 
 #ifdef _WIN32
 
-#include "detail/win_iocp_resolver_service.hpp"
-#include "detail/win_iocp_scheduler.hpp"
-#include "detail/endpoint_convert.hpp"
+#include "win_iocp_resolver_service.hpp"
+#include "win_iocp_scheduler.hpp"
+#include "endpoint_convert.hpp"
 
 #include <boost/url/ipv4_address.hpp>
 #include <boost/url/ipv6_address.hpp>

src/corosio/src/detail/win_iocp_resolver_service.hpp

@@ -26,10 +26,10 @@
 #include <boost/capy/ex/execution_context.hpp>
 #include <boost/capy/core/intrusive_list.hpp>
 
-#include "detail/windows.hpp"
-#include "detail/win_overlapped_op.hpp"
-#include "detail/win_mutex.hpp"
-#include "detail/win_wsa_init.hpp"
+#include "windows.hpp"
+#include "win_overlapped_op.hpp"
+#include "win_mutex.hpp"
+#include "win_wsa_init.hpp"
 
 #include <WS2tcpip.h>
 

src/corosio/src/detail/win_iocp_scheduler.cpp

@@ -9,8 +9,8 @@
 
 #ifdef _WIN32
 
-#include "detail/win_iocp_scheduler.hpp"
-#include "detail/win_overlapped_op.hpp"
+#include "win_iocp_scheduler.hpp"
+#include "win_overlapped_op.hpp"
 
 #include <boost/corosio/detail/except.hpp>
 #include <boost/capy/core/thread_local_ptr.hpp>

src/corosio/src/detail/win_iocp_scheduler.hpp

@@ -16,13 +16,13 @@
 #include <boost/capy/core/intrusive_queue.hpp>
 #include <boost/system/error_code.hpp>
 
-#include "detail/win_mutex.hpp"
+#include "win_mutex.hpp"
 
 #include <chrono>
 #include <cstdint>
 #include <thread>
 
-#include "detail/windows.hpp"
+#include "windows.hpp"
 
 namespace boost {
 namespace corosio {

src/corosio/src/detail/win_iocp_sockets.cpp

@@ -9,9 +9,9 @@
 
 #ifdef _WIN32
 
-#include "detail/win_iocp_sockets.hpp"
-#include "detail/win_iocp_scheduler.hpp"
-#include "detail/endpoint_convert.hpp"
+#include "win_iocp_sockets.hpp"
+#include "win_iocp_scheduler.hpp"
+#include "endpoint_convert.hpp"
 
 namespace boost {
 namespace corosio {

src/corosio/src/detail/win_iocp_sockets.hpp

@@ -18,10 +18,10 @@
 #include <boost/capy/ex/execution_context.hpp>
 #include <boost/capy/core/intrusive_list.hpp>
 
-#include "detail/windows.hpp"
-#include "detail/win_overlapped_op.hpp"
-#include "detail/win_mutex.hpp"
-#include "detail/win_wsa_init.hpp"
+#include "windows.hpp"
+#include "win_overlapped_op.hpp"
+#include "win_mutex.hpp"
+#include "win_wsa_init.hpp"
 
 #include <MSWSock.h>
 #include <Ws2tcpip.h>