From: soares <bsoares@dundee.ac.uk>
Date: Wed, 25 Mar 2020 13:39:41 +0000 (+0000)
Subject: JAL-3210 fix an undefined copyPlugin var and improved warning in Eclipse console... 
X-Git-Tag: Release_2_11_4_0~45^2~18^2~33
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8e6e5eba1f8130dad6c2b697bf7671cb7036c1c0;p=jalview.git

JAL-3210 fix an undefined copyPlugin var and improved warning in Eclipse console when copying plugin
---

diff --git a/build.gradle b/build.gradle
index fcacba3..1f1bc2f 100644
--- 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 (! 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)
@@ -2391,8 +2389,8 @@ task jalviewjsIDE_copyJ2sPlugin {
     }
     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()