svn commit: r1306765 - /lucene/dev/branches/lucene3930/solr/common-build.xml

[rm...@apache.org]

Author: rmuir
Date: Thu Mar 29 09:28:33 2012
New Revision: 1306765

URL: http://svn.apache.org/viewvc?rev=1306765&view=rev
Log:
LUCENE-3930: make sure we resolve jetty libs for compile-core: solr has core source files that need these

Modified:
    lucene/dev/branches/lucene3930/solr/common-build.xml

Modified: lucene/dev/branches/lucene3930/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/common-build.xml?rev=1306765&r1=1306764&r2=1306765&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/common-build.xml Thu Mar 29 09:28:33 2012
@@ -188,7 +188,7 @@
     <solr-jarify/>
   </target>
 
-  <target name="compile-core" depends="prep-lucene-jars,common.compile-core"/>
+  <target name="compile-core" depends="prep-lucene-jars,resolve-jetty,common.compile-core"/>
   <target name="compile-test" depends="sync-resources,compile-solr-test-framework,common.compile-test"/>
 
   <target name="dist" depends="jar-core">
@@ -298,6 +298,14 @@
     <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">
+    <ant dir="${common-solr.dir}/example" target="resolve" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="jetty.libs.uptodate" value="true"/>
+  </target>
+
   <!-- Solr contrib targets -->
   <target name="compile-contrib" description="Compile contrib modules">
   	<contrib-crawl target="compile-core"/>