mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
add branch to packet-name if not build from master
This commit is contained in:
parent
070bf85b33
commit
5189620026
|
@ -4,7 +4,7 @@ javacTarget=1.6
|
|||
|
||||
# Release Configuration
|
||||
releaseVersion=1.62
|
||||
stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
|
||||
stdReleaseFile=yacy${branch}_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
|
||||
sourceReleaseFile=yacy_src_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
|
||||
releaseFileParentDir=yacy
|
||||
privateKeyFile=private.key
|
||||
|
|
|
@ -59,6 +59,9 @@
|
|||
<property name="defaults" location="defaults"/>
|
||||
<property name="RDFaParser" location="RDFaParser"/>
|
||||
|
||||
<!-- pseudo default branch as fallback -->
|
||||
<property name="branch" value="" />
|
||||
|
||||
<!-- pseudo default releaseNr as fallback -->
|
||||
<property name="releaseNr" value="9000" />
|
||||
|
||||
|
@ -98,7 +101,7 @@
|
|||
<pathelement location="${libbuild}/org.eclipse.jgit-1.1.0.201109151100-r.jar" />
|
||||
</classpath>
|
||||
</taskdef>
|
||||
<gitRev repoPath="${yacyroot}" revprop="releaseNr" dateprop="DSTAMP" />
|
||||
<gitRev repoPath="${yacyroot}" branchprop="branch" revprop="releaseNr" dateprop="DSTAMP" />
|
||||
</target>
|
||||
|
||||
<!-- reading the build properties from file -->
|
||||
|
@ -116,6 +119,9 @@
|
|||
<filter token="REPL_DATE" value="${DSTAMP}"/>
|
||||
<filter token="REPL_RELEASE" value="${stdReleaseFile}"/>
|
||||
|
||||
<!-- YaCy Brach -->
|
||||
<echo message="YaCy Branch: ${branch}" />
|
||||
|
||||
<!-- YaCy Release Version number -->
|
||||
<echo message="YaCy Version number: ${releaseVersion}" />
|
||||
<filter token="REPL_VERSION" value="${releaseVersion}" />
|
||||
|
|
|
@ -21,6 +21,7 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
|
|||
public class GitRevTask extends org.apache.tools.ant.Task {
|
||||
|
||||
private String repoPath;
|
||||
private String branchprop;
|
||||
private String revprop;
|
||||
private String dateprop;
|
||||
|
||||
|
@ -28,11 +29,15 @@ public class GitRevTask extends org.apache.tools.ant.Task {
|
|||
this.repoPath = repoPath;
|
||||
}
|
||||
|
||||
public void setRevprop(String revprop) {
|
||||
public void setBranchprop(final String branchprop) {
|
||||
this.branchprop = branchprop;
|
||||
}
|
||||
|
||||
public void setRevprop(final String revprop) {
|
||||
this.revprop = revprop;
|
||||
}
|
||||
|
||||
public void setDateprop(String dateprop) {
|
||||
public void setDateprop(final String dateprop) {
|
||||
this.dateprop = dateprop;
|
||||
}
|
||||
|
||||
|
@ -46,6 +51,7 @@ public class GitRevTask extends org.apache.tools.ant.Task {
|
|||
return;
|
||||
}
|
||||
|
||||
String branch = null;
|
||||
String revision = null;
|
||||
String lastTag = null;
|
||||
String commitDate = null;
|
||||
|
@ -53,6 +59,8 @@ public class GitRevTask extends org.apache.tools.ant.Task {
|
|||
final File src = new File(repoPath);
|
||||
final Repository repo = new FileRepositoryBuilder().readEnvironment()
|
||||
.findGitDir(src).build();
|
||||
branch = repo.getBranch();
|
||||
branch = "master".equals(branch)? "" : "_" + branch;
|
||||
final ObjectId head = repo.resolve("HEAD");
|
||||
|
||||
final Git git = new Git(repo);
|
||||
|
@ -86,6 +94,8 @@ public class GitRevTask extends org.apache.tools.ant.Task {
|
|||
|
||||
Project theProject = getProject();
|
||||
if (theProject != null) {
|
||||
theProject.setProperty(this.branchprop, branch);
|
||||
log("Property '" + this.branchprop + "' set to '" + branch + "'", Project.MSG_VERBOSE);
|
||||
theProject.setProperty(this.revprop, revision);
|
||||
log("Property '" + this.revprop + "' set to '" + revision + "'", Project.MSG_VERBOSE);
|
||||
theProject.setProperty(this.dateprop, commitDate);
|
||||
|
@ -105,12 +115,14 @@ public class GitRevTask extends org.apache.tools.ant.Task {
|
|||
} else {
|
||||
gitRevTask.setRepoPath(args[0]);
|
||||
}
|
||||
gitRevTask.setBranchprop("brnach");
|
||||
gitRevTask.setRevprop("baseRevisionNr");
|
||||
gitRevTask.setDateprop("DSTAMP");
|
||||
|
||||
Project p = new Project();
|
||||
gitRevTask.setProject(p);
|
||||
gitRevTask.execute();
|
||||
String branch = gitRevTask.getProject().getProperty("branch");
|
||||
String version = gitRevTask.getProject().getProperty("baseRevisionNr");
|
||||
String commitDate = gitRevTask.getProject().getProperty("DSTAMP");
|
||||
|
||||
|
@ -123,7 +135,7 @@ public class GitRevTask extends org.apache.tools.ant.Task {
|
|||
try {
|
||||
f.createNewFile();
|
||||
FileWriter w = new FileWriter(f);
|
||||
|
||||
w.append("branch=" + branch + "\n");
|
||||
w.append("releaseNr=" + version + "\n");
|
||||
w.append("DSTAMP=" + commitDate + "\n");
|
||||
w.close();
|
||||
|
|
Loading…
Reference in New Issue
Block a user