From: g0dil Date: Fri, 4 Sep 2009 17:11:32 +0000 (+0000) Subject: Removed further files from top-level directory X-Git-Url: http://g0dil.de/git?p=senf.git;a=commitdiff_plain;h=a5d6a20ef608461a1932b4983139e8a3c1facada Removed further files from top-level directory git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1385 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/.gitignore b/.gitignore index 4dd6f87..c0de9c6 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ doc/ .test.stamp # Local files (files in this directory) -/Doxyfile.local /SConscript.local /*-stamp /*.conf diff --git a/project.el b/.project.el similarity index 98% rename from project.el rename to .project.el index 74eafad..0ec0ad2 100644 --- a/project.el +++ b/.project.el @@ -87,7 +87,7 @@ is ignored (Those are the file local variables and local words)." ;; Better set this here than in the file variables since the setting ;; is only valid if project.el is loaded ... (set (make-local-variable 'ispell-personal-dictionary) - (expand-file-name "senf.dict" ccide-project-root)) + (expand-file-name "tools/senf.dict" ccide-project-root)) (flyspell-cc-mode) (defun senf-new-file-hook () diff --git a/SConstruct b/SConstruct index cabb4bc..ad342c9 100644 --- a/SConstruct +++ b/SConstruct @@ -114,8 +114,8 @@ Export('env') # Create Doxyfile.local otherwise doxygen will barf on this non-existent file # Create it even when cleaning, to silence the doxygen builder warnings -if not os.path.exists("Doxyfile.local"): - Execute(Touch("Doxyfile.local")) +if not os.path.exists("doclib/Doxyfile.local"): + Execute(Touch("doclib/Doxyfile.local")) if not env.GetOption('clean') and not os.path.exists(".prepare-stamp") \ and not os.environ.get("SCONS") and COMMAND_LINE_TARGETS != [ 'prepare' ]: @@ -135,9 +135,6 @@ SConscript("doclib/SConscript") ########################################################################### # Define build targets -#### doc -env.Depends(SENFSCons.Doxygen(env), env.Value(env['ENV']['REVISION'])) - #### libsenf.a libsenf = env.Library("$LOCALLIBDIR/${LIBSENF}${LIBADDSUFFIX}", env['ALLOBJECTS']) env.Default(libsenf) @@ -182,18 +179,16 @@ env.PhonyTarget('valgrind', [ 'all_tests' ], [ """ """.replace("\n"," ") ]) ### lcov -env.Alias('lcov', env.AlwaysBuild( - env.Command( [ env.Dir('doc/lcov'), 'lcov.info' ], [], [ +env.PhonyTarget('lcov', [], [ '$SCONS debug=1 CCFLAGS+="-fprofile-arcs -ftest-coverage" LIBS+="gcov" all_tests', '$LCOV --directory . --capture --output-file /tmp/senf_lcov.info --base-directory .', '$LCOV --output-file ${TARGETS[1]} --remove /tmp/senf_lcov.info \\*/include/\\*', '$GENHTML --output-directory ${TARGETS[0]} --title all_tests ${TARGETS[1]}', - 'rm /tmp/senf_lcov.info' ]))) + 'rm /tmp/senf_lcov.info' ]) #### clean env.Clean('all', '.prepare-stamp') env.Clean('all', libsenf) -env.Clean('all', env.Dir('linklint')) # env.Dir to disambiguate from linklint PhonyTarget env.Clean('all', env.Dir('dist')) env.Clean('all', 'lcov.info') diff --git a/debian/SConscript b/debian/SConscript index 6997332..33e6c81 100644 --- a/debian/SConscript +++ b/debian/SConscript @@ -88,7 +88,7 @@ env.Append( ENV = { env.Replace( LOCAL_CONFIG_FILES = [ '/Doxyfile.local', '/SConscript.local', '/senf/local_config.hh' ], DPKG_IGNORED_FILES = [ '$LOCAL_CONFIG_FILES', '.svn', '.git', '.gitignore', '/_templates', - '/TODO', '.project', '.cproject', '.dir.el', '/project.el' ], + '/TODO', '.project', '.cproject', '.dir.el', '/.project.el' ], DPKG_IGNORED_FILES_OPTS = dpkgIgnoredFilesOpts, BUILDPACKAGE_COMMAND = "dpkg-buildpackage -us -uc -rfakeroot $DPKG_IGNORED_FILES_OPTS", ) diff --git a/doclib/.gitignore b/doclib/.gitignore index 3425fd9..6677436 100644 --- a/doclib/.gitignore +++ b/doclib/.gitignore @@ -3,3 +3,4 @@ ! /logo-head.png /search.php /search_paths.php +/Doxyfile.local diff --git a/Doxyfile b/doclib/Doxyfile similarity index 88% rename from Doxyfile rename to doclib/Doxyfile index 37de8ed..8756efc 100644 --- a/Doxyfile +++ b/doclib/Doxyfile @@ -1,6 +1,6 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" -INPUT = . doclib +INPUT = . PROJECT_NAME = Overview PROJECT_NUMBER = "(Version $(REVISION))" diff --git a/doclib/Doxyfile.global b/doclib/Doxyfile.global index 594f6db..e9fc343 100644 --- a/doclib/Doxyfile.global +++ b/doclib/Doxyfile.global @@ -64,4 +64,4 @@ LAYOUT_FILE = $(LIBDIR)/DoxygenLayout.xml HTML_HEADER = $(TOPDIR)/doclib/doxy-header.html HTML_FOOTER = $(TOPDIR)/doclib/doxy-footer.html -@INCLUDE = "$(TOPDIR)/Doxyfile.local" +@INCLUDE = "$(TOPDIR)/doclib/Doxyfile.local" diff --git a/doclib/SConscript b/doclib/SConscript index 65a798a..8d45689 100644 --- a/doclib/SConscript +++ b/doclib/SConscript @@ -321,3 +321,5 @@ 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') + +env.Depends(SENFSCons.Doxygen(env, output_directory="../doc"), env.Value(env['ENV']['REVISION'])) diff --git a/site_scons/SENFSCons.py b/site_scons/SENFSCons.py index 1f082b9..65b882e 100644 --- a/site_scons/SENFSCons.py +++ b/site_scons/SENFSCons.py @@ -21,7 +21,7 @@ def Glob(env, exclude=[], subdirs=[]): includes.append(p) return ( sources, testSources, includes ) -def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): +def Doxygen(env, doxyfile = "Doxyfile", extra_sources = [], output_directory = "doc"): # 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 site_scons/lib/doxygen.sh. # We thus have to provide all necessary definitions here manually via DOXYENV ! @@ -34,19 +34,25 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): module = doxyfile.dir.get_path(env.Dir('#')).replace('/','_') if module == '.' : module = "Main" + # Standard doc build vars and opts + def vars(env=env, **kw): + denv = { 'TOPDIR' : env.Dir('#').abspath, + 'LIBDIR' : env.Dir('#/site_scons/lib').abspath, + 'output_dir' : '$OUTPUT_DIRECTORY', + 'html_dir' : 'html', + 'html' : 'NO' } + denv.update(kw) + return { 'DOXYENV' : denv, + 'MODULE' : module, + 'OUTPUT_DIRECTORY': output_directory }; + opts = [ '--tagfile-name', '"${MODULE}.tag"', + '--output-dir', '$OUTPUT_DIRECTORY' ] + # Rule to generate tagfile # (need to exclude the 'clean' case, otherwise we'll have duplicate nodes) if not env.GetOption('clean'): - tagfile = env.Doxygen(doxyfile, - DOXYOPTS = [ '--tagfile-name', '"${MODULE}.tag"', - '--tagfile' ], - DOXYENV = { 'TOPDIR' : env.Dir('#').abspath, - 'LIBDIR' : env.Dir('#/site_scons/lib').abspath, - 'output_dir' : 'doc', - 'html_dir' : 'html', - 'html' : 'NO', - 'generate_tagfile': 'doc/${MODULE}.tag' }, - MODULE = module ) + tagfile = env.Doxygen(doxyfile, DOXYOPTS = opts + [ '--tagfile' ], + **vars(generate_tagfile = 'doc/${MODULE}.tag')) env.Append(ALL_TAGFILES = [ tagfile[0].abspath ]) env.Depends(tagfile, [ env.File('#/site_scons/lib/doxygen.sh'), env.File('#/site_scons/lib/tag-munge.xsl') ]) @@ -55,17 +61,8 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): tagfile[0]) # Rule to generate HTML documentation - doc = env.Doxygen(doxyfile, - DOXYOPTS = [ '--tagfiles', '"$ALL_TAGFILES"', - '--tagfile-name', '"${MODULE}.tag"', - '--html' ], - MODULE = module, - DOXYENV = { 'TOPDIR' : env.Dir('#').abspath, - 'LIBDIR' : env.Dir('#/site_scons/lib').abspath, - 'tagfiles' : '${ALL_TAGFILES}', - 'output_dir' : 'doc', - 'html_dir' : 'html', - 'html' : 'YES' } ) + doc = env.Doxygen(doxyfile, DOXYOPTS = opts + [ '--tagfiles', '"$ALL_TAGFILES"', '--html' ], + **vars(html = 'YES')) env.Depends(doc, [ env.File('#/site_scons/lib/doxygen.sh'), env.File('#/site_scons/lib/html-munge.xsl') ]) diff --git a/site_scons/lib/doxygen.sh b/site_scons/lib/doxygen.sh index 958a87b..dd72609 100755 --- a/site_scons/lib/doxygen.sh +++ b/site_scons/lib/doxygen.sh @@ -32,8 +32,10 @@ abspath() # Create relative path from absolute directory $1 to absolute path $2 relpath() { - local src="${1#/}" - local dst="${2#/}" + local src="`abspath "$1"`" # `" + local dst="`abspath "$2"`" # `" + src="${src#/}" + dst="${dst#/}" while true; do if [ -z "$src" -a -z "$dst" ]; then echo "Internal error in relpath()" 1>&2 diff --git a/senf.dict b/tools/senf.dict similarity index 100% rename from senf.dict rename to tools/senf.dict