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

SOLR-362 followup: cleaning up some build.xml cruft from when i thought we needed to jump through a lot of hoops 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@578668 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2007-09-24 06:11:42 +00:00
parent 6d8ae540e2
commit bb036b1df9
1 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build.xml
View File

@ -198,7 +198,7 @@
<!-- Compile common classes. --> <!-- Compile common classes. -->
<target name="compile-common" <target name="compile-common"
description="Compile the source code." description="Compile the source code."
depends="init-forrest-entities,checkJunitPresence"> depends="init-forrest-entities">
<solr-javac destdir="${dest}/common" <solr-javac destdir="${dest}/common"
classpathref="compile.classpath"> classpathref="compile.classpath">
@ -218,7 +218,7 @@
<!-- Compile the project. --> <!-- Compile the project. -->
<target name="compile" <target name="compile"
description="Compile the source code." description="Compile the source code."
depends="compile-common,init-forrest-entities,checkJunitPresence"> depends="compile-common,init-forrest-entities">
<solr-javac destdir="${dest}/core" <solr-javac destdir="${dest}/core"
classpathref="compile.classpath"> classpathref="compile.classpath">
@ -233,19 +233,8 @@
<mkdir dir="${build.javadoc}"/> <mkdir dir="${build.javadoc}"/>
<!-- we do this to make sure whatever classes where in ant's
classpath at runtime are in the classpath used by javadoc
(ie: junit.jar)
-->
<path id="javadoc.classpath"> <path id="javadoc.classpath">
<path refid="compile.classpath"/> <path refid="compile.classpath"/>
<!-- aparently ant.library.dir isn't allways set right? -->
<fileset dir="${ant.home}/lib">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${ant.library.dir}">
<include name="**/*.jar"/>
</fileset>
</path> </path>
<javadoc <javadoc
@ -326,13 +315,6 @@
<mkdir dir="${build.javadoc.solrj}"/> <mkdir dir="${build.javadoc.solrj}"/>
<path id="javadoc.classpath.solrj"> <path id="javadoc.classpath.solrj">
<path refid="compile.classpath"/> <path refid="compile.classpath"/>
<!-- aparently ant.library.dir isn't allways set right? -->
<fileset dir="${ant.home}/lib">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${ant.library.dir}">
<include name="**/*.jar"/>
</fileset>
</path> </path>
<javadoc <javadoc
destdir="${build.javadoc.solrj}" destdir="${build.javadoc.solrj}"
@ -381,24 +363,10 @@
<path refid="compile.classpath.solrj" /> <path refid="compile.classpath.solrj" />
</path> </path>
<!-- Check that JUnit is present. -->
<target name="checkJunitPresence">
<available property="junitPresent"
classname="junit.framework.TestCase" classpathref="compile.classpath"/>
<!-- no description so it doesn't show up in -projecthelp -->
<fail unless="junitPresent">
##################################################################
JUnit not found.
Please make sure junit.jar is in ANT_HOME/lib, or made available
to Ant using other mechanisms like -lib or CLASSPATH.
##################################################################
</fail>
</target>
<!-- Compile unit tests. --> <!-- Compile unit tests. -->
<target name="compileTests" <target name="compileTests"
description="Compile unit tests." description="Compile unit tests."
depends="compile,compile-solrj,checkJunitPresence"> depends="compile,compile-solrj">
<mkdir dir="${dest}/tests" /> <mkdir dir="${dest}/tests" />
<solr-javac <solr-javac