debian: Add missing 'netpbm' build dependency

debian: Add missing call to build arch packages
debian: Exclude '_template' dir from the source package
doclib: Fix 'dot' script to work with more doxygen versions

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

diff --git a/HowTos/NewPacket/Mainpage.dox b/HowTos/NewPacket/Mainpage.dox
index 289007c..e9cca96 100644 (file)
--- a/HowTos/NewPacket/Mainpage.dox
+++ b/HowTos/NewPacket/Mainpage.dox
@@ -20,7 +20,7 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-/** \mainpage HowTo: Defining and using a new 'libPacket' Packet Type 
+/** \mainpage Defining and using a new 'libPacket' Packet Type 
 
     This howto will introduce the facilities needed to define a new packet type. As example, the
     \c GREPacket type is defined. 

diff --git a/SConstruct b/SConstruct
index bc2e7a3..a190dcc 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -141,7 +141,7 @@ env.Append(
    LOCAL_CONFIG_FILES = [ 'Doxyfile.local', 'SConfig', 'local_config.hh' ],
    CONFIG_FILES_OPTS = configFilesOpts,
    CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign', '.sconsign.dblite' ],
-   BUILDPACKAGE_COMMAND = "dpkg-buildpackage -us -uc -rfakeroot -I.svn $CONFIG_FILES_OPTS",
+   BUILDPACKAGE_COMMAND = "dpkg-buildpackage -us -uc -rfakeroot -I.svn -I_templates $CONFIG_FILES_OPTS",
    TOP_INCLUDES = [ 'Packets', 'PPI', 'Scheduler', 'Socket', 'Utils',
                     'config.hh', 'local_config.hh' ],
 )
@@ -153,7 +153,8 @@ env.SetDefault(
 Export('env')
 
 # Create Doxyfile.local otherwise doxygen will barf on this non-existent file
-if not env.GetOption('clean') and not os.path.exists("Doxyfile.local"):
+# Create it even when cleaning, to silence the doxygen builder warnings
+if not os.path.exists("Doxyfile.local"):
     Execute(Touch("Doxyfile.local"))
 
 # Create local_config.h

diff --git a/debian/control b/debian/control
index d8d9fc6..c3b214e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Stefan Bund <senf-dev@lists.berlios.de>
 Build-Depends: debhelper (>= 5), scons, binutils-dev, libboost-dev, 
        libboost-test-dev, libboost-date-time-dev, libboost-regex-dev, 
        libboost-filesystem-dev, doxygen, dia, tidy, xsltproc,
-       graphviz, perl-base, linklint 
+       graphviz, perl-base, linklint, netpbm
 Standards-Version: 3.7.2 Section: libs
 
 Package: libsenf

diff --git a/debian/rules b/debian/rules
index 7820942..a99bd64 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -155,6 +155,7 @@ binary-indep: build-indep install-indep
        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 binary-arch: build-arch install-arch
+       $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch \

diff --git a/doclib/Doxyfile.global b/doclib/Doxyfile.global
index 0ffed1c..374d259 100644 (file)
--- a/doclib/Doxyfile.global
+++ b/doclib/Doxyfile.global
@@ -25,6 +25,7 @@ SOURCE_BROWSER         = YES
 ALPHABETICAL_INDEX     = YES
 COLS_IN_ALPHA_INDEX    = 3
 SEARCHENGINE           = YES
+FULL_PATH_NAMES        = YES
 
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES

diff --git a/doclib/dot b/doclib/dot
index a0efac5..ba31692 100755 (executable)
--- a/doclib/dot
+++ b/doclib/dot
@@ -14,25 +14,31 @@ esac
 set -e
 
 dot "$@"
-if [ -r "$4" ]; then
-    size="`pngtopnm "$4" | sed -n -e '2p'`"
-    width_a="${size% *}"
-    height_a="${size#* }"
-    if [ $width_a -gt 800 ]; then
-       for file in "${1%.dot}".*; do
-           cp "$file" "$file.a"
-       done
-       sed -e 's/rankdir=LR/rankdir=TB/' -e t -e 's/rankdir=TB/rankdir=LR/' "$1.a" > "$1"
-       dot "$@"
-       size="`pngtopnm "$4" | sed -n -e '2p'`"
-       width_b="${size% *}"
-       height_b="${size#* }"
-       if [ $width_a -lt $width_b ]; then
-           for file in "${1%.dot}".*.a; do
-               mv "$file" "${file%.a}"
-           done
-       else
-           rm "${1%.dot}".*.a
+
+case "$4" in
+    *.png)
+       if [ -r "$4" ]; then
+           size="`pngtopnm "$4" | sed -n -e '2p'`"
+           width_a="${size% *}"
+           height_a="${size#* }"
+           if [ $width_a -gt 800 ]; then
+               for file in "${1%.dot}".*; do
+                   cp "$file" "$file.a"
+               done
+               sed -e 's/rankdir=LR/rankdir=TB/' -e t -e 's/rankdir=TB/rankdir=LR/' "$1.a" > "$1"
+               dot "$@"
+               size="`pngtopnm "$4" | sed -n -e '2p'`"
+               width_b="${size% *}"
+               height_b="${size#* }"
+               if [ $width_a -lt $width_b ]; then
+                   for file in "${1%.dot}".*.a; do
+                       mv "$file" "${file%.a}"
+                   done
+               else
+                   rm "${1%.dot}".*.a
+               fi
+           fi
        fi
-    fi
-fi
+       ;;
+    *)  ;;
+esac

diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index b10f2b4..d574747 100644 (file)
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -463,13 +463,13 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []):
             docs,
             SCons.Action.Action(("for html in %s/*.html; do " +
                         "    echo $$html;" +
-                        "    sed -e 's/id=\"current\"/class=\"current\"/' $${html}" +
-                        "        | tidy -ascii -q --show-warnings no --fix-uri no " +
-                        "        | xsltproc --nonet --html --stringparam topdir %s -o $${html}.new %s - 2>&1" +
+                        "    mv $${html} $${html}.orig;" +
+                        "    sed -e 's/id=\"current\"/class=\"current\"/' $${html}.orig" +
+                        "        | tidy -ascii -q --wrap 0 --show-warnings no --fix-uri no " +
+                        "        | xsltproc --nonet --html --stringparam topdir %s -o $${html} %s - 2>&1" +
                         "        | grep '^-'" +
                         "        | grep -v 'ID .* already defined';" +
-                        "    mv $${html}.new $${html}; " +
-                        "done")
+                        "done; true")
                        % (htmlnode.dir.abspath, reltopdir, xslfile.abspath)))
         for doc in docs:
             env.Depends(doc, xslfile)