From 8eb093161aeebac0273b8d12b005aa6c73fe3850 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 27 Jul 2023 02:22:58 +0100
Subject: Restructure FCGI libs

* build requests code into a static library
* linked into icespider-fcgi, testFcgi and testPerf, remove duplications
* only run testPerf for profile variant, but always build it
---
 icespider/core/Jamfile.jam      |  4 ++--
 icespider/fcgi/Jamfile.jam      | 34 +++++++++++++++++++++++-----------
 icespider/unittests/Jamfile.jam | 29 ++++++++++++++++++-----------
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/icespider/core/Jamfile.jam b/icespider/core/Jamfile.jam
index 7b7bd19..0654c78 100644
--- a/icespider/core/Jamfile.jam
+++ b/icespider/core/Jamfile.jam
@@ -13,11 +13,11 @@ lib icespider-core :
 	<library>adhocutil
 	<library>slicer
 	<library>stdc++fs
-	<implicit-dependency>../common
+	<implicit-dependency>../common//icespider-common
 	<implicit-dependency>routeOptions
 	: :
 	<include>.
 	<library>../common//icespider-common
-	<implicit-dependency>../common
+	<implicit-dependency>../common//icespider-common
 	<implicit-dependency>routeOptions
 	;
diff --git a/icespider/fcgi/Jamfile.jam b/icespider/fcgi/Jamfile.jam
index 47c10fa..7788767 100644
--- a/icespider/fcgi/Jamfile.jam
+++ b/icespider/fcgi/Jamfile.jam
@@ -1,16 +1,28 @@
-lib slicer ;
-lib fcgi : : <name>fcgi ;
-lib fcgi++ : : <name>fcgi++ ;
+lib slicer : : <link>shared ;
+lib fcgi : : <link>shared ;
+lib fcgi++ : : <link>shared ;
 
-lib icespider-fcgi :
-	[ glob-tree *.cpp : bin ]
+lib icespider-fcgi-reqs :
+	[ glob *Request*.cpp ]
 	:
-	<library>slicer
+	<link>static
+	<cxxflags>-fPIC
+	<implicit-dependency>../core//icespider-core/<link>shared
+	<use>..//core/<link>shared
+	<use>fcgi
+	<use>fcgi++
+	<use>slicer
+	: :
+	<include>.
+	<implicit-dependency>../core//icespider-core/<link>shared
+	<library>..//core//icespider-core/<link>shared
 	<library>fcgi
 	<library>fcgi++
-	<library>..//core//icespider-core
-	<implicit-dependency>../core//icespider-core
-	: :
-	<library>..//core//icespider-core
-	<implicit-dependency>../core//icespider-core
+	<library>slicer
+	;
+
+lib icespider-fcgi :
+	main.cpp
+	:
+	<library>icespider-fcgi-reqs
 	;
diff --git a/icespider/unittests/Jamfile.jam b/icespider/unittests/Jamfile.jam
index 16cb1e6..68c3852 100644
--- a/icespider/unittests/Jamfile.jam
+++ b/icespider/unittests/Jamfile.jam
@@ -101,23 +101,31 @@ run
 	<include>.
 	: testApp ;
 
-explicit testPerf ;
 run
-	testPerf.cpp
-	../fcgi/cgiRequestBase.cpp
+	[ obj testPerf : testPerf.cpp :
+		<slicer>pure
+		<define>ROOT=\"$(me)\"
+		<implicit-dependency>../core//icespider-core
+		<implicit-dependency>test-fcgi
+		<use>benchmark
+		<use>../common//icespider-common
+		<use>../core//icespider-core
+		<use>../fcgi//icespider-fcgi-reqs
+		<use>stdc++fs
+		<use>slicer
+		<use>slicer-json
+		<use>adhocutil
+	]
 	: : :
-	<slicer>pure
 	<library>benchmark
-	<define>ROOT=\"$(me)\"
-	<library>../common//icespider-common
 	<library>../core//icespider-core
-	<implicit-dependency>../core//icespider-core
-	<implicit-dependency>test-fcgi
+	<library>../fcgi//icespider-fcgi-reqs
 	<library>stdc++fs
 	<library>slicer
 	<library>slicer-json
 	<library>adhocutil
-	<include>../fcgi
+	<variant>profile:<testing.execute>on
+	<testing.execute>off
 	: testPerf ;
 
 obj test-fcgi : test-fcgi.ice : <toolset>tidy:<checker>none ;
@@ -131,19 +139,18 @@ run
 		<implicit-dependency>test-fcgi
 		<toolset>tidy:<checker>none ]
 	test-fcgi
-	../fcgi/cgiRequestBase.cpp
 	: : :
 	<define>BOOST_TEST_DYN_LINK
 	<library>testCommon
 	<library>../common//icespider-common
 	<library>../core//icespider-core
+	<library>../fcgi//icespider-fcgi-reqs
 	<implicit-dependency>../core//icespider-core
 	<implicit-dependency>test-fcgi
 	<library>stdc++fs
 	<library>slicer
 	<library>slicer-json
 	<library>adhocutil
-	<include>../fcgi
 	: testFcgi ;
 
 run
-- 
cgit v1.2.3