summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-09-22 21:43:30 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2016-09-22 21:43:30 +0100
commit52ff71079f7d96e8d07be03d93637c8d813ad811 (patch)
tree6d53df0f184d04089644efe8cd88fea8027cf558
parentDefine all exceptions as ICE exceptions (diff)
downloadslicer-52ff71079f7d96e8d07be03d93637c8d813ad811.tar.bz2
slicer-52ff71079f7d96e8d07be03d93637c8d813ad811.tar.xz
slicer-52ff71079f7d96e8d07be03d93637c8d813ad811.zip
New install rules
-rw-r--r--slicer/Jamfile.jam13
-rw-r--r--slicer/db/Jamfile.jam8
-rw-r--r--slicer/json/Jamfile.jam4
-rw-r--r--slicer/slicer/Jamfile.jam10
-rw-r--r--slicer/tool/Jamfile.jam6
-rw-r--r--slicer/xml/Jamfile.jam9
6 files changed, 46 insertions, 4 deletions
diff --git a/slicer/Jamfile.jam b/slicer/Jamfile.jam
index 69c914b..3d5a62b 100644
--- a/slicer/Jamfile.jam
+++ b/slicer/Jamfile.jam
@@ -7,7 +7,12 @@ build-project json ;
build-project db ;
build-project test ;
-package.install install : <install-source-root>. : tool//slicer : slicer//slicer : [ glob slicer/*.h ] ;
-package.install install-xml : <install-source-root>. : : xml//slicer-xml : [ glob xml/*.h ] ;
-package.install install-json : <install-source-root>. : : json//slicer-json : [ glob json/*.h ] ;
-package.install install-db : <install-source-root>. : : db//slicer-db : [ glob db/*.h ] ;
+explicit install ;
+explicit install-xml ;
+explicit install-json ;
+explicit install-db ;
+alias install : slicer//install tool//install ;
+alias install-xml : xml//install ;
+alias install-json : json//install ;
+alias install-db : db//install ;
+
diff --git a/slicer/db/Jamfile.jam b/slicer/db/Jamfile.jam
index f73d3f8..9b51b82 100644
--- a/slicer/db/Jamfile.jam
+++ b/slicer/db/Jamfile.jam
@@ -1,4 +1,5 @@
import testing ;
+import package ;
lib dbppcore : : : : <include>/usr/include/dbpp ;
lib dbpp-postgresql : : : : <include>/usr/include/dbpp-postgresql ;
@@ -91,3 +92,10 @@ run testUpdate.cpp
testUpdate
;
+alias install : install-lib install-slice ;
+explicit install ;
+explicit install-lib ;
+explicit install-slice ;
+package.install install-lib : <install-header-subdir>slicer/db : : slicer-db : [ glob-tree *.h ] ;
+package.install-data install-slice : slicer/ice : [ glob *.ice ] ;
+
diff --git a/slicer/json/Jamfile.jam b/slicer/json/Jamfile.jam
index 240942a..34ca153 100644
--- a/slicer/json/Jamfile.jam
+++ b/slicer/json/Jamfile.jam
@@ -1,4 +1,5 @@
import testing ;
+import package ;
lib jsonpp : : : :
<library>../..//glibmm
@@ -39,3 +40,6 @@ run testSpecifics.cpp
testSpecifics
;
+explicit install ;
+package.install install : <install-header-subdir>slicer/json : : slicer-json : [ glob-tree *.h ] ;
+
diff --git a/slicer/slicer/Jamfile.jam b/slicer/slicer/Jamfile.jam
index d6fc70f..dec3934 100644
--- a/slicer/slicer/Jamfile.jam
+++ b/slicer/slicer/Jamfile.jam
@@ -1,3 +1,5 @@
+import package ;
+
lib pthread ;
lib Ice ;
lib IceUtil ;
@@ -21,3 +23,11 @@ lib slicer :
<library>boost_system
<library>boost_filesystem
;
+
+alias install : install-lib install-slice ;
+explicit install ;
+explicit install-lib ;
+explicit install-slice ;
+package.install install-lib : <install-header-subdir>slicer/slicer : : slicer : [ glob-tree *.h ] ;
+package.install-data install-slice : slicer/ice : [ glob *.ice ] ;
+
diff --git a/slicer/tool/Jamfile.jam b/slicer/tool/Jamfile.jam
index 5362382..c5f94a3 100644
--- a/slicer/tool/Jamfile.jam
+++ b/slicer/tool/Jamfile.jam
@@ -1,3 +1,5 @@
+import package ;
+
lib Slice ;
lib Ice ;
lib IceUtil ;
@@ -28,3 +30,7 @@ exe slicer :
<library>slicer-compiler
<library>po
;
+
+explicit install ;
+package.install install : <install-header-subdir>slicer/slicer : slicer : slicer-compiler : [ glob-tree *.h ] ;
+
diff --git a/slicer/xml/Jamfile.jam b/slicer/xml/Jamfile.jam
index 28e8aab..0d170da 100644
--- a/slicer/xml/Jamfile.jam
+++ b/slicer/xml/Jamfile.jam
@@ -1,4 +1,6 @@
import testing ;
+import package ;
+
lib pthread ;
lib Ice ;
lib boost_system ;
@@ -40,3 +42,10 @@ run testSpecifics.cpp
testSpecifics
;
+alias install : install-lib install-slice ;
+explicit install ;
+explicit install-lib ;
+explicit install-slice ;
+package.install install-lib : <install-header-subdir>slicer/xml : : slicer-xml : [ glob-tree *.h ] ;
+package.install-data install-slice : slicer/ice : [ glob *.ice ] ;
+