Jamfile cleanup

boostorg · Sep 4, 2024 · 99603c3 · 99603c3
1 parent a9121c2
commit 99603c3
Show file tree

Hide file tree

Showing 30 changed files with 70 additions and 88 deletions.
diff --git a/build.jam b/build.jam
@@ -36,39 +36,13 @@ project /boost/beast
     ;
 
 explicit
-    [ alias boost_beast : build//boost_beast ]
-    [ alias boost_beast_asio : build//boost_beast_asio ]
-    [ alias boost_beast_asio_ssl : build//boost_beast_asio_ssl ]
-    [ alias all : boost_beast boost_beast_asio boost_beast_asio_ssl example test ]
-    # Old-style targets. Remove once the rest of Beast changes.
-    [ alias lib-beast : boost_beast ]
-    [ alias lib-asio : boost_beast_asio ]
-    [ alias lib-asio-ssl : boost_beast_asio_ssl ]
+    [ alias boost_beast : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_beast example test ]
     ;
 
 call-if : boost-library beast
-    : install boost_beast boost_beast_asio boost_beast_asio_ssl
     ;
 
 feature.feature boost.beast.allow-deprecated : on off : propagated ;
 feature.feature boost.beast.separate-compilation : on off : propagated ;
 feature.feature boost.beast.valgrind : on off : optional propagated ;
-
-variant beast_coverage
-    : debug
-    : <cxxflags>"-msse4.2 --coverage"
-        <linkflags>"--coverage"
-    ;
-
-variant beast_valgrind
-    : release
-    : <boost.beast.valgrind>on
-    ;
-
-variant beast_ubasan
-    : release
-    : <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
-        <linkflags>"-fsanitize=address,undefined"
-        <define>BOOST_USE_ASAN=1
-    ;
-
diff --git a/build/Jamfile b/build/Jamfile
@@ -7,18 +7,17 @@ import ac ;
 import-search /boost/config/checks ;
 import config : requires ;
 import os ;
-import path ;
 
-local openssl-root ;
-if [ os.on-windows ]
-{
-    openssl-root ?= [ os.environ OPENSSL_ROOT ] ;
-    if ! $(openssl-root) && [ path.glob "C:/OpenSSL" : lib include ]
-    {
-        openssl-root = "C:/OpenSSL" ;
-    }
-}
-using openssl : : <search>$(openssl-root)/lib <include>$(openssl-root)/include ;
+using openssl ;
+
+explicit
+    [ searched-lib socket ] # SOLARIS, QNXNTO
+    [ searched-lib nsl ] # SOLARIS
+    [ searched-lib ws2_32 : : <target-os>windows ] # NT
+    [ searched-lib mswsock : : <target-os>windows ] # NT
+    [ searched-lib ipv6 ] # HPUX
+    [ searched-lib network ] # HAIKU
+    ;
 
 project
     : source-location ../test
@@ -66,22 +65,13 @@ project
         <boost.beast.separate-compilation>on:<define>BOOST_BEAST_SEPARATE_COMPILATION
     ;
 
-explicit
-    [ searched-lib socket ] # SOLARIS, QNXNTO
-    [ searched-lib nsl ] # SOLARIS
-    [ searched-lib ws2_32 : : <target-os>windows ] # NT
-    [ searched-lib mswsock : : <target-os>windows ] # NT
-    [ searched-lib ipv6 ] # HPUX
-    [ searched-lib network ] # HAIKU
-    ;
-
-lib boost_beast_asio
+lib lib-asio
     : lib_asio.cpp
     : requirements
         <link>static
     ;
 
-lib boost_beast_asio_ssl
+lib lib-asio-ssl
     : lib_asio_ssl.cpp
     : requirements
         <link>static
@@ -92,8 +82,8 @@ lib boost_beast_asio_ssl
         [ ac.check-library /openssl//crypto : <library>/openssl//crypto/<link>shared : <build>no ]
     ;
 
-lib boost_beast
+lib lib-beast
     : lib_beast.cpp
     : requirements
-    <link>static
+        <link>static
     ;
diff --git a/example/Jamfile b/example/Jamfile
@@ -21,8 +21,8 @@ project /boost/beast/example
         cxx11_template_aliases
         cxx11_variadic_templates
     ]
-    <library>/boost/beast//lib-asio/<link>static
-    <boost.beast.separate-compilation>on:<library>/boost/beast//lib-beast/<link>static
+    <library>/boost/beast/build//lib-asio/<link>static
+    <boost.beast.separate-compilation>on:<library>/boost/beast/build//lib-beast/<link>static
     <include>..
     ;
 

diff --git a/example/advanced/server-flex-awaitable/Jamfile b/example/advanced/server-flex-awaitable/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
         <library>/boost/scope//boost_scope
     ;
 

diff --git a/example/advanced/server-flex/Jamfile b/example/advanced/server-flex/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe advanced-server-flex :

diff --git a/example/http/client/async-ssl-system-executor/Jamfile b/example/http/client/async-ssl-system-executor/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-client-async-ssl-system-executor :

diff --git a/example/http/client/async-ssl/Jamfile b/example/http/client/async-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-client-async-ssl :

diff --git a/example/http/client/awaitable-ssl/Jamfile b/example/http/client/awaitable-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-client-awaitable-ssl :

diff --git a/example/http/client/coro-ssl/Jamfile b/example/http/client/coro-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-client-coro-ssl :

diff --git a/example/http/client/sync-ssl/Jamfile b/example/http/client/sync-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-client-sync-ssl :

diff --git a/example/http/server/async-ssl/Jamfile b/example/http/server/async-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-server-async-ssl :

diff --git a/example/http/server/coro-ssl/Jamfile b/example/http/server/coro-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-server-coro-ssl :

diff --git a/example/http/server/flex/Jamfile b/example/http/server/flex/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-server-flex :

diff --git a/example/http/server/stackless-ssl/Jamfile b/example/http/server/stackless-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-server-stackless-ssl :

diff --git a/example/http/server/sync-ssl/Jamfile b/example/http/server/sync-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe http-server-sync-ssl :

diff --git a/example/websocket/client/async-ssl-system-executor/Jamfile b/example/websocket/client/async-ssl-system-executor/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-client-async-ssl-system-executor :

diff --git a/example/websocket/client/async-ssl/Jamfile b/example/websocket/client/async-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-client-async-ssl :

diff --git a/example/websocket/client/coro-ssl/Jamfile b/example/websocket/client/coro-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-client-coro-ssl :

diff --git a/example/websocket/client/sync-ssl/Jamfile b/example/websocket/client/sync-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-client-sync-ssl :

diff --git a/example/websocket/server/async-ssl/Jamfile b/example/websocket/server/async-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-server-async-ssl :

diff --git a/example/websocket/server/coro-ssl/Jamfile b/example/websocket/server/coro-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-server-coro-ssl :

diff --git a/example/websocket/server/stackless-ssl/Jamfile b/example/websocket/server/stackless-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-server-stackless-ssl :

diff --git a/example/websocket/server/sync-ssl/Jamfile b/example/websocket/server/sync-ssl/Jamfile
@@ -11,7 +11,7 @@ import ac ;
 
 project
     : requirements
-        [ ac.check-library /boost/beast//lib-asio-ssl : <library>/boost/beast//lib-asio-ssl/<link>static : <build>no ]
+        [ ac.check-library /boost/beast/build//lib-asio-ssl : <library>/boost/beast/build//lib-asio-ssl/<link>static : <build>no ]
     ;
 
 exe websocket-server-sync-ssl :

diff --git a/test/Jamfile b/test/Jamfile
@@ -11,6 +11,24 @@ import testing ;
 import-search /boost/config/checks ;
 import config : requires ;
 
+variant beast_coverage
+    : debug
+    : <cxxflags>"-msse4.2 --coverage"
+        <linkflags>"--coverage"
+    ;
+
+variant beast_valgrind
+    : release
+    : <boost.beast.valgrind>on
+    ;
+
+variant beast_ubasan
+    : release
+    : <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
+        <linkflags>"-fsanitize=address,undefined"
+        <define>BOOST_USE_ASAN=1
+    ;
+
 project /boost/beast/test
     : requirements
     [ requires
@@ -23,8 +41,8 @@ project /boost/beast/test
     ]
     <define>BOOST_BEAST_TESTS
     <target-os>darwin:<define>Z_HAVE_UNISTD_H=1
-    <library>/boost/beast//lib-asio/<link>static
-    <boost.beast.separate-compilation>on:<library>/boost/beast//lib-beast/<link>static
+    <library>/boost/beast/build//lib-asio/<link>static
+    <boost.beast.separate-compilation>on:<library>/boost/beast/build//lib-beast/<link>static
     <library>/boost/filesystem//boost_filesystem/<link>static
     <library>/boost/context//boost_context/<link>static
     <address-sanitizer>norecover:<context-impl>ucontext

diff --git a/test/beast/Jamfile b/test/beast/Jamfile
@@ -10,7 +10,7 @@
 alias run-tests :
     [ compile core.cpp ]
     [ compile http.cpp ]
-    [ compile ssl.cpp /boost/beast//lib-asio-ssl ]
+    [ compile ssl.cpp /boost/beast/build//lib-asio-ssl ]
     [ compile version.cpp ]
     [ compile websocket.cpp ]
     [ compile zlib.cpp ]

diff --git a/test/beast/_experimental/Jamfile b/test/beast/_experimental/Jamfile
@@ -19,7 +19,7 @@ local RUN_TESTS ;
 for local f in $(SOURCES)
 {
     RUN_TESTS += [ run $(f)
-        /boost/beast//lib-asio-ssl
+        /boost/beast/build//lib-asio-ssl
         /boost/beast/test//lib-test
     ] ;
 }
@@ -28,14 +28,14 @@ alias run-tests : $(RUN_TESTS) ;
 
 exe fat-tests :
     $(SOURCES)
-    /boost/beast//lib-asio-ssl
+    /boost/beast/build//lib-asio-ssl
     /boost/beast/test//lib-test
     ;
 
 explicit fat-tests ;
 
 run $(SOURCES)
-    /boost/beast//lib-asio-ssl
+    /boost/beast/build//lib-asio-ssl
     /boost/beast/test//lib-test
     : : : : run-fat-tests ;
 

diff --git a/test/beast/ssl/Jamfile b/test/beast/ssl/Jamfile
@@ -16,7 +16,7 @@ local RUN_TESTS ;
 for local f in $(SOURCES)
 {
     RUN_TESTS += [ run $(f)
-        /boost/beast//lib-asio-ssl
+        /boost/beast/build//lib-asio-ssl
         /boost/beast/test//lib-test
     ] ;
 }
@@ -26,14 +26,14 @@ alias run-tests : $(RUN_TESTS) ;
 exe fat-tests
     :
     $(SOURCES)
-    /boost/beast//lib-asio-ssl
+    /boost/beast/build//lib-asio-ssl
     /boost/beast/test//lib-test
     ;
 
 explicit fat-tests ;
 
 run $(SOURCES)
-    /boost/beast//lib-asio-ssl
+    /boost/beast/build//lib-asio-ssl
     /boost/beast/test//lib-test
     : : : : run-fat-tests ;