X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=doclib%2FSConscript;h=78312004de28d0b119edc19c9b62c4006ae6f86c;hb=25976ed67c66d30811fa0a01043e50347e9d1e69;hp=097ec6b039bb5cfe3dd5bd28dfc9ac7bc0522973;hpb=f214d8c456b57c851066b6dd437049938f8a91ee;p=senf.git diff --git a/doclib/SConscript b/doclib/SConscript index 097ec6b..7831200 100644 --- a/doclib/SConscript +++ b/doclib/SConscript @@ -127,11 +127,14 @@ def modules(): # Naja ... etwas rumgehackt aber was solls ... global EXTRA_MODULES mods = {} - pathbase = len(env.Dir('#').abspath)+1 + pathbase = env.Dir('#/senf').abspath + pathbasel = len(pathbase)+1 for module in env.Alias('all_docs')[0].sources: if module.name != 'html.stamp' : continue - mods[module.dir.dir.dir.abspath] = [ module.dir.dir.dir.name, - module.dir.abspath[pathbase:], + if not module.dir.dir.dir.abspath.startswith(pathbase): continue + mods[module.dir.dir.dir.abspath] = [ module.dir.dir.dir.abspath[pathbasel:].replace('/','_'), + module.dir.dir.dir.name, + module.dir.abspath[pathbasel:], 0 ] rv = [] @@ -140,39 +143,18 @@ def modules(): for mod in keys: i = 0 while i < len(rv): - if len(rv[i]) > pathbase and mod.startswith(rv[i] + '/'): - level = mods[rv[i]][2] + 1 + if len(rv[i]) > pathbasel and mod.startswith(rv[i] + '/'): + level = mods[rv[i]][-1] + 1 i += 1 while i < len(rv) and mods[rv[i]][2] >= level: i += 1 rv[i:i] = [ mod ] - mods[mod][2] = level + mods[mod][-1] = level break i += 1 if i == len(rv): rv.append(mod) - for mod in keys: - if mods[mod][2] == 0: - mods[mod][0] = 'lib' + mods[mod][0] - - n = 0 - for name,path in EXTRA_MODULES: - path = env.Dir(path).dir.dir.abspath - i = 0 - while i < len(rv): - if rv[i] == path: - mods[rv[i]][0] = name - m = 1 - while i+m < len(rv) and mods[rv[i+m]][2] > mods[rv[i]][2]: - m += 1 - rv[n:n] = rv[i:i+m] - rv[i+m:i+2*m] = [] - i += m - n += m - else: - i += 1 - return ( tuple(mods[mod]) for mod in rv ) def indices(): @@ -191,14 +173,6 @@ writeTemplate = env.Action(writeTemplate, varlist = [ 'TEMPLATE' ]) ########################################################################### -# Extra documentation modules which are handled (named) different from -# library modules -EXTRA_MODULES = [ - ('Overview', '#/doc/html'), - ('Examples', '#/Examples/doc/html'), - ('HowTos', '#/HowTos/doc/html'), - ('SENFSCons', '#/senfscons/doc/html') ] - HEADER = """ @@ -232,7 +206,6 @@ div.tabs li.$projectname a { background-color: #EDE497; }
  • ChangeLog
  • Browse SVN
  • Bug Tracker
    • -
  • Open Issues
    • @@ -240,11 +213,16 @@ div.tabs li.$projectname a { background-color: #EDE497; }
    +
  • Overview
    • +
  • Examples
    • +
  • HowTos
    • +
  • Glossary
    • +
    +
      -{{ for name, path, level in modules(): -
    • ${name}
      • +{{ for id, name, path, level in modules(): +
    • ${name}
      • }} -
    • Glossary
    """ @@ -273,18 +251,21 @@ function paths() { } ?>""" -env.Append( ENV = { - 'TODAY' : str(datetime.date.today()), - 'TEXINPUTS' : os.environ.get('TEXINPUTS',env.Dir('#/doclib').abspath + ':'), - 'DOXYGEN' : env.get('DOXYGEN', 'doxygen'), -}) +env.SetDefault( + DOXYGEN = "doxygen" +) env.Replace( - ALL_TAGFILES = [], DOXYGENCOM = "doclib/doxygen.sh $DOXYOPTS $SOURCE", ) -SENFSCons.PhonyTarget(env, 'linklint', [ +env.Append( ENV = { + 'TODAY' : str(datetime.date.today()), + 'TEXINPUTS' : os.environ.get('TEXINPUTS',env.Dir('#/doclib').abspath + ':'), + 'DOXYGEN' : str(env.File(env['DOXYGEN'])), +}) + +env.PhonyTarget('linklint', [], [ 'rm -rf linklint', 'linklint -doc linklint -limit 99999999 `find -type d -name html -printf "/%P/@ "`', '[ ! -r linklint/errorX.html ] || python doclib/linklint_addnames.py linklint/errorX.html.new', @@ -294,9 +275,7 @@ SENFSCons.PhonyTarget(env, 'linklint', [ 'echo -e "\\nLokal link check results: linklint/index.html\\nRemote link check results: linklint/urlindex.html\\n"', ]) -env.Clean('all', env.Dir('linklint')) - -SENFSCons.PhonyTarget(env, 'fixlinks', [ +env.PhonyTarget('fixlinks', [], [ 'python doclib/fix-links.py -v -s .svn -s linklint -s debian linklint/errorX.txt linklint/errorAX.txt', ]) @@ -337,3 +316,5 @@ env.Alias('install_all', env.Clean('all', 'doxy-header.html') # I should not need this but I do ... env.Clean('all_docs', 'doxy-header.html') # I should not need this but I do ... + +env.Install('${DOCINSTALLDIR}', 'index.html')