diff options
author | Vincent Sanders <vince@kyllikki.org> | 2015-06-24 16:47:32 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2015-06-24 16:47:32 +0100 |
commit | 92a9156ac26570480205425012fe708431d48a13 (patch) | |
tree | 7d4bc8a0b5c42236b33a0625a36101feddfe9c07 | |
parent | 6548d564fd75795806ee9f9e7c6abaa43e56cdf5 (diff) | |
download | buildsystem-92a9156ac26570480205425012fe708431d48a13.tar.gz buildsystem-92a9156ac26570480205425012fe708431d48a13.tar.bz2 |
Update documentation generation
-rwxr-xr-x | citools/jenkins-build.sh | 16 | ||||
-rw-r--r-- | makefiles/Makefile.tools | 6 | ||||
-rw-r--r-- | makefiles/Makefile.top | 6 |
3 files changed, 22 insertions, 6 deletions
diff --git a/citools/jenkins-build.sh b/citools/jenkins-build.sh index 2646427..e0b5929 100755 --- a/citools/jenkins-build.sh +++ b/citools/jenkins-build.sh @@ -24,13 +24,14 @@ # This script may be executed by jenkins jobs that use the core buildsystem # -# Usage: jenkins-build.sh [install|test-install|coverage|static] +# Usage: jenkins-build.sh [install|test-install|coverage|static|docs] # # install - build and install # test-install - build, test and install # coverage - run coverage # static - perform a static analysis # coverity - perform a coverity scan +# docs - build doxygen docs # HOST must be in the environment and set correctly if [ "x${HOST}" = "x" ];then @@ -57,6 +58,7 @@ TARGET_INSTALL= TARGET_COVERAGE= TARGET_STATIC= TARGET_COVERITY= +TARGET_DOCS= # Which variant is being generated VARIANT="release" @@ -94,6 +96,10 @@ case "$1" in TARGET_INSTALL=${HOST} ;; + "docs") + TARGET_DOCS=${HOST} + ;; + "") # default is test only on Linux and install # Currently most tests do not work on targets except for Linux @@ -103,13 +109,14 @@ case "$1" in *) cat <<EOF -Usage: jenkins-build.sh [install|test-install|coverage|static] +Usage: jenkins-build.sh [install|test-install|coverage|static|docs] install build and install test-install build, test and install coverage run coverage static perform a static anaysis coverity perform a coverity scan + docs generate doxygen docs EOF exit 1 ;; @@ -201,6 +208,11 @@ elif [ "x${HOST}" = "x${TARGET_COVERITY}" ]; then curl --form "project=${COVERITY_PROJECT}" --form "token=${COVERITY_TOKEN}" --form "email=${COVERITY_USER}" --form "file=@coverity-scan.tar.gz" --form "version=${COVERITY_VERSION}" --form "description=Git Head build" http://scan5.coverity.com/cgi-bin/upload.py +elif [ "x${HOST}" = "x${TARGET_DOCS}" ]; then + # Documentation build + ${MAKE} Q= HOST=${HOST} VARIANT=${VARIANT} docs + + else # Normal build ${MAKE} Q= HOST=${HOST} VARIANT=${VARIANT} diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index 74bc17f..d74b64b 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -437,6 +437,12 @@ ifeq ($(COMPONENT_TYPE),lib-shared) endif ################################################################################ +# Documentation defaults +################################################################################ + +DOXYCONF ?= docs/Doxyfile + +################################################################################ # Package config macros ################################################################################ diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top index 07d3373..9d3c680 100644 --- a/makefiles/Makefile.top +++ b/makefiles/Makefile.top @@ -115,7 +115,6 @@ BUILDDIR ?= build-$(BUILD)-$(HOST)-$(VARIANT)-$(COMPONENT_TYPE) # Build tree subdirs COVERAGEDIR := $(BUILDDIR)/coverage -DOCDIR := $(BUILDDIR)/docs # Determine if we want to build testcases ifeq ($(MAKECMDGOALS),test) @@ -236,8 +235,8 @@ coverage: __precov test profile: __partial_clean test # Compile documentation -docs: $(BUILDDIR)/stamp - $(Q)$(DOXYGEN) build/Doxyfile +docs: $(DOXYCONF) $(BUILDDIR)/stamp + $(Q)$(DOXYGEN) $< # Distribution # This constructs a distribution tar from the last git tag. It ensures @@ -393,7 +392,6 @@ uninstall: $(BUILDDIR)/stamp: $(Q)$(MKDIR) $(MKDIRFLAGS) $(BUILDDIR) $(Q)$(MKDIR) $(MKDIRFLAGS) $(COVERAGEDIR) - $(Q)$(MKDIR) $(MKDIRFLAGS) $(DOCDIR) $(Q)$(TOUCH) $(TOUCHFLAGS) $(BUILDDIR)/stamp $(OUTPUT): $(BUILDDIR)/stamp $(OBJECTS) |