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

LUCENE-2952: get the proper build.dir 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1084327 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Grant Ingersoll 2011-03-22 19:56:33 +00:00
parent d88d7da6c3
commit bc890a1ff2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lucene/common-build.xml
View File

@ -116,6 +116,8 @@
<property name="tests.src.dir" location="src/test"/> <property name="tests.src.dir" location="src/test"/>
<property name="tests-framework.src.dir" location="${common.dir}/src/test-framework"/> <property name="tests-framework.src.dir" location="${common.dir}/src/test-framework"/>
<property name="build.dir" location="build"/> <property name="build.dir" location="build"/>
<!-- Needed in case a contrib needs the original build, also for compile-tools to be called from contrib -->
<property name="common.build.dir" location="${common.dir}/build"/>
<property name="dist.dir" location="dist"/> <property name="dist.dir" location="dist"/>
<property name="maven.dist.dir" location="dist/maven"/> <property name="maven.dist.dir" location="dist/maven"/>
<property name="m2.repository.url" value="file://${maven.dist.dir}"/> <property name="m2.repository.url" value="file://${maven.dist.dir}"/>
@ -425,9 +427,10 @@
</target> </target>
<target name="compile-tools"> <target name="compile-tools">
<echo>Common dir: ${common.dir}, build: ${build.dir}</echo>
<compile <compile
srcdir="${common.dir}/src/tools/java" srcdir="${common.dir}/src/tools/java"
destdir="${build.dir}/classes/tools"> destdir="${common.build.dir}/classes/tools">
<classpath refid="classpath"/> <classpath refid="classpath"/>
</compile> </compile>
</target> </target>
@ -717,6 +720,8 @@
<element name="nested" implicit="yes" optional="yes"/> <element name="nested" implicit="yes" optional="yes"/>
<sequential> <sequential>
<echo>@{srcdir}</echo>
<echo>@{destdir}</echo>
<mkdir dir="@{destdir}"/> <mkdir dir="@{destdir}"/>
<javac <javac
includeAntRuntime="${javac.includeAntRuntime}" includeAntRuntime="${javac.includeAntRuntime}"