From 73df54b9573f2be83479b00f8179234407cb8690 Mon Sep 17 00:00:00 2001
From: Steve Gerbino <steve@gerbino.co>
Date: Thu, 15 Jan 2026 18:55:49 +0100
Subject: [PATCH] Build system improvements

---
 .gitignore                                    |  3 ++-
 build/Jamfile                                 | 20 ++++++-------------
 src/corosio/src/detail/posix_scheduler.cpp    |  4 ++--
 src/corosio/src/detail/posix_sockets.hpp      |  6 +++---
 .../src/detail/win_iocp_resolver_service.cpp  |  6 +++---
 .../src/detail/win_iocp_resolver_service.hpp  |  8 ++++----
 src/corosio/src/detail/win_iocp_scheduler.cpp |  4 ++--
 src/corosio/src/detail/win_iocp_scheduler.hpp |  4 ++--
 src/corosio/src/detail/win_iocp_sockets.cpp   |  6 +++---
 src/corosio/src/detail/win_iocp_sockets.hpp   |  8 ++++----
 src/corosio/src/detail/win_mutex.hpp          |  2 +-
 src/corosio/src/detail/win_overlapped_op.hpp  |  2 +-
 src/corosio/src/detail/win_wsa_init.cpp       |  2 +-
 src/corosio/src/detail/win_wsa_init.hpp       |  2 +-
 14 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index d41f09f..7aa5a35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /.vscode/
