From: g0dil Date: Wed, 2 Sep 2009 08:06:16 +0000 (+0000) Subject: Remove duplicate files from doclib X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=6f7b76c5b13f6a5f5aeb3515585c84fb0f7fbf8f;p=senf.git Remove duplicate files from doclib git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1367 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/doclib/Doxyfile.global b/doclib/Doxyfile.global index fa0aa5a..63881ec 100644 --- a/doclib/Doxyfile.global +++ b/doclib/Doxyfile.global @@ -9,7 +9,7 @@ ALWAYS_DETAILED_SEC = YES STRIP_FROM_INC_PATH = $(TOPDIR) MULTILINE_CPP_IS_BRIEF = YES DETAILS_AT_TOP = YES -LAYOUT_FILE = $(TOPDIR)/doclib/DoxygenLayout.xml +LAYOUT_FILE = $(TOPDIR)/site_scons/lib/DoxygenLayout.xml ALIASES = "fixme=\xrefitem fixme \"Fix\" \"Fixmes\"" \ "idea=\xrefitem idea \"Idea\" \"Ideas\"" \ @@ -43,7 +43,7 @@ EXCLUDE_PATTERNS = *.test.cc \ "#*#" EXCLUDE_SYMBOLS = boost std IMAGE_PATH = . -INPUT_FILTER = "$(TOPDIR)/doclib/filter.pl" +INPUT_FILTER = "$(TOPDIR)/site_scons/lib/filter.pl" SOURCE_BROWSER = YES ALPHABETICAL_INDEX = YES @@ -109,7 +109,7 @@ COLLABORATION_GRAPH = NO GROUP_GRAPHS = NO GRAPHICAL_HIERARCHY = NO DIRECTORY_GRAPH = NO -DOT_PATH = "$(TOPDIR)/doclib" +DOT_PATH = "$(TOPDIR)/site_scons/lib" DOT_GRAPH_MAX_NODES = 10 MAX_DOT_GRAPH_DEPTH = 5 DOT_MULTI_TARGETS = YES diff --git a/doclib/DoxygenLayout.xml b/doclib/DoxygenLayout.xml deleted file mode 100644 index 94e2cda..0000000 --- a/doclib/DoxygenLayout.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doclib/SConscript b/doclib/SConscript index 7831200..9a941ee 100644 --- a/doclib/SConscript +++ b/doclib/SConscript @@ -256,7 +256,7 @@ env.SetDefault( ) env.Replace( - DOXYGENCOM = "doclib/doxygen.sh $DOXYOPTS $SOURCE", + DOXYGENCOM = "site_scons/lib/doxygen.sh $DOXYOPTS $SOURCE", ) env.Append( ENV = { diff --git a/doclib/dot b/doclib/dot deleted file mode 100755 index c6bdbe4..0000000 --- a/doclib/dot +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -topdir="`dirname "$0"`"; topdir="`cd "$topdir/.."; pwd`" -if head -4 "$1" | grep -q nomunge; then - dot "$@" - exit $? -fi -sed -i -e 's/rankdir=LR/rankdir=TB/' "$1" -"$topdir/doclib/dot-munge.pl" "$1" -unflatten -l2 -c2 -f -o "$1".unflat "$1" -mv "$1".unflat "$1" - -case "$2" in - -Tpng:gd) - first="$1"; shift; shift - set -- "$first" "-Tpng" "$@" - ;; - *) -esac - -set -e - -dot "$@" - -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 - ;; - *) ;; -esac diff --git a/doclib/dot-munge.pl b/doclib/dot-munge.pl deleted file mode 100755 index 263b44e..0000000 --- a/doclib/dot-munge.pl +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/perl -i -n - -# Reduce fontsize and change font -s/fontsize=10/fontsize=8/g; -s/fontname="FreeSans.ttf"/fontname="Verdana"/g; - -# Wrap long labels (templates and pathnames) -if (/label=\"([^"]{48,})\"/) { #"])){ # To make emacs happy ... - $pre=$`; - $post=$'; #'; # To make emacs happy ... - $label=$1; - - # Break at each komma or / - $label=~s{[,/]}{$&\\r\\ \\ \\ \\ \\ \\ \\ \\ }g; - - # If more than one '<' is in the label, break after each '<' - if (($label=~tr/1) { - $label=~s/]*\) id="\1"/name="\1"\2/g' \ - | xsltproc --novalid --nonet --html --stringparam topdir "$reltopdir" \ - "$base/html-munge.xsl" - -} - -########################################################################### - -# Build absolute, normalized pathname -abspath() -{ - case "$1" in - /*) echo "$1" ;; - *) echo "`pwd`/$1" ;; - esac | sed \ - -e 's/\/\/*/\//g' \ - -e:a \ - -e 's/\/\.\(\/\|$\)/\1/g' \ - -eta \ - -e:b \ - -e 's/\/[^\/]*\/..\(\/\|$\)/\1/' \ - -etb \ - -e 's/^\(\/..\)*\(\/\|$\)/\2/' \ - -e 's/^$/\//' -} - -# Create relative path from absolute directory $1 to absolute path $2 -relpath() -{ - local src="${1#/}" - local dst="${2#/}" - while true; do - if [ -z "$src" -a -z "$dst" ]; then - echo "Internal error in relpath()" 1>&2 - exit 1 - fi - srcd="${src%%/*}" - dstd="${dst%%/*}" - if [ "$srcd" = "$dstd" ]; then - src="${src#$srcd}"; src="${src#/}" - dst="${dst#$dstd}"; dst="${dst#/}" - else - break - fi - done - rel="`echo "$src" | sed -e "s/[^\/]*/../g"`/$dst" # `" - echo "${rel%/}" -} - -# Log executed commands -cmd() -{ - echo "+" "$@" - "$@" -} - -html_cleanup() -{ - mv "$1" "${1}.orig" - do_html_cleanup <"${1}.orig" >"$1" -} - -########################################################################### - -name="`basename "$0"`"; #`" -base="`dirname "$0"`"; base="`cd "$base"; pwd`" #`" - -TEMP=`getopt -n $name -o '' -l html,tagfile,tagfile-name:,tagfiles:,output-dir:,html-dir: -- "$@"` -if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi -eval set -- "$TEMP" - -tagxsl="$base/tag-munge.xsl" - -html="NO"; tagfile="NO"; tagfile_name=""; tagfiles=""; output_dir="doc"; html_dir="html" - -while true; do - case "$1" in - --html) - html="YES" ; shift ;; - --tagfile) - tagfile="YES" ; shift ;; - --tagfile-name) - tagfile_name="$2"; shift 2 ;; - --tagfiles) - for f in $2; do - f="`abspath "$f"`" #`" - tagfiles="$tagfiles${tagfiles:+ }$f" - done - shift 2 - ;; - --output-dir) - output_dir="$2"; shift 2 ;; - --html-dir) - html_dir="$2"; shift 2 ;; - --) - shift; break ;; - *) - echo "Internal error: $*"; exit 1 ;; - esac -done - -if [ -z "$1" ]; then - cat <] - [--tagfiles=] - [--output-dir=] - [--html-dir=] - -EOF - exit 1 -fi - -if [ "$tagfile" = "YES" -a -z "$tagfile_name" ]; then - echo "--tagfile-name is required with --tagfile" - exit 1 -fi - -doxydir="$1" - -if [ -f "$doxydir" ]; then - doxydir="`dirname "$doxydir"`" #`" -fi - -doxydir="`abspath "$doxydir"`" #`" - -########################################################################### - -## Find $TOPDIR - -cd "$doxydir" -while [ ! -r "SConstruct" -a "`pwd`" != "/" ]; do cd ..; done -if [ ! -r "SConstruct" ]; then - echo "topdir not found" - exit 1; -fi -TOPDIR="`pwd`"; -reltopdir="`relpath "$doxydir/$output_dir/$html_dir" "$TOPDIR"`" #`" -cd "$doxydir" - - -## Remove tagfile_name from list of tagfiles - -if [ -n "$tagfile_name" ]; then - tagfile_name="`abspath "$output_dir/$tagfile_name"`" #`" - x="$tagfiles"; tagfiles="" - for f in $x; do - if [ "$f" != "$tagfile_name" ]; then - tagfiles="$tagfiles${tagfiles:+ }$f" - fi - done -fi - -## Call doxygen proper - -generate_tagfile="" -if [ "$tagfile" = "YES" ]; then - generate_tagfile="$tagfile_name" -fi -export TOPDIR html tagfile tagfile_name tagfiles output_dir html_dir generate_tagfile - -cmd ${DOXYGEN:-doxygen} - - -## Clean up tagfile, if generated - -if [ "$tagfile" = "YES" ]; then - mv "$tagfile_name" "${tagfile_name}.orig" - cmd xsltproc --novalid --nonet -o "$tagfile_name" "$tagxsl" "${tagfile_name}.orig" -fi - - -## Call installdox - -if [ -n "$tagfiles" ]; then - args="" - for f in $tagfiles; do - n="`basename "$f"`" #`" - d="`dirname "$f"`" #`" - url="`relpath "$doxydir/$output_dir/$html_dir" "$d/$html_dir"`" #`" - args="$args${args:+ }-l $n@$url" - done - - ( - cd "./$output_dir/$html_dir" - cmd "./installdox" $args - ) -fi - - -## Postprocess html files, if generated - -if [ "$html" = "YES" ]; then - for h in "$doxydir/$output_dir/$html_dir"/*.html; do - cmd html_cleanup "$h" - done -fi diff --git a/doclib/filter.pl b/doclib/filter.pl deleted file mode 100755 index 14ad930..0000000 --- a/doclib/filter.pl +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/perl -n - -BEGIN { - ($topdir=$0) =~ s{doclib/.*$}{}; - print $topdir,"\n"; -} - -s/\s*$//; -while (s/\t/' 'x(8-length($`)%8)/e) {} - -if (/^\s*\\code$/ .. /\\endcode/ && !/^$/) { - $i=length($1) if /^(\s*)\\code$/; - print substr($_,$i),"\n"; -} -elsif (s/^(\s*)
$/$1
/ .. /<\/pre>/ && !/^$/) {
-    $i=length($1) if /^(\s*)
$/;
-    print substr($_,$i),"\n";
-} 
-else {
-    print $_,"\n";
-}
diff --git a/doclib/html-munge.xsl b/doclib/html-munge.xsl
deleted file mode 100644
index 5b35045..0000000
--- a/doclib/html-munge.xsl
+++ /dev/null
@@ -1,509 +0,0 @@
-
-
-
-  
-
-  
-  
-  
-    
-      
-      
-    
-  
-
-  
-    
-      
-        
-          
-            
-            
-            
-          
-          
-            
-          
-        
-      
-    
-  
-
-  
-
-  
-    
-    
-    
-  
-  
-  
-  
-  
-    
-    
-      
-      
-      
-    
-  
-
-  
-  
-
-  
-    
-      
-      commalist
-      
-    
-  
- 
-  
-    

