git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1ca55bf
)
JAL-3210 oops. forgot to neaten out the buildProperties change in build.gradle. done now
author
Ben Soares
<bsoares@dundee.ac.uk>
Thu, 14 Nov 2019 16:18:37 +0000
(16:18 +0000)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Thu, 14 Nov 2019 16:18:37 +0000
(16:18 +0000)
build.gradle
patch
|
blob
|
history
diff --git
a/build.gradle
b/build.gradle
index
43f2c1c
..
d065d1b
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-123,7
+123,7
@@
ext {
getdownDir = string("")
reportRsyncCmd = false
buildDist = true
getdownDir = string("")
reportRsyncCmd = false
buildDist = true
- buildProperties = build_properties_file
+ buildProperties = string("${resourceDir}/${build_properties_file}")
getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}")
switch (CHANNEL) {
getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}")
switch (CHANNEL) {
@@
-133,7
+133,7
@@
ext {
getdown_channel_name = string("${bamboo_planKey}/${JAVA_VERSION}")
getdown_app_base = string("${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}")
getdown_app_dir = getdown_app_dir_alt
getdown_channel_name = string("${bamboo_planKey}/${JAVA_VERSION}")
getdown_app_base = string("${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}")
getdown_app_dir = getdown_app_dir_alt
- buildProperties = string("${classesDir}/${build_properties_file}")
+ buildProperties = string("${resourceDir}/${build_properties_file}")
break
case "RELEASE":
break
case "RELEASE":
@@
-141,7
+141,7
@@
ext {
getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_release
getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_release
- buildProperties = string("${classesDir}/${build_properties_file}")
+ buildProperties = string("${resourceDir}/${build_properties_file}")
reportRsyncCommand = true
break
reportRsyncCommand = true
break
@@
-155,7
+155,7
@@
ext {
exit
} else {
packageDir = string("${ARCHIVEDIR}/${packageDir}")
exit
} else {
packageDir = string("${ARCHIVEDIR}/${packageDir}")
- buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}")
+ buildProperties = string("${ARCHIVEDIR}/${resource_dir}/${build_properties_file}")
buildDist = false
}
reportRsyncCommand = true
buildDist = false
}
reportRsyncCommand = true
@@
-171,7
+171,7
@@
ext {
exit
} else {
packageDir = string("${ARCHIVEDIR}/${packageDir}")
exit
} else {
packageDir = string("${ARCHIVEDIR}/${packageDir}")
- buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}")
+ buildProperties = string("${ARCHIVEDIR}/${resource_dir}/${build_properties_file}")
buildDist = false
}
reportRsyncCommand = true
buildDist = false
}
reportRsyncCommand = true
@@
-183,7
+183,7
@@
ext {
getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_alt
getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_alt
- buildProperties = string("${classesDir}/${build_properties_file}")
+ buildProperties = string("${resourceDir}/${build_properties_file}")
reportRsyncCommand = true
break
reportRsyncCommand = true
break
@@
-192,7
+192,7
@@
ext {
getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_alt
getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_alt
- buildProperties = string("${classesDir}/${build_properties_file}")
+ buildProperties = string("${resourceDir}/${build_properties_file}")
reportRsyncCommand = true
break
reportRsyncCommand = true
break
@@
-201,14
+201,14
@@
ext {
getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_alt
getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_alt
- buildProperties = string("${classesDir}/${build_properties_file}")
+ buildProperties = string("${resourceDir}/${build_properties_file}")
reportRsyncCommand = true
break
case "LOCAL":
getdown_app_base = file(getdownWebsiteDir).toURI().toString()
getdown_app_dir = getdown_app_dir_alt
reportRsyncCommand = true
break
case "LOCAL":
getdown_app_base = file(getdownWebsiteDir).toURI().toString()
getdown_app_dir = getdown_app_dir_alt
- buildProperties = string("${classesDir}/${build_properties_file}")
+ buildProperties = string("${resourceDir}/${build_properties_file}")
getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
break
getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
break
@@
-218,7
+218,6
@@
ext {
break
}
break
}
-buildProperties = string("${resourceDir}/${build_properties_file}")
getdownAppDir = string("${getdownWebsiteDir}/${getdown_app_dir}")
//getdownJ11libDir = "${getdownWebsiteDir}/${getdown_j11lib_dir}"
getdownAppDir = string("${getdownWebsiteDir}/${getdown_app_dir}")
//getdownJ11libDir = "${getdownWebsiteDir}/${getdown_j11lib_dir}"