From 25151b4af99b880d1fa77dba356e09eb4bf0b8ee Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 28 Apr 2023 10:22:45 -0700 Subject: [PATCH 1/7] Added publish info --- .../GeneratedVersionOperationBuild.java | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/src/bld/java/rife/bld/extension/GeneratedVersionOperationBuild.java b/src/bld/java/rife/bld/extension/GeneratedVersionOperationBuild.java index e4500de..4dc52d1 100644 --- a/src/bld/java/rife/bld/extension/GeneratedVersionOperationBuild.java +++ b/src/bld/java/rife/bld/extension/GeneratedVersionOperationBuild.java @@ -1,16 +1,20 @@ package rife.bld.extension; -import rife.bld.BaseProject; import rife.bld.BuildCommand; +import rife.bld.Project; +import rife.bld.publish.PublishDeveloper; +import rife.bld.publish.PublishLicense; +import rife.bld.publish.PublishScm; import java.util.List; -import static rife.bld.dependencies.Repository.MAVEN_CENTRAL; -import static rife.bld.dependencies.Repository.RIFE2_RELEASES; +import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Scope.compile; import static rife.bld.dependencies.Scope.test; +import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING; +import static rife.bld.operations.TemplateType.TXT; -public class GeneratedVersionOperationBuild extends BaseProject { +public class GeneratedVersionOperationBuild extends Project { public GeneratedVersionOperationBuild() { pkg = "rife.bld.extension"; name = "GeneratedVersionOperation"; @@ -27,6 +31,33 @@ public class GeneratedVersionOperationBuild extends BaseProject { .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2))) .include(dependency("org.assertj:assertj-joda-time:2.2.0")); + + precompileOperation() + .templateTypes(TXT); + + javadocOperation() + .javadocOptions() + .docLint(NO_MISSING) + .link("https://rife2.github.io/rife2/") + .link("https://javadoc.io/doc/net.sourceforge.pmd/pmd-core/latest/"); + + publishOperation() + .repository(MAVEN_LOCAL) +// .repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2")) + .info() + .groupId("com.uwyn.rife2") + .artifactId("bld-generated-version") + .description("bld Extension to Generate Project Version Data") + .url("https://github.com/rife2/generated-version") + .developer(new PublishDeveloper().id("ethauvin").name("Erik C. Thauvin").email("erik@thauvin.net") + .url("https://erik.thauvin.net/")) + .license(new PublishLicense().name("The Apache License, Version 2.0") + .url("http://www.apache.org/licenses/LICENSE-2.0.txt")) + .scm(new PublishScm().connection("scm:git:https://github.com/rife2/generated-version.git") + .developerConnection("scm:git:git@github.com:rife2/generated-version.git") + .url("https://github.com/rife2/generated-version")) + .signKey(property("sign.key")) + .signPassphrase(property("sign.passphrase")); } public static void main(String[] args) { From ecfde209afa16aa723013a59fc009df12ac4ef2b Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 28 Apr 2023 10:24:35 -0700 Subject: [PATCH 2/7] Changed classPath to classFile --- .../rife/bld/extension/GeneratedVersion.java | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/src/main/java/rife/bld/extension/GeneratedVersion.java b/src/main/java/rife/bld/extension/GeneratedVersion.java index 5662d5b..3f0216d 100644 --- a/src/main/java/rife/bld/extension/GeneratedVersion.java +++ b/src/main/java/rife/bld/extension/GeneratedVersion.java @@ -29,6 +29,7 @@ import java.io.File; @SuppressWarnings("PMD.DataClass") public class GeneratedVersion { private String className; + private File classFile; private String packageName; private BaseProject project; private String projectName; @@ -38,38 +39,46 @@ public class GeneratedVersion { return className; } - public String getPackageName() { - return packageName; - } - - public BaseProject getProject() { - return project; - } - - public String getProjectName() { - return projectName; - } - - public File getTemplate() { - return template; - } - public void setClassName(String className) { this.className = className; } + public File getClassFile() { + return classFile; + } + + public void setClassFile(File classFile) { + this.classFile = classFile; + } + + public String getPackageName() { + return packageName; + } + public void setPackageName(String packageName) { this.packageName = packageName; } + public BaseProject getProject() { + return project; + } + public void setProject(BaseProject project) { this.project = project; } + public String getProjectName() { + return projectName; + } + public void setProjectName(String projectName) { this.projectName = projectName; } + public File getTemplate() { + return template; + } + public void setTemplate(File template) { this.template = template; } From 66f1ac92183257edfe64c00104317ffaaa70a51e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 28 Apr 2023 10:27:18 -0700 Subject: [PATCH 3/7] Improved buildTemplate and writeTemplate --- .../extension/GeneratedVersionOperation.java | 45 +++++++++++-------- src/main/resources/templates/version.txt | 2 +- .../bld/extension/GeneratedVersionTest.java | 39 +++++++++++++++- 3 files changed, 64 insertions(+), 22 deletions(-) diff --git a/src/main/java/rife/bld/extension/GeneratedVersionOperation.java b/src/main/java/rife/bld/extension/GeneratedVersionOperation.java index c779cc0..7111ee3 100644 --- a/src/main/java/rife/bld/extension/GeneratedVersionOperation.java +++ b/src/main/java/rife/bld/extension/GeneratedVersionOperation.java @@ -21,11 +21,12 @@ import rife.bld.BaseProject; import rife.bld.operations.AbstractOperation; import rife.resources.ResourceFinderDirectories; import rife.template.Template; +import rife.template.TemplateConfig; import rife.template.TemplateFactory; import rife.tools.FileUtils; -import rife.tools.exceptions.FileUtilsErrorException; import java.io.File; +import java.io.IOException; import java.nio.file.Path; import java.util.Objects; import java.util.logging.Level; @@ -60,7 +61,8 @@ public class GeneratedVersionOperation extends AbstractOperation Date: Fri, 28 Apr 2023 10:27:42 -0700 Subject: [PATCH 4/7] Added example --- example/.gitignore | 55 ++++++++++++++++++ example/.idea/.gitignore | 3 + example/.idea/.name | 1 + example/.idea/app.iml | 29 +++++++++ example/.idea/bld.iml | 14 +++++ .../inspectionProfiles/Project_Default.xml | 8 +++ example/.idea/libraries/bld.xml | 17 ++++++ example/.idea/libraries/compile.xml | 13 +++++ example/.idea/libraries/runtime.xml | 14 +++++ example/.idea/libraries/test.xml | 14 +++++ example/.idea/misc.xml | 13 +++++ example/.idea/modules.xml | 9 +++ example/.idea/runConfigurations/Run Main.xml | 9 +++ example/.idea/runConfigurations/Run Tests.xml | 13 +++++ example/.idea/vcs.xml | 6 ++ example/.vscode/launch.json | 24 ++++++++ example/.vscode/settings.json | 15 +++++ example/bld | 2 + example/bld.bat | 4 ++ example/lib/bld/bld-wrapper.jar | Bin 0 -> 25099 bytes example/lib/bld/bld-wrapper.properties | 6 ++ example/myversion.txt | 17 ++++++ .../src/bld/java/com/example/SampleBuild.java | 45 ++++++++++++++ .../java/com/example/GeneratedVersion.java | 17 ++++++ .../src/main/java/com/example/SampleMain.java | 22 +++++++ 25 files changed, 370 insertions(+) create mode 100644 example/.gitignore create mode 100644 example/.idea/.gitignore create mode 100644 example/.idea/.name create mode 100644 example/.idea/app.iml create mode 100644 example/.idea/bld.iml create mode 100644 example/.idea/inspectionProfiles/Project_Default.xml create mode 100644 example/.idea/libraries/bld.xml create mode 100644 example/.idea/libraries/compile.xml create mode 100644 example/.idea/libraries/runtime.xml create mode 100644 example/.idea/libraries/test.xml create mode 100644 example/.idea/misc.xml create mode 100644 example/.idea/modules.xml create mode 100644 example/.idea/runConfigurations/Run Main.xml create mode 100644 example/.idea/runConfigurations/Run Tests.xml create mode 100644 example/.idea/vcs.xml create mode 100644 example/.vscode/launch.json create mode 100644 example/.vscode/settings.json create mode 100755 example/bld create mode 100644 example/bld.bat create mode 100644 example/lib/bld/bld-wrapper.jar create mode 100644 example/lib/bld/bld-wrapper.properties create mode 100644 example/myversion.txt create mode 100644 example/src/bld/java/com/example/SampleBuild.java create mode 100644 example/src/main/java/com/example/GeneratedVersion.java create mode 100644 example/src/main/java/com/example/SampleMain.java diff --git a/example/.gitignore b/example/.gitignore new file mode 100644 index 0000000..a63b224 --- /dev/null +++ b/example/.gitignore @@ -0,0 +1,55 @@ +.gradle +.DS_Store +build +lib/bld/** +lib/compile/** +lib/runtime/** +lib/standalone/** +lib/test/** +!bld-wrapper.jar +!bld-wrapper.properties + +# IDEA ignores + +# User-specific +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Editor-based Rest Client +.idea/httpRequests \ No newline at end of file diff --git a/example/.idea/.gitignore b/example/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/example/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/example/.idea/.name b/example/.idea/.name new file mode 100644 index 0000000..84c8d99 --- /dev/null +++ b/example/.idea/.name @@ -0,0 +1 @@ +bld-generated-version-example diff --git a/example/.idea/app.iml b/example/.idea/app.iml new file mode 100644 index 0000000..787b59b --- /dev/null +++ b/example/.idea/app.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/.idea/bld.iml b/example/.idea/bld.iml new file mode 100644 index 0000000..e63e11e --- /dev/null +++ b/example/.idea/bld.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/.idea/inspectionProfiles/Project_Default.xml b/example/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..1e01b48 --- /dev/null +++ b/example/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/example/.idea/libraries/bld.xml b/example/.idea/libraries/bld.xml new file mode 100644 index 0000000..7596927 --- /dev/null +++ b/example/.idea/libraries/bld.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/.idea/libraries/compile.xml b/example/.idea/libraries/compile.xml new file mode 100644 index 0000000..9bd86aa --- /dev/null +++ b/example/.idea/libraries/compile.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/.idea/libraries/runtime.xml b/example/.idea/libraries/runtime.xml new file mode 100644 index 0000000..2ae5c4b --- /dev/null +++ b/example/.idea/libraries/runtime.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/.idea/libraries/test.xml b/example/.idea/libraries/test.xml new file mode 100644 index 0000000..b80486a --- /dev/null +++ b/example/.idea/libraries/test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/.idea/misc.xml b/example/.idea/misc.xml new file mode 100644 index 0000000..c958614 --- /dev/null +++ b/example/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/example/.idea/modules.xml b/example/.idea/modules.xml new file mode 100644 index 0000000..55adcb9 --- /dev/null +++ b/example/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/example/.idea/runConfigurations/Run Main.xml b/example/.idea/runConfigurations/Run Main.xml new file mode 100644 index 0000000..29c79eb --- /dev/null +++ b/example/.idea/runConfigurations/Run Main.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/example/.idea/runConfigurations/Run Tests.xml b/example/.idea/runConfigurations/Run Tests.xml new file mode 100644 index 0000000..16fea3c --- /dev/null +++ b/example/.idea/runConfigurations/Run Tests.xml @@ -0,0 +1,13 @@ + + + +