Move boost/intrusive to senf/boost_intrusive

Fix installation of boost_ext into dev package

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1631 270642c3-0616-0410-b53a-bc976706d245

diff --git a/SConstruct b/SConstruct
index fff1692..0b729ab 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -227,7 +227,8 @@ env.Install('${SCONSINSTALLDIR}', [ 'site_scons/__init__.py',
                                     'site_scons/yaptu.py' ])
 env.InstallDir('${SCONSINSTALLDIR}', [ 'site_scons/site_tools', 'site_scons/lib' ],
                FILTER_SUFFIXES=[ '','.css','.pl','.py','.sh','.sty','.xml','.xsl','.yap' ])
-env.Install('${INCLUDEINSTALLDIR}', 'boost')
+env.Install('${INCLUDEINSTALLDIR}', 'boost_ext')
+env.Install('${INCLUDEINSTALLDIR}/senf', 'senf/boost_intrusive')
 
 env.Alias('install_all', env.FindInstalledFiles())
 env.Alias('default', DEFAULT_TARGETS)

diff --git a/debian/libsenf-dev.install b/debian/libsenf-dev.install
index e509ef2..a14ea35 100644 (file)
--- a/debian/libsenf-dev.install
+++ b/debian/libsenf-dev.install
@@ -1,4 +1,5 @@
 debian/tmp/usr/include/senf
+debian/tmp/usr/include/boost_ext
 debian/tmp/usr/lib/senf/site_scons
 README usr/share/doc/libsenf-dev
 debian/README.Debian usr/share/doc/libsenf-dev

diff --git a/senf/Packets/PacketInterpreter.hh b/senf/Packets/PacketInterpreter.hh
index d0fcca4..17621a4 100644 (file)
--- a/senf/Packets/PacketInterpreter.hh
+++ b/senf/Packets/PacketInterpreter.hh
@@ -27,7 +27,7 @@
 #define HH_SENF_Packets_PacketInterpreter_ 1
 
 // Custom includes
-#include <boost/intrusive/ilist.hpp>
+#include <senf/boost_intrusive/ilist.hpp>
 #include <boost/optional.hpp>
 #include <boost/range.hpp>
 #include <senf/Utils/intrusive_refcount.hh>

diff --git a/senf/Packets/PacketTypes.hh b/senf/Packets/PacketTypes.hh
index 162bf39..be40e5f 100644 (file)
--- a/senf/Packets/PacketTypes.hh
+++ b/senf/Packets/PacketTypes.hh
@@ -30,8 +30,8 @@
 #include <vector>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/intrusive/ilist.hpp>
-#include <boost/intrusive/ilist_hook.hpp>
+#include <senf/boost_intrusive/ilist.hpp>
+#include <senf/boost_intrusive/ilist_hook.hpp>
 
 //#include "PacketTypes.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////

diff --git a/senf/Scheduler/EventHook.hh b/senf/Scheduler/EventHook.hh
index 5ad9e4e..5a943ae 100644 (file)
--- a/senf/Scheduler/EventHook.hh
+++ b/senf/Scheduler/EventHook.hh
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <boost/function.hpp>
-#include <boost/intrusive/ilist_hook.hpp>
+#include <senf/boost_intrusive/ilist_hook.hpp>
 #include "FIFORunner.hh"
 
 //#include "EventHook.mpp"

diff --git a/senf/Scheduler/EventManager.hh b/senf/Scheduler/EventManager.hh
index 5495f6f..6c71d7e 100644 (file)
--- a/senf/Scheduler/EventManager.hh
+++ b/senf/Scheduler/EventManager.hh
@@ -29,8 +29,8 @@
 // Custom includes
 #include <string>
 #include <boost/iterator/filter_iterator.hpp>
-#include <boost/intrusive/ilist.hpp>
-#include <boost/intrusive/ilist_hook.hpp>
+#include <senf/boost_intrusive/ilist.hpp>
+#include <senf/boost_intrusive/ilist_hook.hpp>
 #include <senf/Utils/singleton.hh>
 #include <senf/Utils/Console/LazyDirectory.hh>
 

