avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/instrument build.xml default.properties
Date Tue, 30 Jul 2002 14:01:57 GMT
bloritsch    2002/07/30 07:01:57

  Modified:    .        build.xml
               fortress build.xml default.properties
               instrument build.xml default.properties
  Log:
  update the main build to not use manager/client
  
  Revision  Changes    Path
  1.174     +39 -55    jakarta-avalon-excalibur/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/build.xml,v
  retrieving revision 1.173
  retrieving revision 1.174
  diff -u -r1.173 -r1.174
  --- build.xml	26 Jul 2002 14:29:49 -0000	1.173
  +++ build.xml	30 Jul 2002 14:01:56 -0000	1.174
  @@ -25,8 +25,8 @@
           <ant dir="threadcontext" target="dist"/>
           <ant dir="sourceresolve" target="dist"/>
           <ant dir="monitor" target="dist"/>
  -        <ant dir="store" target="dist"/>             
  -        
  +        <ant dir="store" target="dist"/>
  +
           <!-- Sub projects with dependencies. -->
           <ant dir="pool" target="dist"/>               <!-- collections, concurrent,
instrument -->
           <ant dir="thread" target="dist"/>             <!-- lang, instrument, threadcontext,
pool -->
  @@ -35,9 +35,7 @@
           <ant dir="util" target="dist"/>               <!-- component -->
           <ant dir="testcase" target="dist"/>           <!-- logger, component -->
           <ant dir="event" target="dist"/>              <!-- collections, concurrent,
lang, pool, thread, util, event -->
  -        <ant dir="instrument-manager" target="dist"/> <!-- altrmi, collections,
instrument, logger, pool, component -->
  -        <ant dir="instrument-client" target="dist"/>  <!-- instrument-manager
-->
  -        
  +
   
           <ant dir="baxter" target="dist"/>
           <ant dir="bzip2" target="dist"/>
  @@ -59,15 +57,13 @@
               <pathelement location="altrmi/src/java"/>
               <pathelement location="altrmi/src/test"/>
               <pathelement location="instrument/src/java"/>
  +            <pathelement location="instrument/src/client"/>
  +            <pathelement location="instrument/src/manager"/>
               <pathelement location="instrument/src/test"/>
               <pathelement location="concurrent/src/java"/>
               <pathelement location="concurrent/src/test"/>
               <pathelement location="collections/src/java"/>
               <pathelement location="collections/src/test"/>
  -            <pathelement location="instrument-manager/src/java"/>
  -            <pathelement location="instrument-manager/src/test"/>
  -            <pathelement location="instrument-client/src/java"/>
  -            <pathelement location="instrument-client/src/test"/>
               <pathelement location="baxter/src/java"/>
               <pathelement location="baxter/src/test"/>
               <pathelement location="bzip2/src/java"/>
  @@ -165,8 +161,6 @@
           <ant dir="naming" target="dist-jar"/>
           <ant dir="monitor" target="dist-jar"/>
           <ant dir="altrmi" target="dist-jar"/>
  -        <ant dir="instrument-manager" target="dist-jar"/>
  -        <ant dir="instrument-client" target="dist-jar"/>
   
           <!-- Jump through hoops to avoid jlink size bug.  -->
   
  @@ -203,8 +197,6 @@
                       <include name="monitor/dist/*.jar"/>
                       <include name="store/dist/*.jar"/>
                       <!-- These jars should not be in avalon-excalibur.jar as they are
quite large.
  -                    <include name="instrument-manager/dist/*.jar"/>
  -                    <include name="instrument-client/dist/*.jar"/>
                       <include name="altrmi/dist/*.jar"/>
                       -->
                       <exclude name="*/dist/*a.jar"/> <!-- Exclude alpha quality
jars -->
  @@ -239,8 +231,8 @@
           <ant dir="threadcontext" target="jar"/>
           <ant dir="sourceresolve" target="jar"/>
           <ant dir="monitor" target="jar"/>
  -        <ant dir="store" target="jar"/>              
  -        
  +        <ant dir="store" target="jar"/>
  +
           <!-- Sub projects with dependencies. -->
           <ant dir="pool" target="jar"/>               <!-- collections, concurrent,
