diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-01-21 21:21:09 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-01-21 21:21:09 +0000 |
| commit | 88be6e505a74b8e9249b67bc9a83c9b8f0104008 (patch) | |
| tree | 619f07207e05c3f992abbc9c766b323509721e1b | |
| parent | Remove unnecessary captures (diff) | |
| download | slicer-1.8.2.tar.bz2 slicer-1.8.2.tar.xz slicer-1.8.2.zip | |
Refactor jams to fix folder specific build quirksslicer-1.8.2
| -rw-r--r-- | slicer/db/Jamfile.jam | 1 | ||||
| -rw-r--r-- | slicer/test/Jamfile.jam | 17 | ||||
| -rw-r--r-- | slicer/test/slicer.jam | 17 |
3 files changed, 19 insertions, 16 deletions
diff --git a/slicer/db/Jamfile.jam b/slicer/db/Jamfile.jam index 47cf092..8d8b803 100644 --- a/slicer/db/Jamfile.jam +++ b/slicer/db/Jamfile.jam @@ -1,5 +1,6 @@ import testing ; import package ; +import ../test/slicer.jam ; lib dbppcore : : : : <include>/usr/include/dbpp ; lib dbpp-postgresql : : : : <include>/usr/include/dbpp-postgresql ; diff --git a/slicer/test/Jamfile.jam b/slicer/test/Jamfile.jam index 45558d3..edb1099 100644 --- a/slicer/test/Jamfile.jam +++ b/slicer/test/Jamfile.jam @@ -1,8 +1,5 @@ import testing ; -import generators ; -import type ; -import feature ; -import toolset ; +import ./slicer.jam ; lib dl ; lib pthread ; @@ -12,18 +9,6 @@ lib boost_date_time ; lib boost_utf : : <name>boost_unit_test_framework ; lib adhocutil : : : : <include>/usr/include/adhocutil ; -generators.register-standard $(__name__).slicer : SLICE : CPP CPP(slicer-%) H : <slicer>yes ; -generators.override $(__name__).slicer : slice.slicer ; -feature.feature slicerbin : : free dependency ; -toolset.flags slicer SLICERBIN <slicerbin> ; -toolset.flags slicer INCLUDES <include> ; - -actions slicer bind SLICERBIN -{ - slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) --dll-export JAM_DLL_PUBLIC - "$(SLICERBIN)" -I"$(INCLUDES)" $(2) $(1[2]) --headerPrefix="\"\"" -} - lib types : [ glob *.ice ] conversions.cpp diff --git a/slicer/test/slicer.jam b/slicer/test/slicer.jam new file mode 100644 index 0000000..4d92101 --- /dev/null +++ b/slicer/test/slicer.jam @@ -0,0 +1,17 @@ +import generators ; +import type ; +import feature ; +import toolset ; + +generators.register-standard $(__name__).slicer : SLICE : CPP CPP(slicer-%) H : <slicer>yes ; +generators.override $(__name__).slicer : slice.slicer ; +feature.feature slicerbin : : free dependency ; +toolset.flags slicer SLICERBIN <slicerbin> ; +toolset.flags slicer INCLUDES <include> ; + +actions slicer bind SLICERBIN +{ + slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) --dll-export JAM_DLL_PUBLIC + "$(SLICERBIN)" -I"$(INCLUDES)" $(2) $(1[2]) --headerPrefix="\"\"" +} + |