From bd813abc7002e8268b3e3b907ef4a27d9f9a0dc7 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 25 Apr 2020 14:02:27 +0100
Subject: Modernize and tidy

---
 Jamroot.jam | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'Jamroot.jam')

diff --git a/Jamroot.jam b/Jamroot.jam
index c332369..9f35c7f 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -12,22 +12,37 @@ project
 			<define>ICE_CPP11_MAPPING
 			<cxxstd>17
 			<visibility>hidden
-      <linkflags>"-Wl,-z,defs,--warn-once,--gc-sections"
+			<linkflags>"-Wl,-z,defs,--warn-once,--gc-sections"
 			<variant>release:<cxxflags>"-flto"
 			<toolset>gcc:<variant>release:<cxxflags>"-flto=2"
 			<variant>release:<linkflags>"-flto"
 			<toolset>gcc:<variant>release:<linkflags>"-flto=2"
-      <variant>debug:<warnings>extra
-      <variant>debug:<warnings-as-errors>on
-      <variant>coverage:<coverage>on
+			<variant>debug:<warnings>extra
+			<variant>debug:<warnings-as-errors>on
+			<variant>coverage:<coverage>on
 			<toolset>tidy:<checkxx>boost-*
 			<toolset>tidy:<checkxx>bugprone-*
 			<toolset>tidy:<checkxx>clang-*
 			<toolset>tidy:<checkxx>misc-*
 			<toolset>tidy:<checkxx>modernize-*
+			<toolset>tidy:<xcheckxx>modernize-use-trailing-return-type
 			<toolset>tidy:<checkxx>hicpp-*
 			<toolset>tidy:<checkxx>performance-*
-	;
+			<toolset>tidy:<exclude>test/bin/tidy/debug/classes.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/classtype.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/collections.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/enums.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/inheritance.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/interfaces.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/json.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/locals.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/optionals.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/structs.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/types.h
+			<toolset>tidy:<exclude>test/bin/tidy/debug/xml.h
+			<toolset>tidy:<exclude>slicer/bin/common.h
+			<toolset>tidy:<exclude>xml/bin/tidy/debug/cxxstd-17-iso/xmlExceptions.h
+			;
 
 build-project slicer ;
 
-- 
cgit v1.2.3


From 1c42b48fda9b53e9ac55a9144e3019782c245bd3 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 26 Apr 2020 13:35:04 +0100
Subject: Move test import to root

---
 Jamroot.jam             | 1 +
 slicer/db/Jamfile.jam   | 1 -
 slicer/ice/Jamfile.jam  | 1 -
 slicer/json/Jamfile.jam | 1 -
 slicer/test/Jamfile.jam | 1 -
 slicer/xml/Jamfile.jam  | 1 -
 6 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'Jamroot.jam')

diff --git a/Jamroot.jam b/Jamroot.jam
index 9f35c7f..98e8e4c 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -1,5 +1,6 @@
 import os ;
 import slice ;
+import testing ;
 
 using gcc : : [ os.environ CXX ] ;
 using pkg-config ;
diff --git a/slicer/db/Jamfile.jam b/slicer/db/Jamfile.jam
index 2ea3f05..fcfa4d3 100644
--- a/slicer/db/Jamfile.jam
+++ b/slicer/db/Jamfile.jam
@@ -1,4 +1,3 @@
-import testing ;
 import package ;
 import ../test/slicer.jam ;
 
diff --git a/slicer/ice/Jamfile.jam b/slicer/ice/Jamfile.jam
index 3b9f2b2..fa8aefd 100644
--- a/slicer/ice/Jamfile.jam
+++ b/slicer/ice/Jamfile.jam
@@ -1,4 +1,3 @@
-import testing ;
 import package ;
 
 lib stdc++fs ;
diff --git a/slicer/json/Jamfile.jam b/slicer/json/Jamfile.jam
index 7d7a8ed..7b52b04 100644
--- a/slicer/json/Jamfile.jam
+++ b/slicer/json/Jamfile.jam
@@ -1,4 +1,3 @@
-import testing ;
 import package ;
 
 lib jsonpp : : : :
diff --git a/slicer/test/Jamfile.jam b/slicer/test/Jamfile.jam
index 4c0acbd..d0eecdb 100644
--- a/slicer/test/Jamfile.jam
+++ b/slicer/test/Jamfile.jam
@@ -1,4 +1,3 @@
-import testing ;
 import ./slicer.jam ;
 
 lib dl ;
diff --git a/slicer/xml/Jamfile.jam b/slicer/xml/Jamfile.jam
index 363d68c..c237f93 100644
--- a/slicer/xml/Jamfile.jam
+++ b/slicer/xml/Jamfile.jam
@@ -1,4 +1,3 @@
-import testing ;
 import package ;
 
 lib stdc++fs ;
-- 
cgit v1.2.3