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 76bf6c3 fix build order for git properties + json correction
new 6c3e8d1 Merge pull request #1533 from ebarboni/buildimprovement
76bf6c3 is described below
commit 76bf6c3e321f7e6b45cab6e6b73419f903132605
Author: Eric Barboni <[email protected]>
AuthorDate: Fri Sep 27 11:00:08 2019 +0200
fix build order for git properties + json correction
---
.../antsrc/org/netbeans/nbbuild/ReleaseJsonProperties.java | 10 +++-------
nbbuild/build.xml | 11 +++++------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ReleaseJsonProperties.java
b/nbbuild/antsrc/org/netbeans/nbbuild/ReleaseJsonProperties.java
index 31bbf68..d144b9a 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/ReleaseJsonProperties.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/ReleaseJsonProperties.java
@@ -117,7 +117,7 @@ public class ReleaseJsonProperties extends Task {
// sort all information
Collections.sort(ri);
// build a sorted xml
-
+
for (ReleaseInfo releaseInfo : ri) {
log(releaseInfo.toString());
for (Object milestone : releaseInfo.milestones) {
@@ -191,7 +191,7 @@ public class ReleaseJsonProperties extends Task {
throw new BuildException("Properties File for release cannot be
created");
}
- log("Writing releasinfo file " + xmlFile );
+ log("Writing releasinfo file " + xmlFile);
xmlFile.getParentFile().mkdirs();
try (OutputStream config = new FileOutputStream(xmlFile)) {
@@ -385,11 +385,7 @@ public class ReleaseJsonProperties extends Task {
}
private void setVersion(String version) {
- if (version.equals("-")) {
- this.version = "dev";
- } else {
- this.version = version;
- }
+ this.version = version;
}
private void setApidocurl(String apidocurl) {
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index a8b68cf..0606ae0 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -116,13 +116,13 @@
</not>
</condition>
<get dest="${metabuild.releasejson}" skipexisting="false"
src="${metabuild.jsonurl}" />
- <!-- get branches and git information -->
- <antcall target="getgitinformation" />
- <!-- javadoc content filtering -->
- <taskdef name="setjavadoc"
classname="org.netbeans.nbbuild.SetApidocClustersConfig"
classpath="${nbantext.jar}"/>
<!-- read info from gitinfo.properties , if present in source bundle copy
gitinfo-->
<copy file="${nb_all}/nbbuild/gitinfo.properties"
tofile="${nb_all}/nbbuild/build/gitinfo.properties" failonerror="false"/>
<copy file="${nb_all}/nbbuild/netbeansrelease.properties"
tofile="${nb_all}/nbbuild/build/netbeansrelease.properties"
failonerror="false"/>
+ <!-- get branches and git information as previous not overrided this will
take new-->
+ <antcall target="getgitinformation" />
+ <!-- javadoc content filtering -->
+ <taskdef name="setjavadoc"
classname="org.netbeans.nbbuild.SetApidocClustersConfig"
classpath="${nbantext.jar}"/>
<property file="${nb_all}/nbbuild/build/gitinfo.properties"/>
<property file="${nb_all}/nbbuild/build/netbeansrelease.properties"/>
<setjavadoc branch="${metabuild.branch}"/>
@@ -139,13 +139,12 @@
</classpath>
</taskdef>
<releasejson file="${releasejson}" xmloutput="${xmlrelease}"
propertiesoutput="${propertiesrelease}" branch="${metabuild.branch}"
hash="${metabuild.hash}"/>
- <!--<fail />-->
</target>
<target name="-gitinfo.ispresent">
<available file="${nb_all}/nbbuild/build/gitinfo.properties"
property="gitinfo.present" />
</target>
<target name="-git.down" unless="${gitinfo.present}"
depends="-gitinfo.ispresent">
- <!-- try to get information from jenkins or travis -->
+ <!-- try to get information from jenkins apache multi branch build or
travis -->
<property environment="env"/>
<condition property="metabuild.branch" value="${env.GIT_BRANCH}" >
<isset property="env.GIT_BRANCH" />
---------------------------------------------------------------------
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
