Remove the irksome notifications library, build everything into the service itself

10 files changed, 31 insertions, 53 deletions

diff --git a/gentoobrowse-api/service/Jamfile.jam b/gentoobrowse-api/service/Jamfile.jam
index d1b4833..89b28ab 100644
--- a/gentoobrowse-api/service/Jamfile.jam
+++ b/gentoobrowse-api/service/Jamfile.jam
@@ -1,23 +1,45 @@
 import icetray ;
+import type : register ;
+import generators : register-standard ;
+
+type.register XSLT : xslt ;
+
+generators.register-standard xslt.c : XSLT : C H ;
+
+actions xslt.c
+{
+	echo "extern unsigned char $(2:B)_xslt[];" > $(1[2])
+	echo "extern unsigned int $(2:B)_xslt_len;" >> $(1[2])
+	( cd $(2:D) ; xxd -i $(2:B)$(2:S) ) > $(1[1])
+}
+
+IMPORT $(__name__) : xslt.c : : xslt.c ;
 
 lib icetray : : : : <include>/usr/include/icetray ;
 lib git2 ;
+lib exslt ;
+lib xslt : : : : <include>/usr/include/libxslt ;
+lib slicer-xml ;
+lib esmtp ;
 
 lib gentoobrowse-service :
-	[ glob-tree *.cpp : bin notifications ]
+	[ glob-tree *.cpp : bin ]
+	[ glob-tree *.xslt ]
 	[ glob-tree *.sql ]
+	[ glob-tree *.ice ]
 	:
 	<library>..//adhocutil
-	<library>notifications
 	<library>icetray
 	<library>git2
+	<library>xslt
+	<library>exslt
+	<library>esmtp
 	<library>..//dbppcore
 	<library>..//IceBox
 	<library>..//slicer
 	<library>..//slicer-db
+	<library>slicer-xml
 	<library>../api//gentoobrowse-api
-	<library>notifications//gentoobrowse-service-notifications
-	<implicit-dependency>notifications//gentoobrowse-service-notifications
 	<implicit-dependency>../api//gentoobrowse-api
 	<library>..//boost_system
 	<library>..//boost_thread
@@ -32,8 +54,6 @@ lib gentoobrowse-service :
 	: :
 	<include>.
 	<implicit-dependency>../api//gentoobrowse-api
-	<library>notifications//gentoobrowse-service-notifications
-	<implicit-dependency>notifications//gentoobrowse-service-notifications
 	<library>../api//gentoobrowse-api
 	;
 
