[ofbiz-framework] branch release18.12 updated: fixed: svg files not removed on clean (OFBIZ-11976)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 72ae6c8  fixed: svg files not removed on clean (OFBIZ-11976)
72ae6c8 is described below

commit 72ae6c8e37c8fcdc24d09101e50166329a054bdb
Author: holivier <holiv...@apache.org>
AuthorDate: Fri Oct 2 19:00:18 2020 +0200

    fixed: svg files not removed on clean (OFBIZ-11976)
    
    Backport build.gradle correction from OFBIZ-12035, correction in 
generateAllPluginsDocumentation to put copy of OFBiz-Logo in doFirst to avoid 
it's run during gradle Configure project
---
 build.gradle | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3277199..a25d44b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -622,11 +622,15 @@ task generateAllPluginsDocumentation(group: docsGroup,
                     // the other inner task temporary created by the 
generatePluginDocumentation task
                     def pluginAsciidoc = task 
"${component.name}-Documentation" (type: AsciidoctorTask) {
                         def asciidocFolder = new 
File("${component}/src/docs/asciidoc")
-                        if (asciidocFolder.exists()) {
-                            copy {
-                                from 
"${rootDir}/docs/asciidoc/images/OFBiz-Logo.svg"
-                                into "${component}/src/docs/asciidoc/images"
+                        doFirst {
+                            if (asciidocFolder.exists()) {
+                                copy {
+                                    from 
"${rootDir}/docs/asciidoc/images/OFBiz-Logo.svg"
+                                    into 
"${component}/src/docs/asciidoc/images"
+                                }
                             }
+                        }
+                        if (asciidocFolder.exists()) {
                             sourceDir file("${component}/src/docs/asciidoc")
                             outputDir 
file("${buildDir}/asciidoc/plugins/${component.name}")
                             doLast { println "Documentation generated for 
plugin ${component.name}" }
@@ -637,7 +641,6 @@ task generateAllPluginsDocumentation(group: docsGroup,
 
                     dependsOn pluginAsciidoc
                 }
-                doLast { delete 
"${component}/src/docs/asciidoc/images/OFBiz-Logo.svg" }
             }
         }
     }