rife2/bld-generated-version
rife2/bld-generated-version
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved template search path, again

Browse source
This commit is contained in:
Erik C. Thauvin 2024-07-11 16:25:54 -07:00
parent 61d723b589
commit 07c23883c1
Signed by: erik
GPG key ID: 776702A6A2DA330E
5 changed files with 69 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/rife/bld/extension/GeneratedVersion.java
View file

@ -17,7 +17,9 @@
package rife.bld.extension;
import rife.bld.BaseProject;
import rife.resources.ResourceFinderClasspath;
import rife.resources.ResourceFinderDirectories;
import rife.resources.ResourceFinderGroup;
import rife.template.Template;
import rife.template.TemplateFactory;
import rife.tools.FileUtils;
@ -59,8 +61,10 @@ public class GeneratedVersion {
public Template buildTemplate() {
Template template;
var version = project_.version();
TemplateFactory.TXT.resetClassLoader();
if (template_ == null) {
template = TemplateFactory.TXT.get("default_generated_version");
var group = new ResourceFinderGroup().add(ResourceFinderClasspath.instance());
template = TemplateFactory.TXT.setResourceFinder(group).get("default_generated_version");
} else {
File parent;
if (template_.getParentFile() != null) {
@ -68,8 +72,8 @@ public class GeneratedVersion {
} else {
parent = new File(template_.getAbsolutePath()).getParentFile();
}
var dirs = new ResourceFinderDirectories(parent);
template = TemplateFactory.TXT.setResourceFinder(dirs).get(template_.getName());
var group = new ResourceFinderGroup().add(new ResourceFinderDirectories(parent));
template = TemplateFactory.TXT.setResourceFinder(group).get(template_.getName());
}
if (packageName_ == null) {