avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon build.xml check-targets.ent check-targets.properties
Date Mon, 10 Feb 2003 19:07:56 GMT
bloritsch    2003/02/10 11:07:55

  Modified:    .        build.xml check-targets.ent
                        check-targets.properties
  Log:
  fix up the check-targets stuff to include Rhino--which is used for the announcements
  
  Revision  Changes    Path
  1.168     +5 -5      avalon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon/build.xml,v
  retrieving revision 1.167
  retrieving revision 1.168
  diff -u -r1.167 -r1.168
  --- build.xml	10 Feb 2003 18:10:56 -0000	1.167
  +++ build.xml	10 Feb 2003 19:07:55 -0000	1.168
  @@ -129,10 +129,10 @@
       </target>
   
       <!-- defer to check-targets.ent for figuring out dependencies -->
  -    <target name="check-dependencies" depends="junit-check,log4j-check,logkit-check,jdk14-check"/>
  +    <target name="check-dependencies" depends="junit-check,log4j-check,logkit-check,jdk14-check,bsf-check,rhino-check"/>
   
       <!-- defer to check-targets.ent for downloading dependencies -->
  -    <target name="import-dependencies" depends="import-junit,import-log4j,import-logkit"/>
  +    <target name="import-dependencies" depends="import-junit,import-log4j,import-logkit,import-bsf,import-rhino"/>
   
       <!-- Prepares the build directory -->
       <target name="prepare" depends="check-dependencies">
  @@ -429,7 +429,7 @@
       </target>
   
       <!-- Creates all the .jar files -->
  -    <target name="all" depends="compile, prepare-conf" description="generates the Avalon
jar files">
  +    <target name="all" depends="compile, prepare-conf, check-dependencies" description="generates
