diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-26 21:17:27 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-27 19:31:21 +0100 |
| commit | 6133c8a9e7ab5e1eed2fa7d0ee2a61ace4bea65e (patch) | |
| tree | 4cc8a0b0aafae8773993739aa9c654ecf9f3a6ec /mkspecs/features/default_post.prf | |
| parent | 80b99a6dd74c07a1140ab14459b73171b9e681dc (diff) | |
revamp doc generation targets
- the old docs target becomes html_docs
- a new qch_docs target is added. the .qch files end up directly in
QT_INSTALL_DOCS, wihout any subdirectories in between
- the new docs target invokes html_docs and qch_docs
- respective un-/install targets are added as well. note that the
install targets don't depend on the build targets, as it's virtually
impossible to get the dependencies right throughout the hierarchy.
Change-Id: I07a2589db8252371e77cf925c47c4e59fbd1b2ca
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'mkspecs/features/default_post.prf')
| -rw-r--r-- | mkspecs/features/default_post.prf | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 86ce168a8e..bfabf25f21 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -62,10 +62,12 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST prepare_docs { prepareRecursiveTarget(prepare_docs) prepareRecursiveTarget(generate_docs) - docs.commands = $(MAKE) -f $(MAKEFILE) prepare_docs && $(MAKE) -f $(MAKEFILE) generate_docs + html_docs.commands = $(MAKE) -f $(MAKEFILE) prepare_docs && $(MAKE) -f $(MAKEFILE) generate_docs } else { - prepareRecursiveTarget(docs) + prepareRecursiveTarget(html_docs) } + prepareRecursiveTarget(qch_docs) + prepareRecursiveTarget(docs) } else { # apps and libs only generate docs if QMAKE_DOCS is set !isEmpty(QMAKE_DOCS) { @@ -75,24 +77,35 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST !isEmpty(QMAKE_DOCS_OUTPUTDIR):QMAKE_DOCS_OPTIONS += -outputdir $$QMAKE_DOCS_OUTPUTDIR !isEmpty(QMAKE_DOCS_INSTALLDIR):QMAKE_DOCS_OPTIONS += -installdir $$QMAKE_DOCS_INSTALLDIR doc_command = $$QDOC $$QMAKE_DOCS_OPTIONS $$QDOC_INDEX $$QMAKE_DOCS - prepare_docs { prepare_docs.commands += $$doc_command -prepare -no-link-errors generate_docs.commands += $$doc_command -generate - docs.depends += generate_docs + html_docs.depends += generate_docs } else { - docs.commands += $$doc_command + html_docs.commands += $$doc_command } + + qtPrepareTool(QHELPGENERATOR, qhelpgenerator) + isEmpty(QMAKE_DOCS_TARGET): QMAKE_DOCS_TARGET = $$basename(QMAKE_DOCS_OUTPUTDIR) + qch_docs.commands = $$QHELPGENERATOR $$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp -o $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch } } - QMAKE_EXTRA_TARGETS += docs + docs.commands = $(MAKE) -f $(MAKEFILE) html_docs && $(MAKE) -f $(MAKEFILE) qch_docs + QMAKE_EXTRA_TARGETS += html_docs qch_docs docs prepare_docs: QMAKE_EXTRA_TARGETS += prepare_docs generate_docs } !contains(QMAKE_EXTRA_TARGETS, install_docs) { contains(TEMPLATE, subdirs) { + prepareRecursiveTarget(install_html_docs) + prepareRecursiveTarget(uninstall_html_docs) + prepareRecursiveTarget(install_qch_docs) + prepareRecursiveTarget(uninstall_qch_docs) prepareRecursiveTarget(install_docs) prepareRecursiveTarget(uninstall_docs) } - QMAKE_EXTRA_TARGETS += install_docs uninstall_docs + QMAKE_EXTRA_TARGETS += \ + install_html_docs uninstall_html_docs \ + install_qch_docs uninstall_qch_docs \ + install_docs uninstall_docs } |