instrument, sourceresolve -->
           <ant dir="datasource" target="jar"/>         <!-- pool -->
  @@ -250,9 +242,7 @@
           <ant dir="util" target="jar"/>               <!-- component -->
           <ant dir="testcase" target="jar"/>           <!-- logger, component -->
           <ant dir="event" target="jar"/>              <!-- collections, concurrent,
lang, pool, thread, util, event -->
  -        <ant dir="instrument-manager" target="jar"/> <!-- altrmi, collections,
instrument, logger, pool, component -->
  -        <ant dir="instrument-client" target="jar"/>  <!-- instrument-manager -->
  -        
  +
           <ant dir="baxter" target="jar"/>
           <ant dir="bzip2" target="jar"/>
           <ant dir="cache" target="jar"/>
  @@ -268,7 +258,7 @@
               <mergefiles>
                   <fileset dir=".">
                       <include name="*/build/lib/*.jar"/>
  -                    <include name="altrmi/**"/>                    
  +                    <include name="altrmi/**"/>
                   </fileset>
               </mergefiles>
           </jlink>
  @@ -287,26 +277,24 @@
   
       <!-- Generate all docs -->
       <target name="docs" description="Generate all the docs">
  -	<ant dir="site" target="docs"/>
  -	<!--
  +    <ant dir="site" target="docs"/>
  +    <!--
           <ant dir="fortress" target="docs"/>
           <ant dir="instrument" target="docs"/>
  -        <ant dir="instrument-client" target="docs"/>
  -        <ant dir="instrument-manager" target="docs"/>
  -        <ant dir="altrmi" target="docs"/> 
  +        <ant dir="altrmi" target="docs"/>
           <ant dir="baxter" target="docs"/>
           <ant dir="bzip2" target="docs"/>
  -        <ant dir="cache" target="docs"/> 
  +        <ant dir="cache" target="docs"/>
           <ant dir="cli" target="docs"/>
  -        <ant dir="collections" target="docs"/> 
  -        <ant dir="component" target="docs"/>  
  -        <ant dir="concurrent" target="docs"/>  
  +        <ant dir="collections" target="docs"/>
  +        <ant dir="component" target="docs"/>
  +        <ant dir="concurrent" target="docs"/>
           <ant dir="datasource" target="docs"/>
  -        <ant dir="event" target="docs"/>  
  +        <ant dir="event" target="docs"/>
           <ant dir="extension" target="docs"/>
  -        <ant dir="extension" target="docs"/> 
  -        <ant dir="i18n" target="docs"/> 
  -        <ant dir="io" target="docs"/> 
  +        <ant dir="extension" target="docs"/>
  +        <ant dir="i18n" target="docs"/>
  +        <ant dir="io" target="docs"/>
           <ant dir="threadcontext" target="docs"/>
           <ant dir="logger" target="docs"/>
           <ant dir="monitor" target="docs"/>
  @@ -327,38 +315,36 @@
       <target name="site" depends="mega-jar" description="Generate all the docs for site">
   
           <ant dir="site" target="site"/>
  -    
  -        <!-- 
  +
  +        <!--
             All have to be compiled in correct dependancy order first as the javadocs
             targets require copiled classes as sanity check.  The compilation must
             be done in the correct for thesake of dependancies.  However, the 'site'
  -          targets invoked below are alphabetical because compilations havealready 
  +          targets invoked below are alphabetical because compilations havealready
             been done.
           -->
  -            
  +
           <!--<ant dir="fortress" target="site"/> -->
           <!--<ant dir="instrument" target="site"/>  -->
  -        <!--<ant dir="instrument-client" target="site"/-->  <!-- depends on
instrument-manager -->
  -		<!--<ant dir="instrument-manager" target="site"/>  --> <!-- depends on
