Add missing install files

minor senfutil.py updates

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

diff --git a/SConstruct b/SConstruct
index 6b55257..7eb0637 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -157,9 +157,12 @@ env.Default(conf)
 env.Install('$CONFINSTALLDIR', conf)
 
 #### install_all, default, all_tests, all
-env.Install('${SCONSINSTALLDIR}', 'site_scons/senfutil.py')
-env.Install('${SCONSINSTALLDIR}/site_tools', [ 'site_scons/site_tools/Boost.py',
-                                               'site_scons/site_tools/PhonyTarget.py' ])
+env.Install('${SCONSINSTALLDIR}', [ 'site_scons/__init__.py',
+                                    'site_scons/senfutil.py',
+                                    'site_scons/yaptu.py' ])
+env.InstallDir('${SCONSINSTALLDIR}', [ 'site_scons/site_tools', 'site_scons/lib' ],
+               FILTER_SUFFIXES=[ '', '.css', '.pl', '.py', '.sh', '.xml', '.xsl', '.yap' ])
+env.Install('${INCLUDEINSTALLDIR}', 'boost')
 
 env.Alias('install_all', env.FindInstalledFiles())
 env.Alias('default', DEFAULT_TARGETS)

diff --git a/debian/SConscript b/debian/SConscript
index 85904db..6997332 100644 (file)
--- a/debian/SConscript
+++ b/debian/SConscript
@@ -108,8 +108,8 @@ env.PhonyTarget('debsrc', [], [
 env.PhonyTarget('debbin', [], [
     checkLocalConf,
     updateRevision,
-    "$BUILDPACKAGE_COMMAND -b",
-    "fakeroot ./debian/rules clean"
+    "$BUILDPACKAGE_COMMAND -b -nc",
+    "fakeroot ./debian/rules debclean"
 ])
 
 if not os.environ.get('debian_build'):

diff --git a/senf/Packets/ListOptionTypeParser.cti b/senf/Packets/ListOptionTypeParser.cti
index 125921d..317c2cd 100644 (file)
--- a/senf/Packets/ListOptionTypeParser.cti
+++ b/senf/Packets/ListOptionTypeParser.cti
@@ -33,32 +33,46 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>
 
-template<class ElementParser, class AuxPolicy>
-prefix_ senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::ListOptionTypeParser_Policy() {
-}
+template <class ElementParser, class AuxPolicy>
+prefix_
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::
+ListOptionTypeParser_Policy()
+{}
 
-template<class ElementParser, class AuxPolicy>
-template<class Arg>
-prefix_ senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::ListOptionTypeParser_Policy(Arg const & arg) :AuxPolicy(arg) {
-}
+template <class ElementParser, class AuxPolicy>
+template <class Arg>
+prefix_
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::
+ListOptionTypeParser_Policy(Arg const & arg)
+    : AuxPolicy(arg) 
+{}
 
-template<class ElementParser, class AuxPolicy>
+template <class ElementParser, class AuxPolicy>
 prefix_ typename senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::size_type
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::bytes(data_iterator i, state_type s) const {
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::bytes(data_iterator i,
+                                                                          state_type s)
+    const
+{
     return AuxPolicy::aux(i, s) + AuxPolicy::aux_bytes;
 }
 
-template<class ElementParser, class AuxPolicy>
+template <class ElementParser, class AuxPolicy>
 prefix_ typename senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::size_type
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::size(data_iterator i, state_type s) const {
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::size(data_iterator i,
+                                                                         state_type s)
+    const
+{
     parser_type p(*this, i, s);
     container_type c(p);
     return std::distance(c.begin(), c.end());
 }
 
-template<class ElementParser, class AuxPolicy>
+template <class ElementParser, class AuxPolicy>
 prefix_ void
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::init(data_iterator i, state_type s) const {
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::init(data_iterator i,
+                                                                         state_type s)
+    const
+{
     AuxPolicy::aux(0, i, s);
 }
 
@@ -66,20 +80,26 @@ senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::init(data_i
 // senf::detail::ListOptionTypeParser_Policy<ElementParser,BytesParser>
 
 //constructor
-template<class ElementParser, class AuxPolicy>
-prefix_ senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::container_policy(parser_policy const & p) :
-    AuxPolicy(p) {
-}
+template <class ElementParser, class AuxPolicy>
+prefix_
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+container_policy(parser_policy const & p)
+    : AuxPolicy(p) 
+{}
 
 //destructor
-template<class ElementParser, class AuxPolicy>
-prefix_ senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::~container_policy()
+template <class ElementParser, class AuxPolicy>
+prefix_
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+~container_policy()
 {}
 
 //construct method
-template<class ElementParser, class AuxPolicy>
+template <class ElementParser, class AuxPolicy>
 prefix_ void
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::construct(container_type & c) {
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+construct(container_type & c)
+{
     data_iterator i = c.i();
     realAux_ = (AuxPolicy::aux(i, c.state()) * 8) + 6;
     data_iterator e = i + realAux_;
@@ -97,9 +117,11 @@ senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_p
 }
 
 //destruct method
-template<class ElementParser, class AuxPolicy>
+template <class ElementParser, class AuxPolicy>
 prefix_ void
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::destruct(container_type & c) {
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+destruct(container_type & c)
+{
     // data_iterator i (AuxPolicy::adjust(parser_type::get(p).i(), parser_type::get(p).state()));
     data_iterator i = c.i();
     data_iterator const e = i + realAux_;
@@ -118,32 +140,44 @@ senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_p
 }
 
 //bytes()
-template<class ElementParser, class AuxPolicy>
-prefix_ typename senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::size_type
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::bytes(data_iterator i,state_type s) const {
+template <class ElementParser, class AuxPolicy>
+prefix_ typename senf::detail::ListOptionTypeParser_Policy<
+    ElementParser,AuxPolicy>::container_policy::size_type
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+bytes(data_iterator i, state_type s)
+    const
+{
     return (realAux_ + 2);
 }
 
 //size()
-template<class ElementParser, class AuxPolicy>
-prefix_ typename senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::size_type
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::size(data_iterator i,state_type s) const {
+template <class ElementParser, class AuxPolicy>
+prefix_ typename senf::detail::ListOptionTypeParser_Policy<
+    ElementParser,AuxPolicy>::container_policy::size_type
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+size(data_iterator i, state_type s)
+    const
+{
     return n_;
 }
 
 //init()
-template<class ElementParser, class AuxPolicy>
+template <class ElementParser, class AuxPolicy>
 prefix_ void
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::init(data_iterator i, state_type s) {
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+init(data_iterator i, state_type s)
+{
     n_ = 0;
     container_size_ = s->size();
     AuxPolicy::aux(0, i, s);
 }
 
 //erase()
-template<class ElementParser, class AuxPolicy>
+template <class ElementParser, class AuxPolicy>
 prefix_ void
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::erase(container_type & c, data_iterator p) {
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+erase(container_type & c, data_iterator p)
+{
     size_type b(senf::bytes(ElementParser(p, c.state()))); //length of parser
     //    AuxPolicy::aux(
     //                 AuxPolicy::aux( c.i(), c.state()) -b,
@@ -156,9 +190,11 @@ senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_p
 }
 
 //insert()
-template<class ElementParser, class AuxPolicy>
+template <class ElementParser, class AuxPolicy>
 prefix_ void
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::insert(container_type & c, data_iterator p) {
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+insert(container_type & c, data_iterator p)
+{
     size_type b(senf::bytes(ElementParser(p, c.state())));
     //    AuxPolicy::aux( AuxPolicy::aux(c.i(), c.state())+b, c.i(), c.state());
     realAux_ += b;
@@ -167,9 +203,12 @@ senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_p
 }
 
 //update()
-template<class ElementParser, class AuxPolicy>
+template <class ElementParser, class AuxPolicy>
 prefix_ void
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::update(container_type const & c) const {
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+update(container_type const & c)
+    const
+{
     if (container_size_ == c.data().size())
         return;
     data_iterator i(AuxPolicy::adjust(c.i(), c.state()));
@@ -181,37 +220,55 @@ senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_p
 }
 
 //setbegin()
-template<class ElementParser, class AuxPolicy>
-prefix_ typename senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::data_iterator
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::setBegin(container_type const & c, iterator_data & d) const {
+template <class ElementParser, class AuxPolicy>
+prefix_ typename senf::detail::ListOptionTypeParser_Policy<
+    ElementParser,AuxPolicy>::container_policy::data_iterator
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+setBegin(container_type const & c, iterator_data & d)
+    const
+{
     return c.i();
     //    return AuxPolicy::adjust(c.i(), c.state());
 }
 
 //setEnd()
-template<class ElementParser, class AuxPolicy>
-prefix_ typename senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::data_iterator
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::setEnd(container_type const & c, iterator_data & d) const { //wtf??
+template <class ElementParser, class AuxPolicy>
+prefix_ typename senf::detail::ListOptionTypeParser_Policy<
+    ElementParser,AuxPolicy>::container_policy::data_iterator
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+setEnd(container_type const & c, iterator_data & d)
+    const
+{ //wtf??
     return boost::next(AuxPolicy::adjust(c.i(), c.state()), aux(c.i(),c.state()));
 }
 
 //setFromPosition()
-template<class ElementParser, class AuxPolicy>
+template <class ElementParser, class AuxPolicy>
 prefix_ void
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::setFromPosition(container_type const & c, iterator_data & d, data_iterator p) const {
-}
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+setFromPosition(container_type const & c, iterator_data & d, data_iterator p)
+    const
+{}
 
 //next()
-template<class ElementParser, class AuxPolicy>
-prefix_ typename senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::data_iterator
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::next(container_type const & c, iterator_data & d) const {
+template <class ElementParser, class AuxPolicy>
+prefix_ typename senf::detail::ListOptionTypeParser_Policy<
+    ElementParser,AuxPolicy>::container_policy::data_iterator
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+next(container_type const & c, iterator_data & d)
+    const
+{
     return boost::next(container_type::iterator::get(d).i(), senf::bytes(ElementParser(container_type::iterator::get(d).i(), c.state())));
 }
 
 //raw()
-template<class ElementParser, class AuxPolicy>
-prefix_ typename senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::data_iterator
-senf::detail::ListOptionTypeParser_Policy<ElementParser, AuxPolicy>::container_policy::raw(container_type const & c, iterator_data const & d) const {
+template <class ElementParser, class AuxPolicy>
+prefix_ typename senf::detail::ListOptionTypeParser_Policy<
+    ElementParser,AuxPolicy>::container_policy::data_iterator
+senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
+raw(container_type const & c, iterator_data const & d)
+    const
+{
     return container_type::iterator::get(d).i();
 }
 

diff --git a/senf/SConscript b/senf/SConscript
index c81d609..b8589db 100644 (file)
--- a/senf/SConscript
+++ b/senf/SConscript
@@ -14,4 +14,4 @@ if not env.GetOption('clean') and not os.path.exists("local_config.hh"):
 SConscript(list(set(glob.glob("*/SConscript")) - set(("Ext/SConscript",))))
 SConscript("Ext/SConscript")
 
-env.InstallSubdir(target = '$INCLUDEINSTALLDIR', source = [ 'config.hh', 'local_config.hh' ])
+env.InstallSubdir(target = '$INCLUDEINSTALLDIR', source = [ glob.glob("*.hh") ])

diff --git a/site_scons/SENFSCons.py b/site_scons/SENFSCons.py
index c51cda0..fc26296 100644 (file)
--- a/site_scons/SENFSCons.py
+++ b/site_scons/SENFSCons.py
@@ -50,6 +50,9 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []):
         env.Depends(tagfile, [ env.File('#/doclib/doxygen.sh'), 
                                env.File('#/doclib/tag-munge.xsl') ])
 
+        env.Install(env.Dir('$DOCINSTALLDIR').Dir(tagfile[0].dir.get_path(env.Dir('#'))),
+                    tagfile[0])
+
     # Rule to generate HTML documentation
     doc = env.Doxygen(doxyfile,
                       DOXYOPTS = [ '--tagfiles', '"$ALL_TAGFILES"',

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index 589ff45..215a42f 100644 (file)
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -150,6 +150,8 @@ def SetupForSENF(env, senf_path = []):
     else:
         print "\nSENF library not found .. trying build anyway !!\n"
 
+    env.Alias('all', '#')
+
 
 def DefaultOptions(env):
     env.Append(
@@ -184,9 +186,9 @@ def Doxygen(env, doxyheader=None, doxyfooter=None, doxycss=None, mydoxyfile=Fals
     
     if tagfiles is None:
         senfdocdir = None
-        senfdoc_path.extend(('senf/manual', '../senf/manual', 'senf', '../senf', 
-                             'senfdoc', os.path.dirname(senfutildir), 
+        senfdoc_path.extend(('senfdoc', 'senf/manual', 'senf', '../senf/manual', '../senf', 
                              os.path.join(os.path.dirname(senfutildir), 'manual'),
+                             os.path.dirname(senfutildir), 
                              '/usr/share/doc/senf', '/usr/local/share/doc/senf',
                              '/usr/share/doc/libsenf-doc/html'))
         for path in senfdoc_path: