You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jd...@apache.org on 2012/05/07 21:14:36 UTC
svn commit: r1335205 - in /lucene/dev/branches/lucene_solr_3_6/solr:
build.xml common-build.xml
Author: jdyer
Date: Mon May 7 19:14:35 2012
New Revision: 1335205
URL: http://svn.apache.org/viewvc?rev=1335205&view=rev
Log:
SOLR-3430: build script changes
Modified:
lucene/dev/branches/lucene_solr_3_6/solr/build.xml
lucene/dev/branches/lucene_solr_3_6/solr/common-build.xml (contents, props changed)
Modified: lucene/dev/branches/lucene_solr_3_6/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/build.xml?rev=1335205&r1=1335204&r2=1335205&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/build.xml Mon May 7 19:14:35 2012
@@ -40,7 +40,7 @@
<!-- ========================================================================= -->
<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"
tofile="${example}/webapps/${ant.project.name}.war"/>
<jar destfile="${example}/exampledocs/post.jar"
@@ -56,14 +56,6 @@
<echo>See ${example}/README.txt for how to run the Solr example configuration.</echo>
</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"
description="Run Solr interactively, via Jetty. -Dexample.debug=true to enable JVM debugger">
<property name="example.solr.home" location="example/solr"/>
@@ -485,7 +477,7 @@
<!-- NOOP -->
</target>
- <target name="resolve" depends="resolve-example,resolve-jetty">
+ <target name="resolve" depends="resolve-example">
<sequential>
<ant dir="core" target="resolve" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
Modified: lucene/dev/branches/lucene_solr_3_6/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/common-build.xml?rev=1335205&r1=1335204&r2=1335205&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/common-build.xml Mon May 7 19:14:35 2012
@@ -177,7 +177,7 @@
<solr-jarify/>
</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="dist" depends="jar-core">
@@ -292,12 +292,15 @@
<property name="solr.test.framework.compiled" value="true"/>
</target>
- <!-- resolve jetty dependencies in the example (relied upon by compile!) -->
- <target name="resolve-jetty" unless="jetty.libs.uptodate">
+ <!-- resolve dependencies in the example (relied upon by compile/tests) -->
+ <target name="resolve-example" unless="example.libs.uptodate">
<ant dir="${common-solr.dir}/example" target="resolve" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</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>
<!-- Solr contrib targets -->