Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-4949: Make the version prefix ("SNAPSHOT") separately configurable to enable Jenkins use its BUILD_ID variable, cleanup code duplication 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1470975 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2013-04-23 14:17:17 +00:00
parent ad6b4ea88b
commit 8bf0797a22
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lucene/common-build.xml
View File

@ -47,13 +47,22 @@
<format property="dateversion" pattern="yyyy.MM.dd.HH.mm.ss" />
</tstamp>
<property name="name" value="${ant.project.name}"/>
<property name="Name" value="Lucene"/>
<property name="dev.version" value="5.0-SNAPSHOT"/>
<property name="name" value="${ant.project.name}"/>
<property name="tests.luceneMatchVersion" value="5.0"/>
<property name="dev.version.base" value="5.0"/>
<property name="dev.version.suffix" value="SNAPSHOT"/>
<property name="dev.version" value="${dev.version.base}-${dev.version.suffix}"/>
<property name="version" value="${dev.version}"/>
<property name="spec.version" value="${version}"/>
<property name="year" value="2000-${current.year}"/>
<!-- Lucene modules unfortunately don't have the "lucene-" prefix, so we add it if no prefix is given in $name: -->
<condition property="final.name" value="${name}-${version}">
<matches pattern="^(lucene|solr)\b" string="${name}"/>
</condition>
<property name="final.name" value="lucene-${name}-${version}"/>
<!-- we exclude ext/*.jar because we don't want example/lib/ext logging jars on the cp -->

7
solr/common-build.xml
View File

@ -24,10 +24,6 @@
<dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
<property name="Name" value="Solr" />
<property name="version" value="5.0-SNAPSHOT"/>
<property name="fullname" value="${ant.project.name}"/>
<property name="fullnamever" value="${fullname}-${version}"/>
<property name="final.name" value="${fullnamever}"/>
<!-- solr uses 1.7 -->
<property name="javac.source" value="1.7"/>
@ -50,6 +46,9 @@
<import file="${common-solr.dir}/../lucene/module-build.xml"/>
<!-- backwards compatibility with existing targets/tasks; TODO: remove this! -->
<property name="fullnamever" value="${final.name}"/>
<path id="additional.dependencies">
<fileset dir="${common-solr.dir}/core/lib" excludes="${common.classpath.excludes}"/>
<fileset dir="${common-solr.dir}/solrj/lib" excludes="${common.classpath.excludes}"/>