diff --git a/senf/Scheduler/FIFORunner.hh b/senf/Scheduler/FIFORunner.hh
index 0b13363..4e04a65 100644 (file)
--- a/senf/Scheduler/FIFORunner.hh
+++ b/senf/Scheduler/FIFORunner.hh
@@ -29,8 +29,8 @@
 // Custom includes
 #include <signal.h>
 #include <boost/utility.hpp>
-#include <boost/intrusive/ilist.hpp>
-#include <boost/intrusive/ilist_hook.hpp>
+#include <senf/boost_intrusive/ilist.hpp>
+#include <senf/boost_intrusive/ilist_hook.hpp>
 #include <senf/Utils/singleton.hh>
 #include "EventManager.hh"
 

diff --git a/senf/Scheduler/FdEvent.hh b/senf/Scheduler/FdEvent.hh
index 0705137..bb10e11 100644 (file)
--- a/senf/Scheduler/FdEvent.hh
+++ b/senf/Scheduler/FdEvent.hh
@@ -27,7 +27,7 @@
 #define HH_SENF_Scheduler_FdEvent_ 1
 
 // Custom includes
-#include <boost/intrusive/iset_hook.hpp>
+#include <senf/boost_intrusive/iset_hook.hpp>
 #include <senf/Utils/Exception.hh>
 #include "FdManager.hh"
 #include "FIFORunner.hh"

diff --git a/senf/Scheduler/FdEvent.ih b/senf/Scheduler/FdEvent.ih
index d662b7d..41b4565 100644 (file)
--- a/senf/Scheduler/FdEvent.ih
+++ b/senf/Scheduler/FdEvent.ih
@@ -27,7 +27,7 @@
 #define IH_SENF_Scheduler_FdEvent_ 1
 
 // Custom includes
-#include <boost/intrusive/iset.hpp>
+#include <senf/boost_intrusive/iset.hpp>
 
 ///////////////////////////////ih.p////////////////////////////////////////
 

diff --git a/senf/Scheduler/IdleEvent.hh b/senf/Scheduler/IdleEvent.hh
index 3982e5a..577501c 100644 (file)
--- a/senf/Scheduler/IdleEvent.hh
+++ b/senf/Scheduler/IdleEvent.hh
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <boost/function.hpp>
-#include <boost/intrusive/ilist_hook.hpp>
+#include <senf/boost_intrusive/ilist_hook.hpp>
 #include "FIFORunner.hh"
 
 //#include "IdleEvent.mpp"

diff --git a/senf/Scheduler/SignalEvent.hh b/senf/Scheduler/SignalEvent.hh
index fc01abb..6da7072 100644 (file)
--- a/senf/Scheduler/SignalEvent.hh
+++ b/senf/Scheduler/SignalEvent.hh
@@ -30,7 +30,7 @@
 #include <signal.h>
 #include <boost/function.hpp>
 #include "FIFORunner.hh"
-#include <boost/intrusive/iset_hook.hpp>
+#include <senf/boost_intrusive/iset_hook.hpp>
 
 //#include "SignalEvent.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////

diff --git a/senf/Scheduler/SignalEvent.ih b/senf/Scheduler/SignalEvent.ih
index fa875c2..4e2686a 100644 (file)
--- a/senf/Scheduler/SignalEvent.ih
+++ b/senf/Scheduler/SignalEvent.ih
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include "FdManager.hh"
-#include <boost/intrusive/iset.hpp>
+#include <senf/boost_intrusive/iset.hpp>
 #include <senf/Utils/Exception.hh>
 #include <senf/Utils/singleton.hh>
 

diff --git a/senf/Scheduler/TimerEvent.hh b/senf/Scheduler/TimerEvent.hh
index c4d10ff..d87dca3 100644 (file)
--- a/senf/Scheduler/TimerEvent.hh
+++ b/senf/Scheduler/TimerEvent.hh
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <signal.h>
-#include <boost/intrusive/iset_hook.hpp>
+#include <senf/boost_intrusive/iset_hook.hpp>
 #include "ClockService.hh"
 #include "FIFORunner.hh"
 #include <senf/Utils/Logger/SenfLog.hh>

