[Boost-commit] svn:boost r70181 - in trunk/libs/geometry/doc: . src/docutils/tools/doxygen_xml2qbk

Subject: [Boost-commit] svn:boost r70181 - in trunk/libs/geometry/doc: . src/docutils/tools/doxygen_xml2qbk
From: barend.gehrels_at_[hidden]
Date: 2011-03-19 09:40:38

Author: barendgehrels
Date: 2011-03-19 09:40:38 EDT (Sat, 19 Mar 2011)
New Revision: 70181
URL: http://svn.boost.org/trac/boost/changeset/70181

Log:
Applied patch of Daniel James to build doc:
- install location goes to dist/bin
- support for multiple Doxygen's 

Text files modified: 
   trunk/libs/geometry/doc/make_qbk.py                                   |    16 ++++++++++++++--                        
   trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile.v2 |     9 +++++++++                               
   2 files changed, 23 insertions(+), 2 deletions(-)

Modified: trunk/libs/geometry/doc/make_qbk.py
==============================================================================
--- trunk/libs/geometry/doc/make_qbk.py	(original)
+++ trunk/libs/geometry/doc/make_qbk.py	2011-03-19 09:40:38 EDT (Sat, 19 Mar 2011)
@@ -12,7 +12,19 @@
 
 import os, sys
 
-cmd = "doxygen_xml2qbk"
+os.chdir(os.path.dirname(sys.argv[0]))
+
+if 'DOXYGEN' in os.environ:
+    doxygen_cmd = os.environ['DOXYGEN']
+else:
+    doxygen_cmd = 'doxygen'
+
+if 'DOXYGEN_XML2QBK' in os.environ:
+    doxygen_xml2qbk_cmd = os.environ['DOXYGEN_XML2QBK']
+else:
+    doxygen_xml2qbk_cmd = 'doxygen_xml2qbk'
+
+cmd = doxygen_xml2qbk_cmd
 cmd = cmd + " --xml doxy/doxygen_output/xml/%s.xml"
 cmd = cmd + " --start_include boost/geometry/"
 cmd = cmd + " --convenience_header_path ../../../boost/geometry/"
@@ -23,7 +35,7 @@
 
 def call_doxygen():
     os.chdir("doxy");
-    os.system("doxygen")
+    os.system(doxygen_cmd)
     os.chdir("..")
 
 def group_to_quickbook(section):

Modified: trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile.v2	(original)
+++ trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile.v2	2011-03-19 09:40:38 EDT (Sat, 19 Mar 2011)
@@ -17,3 +17,12 @@
 
 exe doxygen_xml2qbk : doxygen_xml2qbk.cpp ;
 
+install dist-bin
+    :
+    doxygen_xml2qbk
+    :
+    <install-type>EXE
+    <location>../../../../../../../dist/bin
+    :
+    release
+    ;