This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 124aea5 Set buildnumber to
"${metabuild.RawVersion}-${metabuild.hash}" if both values have been computed.
new 3243f30 Merge pull request #1540 from neilcsmith-net/git-buildnum
124aea5 is described below
commit 124aea506e2b06e08e66d5bc8522eae391aad2d5
Author: Neil C Smith <[email protected]>
AuthorDate: Mon Sep 30 17:46:55 2019 +0100
Set buildnumber to "${metabuild.RawVersion}-${metabuild.hash}" if both
values have been computed.
---
nbbuild/default.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/nbbuild/default.xml b/nbbuild/default.xml
index d8ae9d8..b0a5a4d 100644
--- a/nbbuild/default.xml
+++ b/nbbuild/default.xml
@@ -162,7 +162,12 @@
<tstamp>
<format property="buildday" pattern="d MMM yyyy" locale="en" />
</tstamp>
-
+ <condition property="buildnumber"
value="${metabuild.RawVersion}-${metabuild.hash}">
+ <and>
+ <isset property="metabuild.hash" />
+ <isset property="metabuild.RawVersion" />
+ </and>
+ </condition>
<property environment="hudson"/>
<condition property="buildnumber"
value="${hudson.JOB_NAME}-${hudson.BUILD_NUMBER}-on-${buildstamp}">
<and>
@@ -172,7 +177,7 @@
</condition>
<hgid property="hg.id" file="."/>
<property name="buildnumber" value="${buildstamp}-${hg.id}"/>
- <echo message="${buildnumber}" level="verbose"/>
+ <echo message="Build number : ${buildnumber}" />
</target>
<target name="set-buildnumber" depends="-do-set-buildnumber">
<!-- Overridable. Note: need not necessarily be a number at all): -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