instrument, all -->
  -		<!--
  -        <ant dir="altrmi" target="site"/> 
  +        <!--
  +        <ant dir="altrmi" target="site"/>
           <ant dir="baxter" target="site"/>
           <ant dir="bzip2" target="site"/>
           <ant dir="cache" target="site"/>
           <ant dir="cli" target="site"/>
  -        <ant dir="collections" target="site"/> 
  +        <ant dir="collections" target="site"/>
           <ant dir="component" target="site"/>
  -        <ant dir="concurrent" target="site"/>  
  +        <ant dir="concurrent" target="site"/>
           <ant dir="datasource" target="site"/>
  -        <ant dir="event" target="site"/>  
  +        <ant dir="event" target="site"/>
  +        <ant dir="extension" target="site"/>
           <ant dir="extension" target="site"/>
  -        <ant dir="extension" target="site"/> 
  -        <ant dir="i18n" target="site"/> 
  -        <ant dir="io" target="site"/> 
  +        <ant dir="i18n" target="site"/>
  +        <ant dir="io" target="site"/>
           <ant dir="threadcontext" target="site"/>
           <ant dir="logger" target="site"/>
           <ant dir="monitor" target="site"/>
  -        <ant dir="naming" target="site"/> 
  +        <ant dir="naming" target="site"/>
           <ant dir="pool" target="site"/>
           <ant dir="sourceresolve" target="site"/>
           <ant dir="store" target="site"/>
  @@ -367,12 +353,12 @@
           <ant dir="thread" target="site"/>
           <ant dir="util" target="site"/>
           <ant dir="xmlbundle" target="site"/>
  -        <ant dir="zip" target="site"/>               
  -	-->
  +        <ant dir="zip" target="site"/>
  +    -->
       </target>
   
       <!-- Generate all docs -->
  -    <target name="site-docs" depends="site" description="Generate all the docs for site
and Copy to site CVS">    
  +    <target name="site-docs" depends="site" description="Generate all the docs for site
and Copy to site CVS">
           <ant dir="site" target="site-docs"/>
       </target>
   
  @@ -389,15 +375,13 @@
           <ant dir="component" target="real-clean"/>
           <ant dir="concurrent" target="real-clean"/>
           <ant dir="datasource" target="real-clean"/>
  -        <ant dir="event" target="real-clean"/>  
  +        <ant dir="event" target="real-clean"/>
           <ant dir="extension" target="real-clean"/>
           <ant dir="fortress" target="real-clean"/>
           <ant dir="i18n" target="real-clean"/>
           <ant dir="instrument" target="real-clean"/>
  -        <ant dir="instrument-client" target="real-clean"/>
  -        <ant dir="instrument-manager" target="real-clean"/>
           <ant dir="io" target="real-clean"/>
  -        <ant dir="logger" target="real-clean"/>        
  +        <ant dir="logger" target="real-clean"/>
           <ant dir="monitor" target="real-clean"/>
           <ant dir="naming" target="real-clean"/>
           <ant dir="pool" target="real-clean"/>
  @@ -410,7 +394,7 @@
           <ant dir="threadcontext" target="real-clean"/>
           <ant dir="util" target="real-clean"/>
           <ant dir="xmlbundle" target="real-clean"/>
  -        <ant dir="zip" target="real-clean"/>   
  +        <ant dir="zip" target="real-clean"/>
   
       </target>
   
  
  
  
  1.33      +9 -10     jakarta-avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- build.xml	23 Jul 2002 12:41:37 -0000	1.32
  +++ build.xml	30 Jul 2002 14:01:57 -0000	1.33
  @@ -48,7 +48,7 @@
           <pathelement location="${excalibur-scratchpad.jar}"/>
           <pathelement location="${excalibur-concurrent.jar}"/>
           <pathelement location="${excalibur-thread.jar}"/>
  -        <pathelement location="${xalan.jar}"/>	
  +        <pathelement location="${xalan.jar}"/>
           <path refid="project.class.path"/>
       </path>
       <property name="cp" refid="test.class.path"/>
  @@ -60,7 +60,6 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  -	<!--  <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkScratchpad"/>
-->
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkManagerInterfaces"/>
  @@ -86,7 +85,7 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkDatasource"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCache"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkThread"/>

  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkThread"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkXMLBundle"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkMonitor"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkXMLUtil"/>
  @@ -411,25 +410,25 @@
           <filter token="LOGKIT_BASE" value="${logkit.base}"/>
           <filter token="TESTLET_BASE" value="${testlet.base}"/>
       </target>
  -    
  +
       <!-- Prepares the documentation directory -->
       <target name="docs" depends="html-docs, javadocs" description="generates all the