diff --git a/senf/Scheduler/TimerEvent.ih b/senf/Scheduler/TimerEvent.ih
index dafb142..5a79157 100644 (file)
--- a/senf/Scheduler/TimerEvent.ih
+++ b/senf/Scheduler/TimerEvent.ih
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <boost/scoped_ptr.hpp>
-#include <boost/intrusive/iset.hpp>
+#include <senf/boost_intrusive/iset.hpp>
 #include "TimerSource.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////

diff --git a/senf/Utils/Daemon/Daemon.ih b/senf/Utils/Daemon/Daemon.ih
index 8d45a88..5a237e3 100644 (file)
--- a/senf/Utils/Daemon/Daemon.ih
+++ b/senf/Utils/Daemon/Daemon.ih
@@ -28,8 +28,8 @@
 
 // Custom includes
 #include <deque>
-#include <boost/intrusive/iset.hpp>
-#include <boost/intrusive/iset_hook.hpp>
+#include <senf/boost_intrusive/iset.hpp>
+#include <senf/boost_intrusive/iset_hook.hpp>
 #include <boost/utility.hpp>
 #include <boost/function.hpp>
 #include <senf/Scheduler/Scheduler.hh>

diff --git a/boost/intrusive/detail/config_begin.hpp b/senf/boost_intrusive/detail/config_begin.hpp
similarity index 100%
rename from boost/intrusive/detail/config_begin.hpp
rename to senf/boost_intrusive/detail/config_begin.hpp

diff --git a/boost/intrusive/detail/config_end.hpp b/senf/boost_intrusive/detail/config_end.hpp
similarity index 100%
rename from boost/intrusive/detail/config_end.hpp
rename to senf/boost_intrusive/detail/config_end.hpp

diff --git a/boost/intrusive/detail/ebo_holder.hpp b/senf/boost_intrusive/detail/ebo_holder.hpp
similarity index 100%
rename from boost/intrusive/detail/ebo_holder.hpp
rename to senf/boost_intrusive/detail/ebo_holder.hpp

diff --git a/boost/intrusive/detail/ihashtable.hpp b/senf/boost_intrusive/detail/ihashtable.hpp
similarity index 100%
rename from boost/intrusive/detail/ihashtable.hpp
rename to senf/boost_intrusive/detail/ihashtable.hpp

diff --git a/boost/intrusive/detail/irbtree.hpp b/senf/boost_intrusive/detail/irbtree.hpp
similarity index 100%
rename from boost/intrusive/detail/irbtree.hpp
rename to senf/boost_intrusive/detail/irbtree.hpp

diff --git a/boost/intrusive/detail/list_node.hpp b/senf/boost_intrusive/detail/list_node.hpp
similarity index 100%
rename from boost/intrusive/detail/list_node.hpp
rename to senf/boost_intrusive/detail/list_node.hpp

diff --git a/boost/intrusive/detail/pointer_to_other.hpp b/senf/boost_intrusive/detail/pointer_to_other.hpp
similarity index 100%
rename from boost/intrusive/detail/pointer_to_other.hpp
rename to senf/boost_intrusive/detail/pointer_to_other.hpp

diff --git a/boost/intrusive/detail/pointer_type.hpp b/senf/boost_intrusive/detail/pointer_type.hpp
similarity index 100%
rename from boost/intrusive/detail/pointer_type.hpp
rename to senf/boost_intrusive/detail/pointer_type.hpp

diff --git a/boost/intrusive/detail/rbtree_node.hpp b/senf/boost_intrusive/detail/rbtree_node.hpp
similarity index 100%
rename from boost/intrusive/detail/rbtree_node.hpp
rename to senf/boost_intrusive/detail/rbtree_node.hpp

diff --git a/boost/intrusive/detail/slist_node.hpp b/senf/boost_intrusive/detail/slist_node.hpp
similarity index 100%
rename from boost/intrusive/detail/slist_node.hpp
rename to senf/boost_intrusive/detail/slist_node.hpp

diff --git a/boost/intrusive/detail/utilities.hpp b/senf/boost_intrusive/detail/utilities.hpp
similarity index 100%
rename from boost/intrusive/detail/utilities.hpp
rename to senf/boost_intrusive/detail/utilities.hpp

diff --git a/boost/intrusive/ilist.hpp b/senf/boost_intrusive/ilist.hpp
similarity index 100%
rename from boost/intrusive/ilist.hpp
rename to senf/boost_intrusive/ilist.hpp

