lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ehatc...@apache.org
Subject cvs commit: jakarta-lucene-sandbox/contributions/ant build.xml
Date Mon, 05 Jan 2004 15:54:53 GMT
ehatcher    2004/01/05 07:54:53

  Modified:    contributions build.xml common.xml
               contributions/ant build.xml
  Log:
  more work on sandbox build process
  
  Revision  Changes    Path
  1.2       +15 -1     jakarta-lucene-sandbox/contributions/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene-sandbox/contributions/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	5 Jan 2004 07:09:42 -0000	1.1
  +++ build.xml	5 Jan 2004 15:54:53 -0000	1.2
  @@ -1,8 +1,22 @@
   <project name="sandbox" default="build-tree">
   
  +  <target name="clean">
  +    <subant target="clean">
  +      <fileset dir="."
  +               includes="*/build.xml"
  +      />
  +    </subant>
  +  </target>
  +
     <target name="build-tree">
       <subant target="">
  -      <fileset dir="." includes="*/build.xml" excludes="./build.xml"/>
  +      <!-- Exclude LARM for now,
  +           until its build is brought up to speed
  +      -->
  +      <fileset dir="."
  +               includes="*/build.xml"
  +               excludes="webcrawler-LARM/build.xml"
  +      />
       </subant>
     </target>
   </project>
  
  
  
  1.2       +15 -10    jakarta-lucene-sandbox/contributions/common.xml
  
  Index: common.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene-sandbox/contributions/common.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- common.xml	5 Jan 2004 07:09:42 -0000	1.1
  +++ common.xml	5 Jan 2004 15:54:53 -0000	1.2
  @@ -2,10 +2,14 @@
   
   <project name="common">
   
  +  <property name="src.dir" location="src/java"/>
     <property name="build.dir" location="build"/>
     <property name="build.classes.dir" location="${build.dir}/classes"/>
  -  <property name="test.dir" location="${build.dir}/test"/>
  -  <property name="test.classes.dir" location="${test.dir}/classes"/>
  +
  +  <property name="test.src.dir" location="src/test"/>
  +  <property name="test.output.dir" location="${build.dir}/test"/>
  +  <property name="test.classes.dir" location="${test.output.dir}/classes"/>
  +
     <property name="dist.dir" location="dist"/>
   
     <property name="junit.jar" location="${ant.home}/lib/junit.jar"/>
  @@ -39,9 +43,10 @@
       <mkdir dir="${build.classes.dir}"/>
       <mkdir dir="${dist.dir}"/>
   
  -    <mkdir dir="${test.dir}"/>
  +    <mkdir dir="${test.output.dir}"/>
       <mkdir dir="${test.classes.dir}"/>
  -    <echoproperties/>
  +
  +    <available property="has.tests" file="${test.src.dir}" type="dir"/>
     </target>
   
     <target name="clean"
  @@ -50,7 +55,7 @@
       <delete dir="${build.classes.dir}"/>
       <delete dir="${dist.dir}"/>
   
  -    <delete dir="${test.dir}"/>
  +    <delete dir="${test.output.dir}"/>
       <delete dir="${test.classes.dir}"/>
     </target>
   
  @@ -66,12 +71,12 @@
         debug="${build.debug}"
         includeAntRuntime="yes"
         deprecation="true"
  -      srcdir="src/main"
  +      srcdir="${src.dir}"
         classpathref="compile.classpath"
         />
     </target>
   
  -  <target name="test-compile" depends="compile">
  +  <target name="test-compile" depends="compile" if="has.tests">
       <javac destdir="${test.classes.dir}"
         debug="${build.debug}"
         includeAntRuntime="yes"
  @@ -84,19 +89,19 @@
       </copy>
     </target>
   
  -  <target name="test" depends="test-compile">
  +  <target name="test" depends="test-compile" if="has.tests">
       <junit printsummary="no"
         errorProperty="test.failed"
         failureProperty="test.failed"
         fork="${junit.fork}">
         <classpath refid="test.classpath"/>
         <sysproperty key="docs.dir" file="${test.classes.dir}"/>
  -      <sysproperty key="index.dir" file="${test.dir}/index"/>
  +      <sysproperty key="index.dir" file="${test.output.dir}/index"/>
         <formatter type="brief" usefile="false"/>
         <test name="${testcase}" if="testcase"/>
         <batchtest todir="${test.data.dir}" unless="testcase">
           <fileset dir="${test.classes.dir}"
  -          includes="**/*Test.class"
  +          includes="**/*Test.class,**/Test*.class"
             />
         </batchtest>
       </junit>
  
  
  
  1.3       +2 -0      jakarta-lucene-sandbox/contributions/ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene-sandbox/contributions/ant/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	5 Jan 2004 07:09:42 -0000	1.2
  +++ build.xml	5 Jan 2004 15:54:53 -0000	1.3
  @@ -16,5 +16,7 @@
                  refid="additional.dependencies"
     />
   
  +  <property name="src.dir" location="src/main"/>
  +
     <import file="../common.xml"/>
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lucene-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: lucene-dev-help@jakarta.apache.org


Mime
View raw message