Avalon documentation"/>
   
       <target name="html-docs" description="generates the xdocs-based documentation">
         <ant antfile="${basedir}/../cocoonbuild.xml"/>
       </target>
  -        
  -    <target name="site" depends="javadocs, docs" description=" Places Docs ready for
hosting on website">  
  -  
  +
  +    <target name="site" depends="javadocs, docs" description=" Places Docs ready for
hosting on website">
  +
         <mkdir dir="../site/dist/docs/${dir-name}"/>
         <copy todir="../site/dist/docs/${dir-name}">
           <fileset dir="${build.docs}">
             <include name="**"/>
           </fileset>
  -      </copy>        
  -  
  +      </copy>
  +
       </target>
  -    
  +
       <!-- Cleans up build and distribution directories -->
       <target name="clean" description="Cleans up the project">
           <delete file="checkstyle.cache"/>
  
  
  
  1.24      +3 -5      jakarta-avalon-excalibur/fortress/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- default.properties	23 Jul 2002 12:41:37 -0000	1.23
  +++ default.properties	30 Jul 2002 14:01:57 -0000	1.24
  @@ -31,13 +31,11 @@
   # ----- Excalibur instrument, version 1.0 or later -----
   excalibur-instrument.home=${basedir}/../instrument/dist
   excalibur-instrument.lib=${excalibur-instrument.home}
  -excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
  +excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.2.jar
   
   # ----- Excalibur Instrument Manager, version 0.1 or later -----
  -excalibur-instrument-manager.home=${basedir}/../instrument-manager/dist
  -excalibur-instrument-manager.lib=${excalibur-instrument-manager.home}
  -excalibur-instrument-manager.jar=${excalibur-instrument-manager.lib}/excalibur-instrument-manager-0.1.jar
  -excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.lib}/excalibur-instrument-manager-interfaces-0.1.jar
  +excalibur-instrument-manager.jar=${excalibur-instrument.lib}/excalibur-instrument-manager-0.2.jar
  +excalibur-instrument-manager-interfaces.jar=${excalibur-instrument.lib}/excalibur-instrument-manager-interfaces-0.2.jar
   
   # ----- Excalibur event, version 1.0 or later -----
   excalibur-event.home=${basedir}/../event/dist
  
  
  
  1.30      +11 -0     jakarta-avalon-excalibur/instrument/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/build.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- build.xml	29 Jul 2002 21:21:03 -0000	1.29
  +++ build.xml	30 Jul 2002 14:01:57 -0000	1.30
  @@ -237,7 +237,18 @@
                 <attribute name="Implementation-Version" value="${package-version}"/>
               </manifest>
               <exclude name="**/test/**"/>
  +            <exclude name="**/interfaces/**"/>
               <zipfileset dir="${build.conf}" prefix="META-INF/">
  +                <include name="LICENSE.txt"/>
  +            </zipfileset>
  +        </jar>
  +
  +        <jar jarfile="${build.lib}/${manager-interfaces.name}.jar"
  +            basedir="${build.classes}"
  +            compress="${build.compress}">
  +            <include name="**/interfaces/**"/>
  +            <exclude name="**/test/**"/>
  +            <zipfileset dir=".." prefix="META-INF/">
                   <include name="LICENSE.txt"/>
               </zipfileset>
           </jar>
  
  
  
  1.10      +1 -0      jakarta-avalon-excalibur/instrument/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/default.properties,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- default.properties	29 Jul 2002 21:21:03 -0000	1.9
  +++ default.properties	30 Jul 2002 14:01:57 -0000	1.10
  @@ -94,6 +94,7 @@
   jar.name = ${name}-${version}.jar
   client.jar.name = ${client.name}-${version}.jar
   manager.jar.name = ${manager.name}-${version}.jar
  +manager-interfaces.name = ${manager.name}-interfaces-${version}.jar
   
   #  property indicating directory where all distribution archives are placed
   dist.base = distributions
  
  
  

--
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