avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon/tools announcement.xml
Date Mon, 10 Feb 2003 18:10:56 GMT
bloritsch    2003/02/10 10:10:56

  Modified:    .        build.xml check-targets.ent
               tools    announcement.xml
  Log:
  apply some fixes to the announcement build
  
  Revision  Changes    Path
  1.167     +19 -29    avalon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon/build.xml,v
  retrieving revision 1.166
  retrieving revision 1.167
  diff -u -r1.166 -r1.167
  --- build.xml	9 Feb 2003 20:55:19 -0000	1.166
  +++ build.xml	10 Feb 2003 18:10:56 -0000	1.167
  @@ -60,6 +60,7 @@
       <property name="java.dir" value="${src.dir}/java"/>
       <property name="test.dir" value="${src.dir}/test"/>
       <property name="conf.dir" value="${src.dir}/conf"/>
  +    <property name="xdocs.dir" value="${src.dir}/xdocs"/>
       <property name="lib.dir" value="lib"/>
       <property name="tools.dir" value="tools"/>
       <property name="docs.dir" value="docs"/>
  @@ -109,7 +110,7 @@
   
       <target name="dist.lite" depends="main"/>
       <target name="help" depends="usage"/>
  -    
  +
       <!-- Set up properties -->
       <target name="setup-properties" depends="setup-dependencies">
           <property name="dist.dir" value="${dist.base}/${dist.name}"/>
  @@ -299,7 +300,7 @@
           <!-- todo: remove -->
           <mkdir dir="${target.docs}/framework/diagrams"/>
       </target>
  -  
  +
       <!-- Create the API documentation -->
       <target name="javadocs" description="generates the API documentation (java 1.2+
