[prev in list] [next in list] [prev in thread] [next in thread] 

List:       slide-dev
Subject:    cvs commit: jakarta-slide build.xml
From:       remm () locus ! apache ! org
Date:       2000-11-25 1:43:32
[Download RAW message or body]

remm        00/11/24 17:43:31

  Modified:    .        build.xml
  Log:
  - Update the Ant makefile : the Catalina related target is made optional.
  
  Revision  Changes    Path
  1.55      +25 -9     jakarta-slide/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/build.xml,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- build.xml	2000/11/22 06:24:46	1.54
  +++ build.xml	2000/11/25 01:43:30	1.55
  @@ -87,8 +87,11 @@
       <mkdir dir="${slide.build}/doc/samples"/>
       <mkdir dir="${slide.build}/doc/javadoc"/>
       
  -    <available property="jmx.present"      
  +    <available property="jmx.present" 
        classname="javax.management.MBeanServer" />
  +    <available property="catalina.present" 
  +     classname="org.apache.catalina.Container" 
  +     classpath="${catalina.build}/classes" />
       
     </target>
     
  @@ -217,10 +220,10 @@
        destdir="${webdavclient.build}/classes"
        debug="on" deprecation="on" 
        excludes="**/CVS/**,**/package.html" />
  -    <copy todir="${webdavclient.build}">
  +    <copy todir="${webdavclient.build}/bin">
         <fileset dir="src/webdav/client/bin">
  -        <include name="*.bat" />
  -        <include name="*.sh" />
  +        <include name="**/*.bat" />
  +        <include name="**/*.sh" />
         </fileset>
       </copy>
     </target>
  @@ -234,6 +237,12 @@
        destdir="${webdavclient.build}/classes"
        debug="off" deprecation="off" 
        excludes="**/CVS/**,**/package.html" />
  +    <copy todir="${webdavclient.build}/bin">
  +      <fileset dir="src/webdav/client/bin">
  +        <include name="**/*.bat" />
  +        <include name="**/*.sh" />
  +      </fileset>
  +    </copy>
     </target>
     
     
  @@ -283,6 +292,13 @@
       depends="webdav-client-no-debug, webdav-client-dist-prepare, 
         webdav-client-javadoc">
       
  +    <copy todir="${webdavclient.dist}/bin">
  +      <fileset dir="${webdavclient.build}/bin">
  +        <include name="**/*.bat" />
  +        <include name="**/*.sh" />
  +      </fileset>
  +    </copy>
  +    
       <copy file="src/etc/MANIFEST.MF" 
        tofile="${webdavclient.build}/classes/MANIFEST.MF" />
       <replace  file="${webdavclient.build}/classes/MANIFEST.MF" 
  @@ -466,12 +482,12 @@
     <!-- Build Catalina related components                                   -->
     <!-- This target requires Tomcat 4.0                                     -->
     <!-- =================================================================== -->
  -  <target name="catalina-util" depends="no-debug">
  +  <target name="catalina-wrapper" depends="no-debug" if="catalina.present">
       
  -    <javac srcdir="src/clients/tomcat" 
  +    <javac srcdir="src/wrappers/catalina" 
        destdir="${slide.build}/classes"
        debug="off" deprecation="off" 
  -     includes="**/org/apache/catalina/**"
  +     includes="**"
        excludes="**/CVS/**"
        classpath="${slide.build}/classes:${catalina.build}/classes" />
       <copy file="src/etc/MANIFEST.MF" 
  @@ -633,7 +649,7 @@
     <!-- Full distribution                                                   -->
     <!-- =================================================================== -->
     <target name="full-dist" depends="dist, webdav-client-dist, webapp-dist, 
  -   catalina-util, jmx-dist">
  +   catalina-wrapper, jmx-dist">
       
     </target>
     
  @@ -692,7 +708,7 @@
       <jar jarfile="${slide.release}/catalina/catalinautil.jar" 
        basedir="${slide.build}/classes"
        manifest="${slide.build}/classes/MANIFEST.MF" 
  -     includes="LICENSE,README,CHANGELOG,org/apache/catalina/**" />
  +     includes="LICENSE,README,CHANGELOG,**/SlideRealm*.*" />
     </target>
     
     
  
  
  

[prev in list] [next in list] [prev in thread] [next in thread]