ebarboni commented on code in PR #4450:
URL: https://github.com/apache/netbeans/pull/4450#discussion_r944725157


##########
nbbuild/javadoctools/template.xml:
##########
@@ -280,23 +279,69 @@ cause it to fail.
         <!-- Timestamp is handled in javadoc.css to avoid too many commits on 
generated HTML files. -->
         <property name="javadoc.footer" value='&lt;span 
class="footnote"&gt;&lt;/span&gt;&lt;!-- See javadoc.css for timestamp 
information --&gt;'/>
     </target>
-    
-    <target name="javadoc-exec-packages" 
depends="javadoc-init,javadoc-generate-references,javadoc-generate-overview,javadoc-exec-condition,javadoc-check-timestamps,javadoc-make-plain-title,javadoc-make-hyperlinked-title,javadoc-exec-condition,-javadoc-set-footer"
 unless="javadoc.exec.packages">
-        <javadoc source="${javac.source}" author="false" 
destdir="${javadoc.out.dir}" packagenames="${javadoc.packages}" 
stylesheetfile="${javadoc.css.main}" windowtitle="${javadoc.title}" 
overview="${javadoc.overview}" splitindex="true" use="true" version="false" 
useexternalfile="true" encoding="UTF-8">
+
+
+    <target name="-javadoc-exec-packages-nbjavac" 
depends="javadoc-init,javadoc-generate-references,javadoc-generate-overview,javadoc-exec-condition,javadoc-check-timestamps,javadoc-make-plain-title,javadoc-make-hyperlinked-title,javadoc-exec-condition,-javadoc-set-footer"
 if="javadoc.nbjavac">
+        <property name="javadoc.source" value="1.8" />
+        <!--<fail/>-->
+        <javadoc source="${javadoc.source}" verbose="true" failonerror="false" 
author="false" destdir="${javadoc.out.dir}" packagenames="${javadoc.packages}" 
stylesheetfile="${javadoc.css.main}" windowtitle="${javadoc.title}" 
overview="${javadoc.overview}" splitindex="true" use="true" version="false" 
useexternalfile="false" encoding="UTF-8">
+            <!--<arg line="- -patch-module 
java.compiler=${nb_all}/java/libs.javacapi/external/nb-javac-jdk-18.0.1+10-api.jar"
 />-->
             <sourcepath>
                 <pathelement location="${javadoc.docfiles}"/>
                 <pathelement location="${javadoc.src}"/>
+                <pathelement 
location="${javadoc.src}/../build/classes-generated"/>
+                <!--<pathelement 
location="${nb_all}/java/libs.javacapi/external/nb-javac-jdk-18.0.1+10-api.jar"/>
+                <pathelement 
location="${nb_all}/java/libs.javacapi/external/nb-javac-jdk-18.0.1+10.jar"/>-->
             </sourcepath>
+            <!--<bootclasspath>
+                <pathelement 
location="${nb_all}/java/libs.javacapi/external/nb-javac-jdk-18.0.1+10-api.jar"/>
+                <pathelement 
location="${nb_all}/java/libs.javacapi/external/nb-javac-jdk-18.0.1+10.jar"/>
+            </bootclasspath>-->
             <doclet
                 name="org.apidesign.javadoc.codesnippet.Doclet"
                 path="${nb_all}/nbbuild/external/codesnippet-doclet-0.82.jar"
             >
                 <param name="-snippetpath" value="${javadoc.base}/src"/>
                 <param name="-snippetpath" 
value="${javadoc.base}/test/unit/src"/>
-                <param name="-maxLineLength" value="120"/>
+                <param name="-maxLineLength" value="240"/> <!-- 120 was too 
short -->
                 <param name="-snippetmode" value="jep413"/>
             </doclet>
-            <classpath path="${javadoc.classpath}"/>
+            <classpath>
+                <pathelement path="${javadoc.classpath}" />
+            </classpath>
+            <!-- XXX note, this does not support more than one group -->
+            <group packages="${javadoc.packages}">
+                <title>${javadoc.hyperlinked.title}</title>
+            </group>
+            <link href="${javadoc.docs.jdk}" offline="true" 
packagelistloc="."/>
+            &links;
+            
<doctitle>${javadoc.title}&lt;br/&gt;${javadoc.stability.label}</doctitle>
+            <header>${javadoc.header}</header>
+            <bottom>${javadoc.footer}</bottom>
+            <!-- Avoid timestamp comments in _all_ html generated files, to 
reduce unnecessary git commits -->
+            <arg value="-notimestamp" />
+        </javadoc>
+    </target>
+    <target name="-javadoc-exec-packages-jdk" 
depends="javadoc-init,javadoc-generate-references,javadoc-generate-overview,javadoc-exec-condition,javadoc-check-timestamps,javadoc-make-plain-title,javadoc-make-hyperlinked-title,javadoc-exec-condition,-javadoc-set-footer"
 unless="javadoc.nbjavac">

Review Comment:
   target -javadoc-exec-package-jdk is active only if javadoc.nbjavac is not set



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to