'CMakeLists.txt' (AtlasDoxygen-00-04-16)

	* cmt/requirements: AtlasDoxygen_native_version macro fix
	* tagging AtlasDoxygen-00-04-16

2016-01-25 Antonio.Limosani@cern.ch
	* Ensure doxygen bin area is exported retry ATLINFR-889
	* tagging AtlasDoxygen-00-04-15

2016-01-22 Antonio.Limosani@cern.ch
	* Ensure doxygen bin area is exported ATLINFR-889
	* tagging AtlasDoxygen-00-04-14

2015-09-01 Edward.Moyse@cern.ch
	* Updated doxygen.py to now set EXTERNAL_SEARCH_ID and EXTRA_SEARCH_MAPPINGS in the Doxyfile
	* tagging AtlasDoxygen-00-04-13

2015-08-06 Edward.Moyse@cern.ch
	* Updated Doxyfile to use external search: http://www.stack.nl/~dimitri/doxygen/manual/extsearch.html#extsearch_multi
	* tagging AtlasDoxygen-00-04-12

2015-07-28 Edward.Moyse@cern.ch
...
(Long ChangeLog diff - truncated)

Tools/AtlasDoxygen/CMakeLists.txt

+################################################################################
+# Package: AtlasDoxygen
+################################################################################
+
+# Declare the package name:
+atlas_subdir( AtlasDoxygen )
+
+# this line failed automatic conversion in cmt2cmake :
+# path_remove DOTFONTPATH "" Linux&Doxygen "AtlasDoxygen"
+
+# this line failed automatic conversion in cmt2cmake :
+# path_remove PATH "" Doxygen "/doxygen/"
+
+# this line failed automatic conversion in cmt2cmake :
+# path_remove PATH "" Doxygen "/graphviz/"
+
+# this line failed automatic conversion in cmt2cmake :
+# action doxygen "python ${AtlasDoxygen_root}/cmt/doxygen.py  $(cmt_args)"
+

Tools/AtlasDoxygen/cmt/doxygen.py

@@ -412,7 +412,8 @@ def filter_doxyfile (doxygen_input, doxygen_html_output, tagfiles, package_tagfi
     f = open (DoxygenRoot + '/cmt/Doxyfile')
     lines = f.readlines ()
     f.close ()
-    g = open ('Doxyfile', 'w')
+    g = open ('Doxyfile', 'w')  
+    package = package_tagfile.split('/')[-1].split('.')[0]
     # print "Going over Doxyfile lines:"
     for line in lines:
         w = string.split (line)
@@ -425,6 +426,10 @@ def filter_doxyfile (doxygen_input, doxygen_html_output, tagfiles, package_tagfi
                 line = 'TAGFILES = ' + ' '.join(tagfiles) + '\n'
             elif w[0] == 'GENERATE_TAGFILE':
                 line = 'GENERATE_TAGFILE = ' + package_tagfile + '\n'
+            elif w[0] == 'EXTERNAL_SEARCH_ID':
+                line = 'EXTERNAL_SEARCH_ID = ' + package + '\n'
+            elif w[0] == 'EXTRA_SEARCH_MAPPINGS':
+                line = 'EXTRA_SEARCH_MAPPINGS = ' + package + '=' + '../../' + package + '/html\n'
             elif (w[0] == 'GENERATE_HTML'):
                 if package_tagfile=='':
                   # Only generate HTML in the second pass, where we DON'T make a tag file

Tools/AtlasDoxygen/cmt/requirements

@@ -22,7 +22,8 @@ use LCG_Configuration *
 path_remove DOTFONTPATH "" Linux&Doxygen "AtlasDoxygen"
 path_prepend DOTFONTPATH "" Linux&Doxygen "$(AtlasDoxygen_root)/fonts/ttf"
 
-macro AtlasDoxygen_native_version "" Doxygen "$(doxygen_config_version)"
+# Must be specified for default tag, similar to AtlasDoxygen_export_paths, for kit building
+macro AtlasDoxygen_native_version "$(doxygen_config_version)"
 path_remove PATH "" Doxygen "/doxygen/"
 path_prepend PATH "" Doxygen "$(LCG_external)/doxygen/$(AtlasDoxygen_native_version)/$(LCG_system)/bin"
 
@@ -90,3 +91,4 @@ macro DOXYGEN_JAVADOC_AUTOBRIEF "" Doxygen "YES"
 action doxygen "python ${AtlasDoxygen_root}/cmt/doxygen.py  $(cmt_args)"
 
 
+macro AtlasDoxygen_export_paths "$(LCG_external)/doxygen/$(doxygen_config_version)/$(LCG_system)/bin"