From 5f67c67323bff27751ba07c417ba99180fa0d762 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sun, 31 May 2015 16:02:56 +0200 Subject: Cleanup & adapt travis config --- .travis.yml | 6 ++++-- BUILD.txt | 2 +- doc/CMakeLists.txt | 2 +- doc/Makefile.in | 39 --------------------------------------- doc/Makefile.win_make.in | 40 ---------------------------------------- doc/Makefile.win_nmake.in | 41 ----------------------------------------- 6 files changed, 6 insertions(+), 124 deletions(-) delete mode 100644 doc/Makefile.in delete mode 100644 doc/Makefile.win_make.in delete mode 100644 doc/Makefile.win_nmake.in diff --git a/.travis.yml b/.travis.yml index 1206c68..60ae6c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,9 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -qq texlive texlive-extra-utils libxml2-utils perl script: - - ./configure --with-doxywizard + - mkdir build + - cd build + - cmake -G "Unix Makefiles" -Dbuild_doc=ON -Dbuild_wizard=ON .. - make - make docs - - make test + - make tests diff --git a/BUILD.txt b/BUILD.txt index 8c6388c..a507beb 100644 --- a/BUILD.txt +++ b/BUILD.txt @@ -47,5 +47,5 @@ To see the current value is of the various options, you can run cmake -L path/to/root/of/doxygen/source/tree -The build target for building the documentation is 'doc' and the build target for +The build target for building the documentation is 'docs' and the build target for the regression tests is 'tests' diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index c66adf2..cefcccf 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -10,7 +10,7 @@ file(COPY ${EXAMPLE_DIR} DESTINATION ${PROJECT_BINARY_DIR}) file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/man) -add_custom_target(doc +add_custom_target(docs COMMENT "Generating documentation in ${DOXYDOCS}" COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen COMMAND ${CMAKE_COMMAND} -E remove_directory ../latex/refman.tex diff --git a/doc/Makefile.in b/doc/Makefile.in deleted file mode 100644 index e3a833c..0000000 --- a/doc/Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ -# -# -# -# Copyright (C) 1997-2015 by Dimitri van Heesch. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation under the terms of the GNU General Public License is hereby -# granted. No representations are made about the suitability of this software -# for any purpose. It is provided "as is" without express or implied warranty. -# See the GNU General Public License for more details. -# -# Documents produced by Doxygen are derivative works derived from the -# input used in their production; they are not affected by this license. - -all: language config.doc FORCE - DOXYGEN_DOCDIR=$(DOXYDOCS); \ - export DOXYGEN_DOCDIR; \ - VERSION=$(VERSION) ; \ - export VERSION; \ - "$(DOXYGEN)/bin/doxygen" - @rm -f ../latex/refman.tex - @cp doxygen_logo*.gif ../html - @cp Makefile.latex ../latex/Makefile - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >../latex/doxygen_manual.tex - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >../latex/doxygen.sty - @epstopdf doxygen_logo.eps --outfile=../latex/doxygen_logo.pdf - -clean: - rm -rf ../html ../latex *.bak - -language: language.doc - -language.doc: $(wildcard ../src/translator*.h) maintainers.txt language.tpl translator.py - $(PYTHON) translator.py - -config.doc: ../src/config.xml ../src/configgen.py - $(PYTHON) ../src/configgen.py -doc ../src/config.xml > config.doc - -FORCE: diff --git a/doc/Makefile.win_make.in b/doc/Makefile.win_make.in deleted file mode 100644 index a8fc5fb..0000000 --- a/doc/Makefile.win_make.in +++ /dev/null @@ -1,40 +0,0 @@ -# -# -# -# Copyright (C) 1997-2015 by Dimitri van Heesch. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation under the terms of the GNU General Public License is hereby -# granted. No representations are made about the suitability of this software -# for any purpose. It is provided "as is" without express or implied warranty. -# See the GNU General Public License for more details. -# -# Documents produced by Doxygen are derivative works derived from the -# input used in their production; they are not affected by this license. - -all: language config.doc FORCE - @xcopy /s /q /i ..\examples ..\html\examples - set DOXYGEN_DOCDIR=. & \ - set VERSION=$(VERSION) & \ - $(DOXYGEN)\bin\doxygen - @del ..\latex\refman.tex - @copy doxygen_logo*.gif ..\html - @copy Makefile.latex ..\latex\Makefile - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >..\latex\doxygen_manual.tex - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >..\latex\doxygen.sty - @epstopdf doxygen_logo.eps --outfile=..\latex\doxygen_logo.pdf - -clean: - del /s /q ..\html ..\latex - del translator_report.txt *.bak - -language: language.doc - -language.doc: maintainers.txt language.tpl translator.py - set DOXYGEN_DOCDIR=. & set VERSION=$(VERSION) & python translator.py - -config.doc: ..\src\config.xml ..\src\configgen.py - python ..\src\configgen.py -doc ..\src\config.xml > config.doc - - -FORCE: diff --git a/doc/Makefile.win_nmake.in b/doc/Makefile.win_nmake.in deleted file mode 100644 index af9c6d1..0000000 --- a/doc/Makefile.win_nmake.in +++ /dev/null @@ -1,41 +0,0 @@ -# -# -# -# Copyright (C) 1997-2015 by Dimitri van Heesch. -# -# Permission to use, copy, modify, and distribute this software and its -# documentation under the terms of the GNU General Public License is hereby -# granted. No representations are made about the suitability of this software -# for any purpose. It is provided "as is" without express or implied warranty. -# See the GNU General Public License for more details. -# -# Documents produced by Doxygen are derivative works derived from the -# input used in their production; they are not affected by this license. - -all: language config.doc FORCE - @xcopy /s /q /i ..\examples ..\html\examples - set DOXYGEN_DOCDIR=. - set VERSION=$(VERSION) - $(DOXYGEN)\bin\doxygen - @del ..\latex\refman.tex - @copy doxygen_logo*.gif ..\html - @copy Makefile.latex ..\latex\Makefile - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >..\latex\doxygen_manual.tex - @sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >..\latex\doxygen.sty - @epstopdf doxygen_logo.eps --outfile=..\latex\doxygen_logo.pdf - -clean: - del /s /q ..\html ..\latex - del translator_report.txt *.bak - -language: language.doc - -language.doc: maintainers.txt language.tpl translator.py - set DOXYGEN_DOCDIR=. - set VERSION=$(VERSION) - python translator.py - -config.doc: ../src/config.xml ../src/configgen.py - python ../src/configgen.py -doc ../src/config.xml > config.doc - -FORCE: -- cgit v0.12