From 480437a8f80d6ac051abe4d5263dc3dc48f3f340 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 19 Mar 2019 20:37:05 +0000 Subject: Explicitly disable checker for generated code --- slicer/db/Jamfile.jam | 20 ++++++++++++++++++-- slicer/slicer/Jamfile.jam | 5 ++++- slicer/test/Jamfile.jam | 20 +++++++++++++++++--- slicer/test/included/Jamfile.jam | 1 + slicer/test/slicer.jam | 8 ++++++++ slicer/xml/Jamfile.jam | 5 ++++- 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 : : : : /usr/include/dbpp ; lib dbpp-postgresql : : : : /usr/include/dbpp-postgresql ; lib stdc++fs ; +obj sqlExceptions : sqlExceptions.ice : ../slicer//slicer tidy:none ; lib slicer-db : [ glob *.cpp : test*.cpp ] - [ glob *.ice : test*.ice ] + sqlExceptions : .. ..//Ice @@ -17,17 +18,28 @@ lib slicer-db : ..//adhocutil ../slicer//slicer ../slicer//slicer + sqlExceptions : : dbppcore + sqlExceptions ; path-constant me : . ; +lib dbicetypes : + [ glob test*.ice ] + : + no + ../slicer//slicer + ../test//icetypes + ../test//icetypes + tidy:none + ; lib testCommon : [ glob testConversions.cpp testMockCommon.cpp test*.ice ] : ../tool//slicer - yes + pure ../tool//slicer ../test//types ../test//types @@ -35,8 +47,12 @@ lib testCommon : dbpp-postgresql dbppcore ..//adhocutil + dbicetypes + dbicetypes : : ..//adhocutil + dbicetypes + 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 : tidy:none ; lib slicer : [ glob *.cpp ] - [ glob *.ice ] + common : ..//Ice ..//adhocutil .. + common : : .. . + common 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 ] + : + no + . + included//included + included//included + tidy:none + : : + . + included//included + included//included + ; lib types : [ glob *.ice ] conversions.cpp : ../tool//slicer - yes + pure ../tool//slicer . ..//adhocutil boost_date_time included//included ../slicer//slicer - included//included + icetypes + icetypes ../slicer//slicer : : . - included//included + icetypes ../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 : ../..//Ice + tidy:none : : ../..//Ice . 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 : yes ; generators.override $(__name__).slicer : slice.slicer ; +generators.register-standard $(__name__).slicer.pure : SLICE : CPP(slicer-%) : pure ; +generators.override $(__name__).slicer.pure : slice.slicer.pure ; feature.feature slicerbin : : free dependency ; toolset.flags slicer SLICERBIN ; toolset.flags slicer INCLUDES ; @@ -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 : ../slicer//slicer tidy:none ; lib slicer-xml : [ glob *.cpp : test*.cpp ] - [ glob *.ice ] + xmlExceptions : .. stdc++fs @@ -14,9 +15,11 @@ lib slicer-xml : ..//adhocutil ../slicer//slicer ../slicer//slicer + xmlExceptions tidy:clang-analyzer-optin.cplusplus.VirtualCall : : ../..//libxmlpp + xmlExceptions ; run testSpecifics.cpp -- cgit v1.2.3