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-3806 fix and test for one-to-many sequence mapping case
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
66b5550
..
b2e9af1
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-94,7
+94,7
@@
ext {
}
////
// Set JALVIEW_VERSION if it is not already set
}
////
// Set JALVIEW_VERSION if it is not already set
- if (findProperty(JALVIEW_VERSION)==null || "".equals(JALVIEW_VERSION)) {
+ if (findProperty("JALVIEW_VERSION")==null || "".equals(JALVIEW_VERSION)) {
JALVIEW_VERSION = releaseProps.get("jalview.version")
}
JALVIEW_VERSION = releaseProps.get("jalview.version")
}
@@
-344,6
+344,7
@@
ext {
//libDir = j8libDir
libDir = j11libDir
libDistDir = j8libDir
//libDir = j8libDir
libDir = j11libDir
libDistDir = j8libDir
+ digestonlyDir = j8digestonlyDir
compile_source_compatibility = 1.8
compile_target_compatibility = 1.8
// these are getdown.txt properties defined dependent on the JAVA_VERSION
compile_source_compatibility = 1.8
compile_target_compatibility = 1.8
// these are getdown.txt properties defined dependent on the JAVA_VERSION
@@
-357,6
+358,7
@@
ext {
JAVA_INTEGER_VERSION = string("11")
libDir = j11libDir
libDistDir = j11libDir
JAVA_INTEGER_VERSION = string("11")
libDir = j11libDir
libDistDir = j11libDir
+ digestonlyDir = j11digestonlyDir
compile_source_compatibility = 11
compile_target_compatibility = 11
getdownAltJavaMinVersion = string(findProperty("getdown_alt_java11_min_version"))
compile_source_compatibility = 11
compile_target_compatibility = 11
getdownAltJavaMinVersion = string(findProperty("getdown_alt_java11_min_version"))
@@
-1345,6
+1347,16
@@
task getdownWebsite() {
}
}
}
}
+ fileTree(dir: digestonlyDir, include: ["*"]).getFiles().sort().each{f ->
+ def name = f.getName()
+ def line = "digestonly = ${getdownAppDistDir}/${name}\n"
+ getdownTextString += line
+ copy {
+ from f.getPath()
+ into getdownAppDir
+ }
+ }
+
// NOT USING MODULES YET, EVERYTHING SHOULD BE IN dist
/*
if (JAVA_VERSION.equals("11")) {
// NOT USING MODULES YET, EVERYTHING SHOULD BE IN dist
/*
if (JAVA_VERSION.equals("11")) {
@@
-1365,8
+1377,10
@@
task getdownWebsite() {
//getdownTextString += "class = " + file(getdownLauncher).getName() + "\n"
getdownTextString += "resource = ${getdown_launcher_new}\n"
getdownTextString += "class = ${main_class}\n"
//getdownTextString += "class = " + file(getdownLauncher).getName() + "\n"
getdownTextString += "resource = ${getdown_launcher_new}\n"
getdownTextString += "class = ${main_class}\n"
- getdownTextString += "jvmarg = -Dgetdowndistdir=${getdownAppDistDir}\n"
- getdownTextString += "jvmarg = -Dgetdownappbase=${getdownAppBase}\n"
+ /* NOT setting these properties so that getdownappbase and getdowndistdir will default to release version
+ * getdownTextString += "jvmarg = -Dgetdowndistdir=${getdownAppDistDir}\n"
+ * getdownTextString += "jvmarg = -Dgetdownappbase=${getdownAppBase}\n"
+ */
def getdown_txt = file("${getdownWebsiteDir}/getdown.txt")
getdown_txt.write(getdownTextString)
def getdown_txt = file("${getdownWebsiteDir}/getdown.txt")
getdown_txt.write(getdownTextString)