Merge branch 'patch/JAL-3538_fontantialiasingbydefault' into develop

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index c24c020..ba884a1 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ import groovy.transform.ExternalizeMethods
 
 buildscript {
   dependencies {
-    classpath 'org.openclover:clover:4.3.1'
+    classpath 'org.openclover:clover:4.4.1'
     classpath 'org.apache.commons:commons-compress:1.18'
   }
 }
@@ -61,6 +61,9 @@ ext {
 
     case "BUILD":
     // TODO: get bamboo build artifact URL for getdown artifacts
+    getdown_channel_base = bamboo_channelbase
+    getdown_channel_name = bamboo_planKey + '/'+JAVA_VERSION
+    getdown_app_base = bamboo_channelbase + '/'+ bamboo_planKey + bamboo_getdown_channel_suffix + '/'+JAVA_VERSION
     getdown_app_dir = getdown_app_dir_alt
     buildProperties = jalviewDir + "/" + classesDir +"/" + buildPropertiesFile
     break
@@ -269,7 +272,7 @@ sourceSets {
     compileClasspath = files( sourceSets.test.java.outputDir )
 
     if (use_clover) {
-      compileClasspath += sourceSets.clover.compileClasspath
+      compileClasspath = sourceSets.clover.compileClasspath
     } else {
       compileClasspath += files(sourceSets.main.java.outputDir)
     }
@@ -284,8 +287,8 @@ sourceSets {
 // clover bits
 dependencies {
   if (use_clover) {
-    cloverCompile 'org.openclover:clover:4.3.1'
-    testCompile 'org.openclover:clover:4.3.1'
+    cloverCompile 'org.openclover:clover:4.4.1'
+    testCompile 'org.openclover:clover:4.4.1'
   }
 }
 
@@ -449,7 +452,7 @@ eclipse {
 
 task cloverInstr() {
   // only instrument source, we build test classes as normal
-  inputs.files files (sourceSets.main.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
+  inputs.files files (sourceSets.main.allJava,sourceSets.test.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
   outputs.dir cloverInstrDir
 
   doFirst {
@@ -1170,14 +1173,21 @@ clean {
 task sourceDist (type: Tar) {
   
   def VERSION_UNDERSCORES = JALVIEW_VERSION.replaceAll("\\.", "_")
-  archiveFileName = project.name + "_" + VERSION_UNDERSCORES + ".tar.gz"
+  def outputFileName = project.name + "_" + VERSION_UNDERSCORES + ".tar.gz"
+  // cater for buildship < 3.1 [3.0.1 is max version in eclipse 2018-09]
+  try {
+    archiveFileName = outputFileName
+  } catch (Exception e) {
+    archiveName = outputFileName
+  }
   
   compression Compression.GZIP
   
   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 +1199,9 @@ task sourceDist (type: Tar) {
   "JAVA-11-README",
   "FEATURETODO",
   "LICENSE",
-  "README",
+  "**/README",
   "RELEASE",
-  "THIRDPARTYLIBS",
+  "THIRDPARTYLIBS","TESTNG",
   "build.gradle",
   "gradle.properties",
   "**/*.java",
@@ -1211,40 +1221,23 @@ 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)
+//    exclude(PROCESS_FILES)
+//  }
 }
 
 task helppages  {