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-3599 Make jalviewjs dependOn jalviewjsLaunchTest. Change jalviewjsLaunchTest...
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
e0c80e3
..
f2aced5
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-4203,13
+4203,6
@@
task eclipseAutoBuildTask {
}
}
-task jalviewjs {
- group "JalviewJS"
- description "Build the site"
- dependsOn jalviewjsBuildSite
-}
-
-
task jalviewjsCopyStderrLaunchFile(type: Copy) {
from file(jalviewjs_stderr_launch)
into jalviewjsSiteDir
task jalviewjsCopyStderrLaunchFile(type: Copy) {
from file(jalviewjs_stderr_launch)
into jalviewjsSiteDir
@@
-4248,7
+4241,7
@@
task jalviewjsLaunchTest(type: Exec) {
doFirst {
def exec = file(chromiumBinary)
if (!exec.exists()) {
doFirst {
def exec = file(chromiumBinary)
if (!exec.exists()) {
- throw new GradleException("Could not find chromium binary '${chromiumBinary}'. Cannot run task ${name}.")
+ throw new StopExecutionException("Could not find chromium binary '${chromiumBinary}'. Cannot run task ${name}.")
}
stdout = new ByteArrayOutputStream()
}
stdout = new ByteArrayOutputStream()
@@
-4292,5
+4285,13
@@
task jalviewjsLaunchTest(type: Exec) {
if (!found) {
throw new GradleException("Could not find evidence of Desktop launch in JalviewJS.")
}
if (!found) {
throw new GradleException("Could not find evidence of Desktop launch in JalviewJS.")
}
- }
+ }
+}
+
+
+task jalviewjs {
+ group "JalviewJS"
+ description "Build the JalviewJS site and run the launch test"
+ dependsOn jalviewjsBuildSite
+ dependsOn jalviewjsLaunchTest
}
}