From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 3 Sep 2020 11:20:22 +0000 (+0100)
Subject: Merge branch 'improvement/JAL-3280_Migrate_the_VersionChecker_service_to_build_proper... 
X-Git-Tag: Release_2_11_1_1~10
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=cc6ff151e49ae2d9af3fe4c15719f1787bb27ee7;hp=-c

Merge branch 'improvement/JAL-3280_Migrate_the_VersionChecker_service_to_build_properties' into releases/Release_2_11_1_Branch
---

cc6ff151e49ae2d9af3fe4c15719f1787bb27ee7
diff --combined build.gradle
index 5281bb1,49d34fe..68d0c04
--- a/build.gradle
+++ b/build.gradle
@@@ -344,7 -344,6 +344,7 @@@ ext 
      //libDir = j8libDir
      libDir = j11libDir
      libDistDir = j8libDir
 +    digestonlyDir = j8digestonlyDir
      compile_source_compatibility = 1.8
      compile_target_compatibility = 1.8
      // these are getdown.txt properties defined dependent on the JAVA_VERSION
@@@ -358,7 -357,6 +358,7 @@@
      JAVA_INTEGER_VERSION = string("11")
      libDir = j11libDir
      libDistDir = j11libDir
 +    digestonlyDir = j11digestonlyDir
      compile_source_compatibility = 11
      compile_target_compatibility = 11
      getdownAltJavaMinVersion = string(findProperty("getdown_alt_java11_min_version"))
@@@ -1347,16 -1345,6 +1347,16 @@@ task getdownWebsite() 
        }
      }
  
 +    fileTree(dir: digestonlyDir, include: ["*"]).getFiles().sort().each{f ->
 +      def name = f.getName()
 +      def line = "digestonly = ${getdownAppDistDir}/${name}\n"
 +      getdownTextString += line
 +      copy {
 +        from f.getPath()
 +        into getdownAppDir
 +      }
 +    }
 +    
      // NOT USING MODULES YET, EVERYTHING SHOULD BE IN dist
      /*
      if (JAVA_VERSION.equals("11")) {
@@@ -1377,6 -1365,10 +1377,10 @@@
      //getdownTextString += "class = " + file(getdownLauncher).getName() + "\n"
      getdownTextString += "resource = ${getdown_launcher_new}\n"
      getdownTextString += "class = ${main_class}\n"
+     /* NOT setting these properties so that getdownappbase and getdowndistdir will default to release version
+      * getdownTextString += "jvmarg = -Dgetdowndistdir=${getdownAppDistDir}\n"
+      * getdownTextString += "jvmarg = -Dgetdownappbase=${getdownAppBase}\n"
+      */
  
      def getdown_txt = file("${getdownWebsiteDir}/getdown.txt")
      getdown_txt.write(getdownTextString)
@@@ -1403,7 -1395,7 +1407,7 @@@
        copy {
          from getdown_txt
          from getdownLauncher
-         from "${getdownWebsiteDir}/${getdown_build_properties}"
+         from "${getdownAppDir}/${getdown_build_properties}"
          if (file(getdownLauncher).getName() != getdown_launcher) {
            rename(file(getdownLauncher).getName(), getdown_launcher)
          }