diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-10-05 00:57:35 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-10-05 00:57:35 +0100 |
| commit | 979d2c269a67462716b75bc1c2964e71d8c72540 (patch) | |
| tree | eab6c54add80f5e7ae8a571aaf51d7d0d38fef3f | |
| parent | Fix where to find uploaded content type (diff) | |
| download | icespider-979d2c269a67462716b75bc1c2964e71d8c72540.tar.bz2 icespider-979d2c269a67462716b75bc1c2964e71d8c72540.tar.xz icespider-979d2c269a67462716b75bc1c2964e71d8c72540.zip | |
Build slicer bits for http into common
| -rw-r--r-- | icespider/common/Jamfile.jam | 10 | ||||
| -rw-r--r-- | icespider/compile/Jamfile.jam | 6 | ||||
| -rw-r--r-- | icespider/core/Jamfile.jam | 4 | ||||
| -rw-r--r-- | icespider/fcgi/Jamfile.jam | 3 | ||||
| -rw-r--r-- | icespider/unittests/Jamfile.jam | 3 |
5 files changed, 15 insertions, 11 deletions
diff --git a/icespider/common/Jamfile.jam b/icespider/common/Jamfile.jam index 8eceefb..a3acf6b 100644 --- a/icespider/common/Jamfile.jam +++ b/icespider/common/Jamfile.jam @@ -1,13 +1,23 @@ lib adhocutil : : : : <include>/usr/include/adhocutil ; +lib slicer : : : : <include>/usr/include/slicer ; + +cpp http-slicer : + http.ice + : + <slicer>pure + <allow-ice>yes + ; lib icespider-common : [ glob-tree *.ice *.cpp : bin ] + http-slicer : <library>adhocutil <allow-ice>yes <library>..//pthread <library>..//Ice <library>..//IceUtil + <library>slicer : : <library>..//pthread <library>..//Ice diff --git a/icespider/compile/Jamfile.jam b/icespider/compile/Jamfile.jam index 9b07429..986b3c3 100644 --- a/icespider/compile/Jamfile.jam +++ b/icespider/compile/Jamfile.jam @@ -8,7 +8,7 @@ lib Slice ; lib icespider-compile : [ glob-tree *.cpp : bin main.cpp ] - [ glob ../common/*.ice ] + ../common/routes.ice : <slicer>pure <allow-ice>yes @@ -18,7 +18,7 @@ lib icespider-compile : <library>boost_system <library>boost_filesystem <library>Slice - <library>../common + <library>../common//icespider-common <implicit-dependency>../common <library>..//Ice <library>..//IceUtil @@ -26,7 +26,7 @@ lib icespider-compile : : : <library>boost_system <library>boost_filesystem - <library>../common + <library>../common//icespider-common <implicit-dependency>../common ; diff --git a/icespider/core/Jamfile.jam b/icespider/core/Jamfile.jam index 13ecc3d..a0df519 100644 --- a/icespider/core/Jamfile.jam +++ b/icespider/core/Jamfile.jam @@ -6,7 +6,7 @@ lib boost_filesystem ; lib icespider-core : [ glob-tree *.cpp : bin ] : - <library>../common + <library>../common//icespider-common <library>adhocutil <library>slicer <library>boost_system @@ -14,6 +14,6 @@ lib icespider-core : <implicit-dependency>../common : : <include>. - <library>../common + <library>../common//icespider-common <implicit-dependency>../common ; diff --git a/icespider/fcgi/Jamfile.jam b/icespider/fcgi/Jamfile.jam index cf0e7af..c607ed1 100644 --- a/icespider/fcgi/Jamfile.jam +++ b/icespider/fcgi/Jamfile.jam @@ -3,10 +3,7 @@ lib fcgi++ : : <name>fcgi++ ; lib icespider-fcgi : [ glob-tree *.cpp : bin ] - ../common/http.ice : - <slicer>pure - <allow-ice>yes <library>fcgi <library>fcgi++ <library>..//core diff --git a/icespider/unittests/Jamfile.jam b/icespider/unittests/Jamfile.jam index 52e2c25..f5e8f2f 100644 --- a/icespider/unittests/Jamfile.jam +++ b/icespider/unittests/Jamfile.jam @@ -82,11 +82,8 @@ run run testFcgi.cpp ../fcgi/cgiRequestBase.cpp - ../common/http.ice : : : <define>BOOST_TEST_DYN_LINK - <slicer>pure - <allow-ice>yes <library>testCommon <library>../common//icespider-common <library>../core//icespider-core |