dweiss commented on a change in pull request #1352: LUCENE-9278: Make javadoc 
folder structure follow Gradle project path
URL: https://github.com/apache/lucene-solr/pull/1352#discussion_r392568764
 
 

 ##########
 File path: gradle/render-javadoc.gradle
 ##########
 @@ -294,35 +305,41 @@ configure(project(':solr:core')) {
   plugins.withType(JavaPlugin) {
     // specialized to ONLY depend on solrj
     renderJavadoc {
-      dependsOn ':solr:solrj:renderJavadoc'
-      linkHref += [ '../solr-solrj' ]
+      [':solr:solrj'].collect { path ->
+        dependsOn "${path}:renderJavadoc"
+        linkHref += [ "../" + pathToDocdir(path) ]
+      }
     }
   }
 }
 
 configure(subprojects.findAll { it.path.startsWith(':solr:contrib') }) {
   plugins.withType(JavaPlugin) {
     renderJavadoc {
-      dependsOn ':solr:solrj:renderJavadoc'
-      dependsOn ':solr:core:renderJavadoc'
-      linkHref += [ '../solr-solrj', '../solr-core' ]
+      [':solr:solrj', ':solr:core'].collect { path ->
+        dependsOn "${path}:renderJavadoc"
+        linkHref += [ "../../" + pathToDocdir(path) ]
+      }
     }
   }
 }
 
 configure(project(':solr:contrib:dataimporthandler-extras')) {
   plugins.withType(JavaPlugin) {
     renderJavadoc {
-      dependsOn ':solr:contrib:dataimporthandler:renderJavadoc'
-      linkHref += [ '../solr-dataimporthandler' ]
+      [':solr:contrib:dataimporthandler'].collect { path ->
+        dependsOn "${path}:renderJavadoc"
+        linkHref += [ "../../" + pathToDocdir(path) ]
+      }
     }
   }
 }
 
+
 configure(project(':solr:contrib:extraction')) {
   plugins.withType(JavaPlugin) {
     ext {
-      javadocDestDir = "${javadocRoot}/solr-cell"
+      javadocDestDir = "${javadocRoot}/contrib/cell"
 
 Review comment:
   The "solr-cell" is what it's called in ant. I'm not sure why. I would prefer 
to stick to folder/ project path naming here too (so contrib/extraction for me).

----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org

Reply via email to