-  
-
-  
-    
-  
-
-  
-    
-    

-    
-  
-
-  
-    
-    ,

-    
-  
-
-  
-
-  
-
-  
-    
-      
-        
-          glossary
-        
-      
-      
-        
-          
-          
-        
-      
-    
-  
-
-  
-
-  
-    
-      
-      
Contents

-      
    
-        
-          
-            
-              
-            
-             
-            
-              
-                
-                  
-                    
-                  
-                
-                
-                  
-                    #autotoc-
-                    
-                  
-                
-              
-              
-            
-          
-        
-      

-    
-  
-
-  
-    
-    .
-    
-      
-      .
-    
-    
-      
-      .
-    
-  
-  
-  
-    
-      
-      
-        
-          
-           
-          
-            
-              
-            
-            
-              
-                anchor
-                
-                  autotoc-
-                  
-                
-                
-              
-            
-          
-        
-        
-          
-        
-      
-    
-  
-
-  
-  
-    
-      
-      
-        
-          
-          
-            rect
-            
-            
-            
-            
-          
-        
-      
-    
-  
-
-  
-
-  
-    
-    
-    
-    
-      
-        memname
-         macro
-      
-      
-        
-          
-            
-              
-                
-              
-              
-                
-              
-            
-          
-        
-      
-
-      
-        
-          
-            
-            (
-            
-            
-            )
-          
-
-          
-            
-              
-              
-              
-              
-              )
-            
-          
-        
-        
-          
-            
-            ()
-            
-            
-            
-          
-        
-      
-      
-        
-      
-    
-  
-
-  
-  
-  
-
-  
-
-  
-    
-
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-
-      
-        
-      
-      
-        
-        
-      
-
-      
-        
-      
-      
-        
-        
-      
-      
-      
-        
-      
-      
-        
-        
-      
-
-      
-        
-      
-      
-        
-        
-      
-      
-      
-        
-      
-      
-        
-        
-      
-      
-      
-        
-      
-      
-        
-        
-      
-      
-      
-        
-      
-      
-        
-        
-      
-
-    
Static Public Member Functions
Static Public Attributes
Public Member Functions
Public Attributes
Public Enumerators
Public Types
Non-Public Members

