summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-06-27 22:30:03 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2016-06-27 22:30:03 +0100
commitd4291caf3c9515eb4bf8d5a1d197deafff00f450 (patch)
tree954602aaffc725ccdba93aecd3bc2a19e61829eb
parentInclude headers (diff)
downloadgentoobrowse-api-d4291caf3c9515eb4bf8d5a1d197deafff00f450.tar.bz2
gentoobrowse-api-d4291caf3c9515eb4bf8d5a1d197deafff00f450.tar.xz
gentoobrowse-api-d4291caf3c9515eb4bf8d5a1d197deafff00f450.zip
Move model support code in domain lib
-rw-r--r--gentoobrowse-api/domain/Jamfile.jam11
-rw-r--r--gentoobrowse-api/domain/converters.cpp (renamed from gentoobrowse-api/service/converters.cpp)1
-rw-r--r--gentoobrowse-api/domain/converters.h (renamed from gentoobrowse-api/service/converters.h)5
-rw-r--r--gentoobrowse-api/domain/unpackPqTextArray.h (renamed from gentoobrowse-api/service/unpackPqTextArray.h)0
-rw-r--r--gentoobrowse-api/domain/unpackPqTextArray.ll (renamed from gentoobrowse-api/service/unpackPqTextArray.ll)0
-rw-r--r--gentoobrowse-api/service/Jamfile.jam4
6 files changed, 16 insertions, 5 deletions
diff --git a/gentoobrowse-api/domain/Jamfile.jam b/gentoobrowse-api/domain/Jamfile.jam
index 1218e03..3fc393b 100644
--- a/gentoobrowse-api/domain/Jamfile.jam
+++ b/gentoobrowse-api/domain/Jamfile.jam
@@ -1,13 +1,22 @@
+import lex ;
+
lib gentoobrowse-domain :
- [ glob *.ice ]
+ [ glob *.ice *.ll *.cpp ]
:
+ <slicer>yes
<library>..//Ice
<library>..//IceUtil
<library>..//pthread
+ <library>..//slicer
+ <library>..//adhocutil
+ <library>..//boost_date_time
+ <include>.
: :
<library>..//Ice
<library>..//IceUtil
<library>..//pthread
+ <library>..//slicer
+ <library>..//adhocutil
<include>.
;
diff --git a/gentoobrowse-api/service/converters.cpp b/gentoobrowse-api/domain/converters.cpp
index e8b19f5..9d0b795 100644
--- a/gentoobrowse-api/service/converters.cpp
+++ b/gentoobrowse-api/domain/converters.cpp
@@ -1,4 +1,5 @@
#include <portage-models.h>
+#include "converters.h"
#include "unpackPqTextArray.h"
#include <string>
#include <boost/algorithm/string/join.hpp>
diff --git a/gentoobrowse-api/service/converters.h b/gentoobrowse-api/domain/converters.h
index 89a7881..5bb9c4b 100644
--- a/gentoobrowse-api/service/converters.h
+++ b/gentoobrowse-api/domain/converters.h
@@ -2,17 +2,22 @@
#define something
#include <portage-models.h>
+#include <visibility.h>
namespace Slicer {
+ DLL_PUBLIC
::Gentoo::StringList
unpackPqTextArray(const std::string & s);
+ DLL_PUBLIC
std::string
packPqTextArray(const ::Gentoo::StringList & l);
+ DLL_PUBLIC
boost::posix_time::ptime
shortDateToPosixTime(const std::string & s);
+ DLL_PUBLIC
std::string
posixTimeToShortDate(const boost::posix_time::ptime & s);
}
diff --git a/gentoobrowse-api/service/unpackPqTextArray.h b/gentoobrowse-api/domain/unpackPqTextArray.h
index 246be71..246be71 100644
--- a/gentoobrowse-api/service/unpackPqTextArray.h
+++ b/gentoobrowse-api/domain/unpackPqTextArray.h
diff --git a/gentoobrowse-api/service/unpackPqTextArray.ll b/gentoobrowse-api/domain/unpackPqTextArray.ll
index e4b0ccd..e4b0ccd 100644
--- a/gentoobrowse-api/service/unpackPqTextArray.ll
+++ b/gentoobrowse-api/domain/unpackPqTextArray.ll
diff --git a/gentoobrowse-api/service/Jamfile.jam b/gentoobrowse-api/service/Jamfile.jam
index 4cb3ce6..a065393 100644
--- a/gentoobrowse-api/service/Jamfile.jam
+++ b/gentoobrowse-api/service/Jamfile.jam
@@ -1,4 +1,3 @@
-import lex ;
import icetray ;
lib icetray : : : : <include>/usr/include/icetray ;
@@ -6,11 +5,8 @@ lib git2 ;
lib gentoobrowse-service :
[ glob-tree *.cpp : bin ]
- [ glob *.ll ]
[ glob-tree *.sql ]
- [ glob ../domain/*.ice ]
:
- <slicer>pure
<library>..//adhocutil
<library>icetray
<library>git2