From: Ben Soares Date: Mon, 28 Oct 2019 14:16:00 +0000 (+0000) Subject: JAL-3210 Added eclipse instance info in j2s-transpile.out log. X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~94 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=cc9e776268c8713dc69ee6efc09a5f9f4d4ae9cd;p=jalview.git JAL-3210 Added eclipse instance info in j2s-transpile.out log. --- diff --git a/build.gradle b/build.gradle index d259e13..bf27433 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) } @@ -1514,13 +1513,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(