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 f47cb82 use URL information direct from JSON + verbose new a30e5ca Merge pull request #1524 from ebarboni/brandingurl f47cb82 is described below commit f47cb82ec1ef345227a331987b288000e99c9b0a Author: Eric Barboni <sk...@apache.org> AuthorDate: Fri Sep 20 15:05:34 2019 +0200 use URL information direct from JSON + verbose --- .../netbeans/nbbuild/ReleaseJsonProperties.java | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ReleaseJsonProperties.java b/nbbuild/antsrc/org/netbeans/nbbuild/ReleaseJsonProperties.java index a51b420..4ab5422 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/ReleaseJsonProperties.java +++ b/nbbuild/antsrc/org/netbeans/nbbuild/ReleaseJsonProperties.java @@ -20,6 +20,7 @@ package org.netbeans.nbbuild; import java.io.File; import java.io.FileOutputStream; +import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.io.OutputStream; @@ -146,7 +147,7 @@ public class ReleaseJsonProperties extends Task { log("Writing releasinfo file " + propertiesFile); propertiesFile.getParentFile().mkdirs(); try (OutputStream config = new FileOutputStream(propertiesFile)) { - String optionnalversion = ""; + String optionalversion = ""; boolean found = false; for (MileStone m : requiredbranchinfo.milestones) { if (m.hash.equals(hash)) { @@ -156,34 +157,34 @@ public class ReleaseJsonProperties extends Task { if (m.vote != -1) { // vote is set we want the full version } else { - optionnalversion = "-" + m.version; + optionalversion = "-" + m.version; } } } if (!found && !branch.equals("master")) { // hash no match we are building a dev version of specific branch - optionnalversion = "-dev"; + optionalversion = "-dev"; } - config.write(("metabuild.DistributionURL=" + requiredbranchinfo.updateurl.replace(requiredbranchinfo.version, requiredbranchinfo.version + optionnalversion) + "\n").getBytes()); - config.write(("metabuild.PluginPortalURL=" + requiredbranchinfo.pluginsurl.replace(requiredbranchinfo.version, requiredbranchinfo.version + optionnalversion) + "\n").getBytes()); + config.write(("metabuild.DistributionURL=" + requiredbranchinfo.updateurl + "\n").getBytes()); + config.write(("metabuild.PluginPortalURL=" + requiredbranchinfo.pluginsurl + "\n").getBytes()); // used for cache and user dir - config.write(("metabuild.RawVersion=" + requiredbranchinfo.version + optionnalversion + "\n").getBytes()); + config.write(("metabuild.RawVersion=" + requiredbranchinfo.version + optionalversion + "\n").getBytes()); if (branch.equals("master")) { config.write(("metabuild.ComputedSplashVersion=DEV (Build {0})\n").getBytes()); config.write(("metabuild.ComputedTitleVersion=DEV {0}\n").getBytes()); config.write(("metabuild.logcli=-J-Dnetbeans.logger.console=true -J-ea\n").getBytes()); } else { - config.write(("metabuild.ComputedSplashVersion=" + requiredbranchinfo.version + optionnalversion + "\n").getBytes()); - config.write(("metabuild.ComputedTitleVersion=" + requiredbranchinfo.version + optionnalversion + "\n").getBytes()); + config.write(("metabuild.ComputedSplashVersion=" + requiredbranchinfo.version + optionalversion + "\n").getBytes()); + config.write(("metabuild.ComputedTitleVersion=" + requiredbranchinfo.version + optionalversion + "\n").getBytes()); config.write(("metabuild.logcli=\n").getBytes()); } } catch (IOException ex) { 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)) { @@ -191,6 +192,14 @@ public class ReleaseJsonProperties extends Task { } catch (IOException ex) { throw new BuildException("XML File for release cannot be created"); } + String configline; + try (FileReader config = new FileReader(propertiesFile); BufferedReader configStream = new BufferedReader(config);) { + while ((configline = configStream.readLine()) != null) { + log("Branding computed info: " + configline); + } + } catch (IOException ex) { + throw new BuildException("propertiesFile for release cannot be read"); + } } // add attribute for xml building apidoc enhancement --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists