summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2014-09-11 19:16:30 +0000
committerrandomdan <randomdan@localhost>2014-09-11 19:16:30 +0000
commit78ca990b9fb6df444c2b5f60ab1b0ec5b634356a (patch)
tree5d97c1cdc78d635d3371db88554f9ddc670f6fde
parentSlice configuration for client (diff)
downloadnetfs-78ca990b9fb6df444c2b5f60ab1b0ec5b634356a.tar.bz2
netfs-78ca990b9fb6df444c2b5f60ab1b0ec5b634356a.tar.xz
netfs-78ca990b9fb6df444c2b5f60ab1b0ec5b634356a.zip
Match the new Slicer interface
-rw-r--r--netfs/Jamfile.jam6
-rw-r--r--netfs/daemon/Jamfile.jam1
-rw-r--r--netfs/daemon/daemon.cpp2
-rw-r--r--netfs/fuse/Jamfile.jam1
-rw-r--r--netfs/fuse/fuse.cpp2
5 files changed, 7 insertions, 5 deletions
diff --git a/netfs/Jamfile.jam b/netfs/Jamfile.jam
index ec53ba6..d006225 100644
--- a/netfs/Jamfile.jam
+++ b/netfs/Jamfile.jam
@@ -1,8 +1,8 @@
import package ;
-alias libxml2 : : : :
- <cflags>"`pkg-config --cflags libxml-2.0`"
- <linkflags>"`pkg-config --libs libxml-2.0`" ;
+alias libxmlpp : : : :
+ <cflags>"`pkg-config --cflags libxml++-2.6`"
+ <linkflags>"`pkg-config --libs libxml++-2.6`" ;
lib boost_regex : : <name>boost_regex ;
lib boost_filesystem : : <name>boost_filesystem ;
diff --git a/netfs/daemon/Jamfile.jam b/netfs/daemon/Jamfile.jam
index 766c9a5..fd8c463 100644
--- a/netfs/daemon/Jamfile.jam
+++ b/netfs/daemon/Jamfile.jam
@@ -48,6 +48,7 @@ lib netfsd :
<library>..//Ice
<library>..//IceUtil
<library>..//IceBox
+ <library>..//libxmlpp
<library>slicer-xml
;
diff --git a/netfs/daemon/daemon.cpp b/netfs/daemon/daemon.cpp
index 13ccab7..14dd26b 100644
--- a/netfs/daemon/daemon.cpp
+++ b/netfs/daemon/daemon.cpp
@@ -34,7 +34,7 @@ void
NetFSDaemon::LoadConfiguration(const boost::filesystem::path & path)
{
dc = new NetFS::Daemon::RuntimeConfiguration();
- dc->CurrentConfiguration = Slicer::Deserialize<Slicer::Xml, NetFS::Daemon::Configuration>(path);
+ dc->CurrentConfiguration = Slicer::Deserialize<Slicer::XmlFile, NetFS::Daemon::Configuration>(path);
auto selfItr = dc->CurrentConfiguration->Hosts.find(hostname());
if (selfItr == dc->CurrentConfiguration->Hosts.end()) {
throw std::runtime_error("This host is not defined in the configuration.");
diff --git a/netfs/fuse/Jamfile.jam b/netfs/fuse/Jamfile.jam
index 8814a9d..8223aa7 100644
--- a/netfs/fuse/Jamfile.jam
+++ b/netfs/fuse/Jamfile.jam
@@ -47,6 +47,7 @@ exe netfs :
<library>..//IceUtil
<library>..//pthread
<library>slicer
+ <library>..//libxmlpp
<library>slicer-xml
;
diff --git a/netfs/fuse/fuse.cpp b/netfs/fuse/fuse.cpp
index c0aca45..ac0d0d7 100644
--- a/netfs/fuse/fuse.cpp
+++ b/netfs/fuse/fuse.cpp
@@ -37,7 +37,7 @@ void *
NetFS::FuseApp::init(struct fuse_conn_info *)
{
ic = Ice::initialize(_argc, _argv);
- fc = Slicer::Deserialize<Slicer::Xml, NetFS::Client::Configuration>(configPath);
+ fc = Slicer::Deserialize<Slicer::XmlFile, NetFS::Client::Configuration>(configPath);
return NULL;
}