From: Ben Soares Date: Fri, 15 Nov 2019 10:32:45 +0000 (+0000) Subject: JAL-3210 Clean transfer site dirs after syncing when developing in Eclipse, to preven... X-Git-Tag: Release_2_11_4_0~45^2~18^2~48 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=56b4b8a69b9430c4d6dd07eda6954fd77ae7405c;p=jalview.git JAL-3210 Clean transfer site dirs after syncing when developing in Eclipse, to prevent unnecessary results in searches. --- diff --git a/build.gradle b/build.gradle index d065d1b..e261943 100644 --- a/build.gradle +++ b/build.gradle @@ -689,7 +689,7 @@ task createBuildProperties(type: WriteProperties) { clean { doFirst { - delete buildProperties + delete buildProperties } } @@ -2182,12 +2182,19 @@ task jalviewjsBuildSite { } -task cleanJalviewjsSite { +task cleanJalviewjsTransferSite { doFirst { delete "${jalviewDir}/${jalviewjsTransferSiteJsDir}" delete "${jalviewDir}/${jalviewjsTransferSiteLibDir}" delete "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}" delete "${jalviewDir}/${jalviewjsTransferSiteCoreDir}" + } +} + + +task cleanJalviewjsSite { + dependsOn cleanJalviewjsTransferSite + doFirst { delete "${jalviewDir}/${jalviewjsSiteDir}" } } @@ -2351,9 +2358,7 @@ task jalviewjsIDE_SyncCore { } -task jalviewjsIDE_PrepareSite { - group "00 JalviewJS in Eclipse" - description "Sync libs and resources to site dir, but not closure cores" +task jalviewjsIDE_SyncSiteAll { dependsOn jalviewjsSyncAllLibs dependsOn jalviewjsSyncResources dependsOn jalviewjsSyncSiteResources @@ -2361,6 +2366,18 @@ task jalviewjsIDE_PrepareSite { } +cleanJalviewjsTransferSite.mustRunAfter jalviewjsIDE_SyncSiteAll + + +task jalviewjsIDE_PrepareSite { + group "00 JalviewJS in Eclipse" + description "Sync libs and resources to site dir, but not closure cores" + + dependsOn jalviewjsIDE_SyncSiteAll + dependsOn cleanJalviewjsTransferSite +} + + task jalviewjsIDE_AssembleSite { group "00 JalviewJS in Eclipse" description "Assembles unzipped supporting zipfiles, resources, site resources and closure cores into the Eclipse transpiled site"