cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject cvs commit: cocoon-2.1 build.xml
Date Tue, 11 Mar 2003 02:39:00 GMT
stefano     2003/03/10 18:38:59

  Modified:    .        build.xml
  Log:
  improving the webapp build:
- added documentation
- added javadocs
- added idldocs
- samples
are now beginning to be visible again
  
  Revision  Changes    Path
  1.6       +60 -13    cocoon-2.1/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	11 Mar 2003 00:02:18 -0000	1.5
  +++ build.xml	11 Mar 2003 02:38:59 -0000	1.6
  @@ -62,6 +62,9 @@
       <condition property="unless.exclude.webapp.javadocs">
         <istrue value="${exclude.webapp.javadocs}"/>
       </condition>
  +    <condition property="unless.exclude.webapp.idldocs">
  +      <istrue value="${exclude.webapp.idldocs}"/>
  +    </condition>
       <condition property="unless.exclude.webapp.scratchpad">
         <istrue value="${exclude.webapp.scratchpad}"/>
       </condition>
  @@ -527,11 +530,11 @@
                useexternalfile="yes"
                additionalparam="${javadoc.additionalparam}">
   
  -      <link offline="true" href="http://avalon.apache.org/api"                  packagelistloc="${resources}/javadoc/avalon"/>
  -      <link offline="true" href="http://xml.apache.org/xerces2-j/javadocs/api"  packagelistloc="${resources}/javadoc/xerces"/>
  -      <link offline="true" href="http://xml.apache.org/xalan-j/apidocs"         packagelistloc="${resources}/javadoc/xalan"/>
  -      <link offline="true" href="http://java.sun.com/j2se/1.4.1/docs/api"       packagelistloc="${resources}/javadoc/j2se"/>
  -      <link offline="true" href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api" packagelistloc="${resources}/javadoc/j2ee"/>
  +      <link offline="true" href="http://avalon.apache.org/api"                  packagelistloc="${resources.javadoc}/avalon"/>
  +      <link offline="true" href="http://xml.apache.org/xerces2-j/javadocs/api"  packagelistloc="${resources.javadoc}/xerces"/>
  +      <link offline="true" href="http://xml.apache.org/xalan-j/apidocs"         packagelistloc="${resources.javadoc}/xalan"/>
  +      <link offline="true" href="http://java.sun.com/j2se/1.4.1/docs/api"       packagelistloc="${resources.javadoc}/j2se"/>
  +      <link offline="true" href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api" packagelistloc="${resources.javadoc}/j2ee"/>
   
         <packageset dir="${java}">
           <include name="**"/>
  @@ -586,7 +589,6 @@
   
       <!-- patch the welcome page to tell we have samples to show -->
       <xpatch directory="${webapp.samples}" extension="xwelcome" configuration="${build.webapp}/welcome.xml"/>
  -
     </target>
     
     <target name="block-samples" depends="prepare" unless="unless.exclude.webapp.samples">
  @@ -609,6 +611,12 @@
   
       <copy file="${webapp}/sitemap.xmap" tofile="${build.webapp}/sitemap.xmap"/>
   
  +    <copy todir="${build.webapp}/stylesheets" filtering="on">
  +      <fileset dir="${webapp}/stylesheets">
  +        <include name="*.xsl*"/>
  +      </fileset>
  +    </copy>
  +    
       <copy todir="${build.webapp}/WEB-INF" filtering="on">
         <fileset dir="${webapp}/WEB-INF">
           <include name="entities/**"/>
  @@ -659,21 +667,60 @@
            target="patch"/>
     </target>
   
  -  <target name="prepare-webapp-samples" depends="prepare-webapp, samples, block-samples"
unless="unless.exclude.webapp.samples">
  -  </target>
  -
  +  <target name="prepare-webapp-samples" depends="prepare-webapp, samples, block-samples"
unless="unless.exclude.webapp.samples"/>
  + 
     <target name="prepare-webapp-deprecated" depends="prepare-webapp,init-xpatch" unless="unless.exclude.deprecated">
       <copy file="${build}/${name}-deprecated.jar" tofile="${build.webapp.lib}/${name}-${version}-deprecated.jar"/>
       <xpatch directory="${deprecated.conf}" extension="xconf" configuration="${build.webapp}/WEB-INF/cocoon.xconf"/>
     </target>
  +
  +  <target name="prepare-webapp-idldocs" depends="idldocs" unless="unless.exclude.webapp.idldocs">
  +    <mkdir dir="${build.webapp.idldocs}"/>
  +
  +    <copy todir="${build.webapp.idldocs}" filtering="off">
  +      <fileset dir="${build.idldocs}"/>
  +    </copy>
  +
  +    <!-- patch the welcome page to tell we have idldocs to show -->
  +    <xpatch directory="${idl}" extension="xwelcome" configuration="${build.webapp}/welcome.xml"/>
   
  +  </target>
     
  +  <target name="prepare-webapp-javadocs" depends="javadocs" unless="unless.exclude.webapp.javadocs">
  +    <mkdir dir="${build.webapp.javadocs}"/>
  +
  +    <copy todir="${build.webapp.javadocs}" filtering="off">
  +      <fileset dir="${build.javadocs}"/>
  +    </copy>
  +
  +    <!-- patch the welcome page to tell we have javadocs to show -->
  +    <xpatch directory="${resources.javadoc}" extension="xwelcome" configuration="${build.webapp}/welcome.xml"/>
   
  +  </target>
  +    
     <target name="prepare-webapp-docs" depends="init" unless="unless.exclude.webapp.documentation">
  -    <copy todir="${build.webapp}/documentation">
  -      <fileset dir="${src}/documentation"/>
  +    <mkdir dir="${build.webapp.docs}"/>
  +    
  +    <copy todir="${build.webapp.docs}" filtering="on">
  +      <fileset dir="${documentation}">
  +        <exclude name="**/*.jpg"/>
  +        <exclude name="**/*.gif"/>
  +        <exclude name="**/*.png"/>
  +      	<exclude name="*.xwelcome"/>
  +      </fileset>
       </copy>
  +
  +    <copy todir="${build.webapp.docs}" filtering="off">
  +      <fileset dir="${documentation}">
  +        <include name="**/*.jpg"/>
  +        <include name="**/*.gif"/>
  +        <include name="**/*.png"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- patch the welcome page to tell we have javadocs to show -->
  +    <xpatch directory="${documentation}" extension="xwelcome" configuration="${build.webapp}/welcome.xml"/>
   
     </target>
     
  -  <target name="webapp" depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-deprecated,validate-config,init-loader"/>
  +  <target name="webapp" depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-idldocs,prepare-webapp-deprecated,validate-config,init-loader"/>
   
     <target name="war" depends="webapp">
       <!-- A task to create manifest for webapp. -->
  
  
  

Mime
View raw message