JAL-3225 fix comparing Eclispe IDE j2s plugin and this branch j2s plugin

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index fcacba3..901fcc8 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -2362,15 +2362,13 @@ task jalviewjsIDE_checkJ2sPlugin {
     digest.update(j2sPluginFile.text.bytes)
     def j2sPluginMd5 = new BigInteger(1, digest.digest()).toString(16).padLeft(32, '0')
 
-    //digest.update(eclipseJ2sPluginFile.text.bytes)
+    digest.update(eclipseJ2sPluginFile.text.bytes)
     def eclipseJ2sPluginMd5 = new BigInteger(1, digest.digest()).toString(16).padLeft(32, '0')
      
     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()