summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Jamroot.jam1
-rw-r--r--service/Jamfile.jam43
-rw-r--r--site/Jamfile.jam5
3 files changed, 40 insertions, 9 deletions
diff --git a/Jamroot.jam b/Jamroot.jam
index bd9f1d7..09a140e 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -24,7 +24,6 @@ build-project site ;
lib adhocutil : : : : <include>/usr/include/adhocutil ;
lib slicer : : : : <include>/usr/include/slicer ;
lib slicer-db : : : : <include>/usr/include/slicer ;
-lib netfs-api : : : : <include>/usr/include/netfs ;
lib icetray : : : : <include>/usr/include/icetray ;
lib dbppcore : : : : <include>/usr/include/dbpp ;
lib Ice ;
diff --git a/service/Jamfile.jam b/service/Jamfile.jam
index 8f15002..7c0026c 100644
--- a/service/Jamfile.jam
+++ b/service/Jamfile.jam
@@ -7,10 +7,40 @@ lib dbpp-postgresql : : : : <include>/usr/include/dbpp-postgresql ;
lib dryice : : : : <include>/usr/include/icetray ;
lib curl ;
-lib mirrorsearch :
- [ glob *.cpp *.ice sql/*.sql : test.cpp ]
+lib mirrorsearch-domain :
+ models.ice
:
<slicer>yes
+ <library>..//Ice
+ <library>..//IceUtil
+ <library>..//pthread
+ <library>..//slicer
+ <library>..//adhocutil
+ : :
+ <include>.
+ ;
+
+lib mirrorsearch-api :
+ api.ice
+ :
+ <slicer>yes
+ <library>..//Ice
+ <library>..//IceUtil
+ <library>..//pthread
+ <library>..//slicer
+ <library>mirrorsearch-domain
+ <implicit-dependency>mirrorsearch-domain
+ : :
+ <library>mirrorsearch-domain
+ <implicit-dependency>mirrorsearch-domain
+ ;
+
+lib mirrorsearch-service :
+ [ glob *.cpp sql/*.sql : test.cpp ]
+ :
+ <library>mirrorsearch-domain
+ <library>mirrorsearch-api
+ <implicit-dependency>mirrorsearch-api
<library>curl
<library>..//adhocutil
<library>..//dbppcore
@@ -32,6 +62,8 @@ lib mirrorsearch :
: :
<include>.
<library>..//icetray
+ <library>mirrorsearch-api
+ <implicit-dependency>mirrorsearch-api
;
path-constant me : . ;
@@ -51,16 +83,15 @@ run test.cpp
<library>..//adhocutil
<library>..//boost_system
<library>..//boost_filesystem
- <library>..//netfs-api
<library>..//IceUtil
<library>..//Ice
<library>..//IceBox
<library>..//pthread
<library>dryice
- <library>mirrorsearch
- <implicit-dependency>mirrorsearch
+ <library>mirrorsearch-service
+ <implicit-dependency>mirrorsearch-service
;
-package.install install : : : mirrorsearch ;
+package.install install : : : mirrorsearch-service ;
diff --git a/site/Jamfile.jam b/site/Jamfile.jam
index 9f9f9fc..7bdba93 100644
--- a/site/Jamfile.jam
+++ b/site/Jamfile.jam
@@ -37,8 +37,8 @@ alias mirrorsearchsite :
:
<slicer>yes
: :
- <library>../service//mirrorsearch
- <implicit-dependency>../service//mirrorsearch
+ <library>../service//mirrorsearch-api
+ <implicit-dependency>../service//mirrorsearch-api
<library>icespider
<library>slicer-json
<include>.
@@ -69,5 +69,6 @@ run
<library>boost_filesystem
<library>icespider-testing
<library>boost_unit_test_framework
+ <library>../service//mirrorsearch-service
: testmirrorsearchsite ;