From 7ddb134eed67e1490db8752e5f66daedb6ca3482 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 19 Oct 2019 15:37:38 +0100
Subject: Refactor to ease testing

---
 Jamroot.jam                      | 17 ++---------------
 libmysqlpp/Jamfile.jam           | 30 ++++++++++++++++++++++++------
 libmysqlpp/unittests/Jamfile.jam |  3 ++-
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/Jamroot.jam b/Jamroot.jam
index 6886519..0b23636 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -1,25 +1,12 @@
 import os ;
+import feature : feature ;
 
 using gcc : : [ os.environ CXX ] ;
 using pkg-config ;
-import pkg-config ;
 
 variant coverage : debug ;
 
-project
-  : requirements
-			<cxxstd>17
-			<visibility>hidden
-      <linkflags>"-Wl,-z,defs,--warn-once,--gc-sections"
-      <variant>release:<cxxflags>"-flto=2"
-      <variant>release:<linkflags>"-flto=2"
-			<variant>debug:<warnings>extra
-			<variant>debug:<warnings-as-errors>on
-			<variant>coverage:<coverage>on
-	;
+feature local-dbppcore : no ;
 
 build-project libmysqlpp ;
 
-pkg-config.import glibmm : : <name>glibmm-2.4 ;
-pkg-config.import mysqlclient ;
-
diff --git a/libmysqlpp/Jamfile.jam b/libmysqlpp/Jamfile.jam
index 486f77b..6a558fa 100644
--- a/libmysqlpp/Jamfile.jam
+++ b/libmysqlpp/Jamfile.jam
@@ -1,21 +1,39 @@
 import package ;
+import pkg-config ;
 
 lib adhocutil : : : : <include>/usr/include/adhocutil ;
 lib dbppcore : : : : <include>/usr/include/dbpp ;
 lib boost_date_time ;
 
+pkg-config.import glibmm : : <name>glibmm-2.4 ;
+pkg-config.import mysqlclient ;
+
+project
+  : requirements
+			<cxxstd>17
+			<visibility>hidden
+      <linkflags>"-Wl,-z,defs,--warn-once,--gc-sections"
+      <variant>release:<cxxflags>"-flto=2"
+      <variant>release:<linkflags>"-flto=2"
+			<variant>debug:<warnings>extra
+			<variant>debug:<warnings-as-errors>on
+			<variant>coverage:<coverage>on
+	;
+
 lib dbpp-mysql :
 	[ glob my-*.cpp ] :
-	<library>..//glibmm
-	<library>..//mysqlclient
-	<library>dbppcore
+	<library>glibmm
+	<library>mysqlclient
+	<local-dbppcore>yes:<library>../..//dbppcore
+	<local-dbppcore>no:<library>dbppcore
 	<library>adhocutil
 	<library>boost_date_time
 	: :
 	<include>.
-	<library>..//mysqlclient
-	<library>..//glibmm
-	<library>dbppcore
+	<library>mysqlclient
+	<library>glibmm
+	<local-dbppcore>yes:<library>../..//dbppcore
+	<local-dbppcore>no:<library>dbppcore
 	;
 
 build-project unittests ;
diff --git a/libmysqlpp/unittests/Jamfile.jam b/libmysqlpp/unittests/Jamfile.jam
index 8752f86..2884e82 100644
--- a/libmysqlpp/unittests/Jamfile.jam
+++ b/libmysqlpp/unittests/Jamfile.jam
@@ -12,7 +12,8 @@ run
 	<define>ROOT=\"$(me)\"
 	<define>BOOST_TEST_DYN_LINK
 	<library>..//dbpp-mysql
-	<library>dbpptestcore
+	<local-dbppcore>yes:<library>../../..//dbpptestcore
+	<local-dbppcore>no:<library>dbpptestcore
 	<library>..//adhocutil
 	<library>boost_utf
 	<library>stdc++fs
-- 
cgit v1.2.3