avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pro...@apache.org
Subject cvs commit: jakarta-avalon-excalibur depchecker.xml
Date Thu, 08 Aug 2002 14:15:34 GMT
proyal      2002/08/08 07:15:34

  Modified:    instrument build.xml
               .        depchecker.xml
  Log:
  * Split building of instrument manager/client into separate ant tasks for
    dependency purposes (pool requires instrument which required altrmi which required pool...)
    Now pool requires instrument but instrument does not imply instrument-manager
  * Remove old instrument manager dep targets, add custom ant build targets
    when building instrument mgr
  
  Revision  Changes    Path
  1.41      +38 -21    jakarta-avalon-excalibur/instrument/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/build.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- build.xml	8 Aug 2002 06:30:57 -0000	1.40
  +++ build.xml	8 Aug 2002 14:15:33 -0000	1.41
  @@ -53,7 +53,7 @@
           <available property="framework.present" classname="org.apache.avalon.framework.logger.AbstractLogEnabled">
               <classpath refid="project.class.path"/>
           </available>
  -        
  +
           <available property="ecm.present" classname="org.apache.avalon.excalibur.component.ExcaliburComponentManager">
               <classpath refid="project.class.path"/>
           </available>
  @@ -62,6 +62,9 @@
       <target name="dependencies" description="Check dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +    </target>
  +
  +    <target name="manager-dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkAltrmi"/>
       </target>
   
  @@ -93,43 +96,44 @@
                        unless="framework.present"/>
           </javac>
   
  -        <javac srcdir="${manager.dir}"
  -            destdir="${build.manager.classes}"
  +        <!-- copy resources to same location as .class files -->
  +        <copy todir="${build.classes}">
  +            <fileset dir="${java.dir}">
  +                <exclude name="**/*.java"/>
  +                <exclude name="**/package.html"/>
  +            </fileset>
  +        </copy>
  +    </target>
  +
  +    <target name="compile-manager" depends="manager-dependencies, compile" description="Compile
Manager source Code">
  +        <javac srcdir="${client.dir}"
  +            destdir="${build.client.classes}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
               <classpath>
                 <path refid="project.class.path" />
  +              <pathelement path="${build.manager.classes}"/>
                 <pathelement path="${build.classes}"/>
               </classpath>
               <include name="**/*.java"/>
  -            <exclude name="org/apache/excalibur/instrument/component/*"
  -                     unless="ecm.present"/>
           </javac>
   
  -        <javac srcdir="${client.dir}"
  -            destdir="${build.client.classes}"
  +        <javac srcdir="${manager.dir}"
  +            destdir="${build.manager.classes}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
               <classpath>
                 <path refid="project.class.path" />
  -              <pathelement path="${build.manager.classes}"/>
                 <pathelement path="${build.classes}"/>
               </classpath>
               <include name="**/*.java"/>
  +            <exclude name="org/apache/excalibur/instrument/component/*"
  +                     unless="ecm.present"/>
           </javac>
  -
  -        <!-- copy resources to same location as .class files -->
  -        <copy todir="${build.classes}">
  -            <fileset dir="${java.dir}">
  -                <exclude name="**/*.java"/>
  -                <exclude name="**/package.html"/>
  -            </fileset>
  -        </copy>
  -
       </target>
   
       <!-- Generates the altrmi proxies used by the client. -->
  @@ -187,7 +191,7 @@
       </target>
   
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile, prepare-conf, altrmiproxies" description="Generates
the jar files">
  +    <target name="jar" depends="compile, prepare-conf" description="Generates the jar
files">
   
           <mkdir dir="${build.lib}"/>
   
  @@ -206,7 +210,9 @@
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  +    </target>
   
  +    <target name="manager-jar" depends="jar, altrmiproxies">
           <jar jarfile="${build.lib}/${client.jar.name}"
               basedir="${build.client.classes}"
               compress="${build.compress}">
  @@ -259,7 +265,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
  +    <target name="javadocs" depends="compile, compile-manager" description="Generates
the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -405,7 +411,7 @@
   
           <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
           src="${dist.name}-bin.tar"/>
  -    
  +
           <bzip2 zipfile="${dist.base}/${dist.name}-bin.tar.bz2"
                  src="${dist.name}-bin.tar"/>
   
  @@ -439,7 +445,7 @@
   
           <gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
           src="${dist.name}-bin.tar"/>
  -    
  +
           <bzip2 zipfile="${dist.base}/${dist.name}-src.tar.bz2"
           src="${dist.name}-bin.tar"/>
   
  @@ -473,6 +479,17 @@
           <copy todir="${dist.dir}">
               <fileset dir="${build.lib}">
                   <include name="*.jar"/>
  +            </fileset>
  +        </copy>
  +    </target>
  +
  +    <target name="dist-manager-jar" depends="manager-jar">
  +        <mkdir dir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="${manager.jar.name}"/>
  +                <include name="${manager-interfaces.name}.jar"/>
  +                <include name="${client.jar.name}"/>
               </fileset>
           </copy>
       </target>
  
  
  
  1.37      +3 -15     jakarta-avalon-excalibur/depchecker.xml
  
  Index: depchecker.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/depchecker.xml,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- depchecker.xml	7 Aug 2002 11:51:02 -0000	1.36
  +++ depchecker.xml	8 Aug 2002 14:15:34 -0000	1.37
  @@ -345,11 +345,13 @@
               <property name="proj.jar.name" value="excalibur-instrument-manager-0.3.jar"/>
               <property name="path" value="${excalibur-instrument-manager.jar}"/>
               <property name="proj.home" value="${basedir}/../instrument"/>
  +            <property name="proj.target" value="dist-manager-jar"/>
           </ant>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
               <property name="proj.jar.name" value="excalibur-instrument-manager-interfaces-0.3.jar"/>
               <property name="path" value="${excalibur-instrument-manager-interfaces.jar}"/>
               <property name="proj.home" value="${basedir}/../instrument"/>
  +            <property name="proj.target" value="dist-manager-jar"/>
           </ant>
       </target>
       <target name="checkCollections">
  @@ -447,20 +449,6 @@
               <property name="proj.jar.name" value="excalibur-monitor.jar"/>
               <property name="path" value="${excalibur-monitor.jar}"/>
               <property name="proj.home" value="${basedir}/../monitor"/>
  -        </ant>
  -    </target>
  -    <target name="checkManagerInterfaces">
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="proj.jar.name" value="excalibur-instrument-manager-interfaces.jar"/>
  -            <property name="path" value="${excalibur-instrument-manager-interfaces.jar}"/>
  -            <property name="proj.home" value="${basedir}/../instrument-manager"/>
  -        </ant>
  -    </target>
  -    <target name="checkManager">
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="proj.jar.name" value="excalibur-instrument-manager.jar"/>
  -            <property name="path" value="${excalibur-instrument-manager.jar}"/>
  -            <property name="proj.home" value="${basedir}/../instrument-manager"/>
           </ant>
       </target>
       <target name="checkI18N">
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message