Reorder the tasks
This commit is contained in:
parent
ed56cf72f7
commit
196794cd93
1 changed files with 28 additions and 28 deletions
56
build.gradle
56
build.gradle
|
@ -76,29 +76,9 @@ def rhinoJar = configurations.library.files.find { jar ->
|
||||||
jar.name.startsWith('rhino')
|
jar.name.startsWith('rhino')
|
||||||
}
|
}
|
||||||
|
|
||||||
startScripts {
|
run {
|
||||||
applicationName = 'helma'
|
jvmArgs jettyLogLevel, suppressMacosDockIcon
|
||||||
classpath = files('../launcher.jar')
|
classpath += fileTree(dir: 'lib/ext', include: '*.jar')
|
||||||
mainClass = 'helma.main.launcher.Main'
|
|
||||||
|
|
||||||
defaultJvmOpts = [jettyLogLevel, suppressMacosDockIcon]
|
|
||||||
|
|
||||||
doLast {
|
|
||||||
// Work-around to make the classpath above work (launcher.jar is located outside of `lib` dir)
|
|
||||||
// See https://discuss.gradle.org/t/classpath-in-application-plugin-is-building-always-relative-to-app-home-lib-directory/2012
|
|
||||||
def unixScriptFile = file getUnixScript()
|
|
||||||
def windowsScriptFile = file getWindowsScript()
|
|
||||||
unixScriptFile.text = unixScriptFile.text.replace('$APP_HOME/lib', '$APP_HOME')
|
|
||||||
windowsScriptFile.text = windowsScriptFile.text.replace('%APP_HOME%\\lib', '%APP_HOME%')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
distributions {
|
|
||||||
main {
|
|
||||||
contents {
|
|
||||||
from project(':launcher').jar
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
application {
|
application {
|
||||||
|
@ -127,6 +107,31 @@ application {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
startScripts {
|
||||||
|
applicationName = 'helma'
|
||||||
|
classpath = files('../launcher.jar')
|
||||||
|
mainClass = 'helma.main.launcher.Main'
|
||||||
|
|
||||||
|
defaultJvmOpts = [jettyLogLevel, suppressMacosDockIcon]
|
||||||
|
|
||||||
|
doLast {
|
||||||
|
// Work-around to make the classpath above work (launcher.jar is located outside of `lib` dir)
|
||||||
|
// See https://discuss.gradle.org/t/classpath-in-application-plugin-is-building-always-relative-to-app-home-lib-directory/2012
|
||||||
|
def unixScriptFile = file getUnixScript()
|
||||||
|
def windowsScriptFile = file getWindowsScript()
|
||||||
|
unixScriptFile.text = unixScriptFile.text.replace('$APP_HOME/lib', '$APP_HOME')
|
||||||
|
windowsScriptFile.text = windowsScriptFile.text.replace('%APP_HOME%\\lib', '%APP_HOME%')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
distributions {
|
||||||
|
main {
|
||||||
|
contents {
|
||||||
|
from project(':launcher').jar
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
distTar {
|
distTar {
|
||||||
dependsOn ':generateLicenseReport', ':javadoc', ':jsdoc'
|
dependsOn ':generateLicenseReport', ':javadoc', ':jsdoc'
|
||||||
|
|
||||||
|
@ -153,11 +158,6 @@ installDist {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
|
||||||
jvmArgs jettyLogLevel, suppressMacosDockIcon
|
|
||||||
classpath += fileTree(dir: 'lib/ext', include: '*.jar')
|
|
||||||
}
|
|
||||||
|
|
||||||
task processSource(type: Sync) {
|
task processSource(type: Sync) {
|
||||||
def date = new Date().format("d MMM yyyy")
|
def date = new Date().format("d MMM yyyy")
|
||||||
def gitOutput = new ByteArrayOutputStream()
|
def gitOutput = new ByteArrayOutputStream()
|
||||||
|
|
Loading…
Add table
Reference in a new issue