diff --git a/boost/intrusive/ilist_hook.hpp b/senf/boost_intrusive/ilist_hook.hpp
similarity index 100%
rename from boost/intrusive/ilist_hook.hpp
rename to senf/boost_intrusive/ilist_hook.hpp

diff --git a/boost/intrusive/iset.hpp b/senf/boost_intrusive/iset.hpp
similarity index 100%
rename from boost/intrusive/iset.hpp
rename to senf/boost_intrusive/iset.hpp

diff --git a/boost/intrusive/iset_hook.hpp b/senf/boost_intrusive/iset_hook.hpp
similarity index 100%
rename from boost/intrusive/iset_hook.hpp
rename to senf/boost_intrusive/iset_hook.hpp

diff --git a/boost/intrusive/islist.hpp b/senf/boost_intrusive/islist.hpp
similarity index 100%
rename from boost/intrusive/islist.hpp
rename to senf/boost_intrusive/islist.hpp

diff --git a/boost/intrusive/islist_hook.hpp b/senf/boost_intrusive/islist_hook.hpp
similarity index 100%
rename from boost/intrusive/islist_hook.hpp
rename to senf/boost_intrusive/islist_hook.hpp

diff --git a/boost/intrusive/iunordered_set.hpp b/senf/boost_intrusive/iunordered_set.hpp
similarity index 100%
rename from boost/intrusive/iunordered_set.hpp
rename to senf/boost_intrusive/iunordered_set.hpp

diff --git a/boost/intrusive/iunordered_set_hook.hpp b/senf/boost_intrusive/iunordered_set_hook.hpp
similarity index 100%
rename from boost/intrusive/iunordered_set_hook.hpp
rename to senf/boost_intrusive/iunordered_set_hook.hpp

diff --git a/boost/intrusive/linking_policy.hpp b/senf/boost_intrusive/linking_policy.hpp
similarity index 100%
rename from boost/intrusive/linking_policy.hpp
rename to senf/boost_intrusive/linking_policy.hpp

diff --git a/boost/intrusive/list_algorithms.hpp b/senf/boost_intrusive/list_algorithms.hpp
similarity index 100%
rename from boost/intrusive/list_algorithms.hpp
rename to senf/boost_intrusive/list_algorithms.hpp

diff --git a/boost/intrusive/rbtree_algorithms.hpp b/senf/boost_intrusive/rbtree_algorithms.hpp
similarity index 100%
rename from boost/intrusive/rbtree_algorithms.hpp
rename to senf/boost_intrusive/rbtree_algorithms.hpp

diff --git a/boost/intrusive/slist_algorithms.hpp b/senf/boost_intrusive/slist_algorithms.hpp
similarity index 100%
rename from boost/intrusive/slist_algorithms.hpp
rename to senf/boost_intrusive/slist_algorithms.hpp

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index f63873b..29992a3 100644 (file)
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -137,6 +137,7 @@ def SetupForSENF(env, senf_path = []):
                         CPPPATH = [ sconspath ],
                         BUNDLEDIR = sconspath,
                         SENFDIR = sconspath,
+                        SENFINCDIR = sconspath,
                         SENFSYSLAYOUT = False)
             try:
                 env.MergeFlags(file(os.path.join(path,"senf.conf")).read())
@@ -150,6 +151,7 @@ def SetupForSENF(env, senf_path = []):
                 print "\nUsing system SENF in '%s/'\n" % sconspath
             env.Append(BUNDLEDIR = os.path.join(sconspath,"lib/senf"),
                        SENFDIR = sconspath,
+                       SENFINCDIR = '%s/include' % sconspath,
                        SENFSYSLAYOUT = True)
             break
     else:
@@ -160,7 +162,7 @@ def SetupForSENF(env, senf_path = []):
 
     # Only add senf after all configure checks have run
     env.Append(
-        CPPPATH = '${NEED_BOOST_EXT and "$SENFDIR/boost_ext" or None}',
+        CPPPATH = '${NEED_BOOST_EXT and "$SENFINCDIR/boost_ext" or None}',
         LIBS = [ 'senf', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB',
                  '$BOOSTFSLIB' ],
         )