diff --git a/gentoobrowse-api/service/notifications/mailserverimpl.cpp b/gentoobrowse-api/service/mailserverimpl.cpp
index ccc7180..ccc7180 100644
--- a/gentoobrowse-api/service/notifications/mailserverimpl.cpp
+++ b/gentoobrowse-api/service/mailserverimpl.cpp
diff --git a/gentoobrowse-api/service/notifications/mailserverimpl.h b/gentoobrowse-api/service/mailserverimpl.h
index 23b17c2..23b17c2 100644
--- a/gentoobrowse-api/service/notifications/mailserverimpl.h
+++ b/gentoobrowse-api/service/mailserverimpl.h
diff --git a/gentoobrowse-api/service/notifications/notifications.ice b/gentoobrowse-api/service/notifications.ice
index 4a2673f..4a2673f 100644
--- a/gentoobrowse-api/service/notifications/notifications.ice
+++ b/gentoobrowse-api/service/notifications.ice
diff --git a/gentoobrowse-api/service/notifications/Jamfile.jam b/gentoobrowse-api/service/notifications/Jamfile.jam
deleted file mode 100644
index a168649..0000000
--- a/gentoobrowse-api/service/notifications/Jamfile.jam
+++ /dev/null
@@ -1,44 +0,0 @@
-import type : register ;
-import generators : register-standard ;
-
-type.register XSLT : xslt ;
-
-generators.register-standard xslt.h : XSLT : H ;
-
-h base-xslt : xslt/base.xslt : <slicer>yes ;
-h signup-xslt : xslt/signup.xslt : <slicer>yes ;
-h news-xslt : xslt/news.xslt : <slicer>yes ;
-
-lib exslt ;
-lib xslt : : : : <include>/usr/include/libxslt ;
-lib xml2 : : : : <include>/usr/include/libxml2 ;
-lib esmtp ;
-lib slicer-xml ;
-lib boost_system ;
-
-lib gentoobrowse-service-notifications :
-	[ glob *.ice *.cpp ]
-	:
-	<slicer>yes
-	<library>xslt
-	<library>xml2
-	<library>esmtp
-	<library>../../..//libxmlpp
-	<library>boost_system
-	<library>slicer-xml
-	<library>../../domain//gentoobrowse-domain
-	<implicit-dependency>../../domain//gentoobrowse-domain
-	<dependency>base-xslt
-	<dependency>signup-xslt
-	<dependency>news-xslt
-	: :
-	<include>.
-	;
-
-actions xslt.h
-{
-	( cd $(2:D) ; xxd -i $(2:B)$(2:S) ) > $(1)
-}
-
-IMPORT $(__name__) : xslt.h : : xslt.h ;
-
diff --git a/gentoobrowse-api/service/notifications/notificationsimpl.cpp b/gentoobrowse-api/service/notificationsimpl.cpp
index d7dbee4..270e264 100644
--- a/gentoobrowse-api/service/notifications/notificationsimpl.cpp
+++ b/gentoobrowse-api/service/notificationsimpl.cpp
@@ -1,8 +1,8 @@
 #include "notificationsimpl.h"
 #include <libxml/parser.h>
-#include <base-xslt.h>
-#include <news-xslt.h>
-#include <signup-xslt.h>
+#include <notifications/xslt/base.h>
+#include <notifications/xslt/news.h>
+#include <notifications/xslt/signup.h>
 #include <string.h>
 #include <slicer/slicer.h>
 #include "xsltStreamSerializer.h"
diff --git a/gentoobrowse-api/service/notifications/notificationsimpl.h b/gentoobrowse-api/service/notificationsimpl.h
index 1d3b1fc..1d3b1fc 100644
--- a/gentoobrowse-api/service/notifications/notificationsimpl.h
+++ b/gentoobrowse-api/service/notificationsimpl.h
diff --git a/gentoobrowse-api/service/notifications/xsltStreamSerializer.cpp b/gentoobrowse-api/service/xsltStreamSerializer.cpp
index 5a71b35..5a71b35 100644
--- a/gentoobrowse-api/service/notifications/xsltStreamSerializer.cpp
+++ b/gentoobrowse-api/service/xsltStreamSerializer.cpp
diff --git a/gentoobrowse-api/service/notifications/xsltStreamSerializer.h b/gentoobrowse-api/service/xsltStreamSerializer.h
index 492b954..492b954 100644
--- a/gentoobrowse-api/service/notifications/xsltStreamSerializer.h
+++ b/gentoobrowse-api/service/xsltStreamSerializer.h
diff --git a/gentoobrowse-api/unittests/Jamfile.jam b/gentoobrowse-api/unittests/Jamfile.jam
index 9225210..a53781e 100644
--- a/gentoobrowse-api/unittests/Jamfile.jam
+++ b/gentoobrowse-api/unittests/Jamfile.jam
@@ -30,6 +30,7 @@ lib testCommon :
 	<library>..//IceBox
 	<library>dryice
 	<library>../service//gentoobrowse-service
+	<implicit-dependency>../service//gentoobrowse-service
 	<library>boost_utf
 	: :
 	<library>dbpp-postgresql
@@ -38,6 +39,7 @@ lib testCommon :
 	<library>..//IceBox
 	<library>dryice
 	<library>../service//gentoobrowse-service
+	<implicit-dependency>../service//gentoobrowse-service
 	<library>..//IceUtil
 	<library>..//Ice
 	<library>..//boost_system