Skip to content

Build system improvements #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sgerbino merged 1 commit into from
Jan 15, 2026
Merged

Build system improvements #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/.vscode/
/build/
/.cache/
/build/*
!/build/Jamfile
!/build/wolfssl.jam
/out/
Expand Down
20 changes: 6 additions & 14 deletions build/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ constant c20-requires :
]
;

path-constant COROSIO_ROOT : .. ;

project boost/corosio
: requirements
$(c20-requires)
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/corosio/src/detail/posix_scheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/corosio/src/detail/posix_sockets.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions src/corosio/src/detail/win_iocp_resolver_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/corosio/src/detail/win_iocp_resolver_service.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions src/corosio/src/detail/win_iocp_scheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/corosio/src/detail/win_iocp_scheduler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/corosio/src/detail/win_iocp_sockets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions src/corosio/src/detail/win_iocp_sockets.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/corosio/src/detail/win_mutex.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <boost/corosio/detail/config.hpp>

#include "detail/windows.hpp"
#include "src/detail/windows.hpp"

namespace boost {
namespace corosio {
Expand Down
2 changes: 1 addition & 1 deletion src/corosio/src/detail/win_overlapped_op.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <optional>
#include <stop_token>

#include "detail/windows.hpp"
#include "src/detail/windows.hpp"

namespace boost {
namespace corosio {
Expand Down
2 changes: 1 addition & 1 deletion src/corosio/src/detail/win_wsa_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/corosio/src/detail/win_wsa_init.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <boost/corosio/detail/config.hpp>

#include "detail/windows.hpp"
#include "src/detail/windows.hpp"

namespace boost {
namespace corosio {
Expand Down
Loading