the Avalon jar files">
           <mkdir dir="${target.lib}"/>
           <jar jarfile="${target.lib}/${framework.name}.jar"
               basedir="${target.classes}"
  @@ -468,7 +468,7 @@
   
           <mkdir dir="${dist.dir}"/>
           <copy file="${target.lib}/${framework.name}.jar" tofile="${dist.dir}/${framework.name}-${version}.jar"/>
  -        <copy file="${lib.dir}/${logkit.jar}" todir="${dist.dir}"/>
  +	<!-- <copy file="${lib.dir}/${logkit.jar}" todir="${dist.dir}"/> -->
   
           <mkdir dir="${dist.docs}"/>
           <mkdir dir="${dist.javadocs}"/>
  @@ -500,7 +500,7 @@
               </fileset>
           </copy>
   
  -        <copy file="${lib.dir}/${logkit.jar}" todir="${src.dist.lib}"/>
  +	<!-- <copy file="${lib.dir}/${logkit.jar}" todir="${src.dist.lib}"/> -->
   
           <copy todir="${src.dist.src}">
         <fileset dir="${src.dir}">
  
  
  
  1.5       +42 -2     avalon/check-targets.ent
  
  Index: check-targets.ent
  ===================================================================
  RCS file: /home/cvs/avalon/check-targets.ent,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- check-targets.ent	10 Feb 2003 18:10:56 -0000	1.4
  +++ check-targets.ent	10 Feb 2003 19:07:55 -0000	1.5
  @@ -49,7 +49,7 @@
       <property file="check-targets.properties"/>
       <target name="setup-dependencies">
           <available property="bsf.present"
  -               classname="com.bsf.BSFEngine"
  +               classname="com.ibm.bsf.BSFEngine"
                  classpathref="project.class.path" />
           <available property="checkstyle.present"
                  classname="com.puppycrawl.tools.checkstyle.Checker"
  @@ -81,6 +81,9 @@
           <available property="logkit.present"
              classname="org.apache.log.Hierarchy"
              classpathref="project.class.path" />
  +	<available property="rhino.present"
  +	   classname="org.mozilla.javascript.Parser"
  +	   classpathref="project.class.path"/>
   
       </target>
   
  @@ -153,7 +156,7 @@
       </condition>
       <fail if="do.abort">Download aborted.</fail>
   
  -    <get src="${jar.repository}/${id}/jars/${id}-${version}.jar"
  +    <get src="${jar.repository}/${id}/jars/${jar.id}-${version}.jar"
           dest="${lib.dir}/${id}-${version}.jar"
           verbose="true"
           usetimestamp="true"/>
  @@ -170,6 +173,7 @@
     <target name="bsf-check" unless="bsf.present" depends="setup-dependencies">
       <antcall target="missing-dependency">
         <param name="id" value="${bsf.id}"/>
  +      <param name="jar.id" value="${bsf.id}"/>
         <param name="version" value="${bsf.version}"/>
         <param name="license" value="${bsf.license}"/>
         <param name="license.url" value="${bsf.license.url}"/>
  @@ -179,6 +183,7 @@
     <target name="import-bsf" depends="setup-dependencies">
       <antcall target="import-dependency">
         <param name="id" value="${bsf.id}"/>
  +      <param name="jar.id" value="${bsf.id}"/>
         <param name="version" value="${bsf.version}"/>
         <param name="license" value="${bsf.license}"/>
         <param name="license.url" value="${bsf.license.url}"/>
  @@ -189,6 +194,7 @@
     <target name="checkstyle-check" unless="checkstyle.present" depends="setup-dependencies">
       <antcall target="missing-dependency">
         <param name="id" value="${checkstyle.id}"/>
  +      <param name="jar.id" value="${checkstyle.id}"/>
         <param name="version" value="${checkstyle.version}"/>
         <param name="license" value="${checkstyle.license}"/>
         <param name="license.url" value="${checkstyle.license.url}"/>
  @@ -198,6 +204,7 @@
     <target name="import-checkstyle" depends="setup-dependencies">
       <antcall target="import-dependency">
         <param name="id" value="${checkstyle.id}"/>
  +      <param name="jar.id" value="${checkstyle.id}"/>
         <param name="version" value="${checkstyle.version}"/>
         <param name="license" value="${checkstyle.license}"/>
         <param name="license.url" value="${checkstyle.license.url}"/>
  @@ -208,6 +215,7 @@
     <target name="commons-logging-check" unless="commons-logging.present" depends="setup-dependencies">
       <antcall target="missing-dependency">
         <param name="id" value="${commons-logging.id}"/>
  +      <param name="jar.id" value="${commons-logging.id}"/>
         <param name="version" value="${commons-logging.version}"/>
         <param name="license" value="${commons-logging.license}"/>
         <param name="license.url" value="${commons-logging.license.url}"/>
  @@ -217,6 +225,7 @@
     <target name="import-commons-logging" depends="setup-dependencies">
       <antcall target="import-dependency">
         <param name="id" value="${commons-logging.id}"/>
  +      <param name="jar.id" value="${commons-logging.id}"/>
         <param name="version" value="${commons-logging.version}"/>
         <param name="license" value="${commons-logging.license}"/>
         <param name="license.url" value="${commons-logging.license.url}"/>
  @@ -227,6 +236,7 @@
     <target name="javamail-check" unless="javax.mail.present" depends="setup-dependencies">
       <antcall target="missing-dependency-noauto">
         <param name="id" value="${javamail.id}"/>
  +      <param name="jar.id" value="${javamail.id}"/>
         <param name="version" value="${javamail.version}"/>
         <param name="license" value="${javamail.license}"/>
         <param name="license.url" value="${javamail.license.url}"/>
  @@ -238,6 +248,7 @@
     <target name="jdbc-check" unless="javax.sql.present" depends="setup-dependencies">
       <antcall target="missing-dependency-noauto">
         <param name="id" value="${jdbc.id}"/>
  +      <param name="jar.id" value="${jdbc.id}"/>
         <param name="version" value="${jl.version}"/>
         <param name="license" value="${jdbc.license}"/>
         <param name="license.url" value="${jdbc.license.url}"/>
  @@ -259,6 +270,7 @@
     <target name="jms-check" unless="javax.jms.present" depends="setup-dependencies">
       <antcall target="missing-dependency-noauto">
         <param name="id" value="${jms.id}"/>
  +      <param name="jar.id" value="${jms.id}"/>
         <param name="version" value="${jms.version}"/>
         <param name="license" value="${jms.license}"/>
         <param name="license.url" value="${jms.license.url}"/>
  @@ -270,6 +282,7 @@
     <target name="junit-check" unless="junit.present" depends="setup-dependencies">
       <antcall target="missing-dependency">
         <param name="id" value="${junit.id}"/>
  +      <param name="jar.id" value="${junit.id}"/>
         <param name="version" value="${junit.version}"/>
         <param name="license" value="${junit.license}"/>
         <param name="license.url" value="${junit.license.url}"/>
  @@ -279,6 +292,7 @@
     <target name="import-junit" depends="setup-dependencies">
       <antcall target="import-dependency">
         <param name="id" value="${junit.id}"/>
  +      <param name="jar.id" value="${junit.id}"/>
         <param name="version" value="${junit.version}"/>
         <param name="license" value="${junit.license}"/>
         <param name="license.url" value="${junit.license.url}"/>
  @@ -289,6 +303,7 @@
     <target name="log4j-check" unless="log4j.present" depends="setup-dependencies">
       <antcall target="missing-dependency">
         <param name="id" value="${log4j.id}"/>
  +      <param name="jar.id" value="${log4j.id}"/>
         <param name="version" value="${log4j.version}"/>
         <param name="license" value="${log4j.license}"/>
         <param name="license.url" value="${log4j.license.url}"/>
  @@ -298,6 +313,7 @@
     <target name="import-log4j" depends="setup-dependencies">
       <antcall target="import-dependency">
         <param name="id" value="${log4j.id}"/>
  +      <param name="jar.id" value="${log4j.id}"/>
         <param name="version" value="${log4j.version}"/>
         <param name="license" value="${log4j.license}"/>
         <param name="license.url" value="${log4j.license.url}"/>
  @@ -308,6 +324,7 @@
     <target name="logkit-check" unless="logkit.present" depends="setup-dependencies">
       <antcall target="missing-dependency">
         <param name="id" value="${logkit.id}"/>
  +      <param name="jar.id" value="${logit.id}"/>
         <param name="version" value="${logkit.version}"/>
         <param name="license" value="${logkit.license}"/>
         <param name="license.url" value="${logkit.license.url}"/>
  @@ -317,16 +334,39 @@
     <target name="import-logkit" depends="setup-dependencies">
       <antcall target="import-dependency">
         <param name="id" value="${logkit.id}"/>
  +      <param name="jar.id" value="${logkit.id}"/>
         <param name="version" value="${logkit.version}"/>
         <param name="license" value="${logkit.license}"/>
         <param name="license.url" value="${logkit.license.url}"/>
       </antcall>
     </target>
   
  +  <!-- Rhino -->
  +  <target name="rhino-check" unless="rhino.present" depends="setup-dependencies">
  +    <antcall target="missing-dependency">
  +      <param name="id" value="${rhino.id}"/>
  +      <param name="jar.id" value="${rhino.jar.id}"/>
  +      <param name="version" value="${rhino.version}"/>
  +      <param name="license" value="${rhino.license}"/>
  +      <param name="license.url" value="${rhino.license.url}"/>
  +    </antcall>
  +  </target>
  +
  +  <target name="import-rhino" depends="setup-dependencies">
  +    <antcall target="import-dependency">
  +      <param name="id" value="${rhino.id}"/>
  +      <param name="jar.id" value="${rhino.jar.id}"/>
  +      <param name="version" value="${rhino.version}"/>
  +      <param name="license" value="${rhino.license}"/>
  +      <param name="license.url" value="${rhino.license.url}"/>
  +    </antcall>
  +  </target>
  +
     <!-- Servlet API -->
     <target name="servletapi-check" unless="javax.servlet.present" depends="setup-dependencies">
       <antcall target="missing-dependency-noauto">
         <param name="id" value="${servletapi.id}"/>
  +      <param name="jar.id" value="${servletapi.id}"/>
         <param name="version" value="${servletapi.version}"/>
         <param name="license" value="${servletapi.license}"/>
         <param name="license.url" value="${servletapi.license.url}"/>
  
  
  
  1.3       +10 -0     avalon/check-targets.properties
  
  Index: check-targets.properties
  ===================================================================
  RCS file: /home/cvs/avalon/check-targets.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- check-targets.properties	8 Feb 2003 17:27:36 -0000	1.2
  +++ check-targets.properties	10 Feb 2003 19:07:55 -0000	1.3
  @@ -11,6 +11,8 @@
   lgpl.license=GNU Lesser General Public License
   lgpl.license.url=http://www.opensource.org/licenses/lgpl-license.php
   sbcl.license=Sun Binary Code License
  +npl.license=Netzcape Public License
  +npl.license.url=http://www.mozilla.org/MPL/NPL-1.1.html
   
   # BSF
   bsf.version=2.2
  @@ -74,6 +76,14 @@
   logkit.license=${asl.license}
   logkit.license.url=${asl.license.url}
   logkit.dist.url=http://avalon.apache.org/logkit/
  +
  +# Rhino
  +rhino.version=1.5R4-RC3
  +rhino.id=rhino
  +rhino.jar.id=js
  +rhino.license=${npl.license}
  +rhino.license.url=${npl.license.url}
  +rhino.dist.urlftp:ftp://ftp.mozilla.org/pub/js/
   
   # Servlet API
   servletapi.version=2.2
  
  
  

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


Mime
View raw message