-  
-
-  
-    
-    
-  
-
-  
-    
-    
-    
-  
-
-  
-   
-  
-
-  
-  
-    
-      qindextable
-    
-  
-
-  
-
-  
-    
-      xref-bug
-    
-  
-
-  
-    
-      xref-fix
-    
-  
-
-  
-    
-      xref-todo
-    
-  
-
-  
-    
-      xref-idea
-    
-  
-
-  
-    
-      parameters
-    
-  
-
-  
-    
-      implementation
-    
-  
-
-  
-    
-      sourceline
-    
-  
-
-  
-    
-      references
-    
-  
-
-  
-    
-      referencedby
-    
-  
-
-  
-    
-      reimplementedfrom
-    
-  
-
-  
-    
-      reimplementedin
-    
-  
-
-  
-    
-      implementedin
-    
-  
-
-  
-
-  
-    
-  
-
-  
-    
-  
-
-  
-  
-    
-      members
-    
-  
-
-  
-  
-    
-      literal
-    
-  
-
-  
-  
-    
-      ext
-    
-  
-
-  
-  
-    
-      anchor
-    
-  
-
-  
-  
-    
-      memtitle
-    
-  
-
-  
-  
-  
-  
-  
-  
-  
-
-
diff --git a/doclib/tag-munge.xsl b/doclib/tag-munge.xsl
deleted file mode 100644
index 67f1f3d..0000000
--- a/doclib/tag-munge.xsl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-  
-  
-    
-  
-  
-
-  
-    
-      
-      
-    
-  
-
-
diff --git a/site_scons/SENFSCons.py b/site_scons/SENFSCons.py
index fc26296..88fa5e5 100644
--- a/site_scons/SENFSCons.py
+++ b/site_scons/SENFSCons.py
@@ -23,8 +23,8 @@ def Glob(env, exclude=[], subdirs=[]):
 
 def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []):
     # There is one small problem we need to solve with this builder: The Doxygen builder reads
