Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 883eede..2332643 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -747,6 +747,12 @@ task linkCheck(type: JavaExec) {
   outputs.file(helplinkscheckertouchfile)
 }
 
+// import the pubhtmlhelp target
+ant.properties.basedir = "$jalviewDir"
+ant.properties.helpBuildDir = jalviewDirAbsolutePath+"/$classes/$helpDir"
+ant.importBuild "$utilsDir/publishHelp.xml"
+
+
 task cleanPackageDir(type: Delete) {
   delete fileTree("$jalviewDir/$packageDir").include("*.jar")
 }
@@ -1149,27 +1155,32 @@ clean {
 }
 
 task sourceDist (type: Tar) {
-  archiveClassifier = "source-" + JALVIEW_VERSION
   
-  from jalviewDir
-  into project.name + "-" + JALVIEW_VERSION
+  def VERSION_UNDERSCORES = JALVIEW_VERSION.replaceAll("\\.", "_")
+  archiveFileName = project.name + "_" + VERSION_UNDERSCORES + ".tar.gz"
   
+  compression Compression.GZIP
+  
+  from jalviewDir
+  into project.name
+ 
+   
   exclude (".*")
   exclude ("**/.*")
   exclude ("*.class")
   exclude ("**/*.class")
   include (eclipse_extra_jdt_prefs_file)
+  include ("AUTHORS")
+  include ("CITATION")
+  include ("FEATURETODO")
+  include ("JAVA-11-README")
+  include ("FEATURETODO")
   include ("LICENSE")
   include ("README")
+  include ("RELEASE")
+  include ("THIRDPARTYLIBS")
   include ("build.gradle")
   include ("gradle.properties")
-  //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 ("$sourceDir/*.java")
   include ("$sourceDir/**/*.java")
   include ("$sourceDir/**/*.cdr")
@@ -1177,17 +1188,36 @@ task sourceDist (type: Tar) {
   include ("$j11libDir/**/*.jar")
   include ("$resourceDir/**/*")
   include ("$helpDir/**/*")
-  exclude ("appletlib")
-  exclude ("**/*locales")
-  exclude ("*locales/**")
-  exclude ("utils/InstallAnywhere")
   include ("$schemaDir/**/*")
   include ("$utilsDir/**/*")
   include ("$docDir/**/*")
   include ("$examplesDir/**/*")
   include ("getdown/**/*")
+  //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")
+  
+  exclude ("appletlib")
+  exclude ("**/*locales")
+  exclude ("*locales/**")
+  exclude ("utils/InstallAnywhere")
+  exclude (libDir)
   exclude (getdown_files_dir)
   exclude (getdown_website_dir)
 
+  // exluding these as not using jars as modules yet
+  exclude ("$j11modDir/**/*.jar")
+
 }
 
+task helppages  {
+  dependsOn copyHelp
+  dependsOn pubhtmlhelp
+  
+  inputs.dir("$classes/$helpDir")
+  outputs.file("build/distribution/help/helpTOC.html")
+}