From: Ben Soares <bsoares@dundee.ac.uk>
Date: Tue, 1 Oct 2019 08:05:49 +0000 (+0100)
Subject: JAL-3210 more progress with goomph. Error detection for external eclipse transpile.
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ded21f0e35a7003ce2dfdb45d2d550cb38e905b9;p=jalview.git

JAL-3210 more progress with goomph. Error detection for external eclipse transpile.
---

diff --git a/build.gradle b/build.gradle
index 7aefe20..0a3ff41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,52 +27,10 @@ plugins {
   id 'eclipse'
   id 'com.diffplug.gradle.oomph.ide' version '3.18.1'
   id 'com.diffplug.gradle.equinoxlaunch' version '3.18.1'
-
-  //id 'com.diffplug.gradle.p2.asmaven' version '3.18.1'
-
-  //id 'org.eclipse.osgi' version '3.15.0'
-  //id 'osgi'
-}
-
-
-/*
-def eclipseDeps = [
-    // The dependencies we actually use
-    'org.eclipse.jdt.core',
-    'org.eclipse.text',
-
-    // Their transitives
-    'org.eclipse.core.contenttype',
-    'org.eclipse.core.jobs',
-    'org.eclipse.core.runtime',
-    'org.eclipse.core.resources',
-    'org.eclipse.equinox.common',
-    'org.eclipse.equinox.preferences',
-    //'org.eclipse.osgi'
-]
-*/
-
-/*
-p2AsMaven {
-  group 'p2', {
-    repoEclipse goomph_eclipse_version
-    eclipseDeps.each { p2.addIU(it) }
-    eclipseDeps.each { p2.addIU(it + '.source') }
-  }
 }
-*/
-
 
-/*
 dependencies {
-  //eclipseDeps.each { compile "p2:${it}:+" }
-  //implementation 'org.eclipse.platform:org.eclipse.osgi:3.15.0'
-  //compile 'org.eclipse.platform:org.eclipse.osgi:3.15.0'
-  //classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.4.0'
 }
-*/
-
-
 
 repositories {
   jcenter()
@@ -319,9 +277,18 @@ oomphIde {
     */
     //compilerComplianceLevel( JAVA_INTEGER_VERSION )
   }
-  //repo 'http://download.eclipse.org/buildship/updates/e45/milestones/3.x/'
-  repo goomph_repo_buildship
-	feature goomph_feature_buildship
+  repo "https://download.eclipse.org/releases/${goomph_eclipse_version_name}/"
+  feature goomph_eclipse_jee_feature, goomph_eclipse_jee_version
+  thirdParty {
+    buildship {
+      repo goomph_repo_buildship
+      feature goomph_feature_buildship
+    }
+
+  }
+
+
+  // CLI ARGS HERE!
 }
 
 equinoxLaunch {
@@ -334,6 +301,9 @@ equinoxLaunch {
   }
 }
 
+task testIde(type: ) {
+}
+
 task ideCopyDropins (type: Copy) {
   dependsOn ideSetupP2
 
@@ -353,12 +323,6 @@ task ideCopyDropins (type: Copy) {
 
 }
 
-ide.dependsOn eclipseProject
-ide.dependsOn eclipseClasspath
-ide.dependsOn eclipseJdt
-ide.dependsOn ideCopyDropins
-ideJalviewjsBuild.dependsOn ideSetupWorkspace
-ideJalviewjsBuild.dependsOn ideCopyDropins
 
 
 
@@ -607,10 +571,6 @@ task jalviewjsSiteTar(type: Tar) {
   inputs.dir(jalviewjsSiteDir)
 }
 
-task jalviewjs {
-  dependsOn jalviewjsBuildSite
-}
-
 def jalviewjsServer = null
 task jalviewjsServerStart {
   dependsOn jalviewjsSitePath
@@ -629,7 +589,7 @@ task jalviewjsServerStart {
           def doc_root = new File(jalviewDirAbsolutePath +"/"+ jalviewjsSiteDir)
           jalviewjsServer = factory.start(doc_root, port)
           running = true
-          println("SERVER STARTED with document root ${doc_root}.\nGo to "+jalviewjsServer.getResourceUrl(jalviewjs_server_resource)+" . Run  gradle jalviewjsServerStop  to stop.")
+          println("SERVER STARTED with document root ${doc_root}.\nGo to "+jalviewjsServer.getResourceUrl(jalviewjs_server_resource)+" . Run  gradle --stop  to stop (kills all gradle daemons).")
           //println("Ctrl-c to stop.");java.lang.Thread.sleep(Integer.valueOf(jalviewjs_server_wait)*1000);
         } catch (Exception e) {
           port++;
@@ -659,10 +619,36 @@ task jalviewjsServerStop {
 }
 */
 
+task ideSetup {
+  dependsOn ideSetupP2
+  dependsOn ideCopyDropins
+}
+
+task ideBuildSite {
+  dependsOn jalviewjsSitePath
+  dependsOn jalviewjsUnzipFiles
+  dependsOn jalviewjsCopyResources
+  dependsOn jalviewjsCopySiteResources
+  dependsOn ideCopyDropins
+  dependsOn ide
+}
+
+
+
+
+task jalviewjs {
+  dependsOn jalviewjsBuildSite
+}
+
+
 project.afterEvaluate {
   tasks.findByName('ideJalviewjsBuild').dependsOn eclipseProject
   tasks.findByName('ideJalviewjsBuild').dependsOn eclipseClasspath
   tasks.findByName('ideJalviewjsBuild').dependsOn eclipseJdt
+
+  tasks.findByName('ide').dependsOn eclipseProject
+  tasks.findByName('ide').dependsOn eclipseClasspath
+  tasks.findByName('ide').dependsOn eclipseJdt
 }
 
 
diff --git a/gradle.properties b/gradle.properties
index bab2570..061efb6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -65,7 +65,7 @@ j2s.excluded.paths = test;testng;util
 #j2s.testing = null
 #j2s.compiler.nonqualified.packages = null
 #j2s.compiler.nonqualified.classes = null
-j2s.compiler.mode = debug
+#j2s.compiler.mode = debug
 #a semicolon-separated list of package (foo.) or class (foo.bar) replacements to be made 
 j2s.class.replacements = org.apache.log4j.->jalview.javascript.log4j.
 #j2s.template.html = null
@@ -82,7 +82,21 @@ jalviewjs_j2s_stdout = j2s-transpile.out
 jalviewjs_j2s_stderr = j2s-transpile.err
 
 spotless_eclipse_version = 4.12.0
-goomph_eclipse_version = 4.12
+
+## 4.12
+#goomph_eclipse_version = 4.12
+#goomph_eclipse_version_name = 2019-06
+#goomph_eclipse_jee_feature = org.eclipse.epp.package.jee.feature
+## find the jee feature version from https://download.eclipse.org/technology/epp/packages/<ECLIPSE_VERSION_NAME>/features/
+#goomph_eclipse_jee_version = 4.12.0.20190614-1200
+
+# 4.13
+goomph_eclipse_version = 4.13
+goomph_eclipse_version_name = 2019-09
+goomph_eclipse_jee_feature = org.eclipse.epp.package.jee.feature
+goomph_eclipse_jee_version = 4.13.0.20190917-0000
+
 goomph_repo_buildship = https://download.eclipse.org/buildship/updates/e47/releases/3.x/
 goomph_feature_buildship = org.eclipse.buildship
+
 goomph_workspace = ../tmp/goomph-workspace