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 (parent:
18f5de0
)
JAL-3210 fix an undefined copyPlugin var and improved warning in Eclipse console...
author
soares
<bsoares@dundee.ac.uk>
Wed, 25 Mar 2020 13:39:41 +0000
(13:39 +0000)
committer
soares
<bsoares@dundee.ac.uk>
Wed, 25 Mar 2020 13:39:41 +0000
(13:39 +0000)
build.gradle
patch
|
blob
|
history
diff --git
a/build.gradle
b/build.gradle
index
fcacba3
..
1f1bc2f
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-2368,9
+2368,7
@@
task jalviewjsIDE_checkJ2sPlugin {
if (j2sPluginMd5 != eclipseJ2sPluginMd5) {
def msg = "WARNING! Eclipse J2S Plugin '${eclipseJ2sPlugin}' is different to this commit's version '${j2sPlugin}'"
System.err.println(msg)
if (j2sPluginMd5 != eclipseJ2sPluginMd5) {
def msg = "WARNING! Eclipse J2S Plugin '${eclipseJ2sPlugin}' is different to this commit's version '${j2sPlugin}'"
System.err.println(msg)
- if (! copyPlugin) {
- throw new StopExecutionException(msg)
- }
+ throw new StopExecutionException(msg)
} else {
def msg = "Eclipse J2S Plugin is the same as '${j2sPlugin}' (this is good)"
println(msg)
} else {
def msg = "Eclipse J2S Plugin is the same as '${j2sPlugin}' (this is good)"
println(msg)
@@
-2391,8
+2389,8
@@
task jalviewjsIDE_copyJ2sPlugin {
}
def eclipseJ2sPlugin = "${eclipseHome}/dropins/${j2sPluginFile.getName()}"
def eclipseJ2sPluginFile = file(eclipseJ2sPlugin)
}
def eclipseJ2sPlugin = "${eclipseHome}/dropins/${j2sPluginFile.getName()}"
def eclipseJ2sPluginFile = file(eclipseJ2sPlugin)
- def msg = "WARNING! Copying this commit's j2s plugin '${j2sPlugin}' to Eclipse J2S Plugin '${eclipseJ2sPlugin}'\n May require an Eclipse restart"
- println(msg)
+ def msg = "WARNING! Copying this commit's j2s plugin '${j2sPlugin}' to Eclipse J2S Plugin '${eclipseJ2sPlugin}'\n* May require an Eclipse restart"
+ System.err.println(msg)
copy {
from j2sPlugin
eclipseJ2sPluginFile.getParentFile().mkdirs()
copy {
from j2sPlugin
eclipseJ2sPluginFile.getParentFile().mkdirs()