Added build.date to examples

This commit is contained in:
Erik C. Thauvin 2023-04-03 02:17:11 -07:00
parent c53230dd61
commit 29ccd1cbdf
10 changed files with 71 additions and 33 deletions

View file

@ -2,15 +2,15 @@
<library name="bld"> <library name="bld">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.11.jar!/" /> <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.14.jar!/" />
<root url="file://$PROJECT_DIR$/lib/bld" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.11-sources.jar!/" /> <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.14-sources.jar!/" />
<root url="file://$PROJECT_DIR$/lib/bld" />
</SOURCES> </SOURCES>
<excluded> <jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" />
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
</excluded>
<jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" type="SOURCES" /> <jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" type="SOURCES" />
</library> </library>

View file

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="EntryPointsManager">
<pattern value="com.example.PropertyFileExampleBuild" />
<pattern value="com.example.PropertyFileExampleBuild" method="updateMajor" />
<pattern value="com.example.PropertyFileExampleBuild" method="updateMinor" />
<pattern value="com.example.PropertyFileExampleBuild" method="updatePatch" />
</component>
<component name="PDMPlugin"> <component name="PDMPlugin">
<option name="skipTestSources" value="false" /> <option name="skipTestSources" value="false" />
</component> </component>

View file

@ -7,7 +7,7 @@
], ],
"java.configuration.updateBuildConfiguration": "automatic", "java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [ "java.project.referencedLibraries": [
"${HOME}/.rife2/dist/rife2-1.5.11.jar", "${HOME}/.rife2/dist/rife2-1.5.14.jar",
"lib/compile/*.jar", "lib/compile/*.jar",
"lib/runtime/*.jar", "lib/runtime/*.jar",
"lib/test/*.jar" "lib/test/*.jar"

View file

@ -16,11 +16,10 @@ To run the examples, issue one of the following command or combination there off
./bld updateMinor run ./bld updateMinor run
./bld updatePatch run ./bld updatePatch run
``` ```
Upon execution, the content of the `verison.properties` file will be displayed, reflecting the modification to the Upon execution, the `version.properties` file will be created and displayed:
`version.major`, `version.minor` or `version.patch` properties.
```shell ```shell
./bld updatePatch run ./bld updateMajor run
``` ```
```shell ```shell
@ -28,8 +27,28 @@ Upon execution, the content of the `verison.properties` file will be displayed,
| version.properties | | version.properties |
+---------------------------+ +---------------------------+
# #
#Sun Apr 02 17:19:10 PDT 2023 #Sun Apr 02 23:51:39 PDT 2023
build.date=2023-04-02
version.major=1 version.major=1
version.minor=0 version.minor=0
version.patch=1 version.patch=0
```
Subsequent commands will reflect the modifications to the
`version.major`, `version.minor` or `version.patch` properties:
```shell
./bld upatePatch run
```
```shell
+---------------------------+
| version.properties |
+---------------------------+
#
#Sun Apr 02 23:55:09 PDT 2023
build.date=2023-04-02
version.major=1
version.minor=0
version.patch=10
``` ```

Binary file not shown.

View file

@ -1,7 +1,6 @@
#Sun Apr 02 10:32:44 PDT 2023 #Sun Apr 02 10:32:44 PDT 2023
bld.extension=com.uwyn.rife2:bld-property-file:0.9.0 bld.extension=com.uwyn.rife2:bld-property-file:0.9.0
bld.repositories=https\://repo1.maven.org/maven2/,/home/erik/.m2/repository bld.repositories=MAVEN_LOCAL,https\://repo1.maven.org/maven2/
bld.downloadExtensionSources=true
rife2.downloadLocation= rife2.downloadLocation=
rife2.version=1.5.11 rife2.version=1.5.14

View file

