From: soares <bsoares@dundee.ac.uk>
Date: Sun, 6 Oct 2019 00:22:20 +0000 (+0100)
Subject: JAL-3210. IT LIVES\! some goomph transpilation going on
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=58d58e3006059231119911e93918e022b9c3f37c;p=jalview.git

JAL-3210. IT LIVES\! some goomph transpilation going on
---

diff --git a/build.gradle b/build.gradle
index 0a5af56..6688c6b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,15 +4,15 @@ import org.gradle.plugins.ide.eclipse.model.*
 import groovy.transform.ExternalizeMethods
 import com.diffplug.gradle.GoomphCacheLocations
 
+/*
 buildscript {
   repositories {
-    /*
     mavenCentral()
     jcenter()
-    */
 	mavenLocal()
   }
 }
+*/
 
 plugins {
   id 'java'
@@ -29,12 +29,6 @@ def jalviewDirAbsolutePath = file(jalviewDir).getAbsolutePath()
 repositories {
   jcenter()
   mavenCentral()
-  //maven { url "http://maven.icm.edu.pl/artifactory/repo/" }
-  //maven { url "http://maven.geomajas.org/" }
-  //maven { url "https://repo.spring.io/plugins-release/" }
-  //maven { url "http://maven.thingml.org/thirdparty/" }
-  //maven { url "${jalviewDirAbsolutePath}/${m2RepoDir}" }
-  //mavenLocal()
   flatDir {
     dirs gradlePluginsDir
   }
@@ -47,39 +41,46 @@ configurations {
 p2AsMaven {
   group 'eclipseDeps', {
     repoEclipse goomph_eclipse_repo_version
-    slicingOption 'latestVersionOnly', 'true'
+    //slicingOption 'latestVersionOnly', 'true'
     iu 'org.eclipse.update.configurator'
   }
   group 'eclipseOrbit', {
     repo goomph_orbit_repo
     slicingOption 'latestVersionOnly', 'true'
+    iu 'javax.el'
+    iu 'javax.servlet'
+    iu 'javax.servlet.jsp'
     iu 'org.apache.ant'
+    iu 'org.apache.batik.constants'
     iu 'org.apache.batik.css'
+    iu 'org.apache.batik.i18n'
+    iu 'org.apache.batik.util'
+    iu 'org.apache.commons.beanutils'
+    iu 'org.apache.commons.collections'
     iu 'org.apache.commons.jxpath'
-    iu 'javax.servlet'
+    iu 'org.apache.commons.io'
+    iu 'org.apache.commons.logging'
+    iu 'org.apache.xmlgraphics'
+    iu 'org.jdom'
+    iu 'org.w3c.dom.events'
+    iu 'org.w3c.dom.smil'
+    iu 'org.w3c.dom.svg'
   }
 }
 
 dependencies {
-    //compile group: 'org.osgi', name: 'org.osgi.service.component', version: '1.4.0'
 /*
     source.addMaven('org.eclipse.platform:org.eclipse.osgi:3.14.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.equinox.common:3.10.400')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.jobs:3.10.400')
-    source.addMaven('org.eclipse.platform:org.eclipse.update.configurator:3.4.300')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.runtime:3.16.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.equinox.ds:1.6.0')
-    source.addMaven('javax.inject:com.springsource.javax.inject:1.0.0')
+    // ...
+    compile 'eclipseOrbit:org.apache.ant:1.10.5.v20190526-1402'
+    // ...
+    compile 'org.osgi:org.osgi.service.component:1.4.0'
+    // ...
 */
 
-  //compile 'eclipseOrbit:org.apache.ant:1.10.5.v20190526-1402'
-  //compile 'eclipseOrbit:javax.servlet:3.1.0.v201410161800'
-  //compile 'eclipseDeps:net.sf.j2s.core:3.2.4'
-  //compile 'eclipseDeps:com.seeq.eclipse.importprojects:1.4.0'
-
-  //compile 'eclipseDeps:org.eclipse.update.configurator:3.3.400'
+  jalviewjsIde name: 'net.sf.j2s.core-3.2.4'
+  jalviewjsIde name: 'com.seeq.eclipse.importprojects-1.4.0'
 
-  
 }
 
 
@@ -88,6 +89,7 @@ dependencies {
 
 
 eclipseMavenCentral {
+// How do I add these to the jalviewjsIde configuration and not the compile configuration?
   release goomph_eclipse_repo_version, {
 
     //def platformCode="cocoa.macosx.x86_64"
@@ -105,11 +107,6 @@ eclipseMavenCentral {
     compile 'org.eclipse.core.resources'
     compile 'org.eclipse.core.runtime'
     compile 'org.eclipse.core.variables'
-    compile 'org.eclipse.e4.core.commands'
-    compile 'org.eclipse.e4.core.contexts'
-    compile 'org.eclipse.e4.core.di'
-    compile 'org.eclipse.e4.core.di.annotations'
-    compile 'org.eclipse.e4.core.services'
     compile 'org.eclipse.equinox.common'
     compile 'org.eclipse.equinox.ds'
     compile 'org.eclipse.equinox.app'
@@ -123,18 +120,28 @@ eclipseMavenCentral {
     compile 'org.eclipse.team.core'
     compile 'org.eclipse.text'
 
+    compile 'org.eclipse.e4.core.commands'
+    compile 'org.eclipse.e4.core.contexts'
+    compile 'org.eclipse.e4.core.di'
+    compile 'org.eclipse.e4.core.di.annotations'
+    compile 'org.eclipse.e4.core.di.extensions.supplier'
+    compile 'org.eclipse.e4.core.services'
     compile 'org.eclipse.e4.ui.bindings'
     compile 'org.eclipse.e4.ui.model.workbench'
     compile 'org.eclipse.e4.ui.workbench'
     compile 'org.eclipse.e4.ui.workbench.swt'
     compile 'org.eclipse.e4.ui.css.core'
     compile 'org.eclipse.e4.ui.css.swt'
+    compile 'org.eclipse.e4.ui.css.swt.theme'
     compile 'org.eclipse.e4.ui.services'
     compile 'org.eclipse.e4.ui.di'
 
+    //compile 'org.eclipse.e4.core.di.internal.extensions'
+
     // org.eclipse.update.configurator deliberately kept at 3.3.400 see https://github.com/diffplug/goomph/issues/69
     //compile 'org.eclipse.update.configurator'
 
+
   }
 }
 
@@ -420,75 +427,47 @@ equinoxLaunch {
   ideJalviewjsBuildSetup {
 
     source.addConfiguration(configurations.compile)
+    source.addConfiguration(configurations.jalviewjsIde)
 
     source.addMaven('eclipseOrbit:org.apache.ant:1.10.5.v20190526-1402')
     source.addMaven('eclipseOrbit:javax.servlet:3.1.0.v201410161800')
-
+    source.addMaven('eclipseOrbit:javax.servlet.jsp:2.2.0.v201112011158')
+    source.addMaven('eclipseOrbit:javax.el:2.2.0.v201303151357')
+    source.addMaven('eclipseOrbit:org.apache.batik.constants:1.11.0.v20190515-0436')
+    source.addMaven('eclipseOrbit:org.apache.batik.css:1.11.0.v20190515-0436')
+    source.addMaven('eclipseOrbit:org.apache.batik.i18n:1.11.0.v20190515-0436')
+    source.addMaven('eclipseOrbit:org.apache.batik.util:1.11.0.v20190515-0436')
+    source.addMaven('eclipseOrbit:org.apache.commons.beanutils:1.8.0.v201205091237')
+    source.addMaven('eclipseOrbit:org.apache.commons.collections:3.2.2.v201511171945')
+    source.addMaven('eclipseOrbit:org.apache.xmlgraphics:2.3.0.v20190515-0436')
+    source.addMaven('eclipseOrbit:org.apache.commons.jxpath:1.3.0.v200911051830')
+    source.addMaven('eclipseOrbit:org.apache.commons.io:2.6.0.v20190123-2029')
+    source.addMaven('eclipseOrbit:org.apache.commons.logging:1.2.0.v20180409-1502')
+    source.addMaven('eclipseOrbit:org.jdom:1.1.1.v201101151400')
+    source.addMaven('eclipseOrbit:org.w3c.dom.svg:1.1.0.v201011041433')
+    source.addMaven('eclipseOrbit:org.w3c.dom.smil:1.0.1.v200903091627')
+    source.addMaven('eclipseOrbit:org.w3c.dom.events:3.0.0.draft20060413_v201105210656')
     source.addMaven('org.eclipse.birt.runtime:com.ibm.icu:56.1.0.v201601250100')
     source.addMaven('javax.inject:com.springsource.javax.inject:1.0.0')
-
-    //source.addMaven('eclipse-deps:org.apache.ant:1.10.5')
-
     source.addMaven('org.apache.felix:org.apache.felix.scr:2.1.16')
-
     source.addMaven('org.osgi:org.osgi.framework:1.9.0')
     source.addMaven('org.osgi:org.osgi.service.component:1.4.0')
     source.addMaven('org.osgi:org.osgi.service.event:1.4.0')
     source.addMaven('org.osgi:org.osgi.util.promise:1.1.1')
     source.addMaven('org.osgi:org.osgi.util.function:1.1.0')
-
-//### TRY AND FIND A HEADLESS BUILD WITHOUT org.eclipse.jdt.apt.core
     source.addMaven('org.eclipse.jdt:org.eclipse.jdt.apt.core:3.6.500')
     source.addMaven('org.eclipse.jdt:org.eclipse.jdt.core:3.19.0')
+    source.addMaven('org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.300')
 
-    source.addMaven('org.eclipse.platform:org.eclipse.update.configurator:3.3.400')
-
-    //source.addMaven('org.eclipse.e4.ui.internal.workbench.swt')
-    /*
-    source.addMaven('org.eclipse.platform:org.eclipse.ant.core:3.5.500')
-    source.addMaven('org.eclipse.platform:org.eclipse.compare.core:3.6.600')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.commands:3.9.500')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.contenttype:3.7.400')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.jobs:3.10.500')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.expressions:3.6.500')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.filesystem:1.7.500')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.resources:3.13.500')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.runtime:3.16.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.core.variables:3.4.600')
-    //source.addMaven('org.eclipse.platform:org.eclipse.e4.commands:3.10.500')
-    source.addMaven('org.eclipse.platform:org.eclipse.e4.core.commands:0.12.700')
-    source.addMaven('org.eclipse.platform:org.eclipse.e4.core.contexts:1.8.200')
-    source.addMaven('org.eclipse.platform:org.eclipse.e4.core.di:1.7.400')
-    source.addMaven('org.eclipse.platform:org.eclipse.e4.core.di.annotations:1.6.400')
-    source.addMaven('org.eclipse.platform:org.eclipse.e4.core.services:2.2.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.e4.ui.workbench:1.10.100')
-    source.addMaven('org.eclipse.platform:org.eclipse.equinox.common:3.10.500')
-    source.addMaven('org.eclipse.platform:org.eclipse.equinox.ds:1.6.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.equinox.app:1.4.300')
-    source.addMaven('org.eclipse.platform:org.eclipse.equinox.registry:3.8.500')
-    source.addMaven('org.eclipse.platform:org.eclipse.equinox.preferences:3.7.500')
-    source.addMaven('org.eclipse.platform:org.eclipse.jface:3.17.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.osgi:3.14.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.swt:3.112.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.ui:3.114.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.ui.workbench:3.116.0')
-    source.addMaven('org.eclipse.platform:org.eclipse.team.core:3.8.700')
-    source.addMaven('org.eclipse.platform:org.eclipse.text:3.9.0')
     // org.eclipse.update.configurator deliberately kept at 3.3.400 see https://github.com/diffplug/goomph/issues/69
     source.addMaven('org.eclipse.platform:org.eclipse.update.configurator:3.3.400')
 
-    source.addMaven('org.eclipse.platform:org.eclipse.e4.ui.bindings:0.12.600')
-    */
-
-
-
+    launchTask 'ideJalviewjsImport', {
+      it.args = ["-consoleLog", "--launcher.suppressErrors", "-application", "com.seeq.eclipse.importprojects.headlessimport", "-data", eclipseWorkspace.getPath(), "-import", jalviewDirAbsolutePath ]
+    }
 
     launchTask 'ideJalviewjsBuild', {
-      //it.args = ["-nosplash", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-data", eclipseWorkspace, "-"+jalviewjs_eclipseBuildArg, eclipse_project_name ]
-      //it.args = ["-nosplash", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-"+jalviewjs_eclipseBuildArg, eclipse_project_name ]
-      it.args = ["-consoleLog", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-"+jalviewjs_eclipseBuildArg, eclipse_project_name ]
-      //it.vmArgs = ['-Dosgi.bundles=org.eclipse.core.jobs@2:start,org.eclipse.equinox.common@3:start,org.eclipse.core.runtime@2:start']
-      //it.vmArgs = ['-Dequinox.use.ds=false']
+      it.args = ["-consoleLog", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-data", eclipseWorkspace.getPath(), "-"+jalviewjs_eclipseBuildArg, eclipse_project_name ]
 
     }
   }
@@ -854,10 +833,12 @@ task jalviewjs {
 
 
 project.afterEvaluate {
-  tasks.findByName('ideJalviewjsBuild').dependsOn eclipseProject
-  tasks.findByName('ideJalviewjsBuild').dependsOn eclipseClasspath
-  tasks.findByName('ideJalviewjsBuild').dependsOn eclipseJdt
-  //tasks.findByName('ideJalviewjsBuild').dependsOn ideSetup
+  tasks.findByName('ideJalviewjsImport').dependsOn eclipseProject
+  tasks.findByName('ideJalviewjsImport').dependsOn eclipseClasspath
+  tasks.findByName('ideJalviewjsImport').dependsOn eclipseJdt
+  tasks.findByName('ideJalviewjsImport').dependsOn jalviewjsSetEclipseWorkspace
+
+  tasks.findByName('ideJalviewjsBuild').dependsOn tasks.findByName('ideJalviewjsImport')
 
   tasks.findByName('ide').dependsOn eclipseProject
   tasks.findByName('ide').dependsOn eclipseClasspath