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

SOLR-3430: build script changes 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1335196 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Dyer 2012-05-07 19:03:39 +00:00
parent bb56a01e53
commit aa0c9fba28
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
solr/build.xml
View File

@ -40,7 +40,7 @@
<!-- ========================================================================= --> <!-- ========================================================================= -->
<target name="example" description="Creates a runnable example configuration." <target name="example" description="Creates a runnable example configuration."
depends="resolve-example,dist-contrib,dist-war"> depends="dist-contrib,dist-war">
<copy file="${dist}/${fullnamever}.war" <copy file="${dist}/${fullnamever}.war"
tofile="${example}/webapps/${ant.project.name}.war"/> tofile="${example}/webapps/${ant.project.name}.war"/>
<jar destfile="${example}/exampledocs/post.jar" <jar destfile="${example}/exampledocs/post.jar"
@ -56,14 +56,6 @@
<echo>See ${example}/README.txt for how to run the Solr example configuration.</echo> <echo>See ${example}/README.txt for how to run the Solr example configuration.</echo>
</target> </target>
<!-- example-DIH needs hsqldb. don't put anything here needed by *tests* -->
<target name="resolve-example" unless="example.libs.uptodate">
<ant dir="${common-solr.dir}/example/example-DIH" target="resolve" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="example.libs.uptodate" value="true"/>
</target>
<target name="run-example" depends="example" <target name="run-example" depends="example"
description="Run Solr interactively, via Jetty. -Dexample.debug=true to enable JVM debugger"> description="Run Solr interactively, via Jetty. -Dexample.debug=true to enable JVM debugger">
<property name="example.solr.home" location="example/solr"/> <property name="example.solr.home" location="example/solr"/>
@ -474,7 +466,7 @@
<!-- NOOP --> <!-- NOOP -->
</target> </target>
<target name="resolve" depends="resolve-example,resolve-jetty"> <target name="resolve" depends="resolve-example">
<sequential> <sequential>
<ant dir="core" target="resolve" inheritall="false"> <ant dir="core" target="resolve" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/> <propertyset refid="uptodate.and.compiled.properties"/>

11
solr/common-build.xml
View File

@ -190,7 +190,7 @@
<solr-jarify/> <solr-jarify/>
</target> </target>
<target name="compile-core" depends="prep-lucene-jars,resolve-jetty,common.compile-core"/> <target name="compile-core" depends="prep-lucene-jars,resolve-example,common.compile-core"/>
<target name="compile-test" depends="sync-resources,compile-solr-test-framework,common.compile-test"/> <target name="compile-test" depends="sync-resources,compile-solr-test-framework,common.compile-test"/>
<target name="dist" depends="jar-core"> <target name="dist" depends="jar-core">
@ -340,12 +340,15 @@
<property name="solr.test.framework.compiled" value="true"/> <property name="solr.test.framework.compiled" value="true"/>
</target> </target>
<!-- resolve jetty dependencies in the example (relied upon by compile!) --> <!-- resolve dependencies in the example (relied upon by compile/tests) -->
<target name="resolve-jetty" unless="jetty.libs.uptodate"> <target name="resolve-example" unless="example.libs.uptodate">
<ant dir="${common-solr.dir}/example" target="resolve" inheritAll="false"> <ant dir="${common-solr.dir}/example" target="resolve" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/> <propertyset refid="uptodate.and.compiled.properties"/>
</ant> </ant>
<property name="jetty.libs.uptodate" value="true"/> <ant dir="${common-solr.dir}/example/example-DIH" target="resolve" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="example.libs.uptodate" value="true"/>
</target> </target>
<macrodef name="contrib-crawl"> <macrodef name="contrib-crawl">