diff options
| -rw-r--r-- | libfusepp/Jamfile.jam | 5 | ||||
| -rw-r--r-- | libfusepp/fuseAppBase.cpp (renamed from libfusepp/fuseapp.cpp) | 2 | ||||
| -rw-r--r-- | libfusepp/fuseAppBase.h (renamed from libfusepp/fuseapp.h) | 0 | ||||
| -rw-r--r-- | netfs/Jamfile.jam | 1 | ||||
| -rw-r--r-- | netfs/fuse/Jamfile.jam | 22 | ||||
| -rw-r--r-- | netfs/fuse/fuseApp.cpp (renamed from netfs/fuse/fuse.cpp) | 8 | ||||
| -rw-r--r-- | netfs/fuse/fuseApp.h (renamed from netfs/fuse/fuse.h) | 2 | ||||
| -rw-r--r-- | netfs/fuse/fuseDirs.cpp | 2 | ||||
| -rw-r--r-- | netfs/fuse/fuseFiles.cpp | 2 | ||||
| -rw-r--r-- | netfs/fuse/fuseMisc.cpp | 2 | ||||
| -rw-r--r-- | netfs/fuse/fuseSystem.cpp | 2 | ||||
| -rw-r--r-- | netfs/fuse/netfs.cpp | 8 | ||||
| -rw-r--r-- | netfs/fuse/pch.hpp | 4 |
13 files changed, 34 insertions, 26 deletions
diff --git a/libfusepp/Jamfile.jam b/libfusepp/Jamfile.jam deleted file mode 100644 index 1ba4a26..0000000 --- a/libfusepp/Jamfile.jam +++ /dev/null @@ -1,5 +0,0 @@ -project - : usage-requirements - <include>. - ; - diff --git a/libfusepp/fuseapp.cpp b/libfusepp/fuseAppBase.cpp index 1a6494a..4d9ca97 100644 --- a/libfusepp/fuseapp.cpp +++ b/libfusepp/fuseAppBase.cpp @@ -1,4 +1,4 @@ -#include "fuseapp.h" +#include "fuseAppBase.h" #include <errno.h> #include <assert.h> #include <stdio.h> diff --git a/libfusepp/fuseapp.h b/libfusepp/fuseAppBase.h index a320d36..a320d36 100644 --- a/libfusepp/fuseapp.h +++ b/libfusepp/fuseAppBase.h diff --git a/netfs/Jamfile.jam b/netfs/Jamfile.jam index dd8865e..70cd2d9 100644 --- a/netfs/Jamfile.jam +++ b/netfs/Jamfile.jam @@ -13,7 +13,6 @@ lib Ice : : <name>Ice ; lib IceUtil : : <name>IceUtil ; lib IceBox : : <name>IceBox ; lib pthread : : <name>pthread ; -lib fuse : : <name>fuse ; lib slicer : : : : <include>/usr/include/slicer ; lib slicer-xml : : : : <include>/usr/include/slicer ; diff --git a/netfs/fuse/Jamfile.jam b/netfs/fuse/Jamfile.jam index e7558f6..acf757d 100644 --- a/netfs/fuse/Jamfile.jam +++ b/netfs/fuse/Jamfile.jam @@ -1,3 +1,4 @@ +lib fuse : : <name>fuse ; cpp-pch pch : pch.hpp : <define>_FILE_OFFSET_BITS=64 @@ -6,7 +7,7 @@ cpp-pch pch : pch.hpp : <implicit-dependency>../ice//netfsComms <library>../ice//netfsComms <library>..//boost_thread - <library>..//fuse + <library>fuse <library>..//Ice ; @@ -25,10 +26,10 @@ obj configuration : <library>..//slicer ; -exe netfs : +lib netfsClient : pch configuration - [ glob *.cpp ] + [ glob *.cpp : netfs.cpp ] [ glob ../../libfusepp/fuse*.cpp ] : <define>_FILE_OFFSET_BITS=64 @@ -40,12 +41,25 @@ exe netfs : <library>../lib//netfsCommon <library>..//boost_thread <library>..//boost_system - <library>..//fuse + <library>fuse <library>..//Ice <library>..//IceUtil <library>..//pthread <library>..//slicer <library>..//libxmlpp <library>..//slicer-xml + : : + <include>. + <include>../../libfusepp + <library>../ice//netfsComms + <implicit-dependency>../ice//netfsComms + <implicit-dependency>configuration + <define>_FILE_OFFSET_BITS=64 + <library>fuse + ; + +exe netfs : + netfs.cpp : + <library>netfsClient ; diff --git a/netfs/fuse/fuse.cpp b/netfs/fuse/fuseApp.cpp index 7f90710..841d670 100644 --- a/netfs/fuse/fuse.cpp +++ b/netfs/fuse/fuseApp.cpp @@ -1,6 +1,6 @@ #include "pch.hpp" #include <string.h> -#include "fuse.h" +#include "fuseApp.h" #include "lockHelpers.h" #include "cache.impl.h" #include <entCache.h> @@ -168,9 +168,3 @@ NetFS::FuseApp::reqEnv() return { UserEntCache::instance.getName(c->uid), GroupEntCache::instance.getName(c->gid) }; } -int -main(int argc, char* argv[]) -{ - return FuseAppBase::run(argc, argv, new NetFS::FuseApp(argc, argv)); -} - diff --git a/netfs/fuse/fuse.h b/netfs/fuse/fuseApp.h index 3821285..f438910 100644 --- a/netfs/fuse/fuse.h +++ b/netfs/fuse/fuseApp.h @@ -4,7 +4,7 @@ #include <boost/thread/shared_mutex.hpp> #include <Ice/Ice.h> #include <service.h> -#include "fuseapp.h" +#include "fuseAppBase.h" #include "configuration.h" #include "cache.h" diff --git a/netfs/fuse/fuseDirs.cpp b/netfs/fuse/fuseDirs.cpp index 75cb5a5..ad3d017 100644 --- a/netfs/fuse/fuseDirs.cpp +++ b/netfs/fuse/fuseDirs.cpp @@ -1,5 +1,5 @@ #include "pch.hpp" -#include "fuse.h" +#include "fuseApp.h" #include "misc.h" #include "lockHelpers.h" #include <typeConvert.h> diff --git a/netfs/fuse/fuseFiles.cpp b/netfs/fuse/fuseFiles.cpp index 9ce260c..b6cf8db 100644 --- a/netfs/fuse/fuseFiles.cpp +++ b/netfs/fuse/fuseFiles.cpp @@ -1,7 +1,7 @@ #include "pch.hpp" #include <string.h> #include <typeConvert.h> -#include "fuse.h" +#include "fuseApp.h" #include "lockHelpers.h" #include <entCache.h> diff --git a/netfs/fuse/fuseMisc.cpp b/netfs/fuse/fuseMisc.cpp index 0e366be..f6c5976 100644 --- a/netfs/fuse/fuseMisc.cpp +++ b/netfs/fuse/fuseMisc.cpp @@ -1,5 +1,5 @@ #include "pch.hpp" -#include "fuse.h" +#include "fuseApp.h" #include <string.h> #include <typeConvert.h> #include <entCache.h> diff --git a/netfs/fuse/fuseSystem.cpp b/netfs/fuse/fuseSystem.cpp index 0b29d86..36c6af5 100644 --- a/netfs/fuse/fuseSystem.cpp +++ b/netfs/fuse/fuseSystem.cpp @@ -1,6 +1,6 @@ #include "pch.hpp" #include <typeConvert.h> -#include "fuse.h" +#include "fuseApp.h" int NetFS::FuseApp::statfs(const char * p, struct statvfs * vfs) diff --git a/netfs/fuse/netfs.cpp b/netfs/fuse/netfs.cpp new file mode 100644 index 0000000..de89660 --- /dev/null +++ b/netfs/fuse/netfs.cpp @@ -0,0 +1,8 @@ +#include "fuseApp.h" + +int +main(int argc, char* argv[]) +{ + return FuseAppBase::run(argc, argv, new NetFS::FuseApp(argc, argv)); +} + diff --git a/netfs/fuse/pch.hpp b/netfs/fuse/pch.hpp index 7cb79ed..b2a0908 100644 --- a/netfs/fuse/pch.hpp +++ b/netfs/fuse/pch.hpp @@ -3,11 +3,9 @@ #define NETFS_FUSE_PCH #include "../lib/pch.hpp" -#include "../../libfusepp/fuseapp.h" +#include "../../libfusepp/fuseAppBase.h" #include <fuse.h> #endif #endif - - |