Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

add branch to packet-name if not build from master

Browse Source
This commit is contained in:
sixcooler 2013-08-06 03:48:29 +02:00
parent 070bf85b33
commit 5189620026
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -4,7 +4,7 @@ javacTarget=1.6
# Release Configuration # Release Configuration
releaseVersion=1.62 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 sourceReleaseFile=yacy_src_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
releaseFileParentDir=yacy releaseFileParentDir=yacy
privateKeyFile=private.key privateKeyFile=private.key

8
build.xml
View File

@ -58,6 +58,9 @@
<property name="git" location=".git"/> <property name="git" location=".git"/>
<property name="defaults" location="defaults"/> <property name="defaults" location="defaults"/>
<property name="RDFaParser" location="RDFaParser"/> <property name="RDFaParser" location="RDFaParser"/>
<!-- pseudo default branch as fallback -->
<property name="branch" value="" />
<!-- pseudo default releaseNr as fallback --> <!-- pseudo default releaseNr as fallback -->
<property name="releaseNr" value="9000" /> <property name="releaseNr" value="9000" />
@ -98,7 +101,7 @@
<pathelement location="${libbuild}/org.eclipse.jgit-1.1.0.201109151100-r.jar" /> <pathelement location="${libbuild}/org.eclipse.jgit-1.1.0.201109151100-r.jar" />
</classpath> </classpath>
</taskdef> </taskdef>
<gitRev repoPath="${yacyroot}" revprop="releaseNr" dateprop="DSTAMP" /> <gitRev repoPath="${yacyroot}" branchprop="branch" revprop="releaseNr" dateprop="DSTAMP" />
</target> </target>
<!-- reading the build properties from file --> <!-- reading the build properties from file -->
@ -115,6 +118,9 @@
<!-- YaCy Release Date --> <!-- YaCy Release Date -->
<filter token="REPL_DATE" value="${DSTAMP}"/> <filter token="REPL_DATE" value="${DSTAMP}"/>
<filter token="REPL_RELEASE" value="${stdReleaseFile}"/> <filter token="REPL_RELEASE" value="${stdReleaseFile}"/>
<!-- YaCy Brach -->
<echo message="YaCy Branch: ${branch}" />
<!-- YaCy Release Version number --> <!-- YaCy Release Version number -->
<echo message="YaCy Version number: ${releaseVersion}" /> <echo message="YaCy Version number: ${releaseVersion}" />

20
libbuild/GitRevTask/GitRevTask.java
View File

@ -21,18 +21,23 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
public class GitRevTask extends org.apache.tools.ant.Task { public class GitRevTask extends org.apache.tools.ant.Task {
private String repoPath; private String repoPath;
private String branchprop;
private String revprop; private String revprop;
private String dateprop; private String dateprop;
public void setRepoPath(final String repoPath) { public void setRepoPath(final String repoPath) {
this.repoPath = repoPath; this.repoPath = repoPath;
} }
public void setBranchprop(final String branchprop) {
this.branchprop = branchprop;
}
public void setRevprop(String revprop) { public void setRevprop(final String revprop) {
this.revprop = revprop; this.revprop = revprop;
} }
public void setDateprop(String dateprop) { public void setDateprop(final String dateprop) {
this.dateprop = dateprop; this.dateprop = dateprop;
} }
@ -46,6 +51,7 @@ public class GitRevTask extends org.apache.tools.ant.Task {
return; return;
} }
String branch = null;
String revision = null; String revision = null;
String lastTag = null; String lastTag = null;
String commitDate = null; String commitDate = null;
@ -53,6 +59,8 @@ public class GitRevTask extends org.apache.tools.ant.Task {
final File src = new File(repoPath); final File src = new File(repoPath);
final Repository repo = new FileRepositoryBuilder().readEnvironment() final Repository repo = new FileRepositoryBuilder().readEnvironment()
.findGitDir(src).build(); .findGitDir(src).build();
branch = repo.getBranch();
branch = "master".equals(branch)? "" : "_" + branch;
final ObjectId head = repo.resolve("HEAD"); final ObjectId head = repo.resolve("HEAD");
final Git git = new Git(repo); final Git git = new Git(repo);
@ -86,7 +94,9 @@ public class GitRevTask extends org.apache.tools.ant.Task {
Project theProject = getProject(); Project theProject = getProject();
if (theProject != null) { if (theProject != null) {
theProject.setProperty(this.revprop, revision); 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); log("Property '" + this.revprop + "' set to '" + revision + "'", Project.MSG_VERBOSE);
theProject.setProperty(this.dateprop, commitDate); theProject.setProperty(this.dateprop, commitDate);
log("Property '" + this.dateprop + "' set to '" + commitDate + "'", Project.MSG_VERBOSE); log("Property '" + this.dateprop + "' set to '" + commitDate + "'", Project.MSG_VERBOSE);
@ -105,12 +115,14 @@ public class GitRevTask extends org.apache.tools.ant.Task {
} else { } else {
gitRevTask.setRepoPath(args[0]); gitRevTask.setRepoPath(args[0]);
} }
gitRevTask.setBranchprop("brnach");
gitRevTask.setRevprop("baseRevisionNr"); gitRevTask.setRevprop("baseRevisionNr");
gitRevTask.setDateprop("DSTAMP"); gitRevTask.setDateprop("DSTAMP");
Project p = new Project(); Project p = new Project();
gitRevTask.setProject(p); gitRevTask.setProject(p);
gitRevTask.execute(); gitRevTask.execute();
String branch = gitRevTask.getProject().getProperty("branch");
String version = gitRevTask.getProject().getProperty("baseRevisionNr"); String version = gitRevTask.getProject().getProperty("baseRevisionNr");
String commitDate = gitRevTask.getProject().getProperty("DSTAMP"); String commitDate = gitRevTask.getProject().getProperty("DSTAMP");
@ -123,7 +135,7 @@ public class GitRevTask extends org.apache.tools.ant.Task {
try { try {
f.createNewFile(); f.createNewFile();
FileWriter w = new FileWriter(f); FileWriter w = new FileWriter(f);
w.append("branch=" + branch + "\n");
w.append("releaseNr=" + version + "\n"); w.append("releaseNr=" + version + "\n");
w.append("DSTAMP=" + commitDate + "\n"); w.append("DSTAMP=" + commitDate + "\n");
w.close(); w.close();