only)">
   
  @@ -392,33 +393,22 @@
           <mkdir dir="${target.dir}" />
           <mkdir dir="${dist.base}" />
   
  -        <copy todir="${target.context}" overwrite="true" filtering="on">
  -            <fileset dir="${context.dir}">
  -                <exclude name="**/*.ico"/>
  -                <exclude name="**/*.gif"/>
  -                <exclude name="**/*.jpg"/>
  -                <exclude name="**/*.png"/>
  +        <copy todir="${target.docs}" overwrite="true" filtering="on">
  +            <fileset dir="${xdocs.dir}">
  +              <include name="changes.xml"/>
               </fileset>
  -        </copy>
  -        <copy todir="${target.context}" filtering="off">
  -            <fileset dir="${context.dir}">
  -                <include name="**/*.ico"/>
  -                <include name="**/*.gif"/>
  -                <include name="**/*.jpg"/>
  -                <include name="**/*.png"/>
  +            <fileset dir="${tools.dir}">
  +              <include name="announcement.xml"/>
               </fileset>
           </copy>
  -        <copy todir="${target.xdocs}" overwrite="true" filtering="on">
  -            <fileset dir="${xdocs.dir}"/>
  -        </copy>
   
  -        <style style="${announce2txt}" in="${tools.dir}/announcement.xml"
  +        <style style="${announce2txt}" in="${target.docs}/announcement.xml"
               out="Announcement.txt"/>
  -        <style style="${announce2header}" in="${tools.dir}/announcement.xml"
  +        <style style="${announce2header}" in="${target.docs}/announcement.xml"
               out="${dist.base}/HEADER.html"/>
  -        <style style="${announce2readme}" in="${tools.dir}/announcement.xml"
  +        <style style="${announce2readme}" in="${target.docs}/announcement.xml"
               out="${dist.base}/README.html"/>
  -        <style style="${announce2site}" in="${tools.dir}/announcement.xml"
  +        <style style="${announce2site}" in="${target.docs}/announcement.xml"
               out="jakarta-news.xml"/>
   
       </target>
  @@ -513,13 +503,13 @@
           <copy file="${lib.dir}/${logkit.jar}" todir="${src.dist.lib}"/>
   
           <copy todir="${src.dist.src}">
  -	  <fileset dir="${src.dir}">
  -	    <exclude name="**/*.zip"/>
  -	    <exclude name="src/diagrams/**"/>
  -	    <exclude name="src/documentation/**"/>
  -	    <exclude name="src/logos/**"/>
  -	    <exclude name="src/maven/**"/>
  -	    <exclude name="src/proposal/**"/>
  +      <fileset dir="${src.dir}">
  +        <exclude name="**/*.zip"/>
  +        <exclude name="src/diagrams/**"/>
  +        <exclude name="src/documentation/**"/>
  +        <exclude name="src/logos/**"/>
  +        <exclude name="src/maven/**"/>
  +        <exclude name="src/proposal/**"/>
             </fileset>
           </copy>
   
  
  
  
  1.4       +78 -78    avalon/check-targets.ent
  
  Index: check-targets.ent
  ===================================================================
  RCS file: /home/cvs/avalon/check-targets.ent,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- check-targets.ent	8 Feb 2003 17:27:36 -0000	1.3
  +++ check-targets.ent	10 Feb 2003 18:10:56 -0000	1.4
  @@ -20,10 +20,10 @@
     &check-targets;
   
   4) define the properties
  -	- lib.dir
  -	- project.class.path
  -	- Name
  -  
  +    - lib.dir
  +    - project.class.path
  +    - Name
  +
   This is like expanding a macro: it pulls in the contents of this file.
   
   A minimal build.xml would thus be:
  @@ -55,8 +55,8 @@
                  classname="com.puppycrawl.tools.checkstyle.Checker"
                  classpathref="project.class.path" />
           <available property="commons-logging.present"
  -	       classname="org.apache.comons.logging.Log"
  -	       classpathref="project.class.path" />
  +           classname="org.apache.comons.logging.Log"
  +           classpathref="project.class.path" />
         <available property="javax.jms.present"
                  classname="javax.jms.TopicConnection"
                  classpathref="project.class.path" />
  @@ -70,101 +70,101 @@
                  classname="javax.sql.DataSource"
                  classpathref="project.class.path" />
           <available property="jdk14.present"
  -	       classname="java.util.logging.Logger"
  -	       classpathref="project.class.path" />
  +           classname="java.util.logging.Logger"
  +           classpathref="project.class.path" />
           <available property="junit.present"
                  classname="junit.framework.Test"
                  classpathref="project.class.path" />
           <available property="log4j.present"
  -	       classname="org.apache.log4j.Level"
  -	       classpathref="project.class.path" />
  +           classname="org.apache.log4j.Level"
  +           classpathref="project.class.path" />
           <available property="logkit.present"
  -	       classname="org.apache.log.Hierarchy"
  -	       classpathref="project.class.path" />
  +           classname="org.apache.log.Hierarchy"
  +           classpathref="project.class.path" />
   
       </target>
   
     <!-- called if a dependency is missing which has a BSD or ASL or
          similar license for which autodownload is okay. -->
     <target name="missing-dependency">
  -	<echo>
  -	*************************************************************************
  -	Classes needed for compiling ${Name} against the ${id} API
  -	are not available. The build may fail or some functionality may
  -	not be available.
  -	
  -	Recovery:
  -	Run the build target import-${id} and it will download
  -	the needed jar - you should be online for that.
  -	
  -	If you have a fast connection you can also just run the build target
  -	import-all-auto-dependencies, which will download all external jars this
  -	buildfile knows about.
  -	Note this may download unused jars as well.
  -	*************************************************************************
  -	</echo>
  -	<echo/>
  +    <echo>
  +    *************************************************************************
  +    Classes needed for compiling ${Name} against the ${id} API
  +    are not available. The build may fail or some functionality may
  +    not be available.
  +
  +    Recovery:
  +    Run the build target import-${id} and it will download
  +    the needed jar - you should be online for that.
  +
  +    If you have a fast connection you can also just run the build target
  +    import-all-auto-dependencies, which will download all external jars this
  +    buildfile knows about.
  +    Note this may download unused jars as well.
  +    *************************************************************************
  +    </echo>
  +    <echo/>
     </target>
   
     <!-- called if a dependency is missing which we cannot autodownload
          due to licensing-->
     <target name="missing-dependency-noauto">
  -	<echo>
  -	*************************************************************************
  -	Classes needed for compiling ${Name} against the ${id} API
  -	are not available. The build may fail or some functionality may
  -	not be available.
  -	
  -	Recovery:
  -	Get the ${id} jar from the ${id} distribution at
  -	${dist.url}
  -	and place it in ${lib.dir}.
  -	
  -	Please note that ${id} is licensed under the ${license}
  -	and that by downloading it you are agreeing to that license. You can read
  -	this license at
  -	${license.url}
  -	*************************************************************************
  -	</echo>
  -	<echo/>
  +    <echo>
  +    *************************************************************************
  +    Classes needed for compiling ${Name} against the ${id} API
  +    are not available. The build may fail or some functionality may
  +    not be available.
  +
  +    Recovery:
  +    Get the ${id} jar from the ${id} distribution at
  +    ${dist.url}
  +    and place it in ${lib.dir}.
  +
  +    Please note that ${id} is licensed under the ${license}
  +    and that by downloading it you are agreeing to that license. You can read
  +    this license at
  +    ${license.url}
  +    *************************************************************************
  +    </echo>
  +    <echo/>
     </target>
  -  
  +
     <!-- this target fetches a file from a maven repository -->
     <target name="import-dependency">
  -	<get src="${license.url}"
  -		dest="${lib.dir}/${id}.LICENSE.html"
  -		usetimestamp="true"/>
  -	<loadfile property="license.text" srcFile="${lib.dir}/${id}.LICENSE.html"/>
  -	<echo>
  -	*************************************************************************
  -	You have requested to download the ${id} jar, which is licensed under
  -	the ${license}. A copy of this license has been saved to
  -	${lib.dir}/${id}.LICENSE.html
  -	
  -	Please view it now.
  -	*************************************************************************
  -	</echo>
  -	<input message="Do you agree to the terms of this license?"
  -		validargs="y,n"
  -		addproperty="do.download"/>
  -
  -	<condition property="do.abort">
  -		<equals arg1="n" arg2="${do.download}"/>
  -	</condition>
  -	<fail if="do.abort">Download aborted.</fail>
  -	
  -	<get src="${jar.repository}/${id}/jars/${id}-${version}.jar"
  -		dest="${lib.dir}/${id}-${version}.jar"
  -		verbose="true"
  -		usetimestamp="true"/>
  +    <get src="${license.url}"
  +        dest="${lib.dir}/${id}.LICENSE.html"
  +        usetimestamp="true"/>
  +    <loadfile property="license.text" srcFile="${lib.dir}/${id}.LICENSE.html"/>
  +    <echo>
  +    *************************************************************************
  +    You have requested to download the ${id} jar, which is licensed under
  +    the ${license}. A copy of this license has been saved to
  +    ${lib.dir}/${id}.LICENSE.html
  +
  +    Please view it now.
  +    *************************************************************************
  +    </echo>
  +    <input message="Do you agree to the terms of this license?"
  +        validargs="y,n"
  +        addproperty="do.download"/>
  +
  +    <condition property="do.abort">
  +        <equals arg1="n" arg2="${do.download}"/>
  +    </condition>
  +    <fail if="do.abort">Download aborted.</fail>
  +
  +    <get src="${jar.repository}/${id}/jars/${id}-${version}.jar"
  +        dest="${lib.dir}/${id}-${version}.jar"
  +        verbose="true"
  +        usetimestamp="true"/>
     </target>
   
     <target name="check-all-dependencies"
             depends="bsf-check,checkstyle-check,javamail-check,jdbc-check,jms-check,junit-check,log4j-check,logkit-check,servletapi-check,commons-logging-check"
  -	  description="checks for all dependencies we know about. This is usually more than the
