git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3111 replace year in header for help pages and put processed help in build/distri...
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
995afaf
..
383e189
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-56,6
+56,7
@@
ext {
reportRsyncCmd = false
buildDist = true
buildProperties = buildPropertiesFile
reportRsyncCmd = false
buildDist = true
buildProperties = buildPropertiesFile
+ getdownLauncher = jalviewDir + '/' + getdown_lib_dir + '/' + getdown_launcher
switch (CHANNEL) {
case "BUILD":
switch (CHANNEL) {
case "BUILD":
@@
-103,6
+104,7
@@
ext {
buildDist = false
}
reportRsyncCommand = true
buildDist = false
}
reportRsyncCommand = true
+ getdownLauncher = jalviewDir + '/' + getdown_lib_dir + '/' + getdown_launcher_local
break
case "DEVELOP":
break
case "DEVELOP":
@@
-136,6
+138,7
@@
ext {
getdown_app_base = file(getdownWebsiteDir).toURI().toString()
getdown_app_dir = getdown_app_dir_alt
buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
getdown_app_base = file(getdownWebsiteDir).toURI().toString()
getdown_app_dir = getdown_app_dir_alt
buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
+ getdownLauncher = jalviewDir + '/' + getdown_lib_dir + '/' + getdown_launcher_local
break
default: // something wrong specified
break
default: // something wrong specified
@@
-150,7
+153,6
@@
ext {
//getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
getdownInstallDir = getdownWebsiteDir + '/' + getdown_install_dir
//getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
getdownInstallDir = getdownWebsiteDir + '/' + getdown_install_dir
- getdownLauncher = jalviewDir + '/' + getdown_launcher
getdownFilesDir = jalviewDir + '/' + getdown_files_dir + '/' + JAVA_VERSION + '/'
getdownFilesInstallDir = getdownFilesDir+"/"+getdown_install_dir
/* compile without modules -- using classpath libraries
getdownFilesDir = jalviewDir + '/' + getdown_files_dir + '/' + JAVA_VERSION + '/'
getdownFilesInstallDir = getdownFilesDir+"/"+getdown_install_dir
/* compile without modules -- using classpath libraries
@@
-636,7
+638,7
@@
task copyHelp(type: Copy) {
exclude '**/*.gif'
exclude '**/*.jpg'
exclude '**/*.png'
exclude '**/*.gif'
exclude '**/*.jpg'
exclude '**/*.png'
- filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION])
+ filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION,'Year-Rel': getDate("yyyy")])
}
from(inputDir) {
include '**/*.gif'
}
from(inputDir) {
include '**/*.gif'
@@
-747,6
+749,12
@@
task linkCheck(type: JavaExec) {
outputs.file(helplinkscheckertouchfile)
}
outputs.file(helplinkscheckertouchfile)
}
+// import the pubhtmlhelp target
+ant.properties.basedir = "$jalviewDir"
+ant.properties.helpBuildDir = jalviewDirAbsolutePath+"/$classes/$helpDir"
+ant.importBuild "$utilsDir/publishHelp.xml"
+
+
task cleanPackageDir(type: Delete) {
delete fileTree("$jalviewDir/$packageDir").include("*.jar")
}
task cleanPackageDir(type: Delete) {
delete fileTree("$jalviewDir/$packageDir").include("*.jar")
}
@@
-956,6
+964,9
@@
task getdownWebsite() {
copy {
from getdownLauncher
copy {
from getdownLauncher
+ if (file(getdownLauncher).getName() != getdown_launcher) {
+ rename(file(getdownLauncher).getName(), getdown_launcher)
+ }
into project.ext.getdownWebsiteDir
}
into project.ext.getdownWebsiteDir
}
@@
-964,6
+975,9
@@
task getdownWebsite() {
from getdown_txt
from getdownLauncher
from getdownWebsiteDir+"/"+getdown_build_properties
from getdown_txt
from getdownLauncher
from getdownWebsiteDir+"/"+getdown_build_properties
+ if (file(getdownLauncher).getName() != getdown_launcher) {
+ rename(file(getdownLauncher).getName(), getdown_launcher)
+ }
into getdownInstallDir
}
into getdownInstallDir
}
@@
-978,6
+992,9
@@
task getdownWebsite() {
from launch_jvl
from getdownLauncher
from getdownWebsiteDir+"/"+getdown_build_properties
from launch_jvl
from getdownLauncher
from getdownWebsiteDir+"/"+getdown_build_properties
+ if (file(getdownLauncher).getName() != getdown_launcher) {
+ rename(file(getdownLauncher).getName(), getdown_launcher)
+ }
into getdownFilesDir
}
into getdownFilesDir
}
@@
-998,7
+1015,9
@@
task getdownDigest(type: JavaExec) {
group = "distribution"
description = "Digest the getdown website folder"
dependsOn getdownWebsite
group = "distribution"
description = "Digest the getdown website folder"
dependsOn getdownWebsite
- classpath = files(jalviewDir + '/' + getdown_core, jalviewDir+'/'+getdown_launcher)
+ doFirst {
+ classpath = files(getdownWebsiteDir + '/' + getdown_launcher)
+ }
main = "com.threerings.getdown.tools.Digester"
args project.ext.getdownWebsiteDir
inputs.dir(project.ext.getdownWebsiteDir)
main = "com.threerings.getdown.tools.Digester"
args project.ext.getdownWebsiteDir
inputs.dir(project.ext.getdownWebsiteDir)
@@
-1199,8
+1218,19
@@
task sourceDist (type: Tar) {
exclude ("**/*locales")
exclude ("*locales/**")
exclude ("utils/InstallAnywhere")
exclude ("**/*locales")
exclude ("*locales/**")
exclude ("utils/InstallAnywhere")
+ exclude (libDir)
exclude (getdown_files_dir)
exclude (getdown_website_dir)
exclude (getdown_files_dir)
exclude (getdown_website_dir)
+ // exluding these as not using jars as modules yet
+ exclude ("$j11modDir/**/*.jar")
+
}
}
+task helppages {
+ dependsOn copyHelp
+ dependsOn pubhtmlhelp
+
+ inputs.dir("$classes/$helpDir")
+ outputs.dir("$helpOutputDir")
+}