From: Ben Soares Date: Tue, 29 Oct 2019 19:51:51 +0000 (+0000) Subject: Merge branch 'Jalview-JS/develop' into Jalview-JS/develop_with_gradle_build X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~92 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a451d67a4b474906a412fcd521695eae2bdc131f;hp=cc15ec9f510dee0ca701a5e0fd32109a733e6574;p=jalview.git Merge branch 'Jalview-JS/develop' into Jalview-JS/develop_with_gradle_build --- diff --git a/build.gradle b/build.gradle index d259e13..c9b1332 100644 --- a/build.gradle +++ b/build.gradle @@ -1306,10 +1306,9 @@ def eclipseVersion def eclipseDebug = false def eclipseVersionSuffix = "" task jalviewjsEclipsePaths { - def eclipseRoot def eclipseProduct - eclipseRoot = jalviewjs_eclipse_root + def eclipseRoot = jalviewjs_eclipse_root if (eclipseRoot.startsWith("~")) { eclipseRoot = System.getProperty("user.home") + eclipseRoot.substring(1) } @@ -1364,8 +1363,16 @@ task jalviewjsEclipsePaths { } } -task jalviewjsEclipseCopyDropins { +task eclipseSetup { + dependsOn eclipseProject + dependsOn eclipseClasspath + dependsOn eclipseJdt +} + +/* using the Copy task below +task OLDjalviewjsEclipseCopyDropins { dependsOn jalviewjsEclipsePaths + dependsOn jalviewjsCleanEclipse def inputFiles = fileTree(dir: utilsDropinsDir, include: "*.jar") def outputDir = eclipseDropinsDir @@ -1383,14 +1390,43 @@ task jalviewjsEclipseCopyDropins { } } } +*/ // this version (type: Copy) will delete anything in the eclipse dropins folder that isn't in fromDropinsDir -task NEWjalviewjsEclipseCopyDropins(type: Copy) { +task jalviewjsEclipseCopyDropins(type: Copy) { dependsOn jalviewjsEclipsePaths + from utilsDropinsDir into eclipseDropinsDir } +// this eclipse -clean doesn't actually work +task jalviewjsCleanEclipse(type: Exec) { + dependsOn eclipseSetup + dependsOn jalviewjsEclipsePaths + dependsOn jalviewjsEclipseCopyDropins + + executable(eclipseBinary) + args(["-nosplash", "--launcher.suppressErrors", "-data", eclipseWorkspace.getPath(), "-clean", "-console", "-consoleLog"]) + if (eclipseDebug) { + args += "-debug" + } + args += "-l" + + def inputString = """exit +y +""" + def inputByteStream = new ByteArrayInputStream(inputString.getBytes()) + standardInput = inputByteStream + + doFirst { + println("CLEAN ECLIPSE_DEBUG=${eclipseDebug}") + } +} +/* not really working yet +jalviewjsEclipseCopyDropins.finalizedBy jalviewjsCleanEclipse +*/ + task jalviewjsUnzipFiles { dependsOn jalviewjsSitePath @@ -1473,9 +1509,7 @@ task jalviewjsCopySiteResources (type: Copy) { } task jalviewjsProjectImport(type: Exec) { - dependsOn eclipseProject - dependsOn eclipseClasspath - dependsOn eclipseJdt + dependsOn eclipseSetup dependsOn jalviewjsEclipsePaths dependsOn jalviewjsEclipseSetup @@ -1514,13 +1548,21 @@ task jalviewjsTranspile(type: Exec) { def logOutFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}" def logOutFile = file(logOutFileName) logOutFile.createNewFile() - def logOutFOS = new FileOutputStream(logOutFile, false) + logOutFile.text = """ROOT: ${jalviewjs_eclipse_root} +BINARY: ${eclipseBinary} +VERSION: ${eclipseVersion} +WORKSPACE: ${eclipseWorkspace} +DEBUG: ${eclipseDebug} +---- +""" + def logOutFOS = new FileOutputStream(logOutFile, true) // true == append //def logErrFileName = "${jalviewjsBuildDir}/${jalviewjs_j2s_stderr}" //def logErrFile = file(logFileName) //logErrFile.createNewFile() //def logErrFOS = new FileErrputStream(logErrFile, false) // combine stdout and stderr def logErrFOS = logOutFOS + if (jalviewjs_j2s_to_console.equals("true")) { standardOutput = new org.apache.tools.ant.util.TeeOutputStream( new org.apache.tools.ant.util.TeeOutputStream( diff --git a/gradle.properties b/gradle.properties index 7b5771f..6633946 100644 --- a/gradle.properties +++ b/gradle.properties @@ -146,9 +146,9 @@ bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs eclipse_project_name = jalview eclipse_bin_dir = bin -eclipse_debug = true +eclipse_debug = false -jalviewjs_eclipse_root = ~/buildtools/eclipse/jee-2019-06 +jalviewjs_eclipse_root = ~/buildtools/eclipse/jee-2019-09 jalviewjs_utils_dir = utils/jalviewjs jalviewjs_eclipse_dropins_dir = eclipse/dropins diff --git a/utils/jalviewjs/SwingJS-site.zip_4.12 b/utils/jalviewjs/SwingJS-site.zip_4.12 deleted file mode 100644 index 6f2893d..0000000 Binary files a/utils/jalviewjs/SwingJS-site.zip_4.12 and /dev/null differ diff --git a/utils/jalviewjs/SwingJS-site.zip_4.13 b/utils/jalviewjs/SwingJS-site.zip_4.13 deleted file mode 100644 index c0ebd8f..0000000 Binary files a/utils/jalviewjs/SwingJS-site.zip_4.13 and /dev/null differ diff --git a/utils/jalviewjs/eclipse/cleanEclipseOptions b/utils/jalviewjs/eclipse/cleanEclipseOptions new file mode 100644 index 0000000..1f226eb --- /dev/null +++ b/utils/jalviewjs/eclipse/cleanEclipseOptions @@ -0,0 +1,3 @@ +org.eclipse.equinox.p2.core/debug=true +org.eclipse.equinox.p2.core/reconciler=true + diff --git a/utils/jalviewjs/eclipse/dropins_4.12/com.seeq.eclipse.importprojects-1.4.0.jar b/utils/jalviewjs/eclipse/dropins/com.seeq.eclipse.importprojects.jar similarity index 100% rename from utils/jalviewjs/eclipse/dropins_4.12/com.seeq.eclipse.importprojects-1.4.0.jar rename to utils/jalviewjs/eclipse/dropins/com.seeq.eclipse.importprojects.jar diff --git a/utils/jalviewjs/eclipse/dropins_4.12/net.sf.j2s.core-3.2.4-FOR_4.12.jar b/utils/jalviewjs/eclipse/dropins_4.12/net.sf.j2s.core-3.2.4-FOR_4.12.jar deleted file mode 100644 index e8288a9..0000000 Binary files a/utils/jalviewjs/eclipse/dropins_4.12/net.sf.j2s.core-3.2.4-FOR_4.12.jar and /dev/null differ diff --git a/utils/jalviewjs/eclipse/dropins_4.13/com.seeq.eclipse.importprojects-1.4.0.jar b/utils/jalviewjs/eclipse/dropins_4.13/com.seeq.eclipse.importprojects-1.4.0.jar deleted file mode 100644 index 69d7603..0000000 Binary files a/utils/jalviewjs/eclipse/dropins_4.13/com.seeq.eclipse.importprojects-1.4.0.jar and /dev/null differ diff --git a/utils/jalviewjs/eclipse/dropins_4.13/net.sf.j2s.core-3.2.4.08.jar b/utils/jalviewjs/eclipse/dropins_4.13/net.sf.j2s.core-3.2.4.08.jar deleted file mode 100644 index 3570945..0000000 Binary files a/utils/jalviewjs/eclipse/dropins_4.13/net.sf.j2s.core-3.2.4.08.jar and /dev/null differ diff --git a/utils/jalviewjs/eclipse/unused_dropins/net.sf.j2s.core-3.2.4-FOR_4.12.jar b/utils/jalviewjs/eclipse/unused_dropins/net.sf.j2s.core-3.2.4-FOR_4.12.jar deleted file mode 100644 index e8288a9..0000000 Binary files a/utils/jalviewjs/eclipse/unused_dropins/net.sf.j2s.core-3.2.4-FOR_4.12.jar and /dev/null differ diff --git a/utils/jalviewjs/eclipse/unused_dropins/net.sf.j2s.core-3.2.4-FOR_4.13.jar b/utils/jalviewjs/eclipse/unused_dropins/net.sf.j2s.core-3.2.4-FOR_4.13.jar deleted file mode 100644 index a3dff95..0000000 Binary files a/utils/jalviewjs/eclipse/unused_dropins/net.sf.j2s.core-3.2.4-FOR_4.13.jar and /dev/null differ