From: soares <bsoares@dundee.ac.uk>
Date: Tue, 24 Sep 2019 19:04:43 +0000 (+0100)
Subject: JAL-3210 some changes
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fbe0e3fc9fe05c1ac6182172fa923c9c0d5fe1f7;p=jalview.git

JAL-3210 some changes
---

diff --git a/build.gradle b/build.gradle
index 8c35bf8..dec0765 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,6 @@ plugins {
   id 'com.diffplug.gradle.oomph.ide' version '3.18.1'
   id 'com.diffplug.gradle.equinoxlaunch' version '3.18.1'
 
-  id 'com.diffplug.gradle.spotless' version '3.24.2'
-
   //id 'com.diffplug.gradle.p2.asmaven' version '3.18.1'
 
   //id 'org.eclipse.osgi' version '3.15.0'
@@ -74,12 +72,6 @@ dependencies {
 */
 
 
-spotless {
-  java {
-    eclipse(spotless_eclipse_version).configFile eclipse_extra_jdt_prefs_file
-  }
-}
-
 
 repositories {
   jcenter()
@@ -208,9 +200,15 @@ eclipse {
         }
         cp.entries.removeAll(removeTheseToo)
 
-        cp.entries += new Output(eclipse_bin_dir+"/main")
-        cp.entries += new Library(fileReference(helpParentDir))
-        cp.entries += new Library(fileReference(resourceDir))
+	if (file(eclipse_bin_dir+"/main").isDirectory()) {
+		cp.entries += new Output(eclipse_bin_dir+"/main")
+	}
+	if (file(helpParentDir).isDirectory()) {
+		cp.entries += new Library(fileReference(helpParentDir))
+	}
+	if (file(resourceDir).isDirectory()) {
+		cp.entries += new Library(fileReference(resourceDir))
+	}
 
         HashMap<String, Boolean> addedLibPath = new HashMap<>();
 
@@ -340,6 +338,9 @@ task ideCopyDropins (type: Copy) {
 
 }
 
+ide.dependsOn eclipseProject
+ide.dependsOn eclipseClasspath
+ide.dependsOn eclipseJdt
 ide.dependsOn ideCopyDropins
 ideJalviewjsBuild.dependsOn ideSetupWorkspace
 ideJalviewjsBuild.dependsOn ideCopyDropins
@@ -599,3 +600,12 @@ task jalviewjsServerStop {
   }
 }
 */
+
+project.afterEvaluate {
+  tasks.findByName('ideJalviewjsBuild').dependsOn eclipseProject
+  tasks.findByName('ideJalviewjsBuild').dependsOn eclipseClasspath
+  tasks.findByName('ideJalviewjsBuild').dependsOn eclipseJdt
+}
+
+
+