svn commit: r652471 - /lucene/java/trunk/contrib/highlighter/build.xml

[gs...@apache.org]

Author: gsingers
Date: Thu May  1 03:34:50 2008
New Revision: 652471

URL: http://svn.apache.org/viewvc?rev=652471&view=rev
Log:
LUCENE-1276: Fixed contrib highlighter build

Modified:
    lucene/java/trunk/contrib/highlighter/build.xml

Modified: lucene/java/trunk/contrib/highlighter/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/highlighter/build.xml?rev=652471&r1=652470&r2=652471&view=diff
==============================================================================
--- lucene/java/trunk/contrib/highlighter/build.xml (original)
+++ lucene/java/trunk/contrib/highlighter/build.xml Thu May  1 03:34:50 2008
@@ -1,6 +1,23 @@
 <?xml version="1.0"?>
 
-<project name="highlighter" default="buildHighlighter">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ -->
+
+<project name="highlighter" default="default">
 
   <description>
 	Hits highlighter
@@ -8,7 +25,7 @@
 
   <import file="../contrib-build.xml"/>
 
-  <property name="memory.jar" location="../../build/contrib/memory/lucene-memory-${version}.jar"/>
+  <property name="memory.jar" location="${common.dir}/build/contrib/memory/lucene-memory-${version}.jar"/>
 
   <path id="classpath">
    <pathelement path="${lucene.jar}"/>
@@ -17,11 +34,13 @@
   </path>
 
 
-  <target name="buildHighlighter" depends="buildMemory,default" />
-
-  <target name="buildMemory" >
-  	  <echo>Highlighter building dependency ${memory.jar}</echo>
-      <ant antfile="../memory/build.xml" target="default" inheritall="false"/>
+  <target name="buildHighlighter" depends="build-memory,default" />
+  <available property="memory.jar.present" type="file" file="${memory.jar}"/>
+  <target name="compile-core" depends="build-memory, common.compile-core" />
+
+  <target name="build-memory" unless="memory.jar.present">
+    <echo>Highlighter building dependency ${memory.jar}</echo>
+    <ant antfile="../memory/build.xml" target="default" inheritall="false"/>
   </target>