changeset 14907:7683ad455d81

mx: fix post processing of javadoc for jdk8
author Bernhard Urban <bernhard.urban@jku.at>
date Mon, 31 Mar 2014 20:28:34 +0200
parents f3a5036cc13c
children 8db6e76cb658 0fd2e8835ef0
files mxtool/mx.py
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Mon Mar 31 20:51:09 2014 +0200
+++ b/mxtool/mx.py	Mon Mar 31 20:28:34 2014 +0200
@@ -3676,7 +3676,7 @@
                 windowTitle = ['-windowtitle', p.name + ' javadoc']
             try:
                 log('Generating {2} for {0} in {1}'.format(p.name, out, docDir))
-                run([java(p.javaCompliance).javadoc, memory,
+                run([java().javadoc, memory,
                      '-XDignore.symbol.file',
                      '-classpath', cp,
                      '-quiet',
@@ -3767,16 +3767,14 @@
 <div class="subTitle">
 <div class="block">""", """</div>
 </div>
-<p>See: <a href="#overview_description">Description</a></p>
+<p>See: <a href="#overview.description">Description</a></p>
 </div>""")
 
-    chunk2 = Chunk(content, """<div class="footer"><a name="overview_description">
+    chunk2 = Chunk(content, """<div class="contentContainer"><a name="overview.description">
 <!--   -->
 </a>
-<div class="subTitle">
 <div class="block">""", """</div>
 </div>
-</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->""")
 
     assert chunk1.text, 'Could not find header section in ' + path
@@ -3802,10 +3800,10 @@
         content = fp.read()
 
     chunk1 = Chunk(content, """<div class="header">
-<h1 title="Package" class="title">Package""", """<p>See:&nbsp;<a href="#package_description">Description</a></p>
+<h1 title="Package" class="title">Package""", """<p>See:&nbsp;<a href="#package.description">Description</a></p>
 </div>""")
 
-    chunk2 = Chunk(content, """<a name="package_description">
+    chunk2 = Chunk(content, """<a name="package.description">
 <!--   -->
 </a>""", """</div>
 </div>