-/build/
+/.cache/
+/build/*
 !/build/Jamfile
 !/build/wolfssl.jam
 /out/
diff --git a/build/Jamfile b/build/Jamfile
index c0fa215..4a337d2 100644
--- a/build/Jamfile
+++ b/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
diff --git a/src/corosio/src/detail/posix_scheduler.cpp b/src/corosio/src/detail/posix_scheduler.cpp
index 652caf9..12d5e7d 100644
--- a/src/corosio/src/detail/posix_scheduler.cpp
+++ b/src/corosio/src/detail/posix_scheduler.cpp
@@ -9,8 +9,8 @@
 
 #ifndef _WIN32
 
-#include "detail/posix_scheduler.hpp"
-#include "detail/posix_op.hpp"
+#include "src/detail/posix_scheduler.hpp"
+#include "src/detail/posix_op.hpp"
 
 #include <boost/corosio/detail/except.hpp>
 #include <boost/capy/core/thread_local_ptr.hpp>
diff --git a/src/corosio/src/detail/posix_sockets.hpp b/src/corosio/src/detail/posix_sockets.hpp
index 4a40e2b..6bc884f 100644
--- a/src/corosio/src/detail/posix_sockets.hpp
+++ b/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 "src/detail/posix_op.hpp"
+#include "src/detail/posix_scheduler.hpp"
+#include "src/detail/endpoint_convert.hpp"
 
 #include <mutex>
 
diff --git a/src/corosio/src/detail/win_iocp_resolver_service.cpp b/src/corosio/src/detail/win_iocp_resolver_service.cpp
index 217bab6..7f696e9 100644
--- a/src/corosio/src/detail/win_iocp_resolver_service.cpp
+++ b/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 "src/detail/win_iocp_resolver_service.hpp"
+#include "src/detail/win_iocp_scheduler.hpp"
+#include "src/detail/endpoint_convert.hpp"
 
 #include <boost/url/ipv4_address.hpp>
 #include <boost/url/ipv6_address.hpp>
diff --git a/src/corosio/src/detail/win_iocp_resolver_service.hpp b/src/corosio/src/detail/win_iocp_resolver_service.hpp
index cdb4888..e487085 100644
--- a/src/corosio/src/detail/win_iocp_resolver_service.hpp
+++ b/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 "src/detail/windows.hpp"
+#include "src/detail/win_overlapped_op.hpp"
+#include "src/detail/win_mutex.hpp"
+#include "src/detail/win_wsa_init.hpp"
 
 #include <WS2tcpip.h>
 
diff --git a/src/corosio/src/detail/win_iocp_scheduler.cpp b/src/corosio/src/detail/win_iocp_scheduler.cpp
index 0d265db..a936715 100644
--- a/src/corosio/src/detail/win_iocp_scheduler.cpp
+++ b/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 "src/detail/win_iocp_scheduler.hpp"
+#include "src/detail/win_overlapped_op.hpp"
 
 #include <boost/corosio/detail/except.hpp>
 #include <boost/capy/core/thread_local_ptr.hpp>
diff --git a/src/corosio/src/detail/win_iocp_scheduler.hpp b/src/corosio/src/detail/win_iocp_scheduler.hpp
index f98af97..cc7d829 100644
--- a/src/corosio/src/detail/win_iocp_scheduler.hpp
+++ b/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 "src/detail/win_mutex.hpp"
 
 #include <chrono>
 #include <cstdint>
 #include <thread>
 
-#include "detail/windows.hpp"
+#include "src/detail/windows.hpp"
 
 namespace boost {
 namespace corosio {
diff --git a/src/corosio/src/detail/win_iocp_sockets.cpp b/src/corosio/src/detail/win_iocp_sockets.cpp
index 33b5b95..001b02e 100644
--- a/src/corosio/src/detail/win_iocp_sockets.cpp
+++ b/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 "src/detail/win_iocp_sockets.hpp"
+#include "src/detail/win_iocp_scheduler.hpp"
+#include "src/detail/endpoint_convert.hpp"
 
 namespace boost {
 namespace corosio {
diff --git a/src/corosio/src/detail/win_iocp_sockets.hpp b/src/corosio/src/detail/win_iocp_sockets.hpp
index 021f6a4..c1776b3 100644
--- a/src/corosio/src/detail/win_iocp_sockets.hpp
+++ b/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 "src/detail/windows.hpp"
+#include "src/detail/win_overlapped_op.hpp"
+#include "src/detail/win_mutex.hpp"
+#include "src/detail/win_wsa_init.hpp"
 
 #include <MSWSock.h>
 #include <Ws2tcpip.h>
diff --git a/src/corosio/src/detail/win_mutex.hpp b/src/corosio/src/detail/win_mutex.hpp
index 01dc7ae..ef9e8bb 100644
--- a/src/corosio/src/detail/win_mutex.hpp
+++ b/src/corosio/src/detail/win_mutex.hpp
@@ -12,7 +12,7 @@
 
 #include <boost/corosio/detail/config.hpp>
 
-#include "detail/windows.hpp"
+#include "src/detail/windows.hpp"
 
 namespace boost {
 namespace corosio {
diff --git a/src/corosio/src/detail/win_overlapped_op.hpp b/src/corosio/src/detail/win_overlapped_op.hpp
index 3798746..1b4c9cb 100644
--- a/src/corosio/src/detail/win_overlapped_op.hpp
+++ b/src/corosio/src/detail/win_overlapped_op.hpp
@@ -23,7 +23,7 @@
 #include <optional>
 #include <stop_token>
 
-#include "detail/windows.hpp"
+#include "src/detail/windows.hpp"
 
 namespace boost {
 namespace corosio {
diff --git a/src/corosio/src/detail/win_wsa_init.cpp b/src/corosio/src/detail/win_wsa_init.cpp
index 7514704..1bab657 100644
--- a/src/corosio/src/detail/win_wsa_init.cpp
+++ b/src/corosio/src/detail/win_wsa_init.cpp
@@ -9,7 +9,7 @@
 
 #ifdef _WIN32
 
-#include "detail/win_wsa_init.hpp"
+#include "src/detail/win_wsa_init.hpp"
 
 #include <boost/corosio/detail/except.hpp>
 
diff --git a/src/corosio/src/detail/win_wsa_init.hpp b/src/corosio/src/detail/win_wsa_init.hpp
index 45e5ea4..aa69b74 100644
--- a/src/corosio/src/detail/win_wsa_init.hpp
+++ b/src/corosio/src/detail/win_wsa_init.hpp
@@ -12,7 +12,7 @@
 
 #include <boost/corosio/detail/config.hpp>
 
-#include "detail/windows.hpp"
+#include "src/detail/windows.hpp"
 
 namespace boost {
 namespace corosio {