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-3976 fix mock PDBFTS query & responses
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
cf96abf
..
9b1eb69
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-1607,7
+1607,9
@@
task getdownWebsite() {
codeFiles += f
}
}
codeFiles += f
}
}
- codeFiles.sort().each{f ->
+ def jalviewJar = jar.archiveFileName.getOrNull()
+ // put jalview.jar first for CLASSPATH and .properties files reasons
+ codeFiles.sort{a, b -> ( a.getName() == jalviewJar ? -1 : ( b.getName() == jalviewJar ? 1 : a <=> b ) ) }.each{f ->
def name = f.getName()
def line = "code = ${getdownAppDistDir}/${name}\n"
getdownTextString += line
def name = f.getName()
def line = "code = ${getdownAppDistDir}/${name}\n"
getdownTextString += line
@@
-1818,7
+1820,8
@@
task copyInstall4jTemplate {
// disable install screen for OSX dmg (for 2.11.2.0)
install4jConfigXml.'**'.macosArchive.each { macosArchive ->
// disable install screen for OSX dmg (for 2.11.2.0)
install4jConfigXml.'**'.macosArchive.each { macosArchive ->
- macosArchive.'@executeSetupApp' = "false"
+ macosArchive.attributes().remove('executeSetupApp')
+ macosArchive.attributes().remove('setupAppId')
}
// turn off checksum creation for LOCAL channel
}
// turn off checksum creation for LOCAL channel