doc: fix Java API site generation

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

build.gradle

@@ -43,7 +43,7 @@ def getVersion = { boolean considerSnapshot ->
         commandLine "git", "--no-pager", "-C", project.projectDir,  "describe", "--tags", "--always", "--dirty=-SNAPSHOT"
     }.standardOutput.asText.get().trim()
 
-    def pattern = /(?<major>\d*)\.(?<minor>\d*)(\.(?<patch>\d*))?(-(?<build>\d*)-(?<commit>[a-zA-Z\d]*))?/
+    def pattern = /jsqlparser-(?<major>\d*)\.(?<minor>\d*)(\.(?<patch>\d*))?(-(?<build>\d*)-(?<commit>[a-zA-Z\d]*))?/
     def matcher = versionStr =~ pattern
 
     if (matcher.find()) {
@@ -110,7 +110,7 @@ dependencies {
     testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:+'
 
     // Java Doc in XML Format
-    xmlDoclet 'com.manticore-projects.tools:xml-doclet:2.+'
+    xmlDoclet ('com.manticore-projects.tools:xml-doclet:+'){ changing = true }
 
     // enforce latest version of JavaCC
     testImplementation('org.javacc:core:8.1.0-SNAPSHOT') { changing = true }
@@ -174,7 +174,18 @@ jar {
     }
 }
 
+sourceSets {
+    main {
+        java {
+            srcDir layout.getBuildDirectory().dir("generated/javacc").get().asFile
+            srcDir layout.getBuildDirectory().dir("generated/jjtree").get().asFile
+        }
+    }
+}
+
 tasks.register('xmldoc', Javadoc) {
+    dependsOn(compileJava)
+
     def outFile =  reporting.file(
             version.endsWith("-SNAPSHOT")
                     ? "xmlDoclet/javadoc_snapshot.xml"
@@ -188,23 +199,23 @@ tasks.register('xmldoc', Javadoc) {
     )
 
     source = sourceSets.main.allJava
-    include("**/javacc/net/sf/jsqlparser/parser/*.java" )
+    classpath = sourceSets.main.runtimeClasspath
 
     destinationDir = reporting.file("xmlDoclet")
     options.docletpath = configurations.xmlDoclet.files as List
     options.doclet = "com.manticore.tools.xmldoclet.XmlDoclet"
     title = "API $version"
+
     options.addBooleanOption("rst", true)
-    options.addBooleanOption("withFloatingToc", Boolean.parseBoolean(System.getenv().getOrDefault("FLOATING_TOC", "true")))
+    if (Boolean.parseBoolean(System.getenv().getOrDefault("FLOATING_TOC", "false"))) {
+        options.addBooleanOption("withFloatingToc","true")
+    }
     options.addStringOption("basePackage", "net.sf.jsqlparser")
     options.addStringOption("filename", outFile.getName())
 
-    dependsOn(compileJava)
-    doLast {
-        copy {
-            from rstFile
-            into "${projectDir}/src/site/sphinx/"
-        }
+    copy {
+        from rstFile
+        into layout.projectDirectory.dir("src/site/sphinx/").asFile
     }
 }