diff --git a/core b/core index b94124f..5fdaf6d 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b94124fe6d0fd40974f3e882f2ac1335f095ce80 +Subproject commit 5fdaf6def28f0ada93f5da8a47e1ffe86f7ac13f diff --git a/src/bld/java/rife/BldBuild.java b/src/bld/java/rife/BldBuild.java index 4ef38a4..837c031 100644 --- a/src/bld/java/rife/BldBuild.java +++ b/src/bld/java/rife/BldBuild.java @@ -79,7 +79,10 @@ public class BldBuild extends AbstractRife2Build { .sourceFiles(FileUtils.getJavaFileList(core_src_main_java_dir)) .javadocOptions() .docTitle("bld " + version()) - .overview(new File(srcMainJavaDirectory(), "overview.html")); + .overview(new File(srcMainJavaDirectory(), "overview.html")) + .addAll(List.of("--allow-script-in-comments", + "-group", "bld", "rife.bld*", + "-group", "RIFE2/core", "rife:rife.cmf*:rife.config*:rife.database*:rife.datastructures*:rife.engine*:rife.forms*:rife.instrument*:rife.ioc*:rife.resources*:rife.selector*:rife.template*:rife.tools*:rife.validation*:rife.xml*")); publishOperation() .repository(version.isSnapshot() ? repository("rife2-snapshots") : repository("rife2-releases")) @@ -109,14 +112,6 @@ public class BldBuild extends AbstractRife2Build { new PublishArtifact(zipBldOperation.destinationFile(), "", "zip")); } - @Override - public void javadoc() - throws Exception { - javadocOperation().executeOnce(() -> javadocOperation() - .fromProject(this) - .sourceFiles(FileUtils.getJavaFileList(buildGeneratedDir))); - } - final ZipOperation zipBldOperation = new ZipOperation(); @BuildCommand(value = "zip-bld", summary = "Creates the bld zip archive") public void zipBld() diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 61e430e..45424cf 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,7 +1,10 @@ /** * bld is a new build system that allows you to write your build logic in pure Java. *
- * More information can be found on the `bld` website.
+ * More information can be found on the bld
website.
+ *
+ * Note that bld builds on top of the foundation that RIFE2 provides and includes the features + * of RIFE2/core. * * @since 2.1.0 */ @@ -19,6 +22,7 @@ module rife.bld { exports rife.bld.dependencies; exports rife.bld.dependencies.exceptions; exports rife.bld.help; + exports rife.bld.instrument; exports rife.bld.operations; exports rife.bld.operations.exceptions; exports rife.bld.publish; diff --git a/src/main/java/overview.html b/src/main/java/overview.html new file mode 100644 index 0000000..2d1ddd9 --- /dev/null +++ b/src/main/java/overview.html @@ -0,0 +1,24 @@ + +
+bld
is a new build system that allows you to write your build logic in pure Java.
bld
's website is https://rife2.com/bld.
The GitHub project is at https://github.com/rife2/bld
+The documentation is available at https://github.com/rife2/bld/wiki
+ +Note that bld builds on top of the foundation that RIFE2 provides and includes the features of + RIFE2/core.
+ + + + + + diff --git a/src/main/java/rife/bld/instrument/package-info.java b/src/main/java/rife/bld/instrument/package-info.java new file mode 100644 index 0000000..f40b2e9 --- /dev/null +++ b/src/main/java/rife/bld/instrument/package-info.java @@ -0,0 +1,10 @@ +/* + * Copyright 2001-2024 Geert Bevin (gbevin[remove] at uwyn dot com) + * Licensed under the Apache License, Version 2.0 (the "License") + */ + +/** + * Provides functionalities for bytecode instrumentation. + * @since 2.1 + */ +package rife.bld.instrument; \ No newline at end of file