Skip to content

Commit 5d9325d

Browse files
committed
fix buildJsDoc order
1 parent 9ad799c commit 5d9325d

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

buildScript/depends.gincl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ repositories {
101101

102102
jar.destinationDir = file ("$rootDir/jars/build")
103103

104+
clean {
105+
delete "${jar.destinationDir}/${jar.baseName}.jar"
106+
}
104107

105108
task buildClient (dependsOn: loadConfig) {
106109

buildScript/gwt_webapp.gincl

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ war {
146146
}
147147
}
148148

149+
clean {
150+
delete "${war.destinationDir}/${webapp.baseWarName}.war"
151+
}
152+
149153
task deploy (dependsOn: [loadConfig, webapp]) << {
150154
description= 'Deploy webapp(war file) to Tomcat. Require ${tomcat_home} property'
151155
group = WEBAPP_GROUP
@@ -247,10 +251,12 @@ task publishToGithub (dependsOn: loadConfig) {
247251
// ------------------------
248252
// define task order
249253
//-------------------------
250-
loadConfig.mustRunAfter gwt
251-
buildClient.mustRunAfter prepareWebapp
252-
buildJsDoc.mustRunAfter prepareWebapp
254+
gwt.mustRunAfter jar
255+
loadConfig.mustRunAfter gwt
256+
gwtCompile.mustRunAfter loadConfig
253257
prepareWebapp.mustRunAfter gwtCompile
254-
gwtCompile.mustRunAfter jar
255-
deploy.mustRunAfter war
258+
buildClient.mustRunAfter prepareWebapp
259+
buildJsDoc.mustRunAfter buildClient
260+
war.mustRunAfter buildJsDoc
261+
deploy.mustRunAfter war
256262

0 commit comments

Comments
 (0)