avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly build.xml default.properties
Date Wed, 11 Sep 2002 16:38:32 GMT
mcconnell    2002/09/11 09:38:31

  Modified:    assembly build.xml default.properties
  Log:
  More build file adjustments for Gump.
  
  Revision  Changes    Path
  1.60      +18 -14    jakarta-avalon-excalibur/assembly/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- build.xml	9 Sep 2002 13:34:49 -0000	1.59
  +++ build.xml	11 Sep 2002 16:38:30 -0000	1.60
  @@ -23,18 +23,15 @@
         <pathelement location="${build.classes}"/>
         <pathelement location="${checkstyle.jar}"/>
         <pathelement location="${xml-apis.jar}"/>
  -      <pathelement path="${java.class.path}"/>
  -      <fileset dir="${lib.dir}">
  -        <include name="orb*.jar" />
  -        <include name="corbaloc*.jar" />
  -        <include name="openorb*.jar" />
  -      </fileset>
  +      <pathelement location="${openorb.jar}"/>
         <pathelement location="${idl-compiler.jar}"/>
  +      <pathelement location="${orb.jar}"/>
  +      <pathelement location="${corbaloc.jar}"/>
  +      <pathelement path="${java.class.path}"/>
       </path>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  -        <pathelement location="${idl-compiler.jar}"/>
       </path>
   
       <path id="test.class.path">
  @@ -157,7 +154,8 @@
   
   
       <!-- Compiles the unit test source code -->
  -    <target name="compile-test" depends="compile, dependencies-test" description="Compiles
the source code">
  +    <target name="compile-test" depends="compile, dependencies-test" 
  +          description="Compiles the source code">
           <mkdir dir="${build.testsrc}"/>
   
           <!-- Copy over all of the tests applying test filters -->
  @@ -261,7 +259,8 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
  +    <target name="javadocs" depends="compile" 
  +          description="Generates the javadocs" unless="skip.javadocs">
           <mkdir dir="${build.javadocs}"/>
           <javadoc packagenames="org.apache.excalibur.merlin.*"
               sourcepath="${java.dir}"
  @@ -422,13 +421,15 @@
   
       </target>
   
  -    <target name="docs" depends="javadocs, xdocs" description="generates all the Avalon
documentation"/>
  +    <target name="docs" depends="javadocs, xdocs" 
  +         description="generates all the Avalon documentation"/>
   
       <target name="xdocs" 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="${docs.dir}">
  @@ -449,7 +450,8 @@
           </delete>
       </target>
   
  -    <target name="real-clean" depends="clean" description="Cleans up the project, including
distributions">
  +    <target name="real-clean" depends="clean" 
  +          description="Cleans up the project, including distributions">
           <delete dir="${dist.base}" />
       </target>
   
  @@ -458,10 +460,12 @@
     -->
   
     <target name="corbaloc.context">
  -    <available property="corbaloc.available" file="${apps.dir}/enterprise/corbaloc/build/corbaloc-1.0.jar"/>
  +    <available property="corbaloc.available" 
  +       file="${apps.dir}/enterprise/corbaloc/build/corbaloc-1.0.jar"/>
     </target>
   
     <target name="corbaloc.update" depends="corbaloc.context" if="corbaloc.available">
  +    <echo message="updating corbaloc jar file"/>
       <copy toDir="${lib.dir}" file="${apps.dir}/enterprise/corbaloc/build/corbaloc-1.0.jar"/>
     </target>
   
  @@ -474,7 +478,7 @@
     </target>
   
     <target name="orb.update" depends="orb.context" if="orb.available">
  -    <echo message="updating orb"/>
  +    <echo message="updating orb jars"/>
       <copy toDir="${lib.dir}" file="${apps.dir}/enterprise/orb/build/orb-2.0.jar"/>
       <copy toDir="${lib.dir}" file="${apps.dir}/enterprise/orb/lib/openorb_tools-1.3.0.jar"/>
       <copy toDir="${local-tools.dir}" file="${apps.dir}/enterprise/orb/lib/openorb-1.3.0.jar"/>
  
  
  
  1.14      +8 -3      jakarta-avalon-excalibur/assembly/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/default.properties,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- default.properties	10 Sep 2002 23:07:18 -0000	1.13
  +++ default.properties	11 Sep 2002 16:38:31 -0000	1.14
  @@ -129,14 +129,19 @@
   # project specific properties
   
   lib.dir = lib
  +openorb.jar = ${lib.dir}/openorb-1.3.0.jar
  +orb.jar = ${lib.dir}/orb-2.0.jar
  +corbaloc.jar = ${lib.dir}/corbaloc-1.0.jar
  +
  +local-tools.dir = tools
  +idl-compiler.jar = ${local-tools.dir}/openorb_tools-1.3.0.jar
  +idl.class = org.openorb.compiler.IdlCompiler
  +
   idl.dir = ${src.dir}/idl
   extension.dir = extensions
   demo.name = demo
   demo.jar = ${demo.name}.jar
   sar.name = ${name}-${version}.sar
  -local-tools.dir = tools
  -idl-compiler.jar = ${local-tools.dir}/openorb_tools-1.3.0.jar
  -idl.class = org.openorb.compiler.IdlCompiler
   
   activation.version = 1.0
   activation.jar = ${name}-activation-${activation.version}.jar
  
  
  

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