summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2019-03-19 20:37:05 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2019-03-19 20:37:05 +0000
commit480437a8f80d6ac051abe4d5263dc3dc48f3f340 (patch)
tree61446a8a1da893eccde6f482dbc3b8665cde0a85
parentMore clang tidy fixes (diff)
downloadslicer-480437a8f80d6ac051abe4d5263dc3dc48f3f340.tar.bz2
slicer-480437a8f80d6ac051abe4d5263dc3dc48f3f340.tar.xz
slicer-480437a8f80d6ac051abe4d5263dc3dc48f3f340.zip
Explicitly disable checker for generated code
-rw-r--r--slicer/db/Jamfile.jam20
-rw-r--r--slicer/slicer/Jamfile.jam5
-rw-r--r--slicer/test/Jamfile.jam20
-rw-r--r--slicer/test/included/Jamfile.jam1
-rw-r--r--slicer/test/slicer.jam8
-rw-r--r--slicer/xml/Jamfile.jam5
6 files changed, 52 insertions, 7 deletions
diff --git a/slicer/db/Jamfile.jam b/slicer/db/Jamfile.jam
index 75c53b8..2ea3f05 100644
--- a/slicer/db/Jamfile.jam
+++ b/slicer/db/Jamfile.jam
@@ -6,9 +6,10 @@ lib dbppcore : : : : <include>/usr/include/dbpp ;
lib dbpp-postgresql : : : : <include>/usr/include/dbpp-postgresql ;
lib stdc++fs ;
+obj sqlExceptions : sqlExceptions.ice : <use>../slicer//slicer <toolset>tidy:<checker>none ;
lib slicer-db :
[ glob *.cpp : test*.cpp ]
- [ glob *.ice : test*.ice ]
+ sqlExceptions
:
<include>..
<library>..//Ice
@@ -17,17 +18,28 @@ lib slicer-db :
<library>..//adhocutil
<library>../slicer//slicer
<implicit-dependency>../slicer//slicer
+ <implicit-dependency>sqlExceptions
: :
<library>dbppcore
+ <implicit-dependency>sqlExceptions
;
path-constant me : . ;
+lib dbicetypes :
+ [ glob test*.ice ]
+ :
+ <slicer>no
+ <library>../slicer//slicer
+ <library>../test//icetypes
+ <implicit-dependency>../test//icetypes
+ <toolset>tidy:<checker>none
+ ;
lib testCommon :
[ glob testConversions.cpp testMockCommon.cpp test*.ice ]
:
<dependency>../tool//slicer
- <slicer>yes
+ <slicer>pure
<slicerbin>../tool//slicer
<implicit-dependency>../test//types
<library>../test//types
@@ -35,8 +47,12 @@ lib testCommon :
<library>dbpp-postgresql
<library>dbppcore
<library>..//adhocutil
+ <library>dbicetypes
+ <implicit-dependency>dbicetypes
: :
<library>..//adhocutil
+ <library>dbicetypes
+ <implicit-dependency>dbicetypes
;
run testSelect.cpp
diff --git a/slicer/slicer/Jamfile.jam b/slicer/slicer/Jamfile.jam
index d4ee48e..f1ba4b1 100644
--- a/slicer/slicer/Jamfile.jam
+++ b/slicer/slicer/Jamfile.jam
@@ -2,16 +2,19 @@ import package ;
lib stdc++fs ;
+obj common : common.ice : <toolset>tidy:<checker>none ;
lib slicer :
[ glob *.cpp ]
- [ glob *.ice ]
+ common
:
<library>..//Ice
<library>..//adhocutil
<include>..
+ <implicit-dependency>common
: :
<include>..
<include>.
+ <implicit-dependency>common
<library>stdc++fs
;
diff --git a/slicer/test/Jamfile.jam b/slicer/test/Jamfile.jam
index c5e11d6..c288fc9 100644
--- a/slicer/test/Jamfile.jam
+++ b/slicer/test/Jamfile.jam
@@ -5,23 +5,37 @@ lib dl ;
lib stdc++fs ;
lib boost_date_time ;
+lib icetypes :
+ [ glob *.ice ]
+ :
+ <slicer>no
+ <include>.
+ <implicit-dependency>included//included
+ <library>included//included
+ <toolset>tidy:<checker>none
+ : :
+ <include>.
+ <implicit-dependency>included//included
+ <library>included//included
+ ;
lib types :
[ glob *.ice ]
conversions.cpp
:
<dependency>../tool//slicer
- <slicer>yes
+ <slicer>pure
<slicerbin>../tool//slicer
<include>.
<library>..//adhocutil
<library>boost_date_time
<library>included//included
<library>../slicer//slicer
- <implicit-dependency>included//included
+ <library>icetypes
+ <implicit-dependency>icetypes
<implicit-dependency>../slicer//slicer
: :
<include>.
- <library>included//included
+ <library>icetypes
<library>../slicer//slicer
;
diff --git a/slicer/test/included/Jamfile.jam b/slicer/test/included/Jamfile.jam
index 309b24b..081810a 100644
--- a/slicer/test/included/Jamfile.jam
+++ b/slicer/test/included/Jamfile.jam
@@ -4,6 +4,7 @@ lib included :
included.ice
:
<library>../..//Ice
+ <toolset>tidy:<checker>none
: :
<library>../..//Ice
<include>.
diff --git a/slicer/test/slicer.jam b/slicer/test/slicer.jam
index 8498837..f43d087 100644
--- a/slicer/test/slicer.jam
+++ b/slicer/test/slicer.jam
@@ -5,6 +5,8 @@ import toolset ;
generators.register-standard $(__name__).slicer : SLICE : CPP CPP(slicer-%) H : <slicer>yes ;
generators.override $(__name__).slicer : slice.slicer ;
+generators.register-standard $(__name__).slicer.pure : SLICE : CPP(slicer-%) : <slicer>pure ;
+generators.override $(__name__).slicer.pure : slice.slicer.pure ;
feature.feature slicerbin : : free dependency ;
toolset.flags slicer SLICERBIN <slicerbin> ;
toolset.flags slicer INCLUDES <include> ;
@@ -16,3 +18,9 @@ actions slicer bind SLICERBIN
"$(SLICERBIN)" -I"$(INCLUDES)" $(2) $(1[2]) --headerPrefix="\"\""
}
+actions slicer.pure bind SLICERBIN
+{
+ touch $(1[1])
+ "$(SLICERBIN)" -I"$(INCLUDES)" $(2) $(1[1]) --headerPrefix="\"\""
+}
+
diff --git a/slicer/xml/Jamfile.jam b/slicer/xml/Jamfile.jam
index 17fe209..363d68c 100644
--- a/slicer/xml/Jamfile.jam
+++ b/slicer/xml/Jamfile.jam
@@ -3,9 +3,10 @@ import package ;
lib stdc++fs ;
+obj xmlExceptions : xmlExceptions.ice : <use>../slicer//slicer <toolset>tidy:<checker>none ;
lib slicer-xml :
[ glob *.cpp : test*.cpp ]
- [ glob *.ice ]
+ xmlExceptions
:
<include>..
<library>stdc++fs
@@ -14,9 +15,11 @@ lib slicer-xml :
<library>..//adhocutil
<library>../slicer//slicer
<implicit-dependency>../slicer//slicer
+ <implicit-dependency>xmlExceptions
<toolset>tidy:<xcheckxx>clang-analyzer-optin.cplusplus.VirtualCall
: :
<library>../..//libxmlpp
+ <implicit-dependency>xmlExceptions
;
run testSpecifics.cpp