lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hoss...@apache.org
Subject svn commit: r543257 - in /lucene/java/trunk: build.xml common-build.xml contrib/gdata-server/build.xml
Date Thu, 31 May 2007 20:58:56 GMT
Author: hossman
Date: Thu May 31 13:58:55 2007
New Revision: 543257

URL: http://svn.apache.org/viewvc?view=rev&rev=543257
Log:
LUCENE-885: fixing bug with compilation on java 1.4, introduce by earlier commit for this
issue

Modified:
    lucene/java/trunk/build.xml
    lucene/java/trunk/common-build.xml
    lucene/java/trunk/contrib/gdata-server/build.xml

Modified: lucene/java/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/build.xml?view=diff&rev=543257&r1=543256&r2=543257
==============================================================================
--- lucene/java/trunk/build.xml (original)
+++ lucene/java/trunk/build.xml Thu May 31 13:58:55 2007
@@ -384,17 +384,14 @@
     <attribute name="destdir"/>
     <sequential>
     
-      <condition property="javadoc-1-5-contrib">
-        <equals arg1="1.5" arg2="${ant.java.version}" />
-      </condition>
       <dirset dir="contrib/gdata-server/src/core/src/java" id="gdata-server-core">
-        <include name="**" if="javadoc-1-5-contrib" />
+        <include name="**" if="build-1-5-contrib" />
       </dirset>
       <dirset dir="contrib/gdata-server/src/gom/src/java" id="gdata-server-gom">
-        <include name="**" if="javadoc-1-5-contrib" />
+        <include name="**" if="build-1-5-contrib" />
       </dirset>
       <dirset dir="contrib/gdata-server/src/hivemind/src/java" id="gdata-server-hivemind">
-        <include name="**" if="javadoc-1-5-contrib" />
+        <include name="**" if="build-1-5-contrib" />
       </dirset>
 
       <javadoc

Modified: lucene/java/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/common-build.xml?view=diff&rev=543257&r1=543256&r2=543257
==============================================================================
--- lucene/java/trunk/common-build.xml (original)
+++ lucene/java/trunk/common-build.xml Thu May 31 13:58:55 2007
@@ -45,6 +45,9 @@
   <property name="junit.includes" value="**/Test*.java,**/*Test.java"/>
   <property name="junit.excludes" value=""/>
 
+  <condition property="build-1-5-contrib">
+     <equals arg1="1.5" arg2="${ant.java.version}" />
+  </condition>
   
   <property name="clover.db.dir" location="${build.dir}/test/clover/db"/>
   <property name="clover.report.dir" location="${build.dir}/test/clover/reports"/>

Modified: lucene/java/trunk/contrib/gdata-server/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/gdata-server/build.xml?view=diff&rev=543257&r1=543256&r2=543257
==============================================================================
--- lucene/java/trunk/contrib/gdata-server/build.xml (original)
+++ lucene/java/trunk/contrib/gdata-server/build.xml Thu May 31 13:58:55 2007
@@ -21,6 +21,14 @@
 	<description>  
         Serverside Google Data API implementation  
     </description>
+        <!-- NOTE: attempting to import ../contrib-build.xml or
+             ../../common-build.xml breaks everything
+             whole build file should be cleaned up later if possible
+          -->
+        <condition property="build-1-5-contrib">
+           <equals arg1="1.5" arg2="${ant.java.version}" />
+        </condition>
+
 	<import file="gdata-build/get-dependencies.xml" />
 	<property name="javac.source" value="1.5" />
 	<property name="javac.target" value="1.5" />
@@ -76,46 +84,50 @@
 			</and>
 		</not>
 	</condition>
-	<target name="jar-core" description="Packages the JAR file">
+	<target name="jar-core" description="Packages the JAR file" depends="init" if="build-1-5-contrib">
 		<ant dir="src/core" target="jar-core" inheritRefs="true" />
 		<ant dir="src/hivemind" target="jar-core" inheritRefs="true" />
 		<ant dir="src/gom" target="jar-core" inheritRefs="true" />
 	</target>
 
 
-	<target name="test">
+	<target name="test" depends="init" if="build-1-5-contrib">
 		<ant dir="src/core" target="test" inheritRefs="true" />
 		<ant dir="src/gom" target="test" inheritRefs="true" />
 		<ant dir="src/hivemind" target="test" inheritRefs="true" />
 	</target>
 	
-	<target name="compile-core" depends="download">
+	<target name="compile-core" depends="init,download" if="build-1-5-contrib">
 		<ant dir="src/core" target="compile-core" inheritRefs="true" />
 		<ant dir="src/hivemind" target="compile-core" inheritRefs="true" />
 		<ant dir="src/gom" target="compile-core" inheritRefs="true" />
 	</target>
 
-	<target name="compile-test" depends="compile-core, download">
+	<target name="compile-test" depends="init,compile-core,download" if="build-1-5-contrib">
 		<ant dir="src/core" target="compile-test" inheritRefs="true" />
 		<ant dir="src/hivemind" target="compile-test" inheritRefs="true" />
 		<ant dir="src/gom" target="compile-test" inheritRefs="true" />
 	</target>
 
-	<target name="clean">
+	<target name="clean" depends="init" if="build-1-5-contrib">
 		<ant dir="src/core" target="clean" inheritRefs="true" />
 		<ant dir="src/hivemind" target="clean" inheritRefs="true" />
 		<ant dir="src/gom" target="clean" inheritRefs="true" />
 	</target>
 
-	<target name="war-gdata" depends="clean,jar-core">
+	<target name="war-gdata" depends="init,clean,jar-core" if="build-1-5-contrib">
 		<ant dir="src/core" target="war-gdata" inheritRefs="true" />
 	</target>
 	
-	 <target name="default" description="default" depends="download">
+	 <target name="default" description="default" depends="init,download" if="build-1-5-contrib">
 		<ant dir="src/core" target="default" inheritRefs="true" />
 		<ant dir="src/hivemind" target="default" inheritRefs="true" />
 		<ant dir="src/gom" target="default" inheritRefs="true" />	 	
 	 </target>
 
-
-</project>
\ No newline at end of file
+  <target name="init" depends="check-1-5" />
+  <target name="check-1-5" unless="build-1-5-contrib" >
+     <echo>Java 1.5 support not availabble (or prohibited by explicitly set property)
... skipping task</echo>
+  </target>
+         
+</project>



Mime
View raw message