Skip to content

Commit 2872ebc

Browse files
committed
Build: Move defaults for detected build properties
The default values for the following properties are now specified in the .properties files in the event that git is unavailable when building the project: - git.commit.timestamp - git.commit.hash - git.commit.name The default properties have the same names as the properties above with a `.default` suffix. Signed-off-by: Tony Germano <[email protected]>
1 parent 198889f commit 2872ebc

File tree

14 files changed

+30
-13
lines changed

14 files changed

+30
-13
lines changed

client/ant-build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</path>
1515

1616
<!-- Set to default if not set globally -->
17-
<property name="git.commit.timestamp" value="2025-03-25T22:28:08.664Z" />
17+
<property name="git.commit.timestamp" value="${git.commit.timestamp.default}" />
1818

1919
<mkdir dir="${logs}" />
2020

client/build.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ logs=${basedir}/logs
1111
dist=${basedir}/dist
1212

1313
# jars
14-
client.jar=mirth-client.jar
14+
client.jar=mirth-client.jar
15+
16+
git.commit.timestamp.default=1999-01-01T00:00:00.000Z

command/build.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ server=${basedir}/../server
1212

1313
# jars
1414
cli.jar=mirth-cli.jar
15-
cli-launcher.jar=mirth-cli-launcher.jar
15+
cli-launcher.jar=mirth-cli-launcher.jar
16+
17+
git.commit.timestamp.default=1999-01-01T00:00:00.000Z

command/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</path>
88

99
<!-- Set to default if not set globally -->
10-
<property name="git.commit.timestamp" value="2025-03-25T22:28:08.664Z" />
10+
<property name="git.commit.timestamp" value="${git.commit.timestamp.default}" />
1111
</target>
1212

1313
<target name="clean" depends="init">

donkey/build.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ model.jar=donkey-model.jar
1818
setup=${basedir}/setup
1919
setup.lib=${setup}/lib
2020
setup.docs=${setup}/docs
21+
22+
git.commit.timestamp.default=1999-01-01T00:00:00.000Z

donkey/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</path>
99

1010
<!-- Set to default if not set globally -->
11-
<property name="git.commit.timestamp" value="2025-03-25T22:28:08.664Z" />
11+
<property name="git.commit.timestamp" value="${git.commit.timestamp.default}" />
1212
</target>
1313

1414
<target name="clean" depends="init">

generator/build.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ vocab.src=${vocab}/src
99
vocab.classes=${vocab}/classes
1010
vocab.dist=${vocab}/dist
1111
vocab.version=1.2
12-
vocab.jar=mirth-vocab-${vocab.version}.jar
12+
vocab.jar=mirth-vocab-${vocab.version}.jar
13+
14+
git.commit.timestamp.default=1999-01-01T00:00:00.000Z

generator/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</path>
88

99
<!-- Set to default if not set globally -->
10-
<property name="git.commit.timestamp" value="2025-03-25T22:28:08.664Z" />
10+
<property name="git.commit.timestamp" value="${git.commit.timestamp.default}" />
1111
</target>
1212

1313
<target name="clean" depends="init">

manager/ant-build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</path>
1313

1414
<!-- Set to default if not set globally -->
15-
<property name="git.commit.timestamp" value="2025-03-25T22:28:08.664Z" />
15+
<property name="git.commit.timestamp" value="${git.commit.timestamp.default}" />
1616

1717
<mkdir dir="${logs}" />
1818
</target>

manager/build.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ dist=${basedir}/dist
77
dist.source=${dist}/source
88

99
# jars
10-
manager.jar=mirth-manager-launcher.jar
10+
manager.jar=mirth-manager-launcher.jar
11+
12+
git.commit.timestamp.default=1999-01-01T00:00:00.000Z

0 commit comments

Comments
 (0)