From eaace91e0394510ab4053b0884804cd2200c9ef6 Mon Sep 17 00:00:00 2001 From: soares Date: Fri, 20 Dec 2019 14:11:00 +0000 Subject: [PATCH] JAL-3210 Added a flag to skip transpile errors, now like in Eclipse IDE. Will want this to be false in production --- build.gradle | 7 ++++++- gradle.properties | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c451100..b461247 100644 --- a/build.gradle +++ b/build.gradle @@ -1851,7 +1851,12 @@ DEBUG: ${eclipseDebug} if (stdout.toString().contains("Error processing ")) { // j2s did not complete transpile //throw new TaskExecutionException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'") - throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'") + if (jalviewjs_ignore_transpile_errors.equals("true")) { + println("IGNORING TRANSPILE ERRORS") + println("See eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'") + } else { + throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'") + } } } diff --git a/gradle.properties b/gradle.properties index b64eb11..fda866e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -178,6 +178,7 @@ jalviewjs_core_name = _jalview jalviewjs_name = JalviewJS jalviewjs_core_key = core #jalviewjs_core_key = preloadCore +jalviewjs_ignore_transpile_errors = true j2s.compiler.status = enable #j2s.site.directory = null ## site defined from buildDir+'/jalviewjs/'+jalviewjs_site_dir -- 1.7.10.2