From e3403649701ee296338a22b27b18bf0508ae0fdb Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 6 Mar 2014 22:44:40 +1100
Subject: [PATCH] Pass doxyfile as a command line arg
---
utils_ide/qtcreator/externaltools/qtc_doxy_file.py | 13 +++++--------
utils_ide/qtcreator/externaltools/qtc_doxy_file.xml | 2 +-
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/utils_ide/qtcreator/externaltools/qtc_doxy_file.py b/utils_ide/qtcreator/externaltools/qtc_doxy_file.py
index 5034cf9..bca773c 100755
--- a/utils_ide/qtcreator/externaltools/qtc_doxy_file.py
+++ b/utils_ide/qtcreator/externaltools/qtc_doxy_file.py
@@ -2,6 +2,9 @@
"""
This script takes 2-3 args: [--browse] <Doxyfile> <sourcefile>
+Where Doxyfile is a path relative to source root,
+and the sourcefile as an absolute path.
+
--browse will open the resulting docs in a web browser.
"""
import sys
@@ -17,15 +20,9 @@ def find_gitroot(filepath_reference):
path = os.path.dirname(path)
return path
-def find_doxy(filepath_reference):
- root = find_gitroot(filepath_reference)
-
- # project specific!
- return os.path.join(root, "doc", "doxygen", "Doxyfile")
-
-sourcefile = sys.argv[-1]
+doxyfile, sourcefile = sys.argv[-2:]
-doxyfile = find_doxy(sourcefile)
+doxyfile = os.path.join(find_gitroot(sourcefile), doxyfile)
os.chdir(os.path.dirname(doxyfile))
tempfile = tempfile.NamedTemporaryFile(mode='w+b')
diff --git a/utils_ide/qtcreator/externaltools/qtc_doxy_file.xml b/utils_ide/qtcreator/externaltools/qtc_doxy_file.xml
index 2a2ac13..af1dc26 100644
--- a/utils_ide/qtcreator/externaltools/qtc_doxy_file.xml
+++ b/utils_ide/qtcreator/externaltools/qtc_doxy_file.xml
@@ -5,7 +5,7 @@
<category>Documentation</category>
<executable output="showinpane" error="showinpane" modifiesdocument="no">
<path>qtc_doxy_file.py</path>
- <arguments>--browse %{CurrentDocument:FilePath}</arguments>
+ <arguments>--browse doc/doxygen/Doxyfile %{CurrentDocument:FilePath}</arguments>
<workingdirectory>%{CurrentProject:BuildPath}</workingdirectory>
</executable>
</externaltool>
--
GitLab