From 96564261f4c38b140df46300843a0d30569ee8df Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 8 Oct 2012 18:12:41 +0000 Subject: [PATCH] Intermediate git-svn-id: https://svn.dealii.org/branches/branch_cmake@27012 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/CMakeLists.txt | 2 +- deal.II/doc/doxygen/CMakeLists.txt | 21 +-------- deal.II/doc/doxygen/options.dox.in | 2 +- deal.II/doc/{doxygen => scripts}/filter | 0 deal.II/{ => doc}/scripts/validate-xrefs.pl | 0 deal.II/examples/Makefile | 49 --------------------- 6 files changed, 3 insertions(+), 71 deletions(-) rename deal.II/doc/{doxygen => scripts}/filter (100%) rename deal.II/{ => doc}/scripts/validate-xrefs.pl (100%) delete mode 100644 deal.II/examples/Makefile diff --git a/deal.II/doc/CMakeLists.txt b/deal.II/doc/CMakeLists.txt index c5c107f15b..dc92cdf145 100644 --- a/deal.II/doc/CMakeLists.txt +++ b/deal.II/doc/CMakeLists.txt @@ -31,7 +31,7 @@ IF(DEAL_II_COMPONENT_DOCUMENTATION) INSTALL(DIRECTORY . DESTINATION ${DEAL_II_DOCUMENTATION_RELDIR} COMPONENT documentation - FILES_MATCHING REGEX "^.*(html|css|eps|fig|png)$" # TODO + FILES_MATCHING REGEX "^.*(html|css|eps|jpg|gif|fig|png|ico)$" # TODO ) CONFIGURE_FILE( diff --git a/deal.II/doc/doxygen/CMakeLists.txt b/deal.II/doc/doxygen/CMakeLists.txt index 6512ff68da..27fbcd3480 100644 --- a/deal.II/doc/doxygen/CMakeLists.txt +++ b/deal.II/doc/doxygen/CMakeLists.txt @@ -1,9 +1,4 @@ # -# TODO: -# -# A very primitive proof of concept on how to use doxygen, atm. -# -# # doxygen/tutorial/toc.html.in # doxygen/header.tex.in # @@ -24,14 +19,6 @@ CONFIGURE_FILE( COPYONLY ) -CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/filter - ${CMAKE_CURRENT_BINARY_DIR}/filter - COPYONLY - ) - - - file(GLOB doxygen_input ${CMAKE_SOURCE_DIR}/include/deal.II/* ${CMAKE_BINARY_DIR}/include/deal.II/* @@ -70,13 +57,7 @@ ADD_CUSTOM_TARGET(doxygen ALL # TODO: Really all? WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/deal.II - ${CMAKE_CURRENT_BINARY_DIR}/options.dox - #already generated at configuration time: - #${CMAKE_CURRENT_BINARY_DIR}/header.html - #${CMAKE_CURRENT_BINARY_DIR}/footer.html - #${CMAKE_CURRENT_BINARY_DIR}/filter - #${CMAKE_BINARY_DIR}/include/deal.II/base/config.h - #${CMAKE_BINARY_DIR}/include/deal.II/lac/lapack_templates.h + ${CMAKE_CURRENT_BINARY_DIR}/options.dox # TODO COMMENT "Generating documentation via doxygen" VERBATIM ) diff --git a/deal.II/doc/doxygen/options.dox.in b/deal.II/doc/doxygen/options.dox.in index ec29fb9cea..bcaeccef52 100644 --- a/deal.II/doc/doxygen/options.dox.in +++ b/deal.II/doc/doxygen/options.dox.in @@ -507,7 +507,7 @@ IMAGE_PATH = # to standard output. If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = ./filter +INPUT_FILTER = ${CMAKE_SOURCE_DIR}/doc/scripts/filter # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. Doxygen will compare the file name with each pattern and apply the diff --git a/deal.II/doc/doxygen/filter b/deal.II/doc/scripts/filter similarity index 100% rename from deal.II/doc/doxygen/filter rename to deal.II/doc/scripts/filter diff --git a/deal.II/scripts/validate-xrefs.pl b/deal.II/doc/scripts/validate-xrefs.pl similarity index 100% rename from deal.II/scripts/validate-xrefs.pl rename to deal.II/doc/scripts/validate-xrefs.pl diff --git a/deal.II/examples/Makefile b/deal.II/examples/Makefile deleted file mode 100644 index 14655af659..0000000000 --- a/deal.II/examples/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# $Id$ -# -# This Makefile only recurses into the subdirs -include ../common/Make.global_options - -all: default - -# existing examples. take dirnames and strip 'step' -steps = $(shell echo step-? step-??) - - -# default is: build all examples. for each example, there is a target -# build-step-N, where N in [1...] -default: $(addprefix build-,$(steps)) doxygen - -# run example programs; make a target run-step-N for each N -run: $(addprefix run-,$(steps)) run-doxygen - -# clean subdirs; make a target clean-step-N for each N -clean: - -rm -f *~ */*~ */*.$(OBJEXT) */*gmv */*gnuplot */*gpl */*eps */*pov */*tex \ - $(addsuffix $(EXEEXT),$(basename $(shell echo step-*/step-*.cc))) \ - doxygen/*.o doxygen/*.exe */Makefile.dep - -# Create plain.cc in each subdirectory -plain: $(steps) - for step in $(steps) ; do cd $$step; perl $D/doc/doxygen/tutorial/program2plain $$step.cc > plain.cc ; cd .. ; done - -# for each build/run/clean target: strip the build- prefix of the -# target and build in that directory -build-step-%: - cd $(@:build-%=%) ; $(MAKE) -run-step-%: - cd $(@:run-%=%) ; $(MAKE) run -clean-step-%: - cd $(@:clean-%=%) ; $(MAKE) clean -doxygen: - cd doxygen ; $(MAKE) -run-doxygen: - cd doxygen ; $(MAKE) run -clean-doxygen: - cd doxygen ; $(MAKE) clean - -# all targets in this directory do not produce files, so they are -# .PHONY: -.PHONY: $(addprefix build-step-,$(steps)) \ - $(addprefix run-step-,$(steps)) \ - $(addprefix clean-step-,$(steps)) \ - doxygen doxygen-run doxygen-clean \ No newline at end of file -- 2.39.5