JAL-247 pass idwidth parameter to IdCanvas.drawMarker

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 6c1e365..f02d8ad 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -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
@@ -1170,7 +1173,13 @@ 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
   
@@ -1192,7 +1201,7 @@ task sourceDist (type: Tar) {
   "LICENSE",
   "**/README",
   "RELEASE",
-  "THIRDPARTYLIBS","TESTNG","**/README",
+  "THIRDPARTYLIBS","TESTNG",
   "build.gradle",
   "gradle.properties",
   "**/*.java",
@@ -1223,11 +1232,12 @@ task sourceDist (type: Tar) {
   // 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)
-  }
+//  from (jalviewDir) {
+//    // explicit includes for stuff that seemed to not get included
+//    include(fileTree("test/**/*."))
+//    exclude(EXCLUDE_FILES)
+//    exclude(PROCESS_FILES)
+//  }
 }
 
 task helppages  {