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 1d8420d Fork HgId Ant task to try and parse git branch and hash from
.git folder if not otherwise available.
new 2f3fd90 Merge pull request #1541 from
neilcsmith-net/git-parse-branch-hash
1d8420d is described below
commit 1d8420d524bc03443bc49456fcd3071fc41fd882
Author: Neil C Smith <[email protected]>
AuthorDate: Mon Sep 30 18:34:41 2019 +0100
Fork HgId Ant task to try and parse git branch and hash from .git folder if
not otherwise available.
---
.../antsrc/org/netbeans/nbbuild/GitBranchHash.java | 109 +++++++++++++++++++++
nbbuild/build.xml | 15 ++-
2 files changed, 119 insertions(+), 5 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/GitBranchHash.java
b/nbbuild/antsrc/org/netbeans/nbbuild/GitBranchHash.java
new file mode 100644
index 0000000..2d53fe8
--- /dev/null
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/GitBranchHash.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.netbeans.nbbuild;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+
+/**
+ * Forked from HgId to parse branch and git hash as fallback.
+ */
+public class GitBranchHash extends Task {
+
+ private File file;
+ /**
+ * Locates the repository.
+ * May be repository root, or any file or folder inside it.
+ */
+ public void setFile(File file) {
+ this.file = file;
+ }
+
+ private String branchProperty;
+ /**
+ * Declares which property to define with the resulting branch info.
+ */
+ public void setBranchProperty(String branchProperty) {
+ this.branchProperty = branchProperty;
+ }
+
+ private String hashProperty;
+ /**
+ * Declares which property to define with the resulting hash info.
+ */
+ public void setHashProperty(String hashProperty) {
+ this.hashProperty = hashProperty;
+ }
+
+
+ @Override
+ public void execute() throws BuildException {
+ if (file == null || branchProperty == null || hashProperty == null) {
+ throw new BuildException("define file, branch property and hash
property");
+ }
+ Path headroot = null;
+ for (Path root = file.toPath(); root != null; root = root.getParent())
{
+ Path headpath = root.resolve(".git/HEAD");
+ if (Files.isRegularFile(headpath)) {
+ headroot = headpath;
+ break;
+ }
+ }
+ String branch = "";
+ String hash = "";
+ try {
+ if (headroot != null && Files.size(headroot) > 0l) {
+ List<String> lines = Files.readAllLines(headroot);
+ String line = lines.get(0);
+ String revLink = line.substring(line.indexOf(':')+1).trim();
+ branch = revLink.substring(revLink.lastIndexOf('/')+1).trim();
+ Path revPath = headroot.getParent().resolve(revLink);
+ if(Files.isRegularFile(revPath) && Files.size(revPath) > 0l) {
+ List<String> revlines = Files.readAllLines(revPath);
+ String revline = revlines.get(0);
+ if(revline.length()>=12){
+ hash = revline.trim();
+ } else {
+ log("no content in " + revPath, Project.MSG_WARN);
+ }
+ } else {
+ log("unable to find revision info for " + revPath,
Project.MSG_WARN);
+ }
+ } else {
+ log("No HEAD found starting from " + file, Project.MSG_WARN);
+ }
+ } catch(IOException ex) {
+ log("Could not read " + headroot + ": " + ex, Project.MSG_WARN);
+ }
+ if (!branch.isEmpty() && !hash.isEmpty()) {
+ getProject().setNewProperty(branchProperty, branch);
+ getProject().setNewProperty(hashProperty, hash);
+ }
+
+ }
+
+}
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 0606ae0..aeb09df 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -145,6 +145,7 @@
</target>
<target name="-git.down" unless="${gitinfo.present}"
depends="-gitinfo.ispresent">
<!-- try to get information from jenkins apache multi branch build or
travis -->
+ <taskdef name="gitbranchhash"
classname="org.netbeans.nbbuild.GitBranchHash" classpath="${nbantext.jar}" />
<property environment="env"/>
<condition property="metabuild.branch" value="${env.GIT_BRANCH}" >
<isset property="env.GIT_BRANCH" />
@@ -155,11 +156,6 @@
<condition property="metabuild.branch" value="${metabuild.branch}" >
<isset property="metabuild.branch" />
</condition>
- <condition property="metabuild.branch" value="master" >
- <not>
- <isset property="metabuild.branch" />
- </not>
- </condition>
<condition property="metabuild.hash" value="${env.GIT_COMMIT}" >
<isset property="env.GIT_COMMIT" />
</condition>
@@ -169,6 +165,15 @@
<condition property="metabuild.hash" value="${metabuild.hash}" >
<isset property="metabuild.hash" />
</condition>
+
+ <gitbranchhash file="." branchproperty="metabuild.branch"
hashproperty="metabuild.hash" />
+
+ <condition property="metabuild.branch" value="master" >
+ <not>
+ <isset property="metabuild.branch" />
+ </not>
+ </condition>
+
<echo message="Processing build with branch ${metabuild.branch} and hash
${metabuild.hash}" />
<!-- if hash not present do not fail -->
<fail message="Branch not found use -Dmetabuild.branch=branchName " >
---------------------------------------------------------------------
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