-    # the Doxyfile and thus depends on the environment variables set by doclib/doxygen.sh. We
-    # thus have to provide all necessary definitions here manually via DOXYENV !
+    # the Doxyfile and thus depends on the environment variables set by site_scons/lib/doxygen.sh.
+    # We thus have to provide all necessary definitions here manually via DOXYENV !
 
     if type(doxyfile) is type(""):
         doxyfile = env.File(doxyfile)
@@ -47,8 +47,8 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []):
                                            'generate_tagfile': 'doc/${MODULE}.tag' },
                               MODULE   = module )
         env.Append(ALL_TAGFILES = [ tagfile[0].abspath ])
-        env.Depends(tagfile, [ env.File('#/doclib/doxygen.sh'), 
-                               env.File('#/doclib/tag-munge.xsl') ])
+        env.Depends(tagfile, [ env.File('#/site_scons/lib/doxygen.sh'), 
+                               env.File('#/site_scons/lib/tag-munge.xsl') ])
 
         env.Install(env.Dir('$DOCINSTALLDIR').Dir(tagfile[0].dir.get_path(env.Dir('#'))),
                     tagfile[0])
@@ -64,8 +64,8 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []):
                                    'output_dir'      : 'doc',
                                    'html_dir'        : 'html',
                                    'html'            : 'YES' } )
-    env.Depends(doc, [ env.File('#/doclib/doxygen.sh'),
-                       env.File('#/doclib/html-munge.xsl') ])
+    env.Depends(doc, [ env.File('#/site_scons/lib/doxygen.sh'),
+                       env.File('#/site_scons/lib/html-munge.xsl') ])
 
     # Copy the extra_sources (the images) into the documentation directory
     # (need to exclude the 'clean' case otherwise there are multiple ways to clean the copies)