From ec683311b8920e7ad5d5841315070540d9ea22b3 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Thu, 11 May 2023 12:30:02 -0400 Subject: [PATCH] Added bld.sourceDirectories property to allow additional source directories to be added for the build file compilation. Simplified build file by using the AbstractRife2Build file from core as the base. --- .idea/bld.iml | 3 + core | 2 +- lib/bld/bld-wrapper.jar | Bin 26340 -> 26587 bytes lib/bld/bld-wrapper.properties | 1 + src/bld/java/rife/BldBuild.java | 96 +------------------- src/main/java/rife/bld/wrapper/Wrapper.java | 27 +++++- 6 files changed, 30 insertions(+), 99 deletions(-) diff --git a/.idea/bld.iml b/.idea/bld.iml index e63e11e..914a6d0 100644 --- a/.idea/bld.iml +++ b/.idea/bld.iml @@ -4,6 +4,9 @@ + + + diff --git a/core b/core index 840b862..0d07c48 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 840b862d35c193c4b4dc5c82c2f9cebbbd50bf04 +Subproject commit 0d07c4856946555154afdd26e54d6a855fe3724f diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index b8d38e651d80c7f2347eb5061c8777d9129662f5..41b25fc24ab39de877846f983524d269018a4b6d 100644 GIT binary patch delta 12676 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 delta 12414 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%0A}{WqRT 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 m|JTQw435Vbld " + version()) - .docLint(NO_MISSING) - .keywords() - .splitIndex() - .tag("apiNote", "a", "API Note:") - .link("https://jakarta.ee/specifications/servlet/5.0/apidocs/") - .link("https://jsoup.org/apidocs/") .overview(new File(srcMainJavaDirectory(), "overview.html")); publishOperation() @@ -159,35 +105,6 @@ public class BldBuild extends Project { new PublishArtifact(zipBldOperation.destinationFile(), "", "zip")); } - void propagateJavaProperties(JavaOptions options, String... names) { - for (var name : names) { - if (properties().contains(name)) { - options.property(name, properties().getValueString(name)); - } - } - } - - final Antlr4Operation antlr4Operation = new Antlr4Operation() { - @Override - public void execute() - throws Exception { - super.execute(); - // replace the package name so that it becomes part of RIFE2 - FileUtils.transformFiles(outputDirectory(), FileUtils.JAVA_FILE_PATTERN, null, s -> - StringUtils.replace(s, "org.antlr.v4.runtime", "rife.antlr.v4.runtime")); - } - }; - @BuildCommand(summary = "Generates the grammar Java sources") - public void generateGrammar() - throws Exception { - antlr4Operation.executeOnce(); - } - - public void compile() - throws Exception { - generateGrammar(); - super.compile(); - } final ZipOperation zipBldOperation = new ZipOperation(); @BuildCommand(value = "zip-bld", summary = "Creates the bld zip archive") @@ -224,15 +141,6 @@ public class BldBuild extends Project { } } - private final TestsBadgeOperation testsBadgeOperation = new TestsBadgeOperation(); - public void test() - throws Exception { - testsBadgeOperation.executeOnce(() -> testsBadgeOperation - .url(property("testsBadgeUrl")) - .apiKey(property("testsBadgeApiKey")) - .fromProject(this)); - } - @BuildCommand(summary = "Creates all the distribution artifacts") public void all() throws Exception { diff --git a/src/main/java/rife/bld/wrapper/Wrapper.java b/src/main/java/rife/bld/wrapper/Wrapper.java index 15d30d2..4a0fb46 100644 --- a/src/main/java/rife/bld/wrapper/Wrapper.java +++ b/src/main/java/rife/bld/wrapper/Wrapper.java @@ -49,6 +49,7 @@ public class Wrapper { static final String PROPERTY_EXTENSIONS = "bld.extensions"; static final String PROPERTY_DOWNLOAD_EXTENSION_SOURCES = "bld.downloadExtensionSources"; static final String PROPERTY_DOWNLOAD_EXTENSION_JAVADOC = "bld.downloadExtensionJavadoc"; + static final String PROPERTY_SOURCE_DIRECTORIES = "bld.sourceDirectories"; static final File BLD_USER_DIR = new File(System.getProperty("user.home"), ".bld"); static final File DISTRIBUTIONS_DIR = new File(BLD_USER_DIR, "dist"); static final Pattern META_DATA_SNAPSHOT_VERSION = Pattern.compile(".*?([^<]+)", Pattern.DOTALL | Pattern.CASE_INSENSITIVE); @@ -164,6 +165,7 @@ public class Wrapper { bld.extensions= bld.repositories=MAVEN_CENTRAL,RIFE2 bld.downloadLocation= + bld.sourceDirectories= bld.version=${version} """ .replace("${version}", version); @@ -513,7 +515,7 @@ public class Wrapper { } private int launchMainBuild(File jarFile, List arguments) - throws FileUtilsErrorException, IOException, InterruptedException { + throws IOException, InterruptedException { resolveExtensions(); arguments.remove(0); @@ -582,9 +584,26 @@ public class Wrapper { } public List bldSourceFiles() { + var source_directories = new ArrayList(); + source_directories.add(srcBldJavaDirectory().getAbsoluteFile()); + + // extract wrapper source directories specifications + if (wrapperProperties_.containsKey(PROPERTY_SOURCE_DIRECTORIES)) { + var source_directories_property = wrapperProperties_.get(PROPERTY_SOURCE_DIRECTORIES).toString(); + for (var source_directory : source_directories_property.split(",")) { + source_directory = source_directory.trim(); + if (!source_directory.isBlank()) { + source_directories.add(new File(source_directory).getAbsoluteFile()); + } + } + } + // get all the bld java sources - var src_main_java_dir_abs = srcBldJavaDirectory().getAbsoluteFile(); - return FileUtils.getFileList(src_main_java_dir_abs, JAVA_FILE_PATTERN, null) - .stream().map(file -> new File(src_main_java_dir_abs, file)).toList(); + var source_files = new ArrayList(); + for (var source_directory : source_directories) { + source_files.addAll(FileUtils.getFileList(source_directory, JAVA_FILE_PATTERN, null) + .stream().map(file -> new File(source_directory, file)).toList()); + } + return source_files; } }