From 9831dc2e2e282496e16649cd514e9c24bede5c16 Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 4 Jul 2019 16:23:16 +0100
Subject: [PATCH] JAL-3337 more includes and excludes

---
 build.gradle |   39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/build.gradle b/build.gradle
index c24c020..6c1e365 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1176,8 +1176,9 @@ task sourceDist (type: Tar) {
   
   into project.name
 
-  def EXCLUDE_FILES=["bin/*","test-*","clover*/*"
+  def EXCLUDE_FILES=["build/*","bin/*","test-output/","test-reports","tests","clover*/*"
   ,".*"
+  ,"benchmarking/*"
   ,"**/.*"
   ,"*.class"
   ,"**/*.class","$j11modDir/**/*.jar","appletlib","**/*locales"
@@ -1189,9 +1190,9 @@ task sourceDist (type: Tar) {
   "JAVA-11-README",
   "FEATURETODO",
   "LICENSE",
-  "README",
+  "**/README",
   "RELEASE",
-  "THIRDPARTYLIBS",
+  "THIRDPARTYLIBS","TESTNG","**/README",
   "build.gradle",
   "gradle.properties",
   "**/*.java",
@@ -1211,40 +1212,22 @@ task sourceDist (type: Tar) {
   from(jalviewDir) {
     exclude (EXCLUDE_FILES)
     exclude (PROCESS_FILES)
-    include (eclipse_extra_jdt_prefs_file)
-    include ("$schemaDir/**/*")
-    include ("$utilsDir/**/*")
-    include ("$docDir/**/*")
-    include ("$examplesDir/**/*")
-    include ("getdown/**/*")
-  
-    include ("$sourceDir/**/*.cdr")
-    include ("$j8libDir/**/*.jar")
-    include ("$j11libDir/**/*.jar")
-    include ("$resourceDir/**/*")
-  
-  //include ("jalview-jalopy.xml")
-  //include ("JalviewApplet.jpx")
-  //include ("JalviewX.jpx")
-  //include ("nbbuild.xml")
-  //include ("nbproject/genfiles.properties")
-  //include ("nbproject/project.properties")
-  //include ("nbproject/project.xml")
-  
-  include ("$helpDir/**/*")
-  exclude ("$helpDir/**/*.html")
-
   exclude ("appletlib")
   exclude ("**/*locales")
   exclude ("*locales/**")
   exclude ("utils/InstallAnywhere")
-  exclude (libDir)
-  exclude (getdown_files_dir)
+
+    exclude (getdown_files_dir)
   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)
+  }
 }
 
 task helppages  {
-- 
1.7.10.2