@ -2,10 +2,10 @@ package com.example;
import rife.bld.BuildCommand; import rife.bld.BuildCommand;
import rife.bld.Project; import rife.bld.Project;
import rife.bld.extension.propertyFile.Entry; import rife.bld.extension.propertyfile.Entry;
import rife.bld.extension.propertyFile.Entry.Operations; import rife.bld.extension.propertyfile.Entry.Operations;
import rife.bld.extension.propertyFile.Entry.Types; import rife.bld.extension.propertyfile.Entry.Types;
import rife.bld.extension.propertyFile.PropertyFileOperation; import rife.bld.extension.propertyfile.PropertyFileOperation;
import java.util.List; import java.util.List;
@ -14,6 +14,7 @@ import static rife.bld.dependencies.Repository.SONATYPE_SNAPSHOTS;
import static rife.bld.dependencies.Scope.test; import static rife.bld.dependencies.Scope.test;
public class PropertyFileExampleBuild extends Project { public class PropertyFileExampleBuild extends Project {
final Entry buildDateEntry = new Entry("build.date").value("now").pattern("yyyy-MM-dd").type(Types.DATE);
public PropertyFileExampleBuild() { public PropertyFileExampleBuild() {
pkg = "com.example"; pkg = "com.example";
@ -33,30 +34,48 @@ public class PropertyFileExampleBuild extends Project {
new PropertyFileExampleBuild().start(args); new PropertyFileExampleBuild().start(args);
} }
@BuildCommand @BuildCommand(summary = "Updates major version")
public void updateMajor() throws Exception { public void updateMajor() throws Exception {
new PropertyFileOperation(this) new PropertyFileOperation(this)
.file("version.properties") .file("version.properties")
.entry(new Entry("version.major").defaultValue(1).type(Types.INT).operation(Operations.ADD)) // set the major version to 1 if it doesn't exist, increase by 1
.entry(new Entry("version.major").defaultValue(0).type(Types.INT).operation(Operations.ADD))
// set the minor version to 0
.entry(new Entry("version.minor").value(0)) .entry(new Entry("version.minor").value(0))
// set the patch version to 0
.entry(new Entry("version.patch").value(0)) .entry(new Entry("version.patch").value(0))
// set the build date to the current date
.entry(buildDateEntry)
.execute(); .execute();
} }
@BuildCommand @BuildCommand(summary = "Updates minor version")
public void updateMinor() throws Exception { public void updateMinor() throws Exception {
new PropertyFileOperation(this) new PropertyFileOperation(this)
.file("version.properties") .file("version.properties")
.entry(new Entry("version.minor").defaultValue(0).type(Types.INT).operation(Operations.ADD)) // set the major version to 1 if it doesn't exist
.entry(new Entry("version.major").defaultValue(1))
// set the minor version to 0 if it doesn't exist, increase by 1
.entry(new Entry("version.minor").defaultValue(-1).type(Types.INT).operation(Operations.ADD))
// set the patch version to 0
.entry(new Entry("version.patch").value(0)) .entry(new Entry("version.patch").value(0))
// set the build date to the current date
.entry(buildDateEntry)
.execute(); .execute();
} }
@BuildCommand @BuildCommand(summary = "Updates patch version")
public void updatePatch() throws Exception { public void updatePatch() throws Exception {
new PropertyFileOperation(this) new PropertyFileOperation(this)
.file("version.properties") .file("version.properties")
.entry(new Entry("version.patch").defaultValue(0).type(Types.INT).operation(Operations.ADD)) // set the major version to 1 if it doesn't exist
.entry(new Entry("version.major").defaultValue(1))
// set the minor version to 0 if it doesn't exist
.entry(new Entry("version.minor").defaultValue(0))
// set the patch version to 10 if it doesn't exist, increase by 10
.entry(new Entry("version.patch").defaultValue(0).type(Types.INT).operation(Operations.ADD).value(10))
// set the build date to the current date
.entry(buildDateEntry)
.execute(); .execute();
} }
} }

View file

@ -21,7 +21,7 @@ public class PropertyFileExampleMain {
} }
} }
public String getMessage() { String getMessage() {
return "Hello World!"; return "Hello World!";
} }
} }

View file

@ -2,9 +2,9 @@ package com.example;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.assertEquals;
public class PropertyFileExampleTest { class PropertyFileExampleTest {
@Test @Test
void verifyHello() { void verifyHello() {
assertEquals("Hello World!", new PropertyFileExampleMain().getMessage()); assertEquals("Hello World!", new PropertyFileExampleMain().getMessage());

View file

@ -1,5 +0,0 @@
#
#Sun Apr 02 17:19:10 PDT 2023
version.major=1
version.minor=0
version.patch=1