minimum needed to build this project; actual use is not recommended."/>
  +      description="checks for all dependencies we know about. This is usually more than
the minimum needed to build this project; actual use is not recommended."/>
     <target name="import-all-auto-dependencies"
             depends="import-bsf,import-checkstyle,import-junit,import-log4j,import-logkit,import-commons-logging"
  -	  description="checks for all dependencies we know about. This is usually more than the
minimum needed to build this project; actual use is not recommended."/>
  +      description="checks for all dependencies we know about. This is usually more than
the minimum needed to build this project; actual use is not recommended."/>
   
     <!-- BSF -->
     <target name="bsf-check" unless="bsf.present" depends="setup-dependencies">
  @@ -213,7 +213,7 @@
         <param name="license.url" value="${commons-logging.license.url}"/>
       </antcall>
     </target>
  -  
  +
     <target name="import-commons-logging" depends="setup-dependencies">
       <antcall target="import-dependency">
         <param name="id" value="${commons-logging.id}"/>
  @@ -313,7 +313,7 @@
         <param name="license.url" value="${logkit.license.url}"/>
       </antcall>
     </target>
  -  
  +
     <target name="import-logkit" depends="setup-dependencies">
       <antcall target="import-dependency">
         <param name="id" value="${logkit.id}"/>
  
  
  
  1.3       +1 -1      avalon/tools/announcement.xml
  
  Index: announcement.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tools/announcement.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- announcement.xml	6 Feb 2003 13:31:50 -0000	1.2
  +++ announcement.xml	10 Feb 2003 18:10:56 -0000	1.3
  @@ -52,7 +52,7 @@
         </para>
       </description>
       <changes version="@version@" file="changes.xml"/>
  -    <downloads name="Avalon" base="http://jakarta.apache.org/builds/avalon/release/@name@"/>
  +    <downloads name="Avalon" base="http://avalon.apache.org/bindownload.cgi"/>
     </project>
   
   </announcement>
  
  
  

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


Mime
View raw message