From: g0dil Date: Wed, 2 Sep 2009 09:28:25 +0000 (+0000) Subject: automate makeDieImageMap.py processing X-Git-Url: http://g0dil.de/git?p=senf.git;a=commitdiff_plain;h=4d7356cbd92801bc0c4bec27fffe3b0024807185 automate makeDieImageMap.py processing git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1370 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Examples/RateStuffer/Mainpage.dox b/Examples/RateStuffer/Mainpage.dox index 4a3eda9..fb70e0f 100644 --- a/Examples/RateStuffer/Mainpage.dox +++ b/Examples/RateStuffer/Mainpage.dox @@ -20,6 +20,8 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +using namespace senf::ppi::module; + /** \mainpage Example introducing the Packet Processing Infrastructure This example application implements a simple PPI application: It will read UDP packets from an @@ -60,16 +62,7 @@ \section setup Module setup -
- \ref senf::ppi::module::ThrottleBarrier - \ref senf::ppi::module::PassiveQueue - \ref senf::ppi::module::PassiveSocketSink<> - \ref RateFilter - \ref senf::ppi::module::PriorityJoin - \ref senf::ppi::module::ActiveSocketSource<> - \ref senf::ppi::module::CloneSource -
- \htmlonly ratestuffer \endhtmlonly + \diaimage ratestuffer.dia Above image depicts the module setup implementing the rate stuffer. A senf::ppi::module::ActiveSocketSource reads the incoming UDP packets and sends them into a diff --git a/Examples/RateStuffer/ratestuffer.dia b/Examples/RateStuffer/ratestuffer.dia index adfa69c..bfdc464 100644 Binary files a/Examples/RateStuffer/ratestuffer.dia and b/Examples/RateStuffer/ratestuffer.dia differ diff --git a/find-sources.sh b/find-sources.sh index 268aede..ecc3267 100755 --- a/find-sources.sh +++ b/find-sources.sh @@ -23,6 +23,7 @@ find . \ -name .svn -prune -o \ -name doc -prune -o \ -name debian -prune -o \ + -name dist -prune -o \ -name "*.a" -o \ -name "*.o" -o \ -name "*~" -o \ diff --git a/senf/PPI/Mainpage.dox b/senf/PPI/Mainpage.dox index fc16dab..47e55fc 100644 --- a/senf/PPI/Mainpage.dox +++ b/senf/PPI/Mainpage.dox @@ -465,28 +465,7 @@ \section ppi_classdiagram Class Diagram -
- \ref senf::ppi::connector::PassiveConnector - \ref senf::ppi::EventManager - \ref senf::ppi::connector::ActiveOutput - \ref senf::ppi::connector::ActiveInput - \ref senf::ppi::RouteBase - \ref senf::ppi::Route - \ref (some module) - \ref senf::ppi::EventImplementation - \ref senf::ppi::module::Module - \ref senf::ppi::connector::Connector - \ref senf::ppi::connector::PassiveOutput - \ref senf::ppi::detail::EventBindingBase - \ref senf::ppi::connector::InputConnector - \ref senf::ppi::detail::RouteImplementation - \ref senf::ppi::connector::OutputConnector - \ref senf::ppi::connector::ActiveConnector - \ref senf::ppi::detail::EventBinding - \ref senf::ppi::EventDescriptor - \ref senf::ppi::connector::PassiveInput -
- \htmlonly classes \endhtmlonly + \diaimage classes.dia */ diff --git a/senf/PPI/classes.dia b/senf/PPI/classes.dia index 379f5fa..36d75a0 100644 Binary files a/senf/PPI/classes.dia and b/senf/PPI/classes.dia differ diff --git a/senf/Socket/FileHandle.hh b/senf/Socket/FileHandle.hh index 6b9bfb9..0667051 100644 --- a/senf/Socket/FileHandle.hh +++ b/senf/Socket/FileHandle.hh @@ -25,16 +25,8 @@ */ /** \defgroup handle_group The Handle Hierarchy - -
- \ref SocketHandle - \ref ClientSocketHandle - \ref ProtocolClientSocketHandle - \ref ProtocolServerSocketHandle - \ref FileHandle - \ref ServerSocketHandle -
- \htmlonly FhHierarchy \endhtmlonly + + \diaimage FhHierarchy.dia The senf::FileHandle class is the base of a hierarchy of socket handle classes (realized as templates). These classes provide an interface to the complete socket API. While going down the diff --git a/senf/Socket/Mainpage.dox b/senf/Socket/Mainpage.dox index 5485c7e..b819521 100644 --- a/senf/Socket/Mainpage.dox +++ b/senf/Socket/Mainpage.dox @@ -291,48 +291,7 @@ namespace senf { \section class_diagram Class Diagram -
- \ref IPv4Protocol - \ref WritePolicyBase - \ref SocketBufferingPolicy - \ref NoAddressingPolicy - \ref NotReadablePolicy - \ref AdressableBSDSocketProtocol - \ref BufferingPolicyBase - \ref FramingPolicyBase - \ref FileBody - \ref DatagramFramingPolicy - \ref INet6AddressingPolicy - \ref BSDSocketProtocol - \ref INet4AddressingPolicy - \ref ProtocolServerSocketHandle - \ref PolicyBase - \ref TCPProtocol - \ref ReadablePolicy - \ref SocketPolicy - \ref CommunicationPolicyBase - \ref TCPv6Protocol - \ref SocketProtocol - \ref ConnectedCommunicationPolicy - \ref ProtocolClientSocketHandle - \ref IPv6Protocol - \ref WritablePolicy - \ref SocketBody - \ref PacketProtocol - \ref NotWritablePolicy - \ref ReadPolicyBase - \ref SocketHandle - \ref ClientSocketHandle - \ref UnconnectedCommunicationPolicy - \ref ConcreteSocketProtocol - \ref TCPv4Protocol - \ref StreamFramingPolicy - \ref AddressingPolicyBase - \ref FileHandle - \ref LLAddressingPolicy - \ref ServerSocketHandle -
- \htmlonly SocketLibrary-classes \endhtmlonly + \diaimage SocketLibrary-classes.dia \section impl_notes Arbitrary Implementation Notes diff --git a/senf/Socket/SocketPolicy.hh b/senf/Socket/SocketPolicy.hh index af32b65..256081a 100644 --- a/senf/Socket/SocketPolicy.hh +++ b/senf/Socket/SocketPolicy.hh @@ -32,16 +32,7 @@ /** \defgroup policy_group The Policy Framework -
- \ref WritePolicyBase - \ref AddressingPolicyBase - \ref FramingPolicyBase - \ref PolicyBase - \ref SocketPolicy - \ref CommunicationPolicyBase - \ref ReadPolicyBase -
- \htmlonly SocketPolicy \endhtmlonly + \diaimage SocketPolicy.dia \section policy_group_introduction Introduction to the Policy Framework diff --git a/senf/Socket/SocketProtocol.hh b/senf/Socket/SocketProtocol.hh index b41fccb..8538b17 100644 --- a/senf/Socket/SocketProtocol.hh +++ b/senf/Socket/SocketProtocol.hh @@ -32,19 +32,7 @@ /** \defgroup protocol_group The Protocol Classes -
- \ref SocketProtocol - \ref UNSocketProtocol - \ref PacketSocketProtocol - \ref ConcreteSocketProtocol - \ref BSDSocketProtocol - \ref DatagramSocketProtocol - \ref TCPSocketProtocol - \ref UNDatagramSocketProtocol - \ref AddressableBSDSocketProtocol - \ref TCPv4SocketProtocol -
- \htmlonly Protocols \endhtmlonly + \diaimage Protocols.dia The socket handle classes and templates only implement the most important socket API methods using the policy framework. To access the complete API, the protocol interface is diff --git a/site_scons/lib/filter.pl b/site_scons/lib/filter.pl index 14ad930..c35ae81 100755 --- a/site_scons/lib/filter.pl +++ b/site_scons/lib/filter.pl @@ -1,8 +1,7 @@ #!/usr/bin/perl -n BEGIN { - ($topdir=$0) =~ s{doclib/.*$}{}; - print $topdir,"\n"; + ($libdir=$0) =~ s{/[^/]*$}{}; } s/\s*$//; @@ -16,6 +15,11 @@ elsif (s/^(\s*)
$/$1
/ .. /<\/pre>/ && !/^$/) {
     $i=length($1) if /^(\s*)
$/;
     print substr($_,$i),"\n";
 } 
+elsif (/\\diaimage\s+(\S+)/) {
+    $dia=$1;
+    ($png=$dia)=~s/\.dia$/.png/;
+    system("python $libdir/makeDiaImageMap.py $dia");
+}
 else {
     print $_,"\n";
 }
diff --git a/doclib/makeDiaImageMap.py b/site_scons/lib/makeDiaImageMap.py
similarity index 88%
rename from doclib/makeDiaImageMap.py
rename to site_scons/lib/makeDiaImageMap.py
index db9a9ce..56dfbc3 100755
--- a/doclib/makeDiaImageMap.py
+++ b/site_scons/lib/makeDiaImageMap.py
@@ -18,14 +18,21 @@ stylesheet=u"""
   
 
   
-    
+    
+      
+        
+      
+      
+        
+      
+    
      
     
     

   
 
   
-    ## 
+    !!