LUCENE-3965: remove contrib references

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1327837 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-04-19 06:08:55 +00:00
parent 85bb7984b7
commit efd3e94237
1 changed files with 16 additions and 24 deletions

View File

@ -34,7 +34,6 @@
includes="LICENSE.txt,NOTICE.txt,README.txt, includes="LICENSE.txt,NOTICE.txt,README.txt,
MIGRATE.txt,JRE_VERSION_MIGRATION.txt, MIGRATE.txt,JRE_VERSION_MIGRATION.txt,
CHANGES.txt, CHANGES.txt,
contrib/**/CHANGES.txt,
**/lib/*.jar, **/lib/*.jar,
**/lib/*LICENSE*.txt, **/lib/*LICENSE*.txt,
**/lib/*NOTICE*.txt, **/lib/*NOTICE*.txt,
@ -53,8 +52,8 @@
</ant> </ant>
</target> </target>
<target name="test" depends="test-core, test-contrib, test-backwards" <target name="test" depends="test-core, test-modules, test-backwards"
description="Runs all unit tests (core, contrib and back-compat)" description="Runs all unit tests (core, modules and back-compat)"
/> />
<path id="backwards.test.compile.classpath"> <path id="backwards.test.compile.classpath">
@ -198,7 +197,7 @@
<target name="javadoc" depends="javadocs"/> <target name="javadoc" depends="javadocs"/>
<target name="javadocs" description="Generate javadoc" <target name="javadocs" description="Generate javadoc"
depends="javadocs-all, javadocs-core, javadocs-contrib, javadocs-test-framework"> depends="javadocs-all, javadocs-core, javadocs-modules, javadocs-test-framework">
<echo file="${javadoc.dir}/index.html" append="false"> <echo file="${javadoc.dir}/index.html" append="false">
<![CDATA[<html><head><title>${Name} ${version} Javadoc Index</title></head> <![CDATA[<html><head><title>${Name} ${version} Javadoc Index</title></head>
<body> <body>
@ -225,14 +224,14 @@
</ant> </ant>
</target> </target>
<target name="javadocs-contrib" description="Generate javadoc for contrib classes"> <target name="javadocs-modules" description="Generate javadoc for modules classes">
<modules-crawl target="javadocs" <modules-crawl target="javadocs"
failonerror="false"/> failonerror="false"/>
</target> </target>
<!-- call resolve to force dependencies to be in lib/ for javadocs --> <!-- call resolve to force dependencies to be in lib/ for javadocs -->
<target name="javadocs-all" depends="resolve" <target name="javadocs-all" depends="resolve"
description="Generate javadoc for core and contrib classes"> description="Generate javadoc for all classes">
<sequential> <sequential>
<mkdir dir="${javadoc.dir}/all"/> <mkdir dir="${javadoc.dir}/all"/>
@ -251,7 +250,7 @@
<!-- please keep this list up to date, and in alpha order... --> <!-- please keep this list up to date, and in alpha order... -->
<!-- ie: `find contrib/* -path \*src/java | sort` --> <!-- ie: `find ./* -path \*src/java | sort` -->
<!-- if you make changes to the list of package sets, also --> <!-- if you make changes to the list of package sets, also -->
<!-- make sure the group list below is updated. --> <!-- make sure the group list below is updated. -->
@ -318,7 +317,7 @@
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="package" depends="jar-core, jar-test-framework, docs, javadocs, build-contrib, init-dist, changes-to-html"/> <target name="package" depends="jar-core, jar-test-framework, docs, javadocs, build-modules, init-dist, changes-to-html"/>
<target name="nightly" depends="test, package-tgz"> <target name="nightly" depends="test, package-tgz">
</target> </target>
@ -474,26 +473,23 @@
<!-- Build the JavaCC files into the source tree --> <!-- Build the JavaCC files into the source tree -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="javacc" depends="javacc-check,javacc-contrib-demo"/> <target name="javacc" depends="javacc-check">
<subant target="javacc" failonerror="true" inheritall="false">
<target name="javacc-contrib-demo" depends="javacc-check" if="javacc.present"> <fileset dir="${common.dir}/queryparser" includes="build.xml"/>
<ant target="javacc" </subant>
dir="contrib/demo"
antfile="build.xml"
/>
</target> </target>
<target name="build-contrib" depends="compile-test" <target name="build-modules" depends="compile-test"
description="Builds all contrib modules and their tests"> description="Builds all additional modules and their tests">
<modules-crawl target="build-artifacts-and-tests"/> <modules-crawl target="build-artifacts-and-tests"/>
</target> </target>
<target name="compile-test" depends="compile-lucene-core,compile-test-framework" <target name="compile-test" depends="compile-lucene-core,compile-test-framework"
description="Builds core, test-framework, and contrib tests"> description="Builds core, test-framework, and modules tests">
<modules-crawl target="compile-test" failonerror="true"/> <modules-crawl target="compile-test" failonerror="true"/>
</target> </target>
<target name="test-contrib" depends="compile-test"> <target name="test-modules" depends="compile-test">
<modules-crawl target="test" failonerror="true"/> <modules-crawl target="test" failonerror="true"/>
</target> </target>
@ -509,10 +505,6 @@
failonerror="true" logError="true"> failonerror="true" logError="true">
<arg value="@{changes.src.dir}/changes2html.pl"/> <arg value="@{changes.src.dir}/changes2html.pl"/>
</exec> </exec>
<exec executable="perl" input="contrib/CHANGES.txt" output="@{changes.target.dir}/Contrib-Changes.html"
failonerror="true" logError="true">
<arg value="@{changes.src.dir}/changes2html.pl"/>
</exec>
<copy todir="@{changes.target.dir}"> <copy todir="@{changes.target.dir}">
<fileset dir="@{changes.src.dir}" includes="*.css"/> <fileset dir="@{changes.src.dir}" includes="*.css"/>
</copy> </copy>