From: Ben Soares <bsoares@dundee.ac.uk>
Date: Wed, 19 Feb 2020 16:40:09 +0000 (+0000)
Subject: Merge branch 'develop' into improvement/JAL-3449_add_install4j_installer_getdown_vers... 
X-Git-Tag: Develop-2_11_2_0-d20201215~80^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=56f4324f197ac20954ce304d103ff26f1dda58e2;p=jalview.git

Merge branch 'develop' into improvement/JAL-3449_add_install4j_installer_getdown_versions_to_jalview_console.2
---

56f4324f197ac20954ce304d103ff26f1dda58e2
diff --cc build.gradle
index 9dae53a,427d4a3..36b75fd
--- a/build.gradle
+++ b/build.gradle
@@@ -1439,18 -1244,20 +1453,21 @@@ task sourceDist(type: Tar) 
      exclude (getdown_website_dir)
  
      // exluding these as not using jars as modules yet
-     exclude ("${j11modDir}/**/*.jar")
-   }
-   //  from (jalviewDir) {
-   //    // explicit includes for stuff that seemed to not get included
-   //    include(fileTree("test/**/*."))
-   //    exclude(EXCLUDE_FILES)
-   //    exclude(PROCESS_FILES)
-   //  }
+     exclude ("$j11modDir/**/*.jar")
+   }
+   from(jalviewDir) {
+     include(INCLUDE_FILES)
+   }
+ //  from (jalviewDir) {
+ //    // explicit includes for stuff that seemed to not get included
+ //    include(fileTree("test/**/*."))
+ //    exclude(EXCLUDE_FILES)
+ //    exclude(PROCESS_FILES)
+ //  }
  }
  
 -task helppages  {
 +
 +task helppages {
    dependsOn copyHelp
    dependsOn pubhtmlhelp