avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin build.xml default.properties
Date Thu, 13 Feb 2003 18:21:23 GMT
mcconnell    2003/02/13 10:21:23

  Modified:    merlin   build.xml default.properties
  Log:
  Moved javadoc links to property file.
  
  Revision  Changes    Path
  1.20      +56 -12    avalon-sandbox/merlin/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	12 Feb 2003 16:28:18 -0000	1.19
  +++ build.xml	13 Feb 2003 18:21:22 -0000	1.20
  @@ -267,14 +267,10 @@
     </target>
   
     <target name="context" depends="dependencies">
  -    <mkdir dir="${lib.dir}"/>
       <uptodate property="uptodate" targetfile="${build.lib}/${jar.name}">
         <srcfiles dir="${src.dir}">
           <include name="**/*.*"/>
         </srcfiles>
  -      <srcfiles dir="${lib.dir}">
  -        <include name="**/*.*"/>
  -      </srcfiles>
       </uptodate>
     </target>
   
  @@ -345,10 +341,58 @@
   
     </target>
   
  -  <target name="install" depends="jar,jar-playground">
  +  <target name="update-install" depends="jar,jar-playground">
         <mkdir dir="${local.repository}"/>
         <copy toDir="${local.repository}" file="${build.dir}/lib/${jar.name}"/>
  -  </target> 
  +  </target>
  +
  +  <target name="install" depends="update-install">
  +    <mkdir dir="${merlin.home}"/>
  +    <mkdir dir="${merlin.home}/lib/system"/>
  +    <mkdir dir="${merlin.home}/lib/shared"/>
  +    <mkdir dir="${merlin.home}/repository"/>
  +    <copy toDir="${merlin.home}/lib/shared" file="${avalon-framework.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${excalibur-i18n.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${excalibur-configuration.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${excalibur-extension.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${excalibur-util-concurrent.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${excalibur-thread.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${excalibur-threadcontext.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${excalibur-pool.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${excalibur-event.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${excalibur-collections.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${commons-collections.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${avalon-logkit.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${avalon-meta.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${avalon-lifecycle.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${avalon-assembly.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${merlin.jar}"/>
  +    <copy toDir="${merlin.home}/lib/system" file="${merlin-bootstrap.jar}"/>
  +    <mkdir dir="${merlin.home}/bin"/>
  +    <copy toDir="${merlin.home}/bin">
  +      <fileset dir="${src.dir}/bin">
  +        <include name="**/*.*"/>
  +      </fileset>
  +    </copy>
  +    <mkdir dir="${merlin.home}/config"/>
  +    <copy toDir="${merlin.home}/config">
  +      <fileset dir="${src.dir}/config">
  +        <include name="**/*.*"/>
  +      </fileset>
  +    </copy>
  +    <mkdir dir="${merlin.home}/repository"/>
  +    <copy toDir="${merlin.home}/repository">
  +      <fileset dir="${src.dir}/repository">
  +        <include name="**/*.*"/>
  +      </fileset>
  +    </copy>
  +    <mkdir dir="${merlin.home}/repository/playground"/>
  +    <copy toDir="${merlin.home}/repository/playground">
  +      <fileset dir="../assembly/build/lib">
  +        <include name="playground*.jar"/>
  +      </fileset>
  +    </copy>
  +  </target>
   
     <target name="deploy" depends="jar">
   
  @@ -412,12 +456,12 @@
           <param name="-version"/>
           <param name="-doctitle" value="${Name}"/>
           <param name="-windowtitle" value="${Name} API"/>
  -        <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
  -        <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
  -        <param name="-link" value="../../avalon/api"/>
  -        <param name="-link" value="../../assembly/api"/>
  -        <param name="-link" value="../../lifecycle/api"/>
  -        <param name="-link" value="../../meta/api"/>
  +        <param name="-link" value="${j2se.api.link}"/>
  +        <param name="-link" value="${j2ee.api.link}"/>
  +        <param name="-link" value="${avalon.api.link}"/>
  +        <param name="-link" value="${assembly.api.link}"/>
  +        <param name="-link" value="${lifecycle.api.link}"/>
  +        <param name="-link" value="${meta.api.link}"/>
           <param name="-bottom"
              value="&quot;Copyright &#169; ${year} Apache Avalon Project. All Rights
Reserved.&quot;"/>
         </doclet>
  
  
  
  1.19      +16 -1     avalon-sandbox/merlin/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/default.properties,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- default.properties	12 Feb 2003 16:28:18 -0000	1.18
  +++ default.properties	13 Feb 2003 18:21:22 -0000	1.19
  @@ -18,6 +18,8 @@
   remote.repository = http://www.osm.net/repository
   local.repository = ../lib
   
  +merlin.home = merlin
  +
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
  @@ -129,6 +131,13 @@
   excalibur-collections.jar=${local.repository}/${excalibur-collections.name}
   
   # ----- Merlin Bootstrap -----
  +merlin.id = ${name}
  +merlin.version = ${package-version}
  +merlin.key = org.apache.avalon.merlin.kernel.Kernel
  +merlin.name = ${merlin.id}-${merlin.version}.jar
  +merlin.jar=${local.repository}/${merlin.name}
  +
  +# ----- Merlin Bootstrap -----
   merlin-bootstrap.id = merlin-bootstrap
   merlin-bootstrap.version = 1.0
   merlin-bootstrap.key = Merlin
  @@ -197,4 +206,10 @@
   
   checkstyle-cache = ${build.dir}/checkstyle.cache
   
  -#depchecker.prefix=.
  +# javadoc links
  +j2se.api.link = http://java.sun.com/j2se/1.4/docs/api/
  +j2ee.api.link = http://java.sun.com/j2ee/sdk_1.3/techdocs/api/
  +avalon.api.link = ../../avalon/api
  +assembly.api.link =../../assembly/api
  +lifecycle.api.link =../../lifecycle/api
  +meta.api.link =../../meta/api
  
  
  

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


Mime
View raw message