From 004bcce3b9afea926ffe15514ce3080186a71d2b Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Fri, 20 Sep 2024 16:42:53 +0100 Subject: [PATCH] JAL-4467 Take account of presource and xresource in the getdownArchiveBuild task --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1cd0565..4a7c921 100644 --- a/build.gradle +++ b/build.gradle @@ -2667,13 +2667,13 @@ task getdownArchiveBuild() { getdownTextLines.each { line -> line = line.replaceAll("^(?appbase\\s*=\\s*).*", '${s}'+getdownFullArchiveAppBase) - line = line.replaceAll("^(?(resource|code)\\s*=\\s*)${getdownAppDistDir}/", '${s}'+vAltDir+"/") + line = line.replaceAll("^(?([px]?resource|code)\\s*=\\s*)${getdownAppDistDir}/", '${s}'+vAltDir+"/") line = line.replaceAll("^(?ui.background_image\\s*=\\s*).*\\.png", '${s}'+"${getdown_resource_dir}/jalview_archive_getdown_background.png") line = line.replaceAll("^(?ui.instant_background_image\\s*=\\s*).*\\.png", '${s}'+"${getdown_resource_dir}/jalview_archive_getdown_background_initialising.png") line = line.replaceAll("^(?ui.error_background\\s*=\\s*).*\\.png", '${s}'+"${getdown_resource_dir}/jalview_archive_getdown_background_error.png") line = line.replaceAll("^(?ui.progress_image\\s*=\\s*).*\\.png", '${s}'+"${getdown_resource_dir}/jalview_archive_getdown_progress_bar.png") // remove the existing resource = resource/ or bin/ lines - if (! line.matches("resource\\s*=\\s*(resource|bin)/.*")) { + if (! line.matches("[px]?resource\\s*=\\s*(resource|bin)/.*")) { getdownArchiveTextLines += line } } @@ -2683,7 +2683,7 @@ task getdownArchiveBuild() { from "${archiveImagesDir}" into "${getdownFullArchiveDir}/${getdown_resource_dir}" eachFile { file -> - getdownArchiveTextLines += "resource = ${getdown_resource_dir}/${file.getName()}" + getdownArchiveTextLines += "presource = ${getdown_resource_dir}/${file.getName()}" } } -- 1.7.10.2