summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Jamroot.jam16
-rw-r--r--slice.jam11
2 files changed, 18 insertions, 9 deletions
diff --git a/Jamroot.jam b/Jamroot.jam
index a0b4d73..cc16698 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -9,7 +9,7 @@ variant coverage : debug ;
project
: requirements
<variant>release:<cflags>"-std=c++1y"
- <variant>release:<linkflags>"-Wl,-z,defs,--warn-once"
+ <variant>release:<linkflags>"-Wl,-z,defs,--warn-once,--gc-sections"
<variant>debug:<cflags>"-W -Wall -Werror -Wwrite-strings -std=c++1y"
<variant>debug:<linkflags>"-Wl,-z,defs,--warn-once"
<variant>coverage:<cflags>"-W -Wall -Werror -Wwrite-strings -std=c++1y --coverage"
@@ -44,14 +44,14 @@ lib sigc-2.0 ;
alias libxmlpp : : : :
<include>/usr/include/libxml++-2.6
- <include>/usr/lib64/libxml++-2.6/include
+ <include>/usr/lib/libxml++-2.6/include
<include>/usr/include/libxml2
<include>/usr/include/glibmm-2.4
- <include>/usr/lib64/glibmm-2.4/include
+ <include>/usr/lib/glibmm-2.4/include
<include>/usr/include/glib-2.0
- <include>/usr/lib64/glib-2.0/include
+ <include>/usr/lib/glib-2.0/include
<include>/usr/include/sigc++-2.0
- <include>/usr/lib64/sigc++-2.0/include
+ <include>/usr/lib/sigc++-2.0/include
<library>xml++-2.6
<library>xml2
<library>glibmm-2.4
@@ -62,11 +62,11 @@ alias libxmlpp : : : :
alias glibmm : : : :
<include>/usr/include/glibmm-2.4
- <include>/usr/lib64/glibmm-2.4/include
+ <include>/usr/lib/glibmm-2.4/include
<include>/usr/include/glib-2.0
- <include>/usr/lib64/glib-2.0/include
+ <include>/usr/lib/glib-2.0/include
<include>/usr/include/sigc++-2.0
- <include>/usr/lib64/sigc++-2.0/include
+ <include>/usr/lib/sigc++-2.0/include
<library>glibmm-2.4
<library>gobject-2.0
<library>glib-2.0
diff --git a/slice.jam b/slice.jam
index 5534092..bc038c1 100644
--- a/slice.jam
+++ b/slice.jam
@@ -7,7 +7,7 @@ import toolset ;
type.register SLICE : ice ;
-feature slicer : no yes ;
+feature slicer : no yes pure ;
class slice-scanner : common-scanner
{
@@ -23,9 +23,11 @@ type.set-scanner SLICE : slice-scanner ;
generators.register-standard slice.slice2cpp : SLICE : CPP H : <slicer>no ;
generators.register-standard slice.slicer : SLICE : CPP H : <slicer>yes ;
+generators.register-standard slice.slicer.pure : SLICE : CPP : <slicer>pure ;
toolset.flags slice.slice2cpp INCLUDES <include> ;
toolset.flags slice.slicer INCLUDES <include> ;
+toolset.flags slice.slicer.pure INCLUDES <include> ;
actions slice.slice2cpp
{
@@ -38,6 +40,13 @@ actions slice.slicer
slicer -I"$(INCLUDES)" $(2) $(1[1])
}
+actions slice.slicer.pure
+{
+ truncate -c -s 0 $(1[1])
+ slicer -I"$(INCLUDES)" $(2) $(1[1])
+}
+
IMPORT $(__name__) : slice.slice2cpp : : slice.slice2cpp ;
IMPORT $(__name__) : slice.slicer : : slice.slicer ;
+IMPORT $(__name__) : slice.slicer.pure : : slice.slicer.pure ;