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:
9b12c06
)
JAL-3210 better diagnostics for net.sf.j2s.core.jar missing/mismatch in Eclipse IDE
author
Ben Soares
<bsoares@dundee.ac.uk>
Thu, 19 Dec 2019 12:50:50 +0000
(12:50 +0000)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Thu, 19 Dec 2019 12:50:50 +0000
(12:50 +0000)
build.gradle
patch
|
blob
|
history
diff --git
a/build.gradle
b/build.gradle
index
fc13bff
..
c451100
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-2304,8
+2304,8
@@
task jalviewjsIDE_checkJ2sPlugin {
def eclipseJ2sPlugin = "${eclipseHome}/dropins/${j2sPluginFile.getName()}"
def eclipseJ2sPluginFile = file(eclipseJ2sPlugin)
if (!eclipseJ2sPluginFile.exists()) {
def eclipseJ2sPlugin = "${eclipseHome}/dropins/${j2sPluginFile.getName()}"
def eclipseJ2sPluginFile = file(eclipseJ2sPlugin)
if (!eclipseJ2sPluginFile.exists()) {
- def msg = "Eclipse J2S Plugin is not installed"
- println(msg)
+ def msg = "Eclipse J2S Plugin is not installed (could not find '${eclipseJ2sPlugin}')"
+ System.err.println(msg)
if (! copyPlugin) {
throw new GradleException(msg)
}
if (! copyPlugin) {
throw new GradleException(msg)
}
@@
-2322,7
+2322,7
@@
task jalviewjsIDE_checkJ2sPlugin {
if (j2sPluginMd5 != eclipseJ2sPluginMd5) {
def msg = "WARNING! Eclipse J2S Plugin '${eclipseJ2sPlugin}' is different to this commit's version '${j2sPlugin}'"
if (j2sPluginMd5 != eclipseJ2sPluginMd5) {
def msg = "WARNING! Eclipse J2S Plugin '${eclipseJ2sPlugin}' is different to this commit's version '${j2sPlugin}'"
- println(msg)
+ System.err.println(msg)
if (! copyPlugin) {
throw new StopExecutionException(msg)
}
if (! copyPlugin) {
throw new StopExecutionException(msg)
}
@@
-2338,7
+2338,7
@@
task jalviewjsIDE_checkJ2sPlugin {
into eclipseJ2sPluginFile.getParent()
}
} else {
into eclipseJ2sPluginFile.getParent()
}
} else {
- def msg = "Eclipse J2S Plugin is the same as '${j2sPlugin}'"
+ def msg = "Eclipse J2S Plugin is the same as '${j2sPlugin}' (this is good)"
println(msg)
}
}
println(msg)
}
}