incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: incubator-ftpserver build.xml forrest.properties
Date Wed, 07 Sep 2005 05:13:18 GMT
rana_b      2005/09/06 22:13:18

  Modified:    .        build.xml forrest.properties
  Log:
  refactored
  
  Revision  Changes    Path
  1.4       +127 -437  incubator-ftpserver/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	19 Oct 2003 15:52:35 -0000	1.3
  +++ build.xml	7 Sep 2005 05:13:18 -0000	1.4
  @@ -1,459 +1,149 @@
   <?xml version="1.0"?>
  -
  -  <!DOCTYPE project [
  -    <!ENTITY forrest-targets SYSTEM "file:./forrest-targets.ent">
  -  ]>
  -
  -<!-- 
  -  ==============================================================================
  -  $Id$
  -  FTP server build file
  -  Legal:
  -  Copyright (c) 1999-2002 The Apache Software Foundation. All Rights Reserved.
  -  ==============================================================================
  - -->
  +<!--
  +  Copyright 2002-2004 The Apache Software Foundation or its licensors,
  +  as applicable.
  +
  +  Licensed under the Apache License, Version 2.0 (the "License");
  +  you may not use this file except in compliance with the License.
  +  You may obtain a copy of the License at
  +
  +      http://www.apache.org/licenses/LICENSE-2.0
  +
  +  Unless required by applicable law or agreed to in writing, software
  +  distributed under the License is distributed on an "AS IS" BASIS,
  +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +  See the License for the specific language governing permissions and
  +  limitations under the License.
  +-->
   <project default="usage" basedir=".">
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file=".ant.properties"/>
  -    <property file="${user.home}/.ant.properties"/>
  -    <property file="${basedir}/../default.properties"/>
  -    <property file="${basedir}/default.properties"/>    
  -    <property name="admin.name" value="ftp-admin"/>
  -    <property name="version" value="1.0"/>
  -    <property name="year" value="1999-2003"/>
  -
  -    <!-- 
  -       There should be no need to override default compiler but need to change
  -       javac task to run without this 
  -    -->
  -    <property name="build.compiler" value="modern"/>
       
  -    <!--
  -      these are here only for those who use jikes compiler. For other
  -      developers this part makes no difference.
  -    -->
  -    <property name="build.compiler.emacs" value="on"/>
  -    <property name="build.compiler.pedantic" value="true"/>
  -    <property name="build.compiler.depend" value="true"/>
  -    <property name="build.compiler.fulldepend" value="true"/>
  -    <property name="debug" value="on"/>
  -    <property name="optimize" value="on"/>
  -    <property name="deprecation" value="off"/>
  -
  -    <!--
  -       Set the properties for intermediate directories
  -    -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.javadocs" value="${build.dir}/javadocs"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -
  -    <!--
  -       Set the properties for source directories and parameters
  -    -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="manifest.src" value="${src.dir}/manifest"/>
  -
  -    <!--
  -       Set the properties for the distribution directories
  -    -->
  -    <property name="dist.base" value="dist"/>
  -    <property name="dist.name" value="${name}-${version}"/>
  -    <property name="dist.dir" value="${dist.base}/${dist.name}"/>
  -    <property name="dist.bin" value="${dist.dir}/bin"/>
  -    <property name="dist.binary.dir" value="${dist.dir}/downloads/bin"/>
  -    <property name="dist.source.dir" value="${dist.dir}/downloads/src"/>
  -
  -    <!--
  -       Third party binary directories
  -    -->
  -    <property name="lib.dir" value="lib"/>
  -    <property name="phoenix.dir" value="phoenix-bin"/>
  -    <property name="phoenix.lib.dir" value="${phoenix.dir}/lib"/>
  -
  -    <!--
  -       Set the properties for the website directories
  -    -->
  -    <property name="www.dir" value="www"/>
  -
  -    <!--
  -       Set the classpath
  -    -->
  -    <path id="project.class.path">
  -        <pathelement path="${java.class.path}"/>
  -        <fileset dir="${lib.dir}">
  -            <include name="*.jar"/>
  -        </fileset>
  -        <fileset dir="${lib.dir}/buildtime">
  -            <include name="*.jar"/>
  -        </fileset>
  -        <fileset dir="${phoenix.lib.dir}">
  -            <include name="*.jar"/>
  -        </fileset>
  -        <pathelement path="${build.classes}"/>
  -    </path>
  -
  +    <!-- project name -->
  +    <property name="project.name"    value="ftpserver"/>
  +    <property name="project.title"   value="FtpServer"/>
  +    <property name="project.version" value="1.0"/>
  +
  +    <!-- all project directories -->
  +    <property name="project.dir"           value="${basedir}"/>
  +    <property name="project.src"           value="${project.dir}/src"/>
  +    <property name="project.src.java"      value="${project.src}/java"/>
  +    <property name="project.src.bin"       value="${project.src}/bin"/>
  +    <property name="project.build"         value="${project.dir}/build"/>
  +    <property name="project.build.classes" value="${project.build}/classes"/>
  +    <property name="project.build.dist"    value="${project.build}/dist"/>
  +    <property name="project.build.site"    value="${project.build}/site"/>
  +    <property name="project.build.javadoc" value="${project.build.site}/javadoc"/>
       
  -    <!--
  -       Task definitions
  -    -->
  -    <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
  -        <classpath refid="project.class.path"/>
  -    </taskdef>
  -
  -    <taskdef name="generatemeta" classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
  -        <classpath refid="project.class.path" />
  -    </taskdef>
  -
  -
  -    <!--
  -       ===================================================================
  -                              Display usage
  -       ===================================================================
  -    -->
  -    <target name="usage">
  -        <echo message=""/>
  -        <echo message="${Name} Build file"/>
  -        <echo message="-------------------------------------------------------------"/>
  -        <echo message=" available targets are:"/>
  -        <echo message=""/>
  -        <echo message="   dist-lite --> generates unpacked distribution "/>
  -        <echo message="   compile   --> compiles the source code"/>
  -        <echo message="   dist      --> generates all the ${name} distributions,
packed"/>
  -        <echo message="   clean     --> cleans up the directory"/>
  -        <echo message="   javadocs  --> creates the Javadoc"/>
  -        <echo message=""/>
  -        <echo message=" See the comments inside the build.xml file for more details."/>
  -        <echo message="-------------------------------------------------------------"/>
  -        <echo message=""/>
  -    </target>
  -
  -
  -    <!--
  -       ===================================================================
  -        Prepare-common target - common tasks executed in preparation for
  -        all targets
  -       ===================================================================
  -     -->
  -    <target name="prepare-common">
  -    <echo message="Preparing code"/>
  +    <!-- all compilatin attributes -->
  +    <property name="project.compiler.optimization" value="off"/>
  +    <property name="project.compiler.debug"        value="on"/>
  +    <property name="project.compiler.deprecation"  value="on"/>
  +
  +    <!-- FORREST_HOME must be set as an environment variable -->
  +    <property environment="env"/>
  +    <property name="forrest.home" value="${env.FORREST_HOME}"/>
  +    
  +    <!-- build initialization block -->
  +    <target name="init">
           <tstamp/>
  -        <available file="${phoenix.dir}/bin" type="dir" property="phoenix.bin.present"/>
  -        <mkdir dir="${dist.dir}"/>
  -        <copy todir="${dist.dir}">
  -            <fileset dir=".">
  -                <include name="LICENSE"/>
  -                <include name="README"/>
  -            </fileset>
  -        </copy>
  -    </target>
  -
  -
  -    <!--
  -       ===================================================================
  -         Copy files, set permissions and line feeds for the packaged Phoenix distribution
  -       ===================================================================
  -    -->
  -    <target name="prepare-phoenix" depends="prepare-common" if="phoenix.bin.present">
  -        <echo message="Phoenix distribution present - adjusting linefeeds and permissions,
copying files"/>
  -        
  -        <fixcrlf srcdir="${phoenix.dir}/bin" includes="phoenix.sh" eol="lf"/>
  -        <copy todir="${dist.dir}">
  -            <fileset dir="${phoenix.dir}">
  -                <exclude name="CVS/**"/>
  -            </fileset>
  -        </copy>
  -        <fixcrlf srcdir="${dist.bin}" includes="run.sh" eol="lf"/>
  -        <fixcrlf srcdir="${dist.bin}" includes="run.bat" eol="crlf"/>
  -        <chmod perm="+x">
  -            <fileset dir="${dist.bin}">
  -                <include name="run.sh"/>
  -                <include name="phoenix.sh"/>
  -            </fileset>
  -        </chmod>
  -    </target>
  -
  +        <echo message="--------- ${project.name} ${project.version} ---------"/>
  +        <echo message="Build started at: ${TSTAMP} ${TODAY}"/>
  +        <echo message="java.home   = ${java.home}"/>
  +        <echo message="project.dir = ${basedir}"/>
  +    </target>
  +
  +    <!-- display usage information -->
  +    <target name="usage" depends="init">
  +        <echo message="usage:    display this message"/>
  +        <echo message="build:    compile all java files and copy resources"/>
  +        <echo message="clean:    remove all temporary files/directories"/>
  +        <echo message="doc:      generate all documents"/>
  +        <echo message="javadoc:  generate the javadocs"/>
  +        <echo message="site:     generate FtpServer web site"/>
  +        <echo message="dist:     generate binary and source distributions"/>
  +    </target>
  +
  +    <!-- compile all the java files and copy resources -->
  +    <target name="build" depends="init">
  +        <mkdir dir="${project.build.classes}"/>
  +        <javac srcdir="${project.src.java}" 
  +               destdir="${project.build.classes}" 
  +               debug="${project.compiler.debug}" 
  +               optimize="${project.compiler.optimization}" 
  +               deprecation="${project.compiler.deprecation}"/>
   
  -    <!--
  -       ===================================================================
  -                                  Prepare target
  -       ===================================================================
  -    -->
  -    <target name="prepare" depends="prepare-common,prepare-phoenix"/>
  -
  -
  -    <!--
  -       ===================================================================
  -                                  Compile
  -       ===================================================================
  -    -->
  -    <target name="compile" depends="prepare">
  -        <echo message="Compiling ${Name} Java sources"/>
  -        <available property="jndi.present" classname="javax.naming.InitialContext"/>
  -        <mkdir dir="${build.classes}"/>
  -        <javac destdir="${build.classes}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}">
  -            <classpath refid="project.class.path"/>
  -            <src path="${java.dir}"/>
  -            <exclude name="org/apache/avalon/${name}/usermanager/LdapUserManager.java"
unless="jndi.present"/>
  -        </javac>
  -        
  -        <rmic base="${build.classes}" classpathref="project.class.path"  includes="**/${name}/remote/*.class,**/gui/remote/*.class"/>
  -
  -        <copy todir="${build.classes}">
  -            <fileset dir="${java.dir}">
  +        <copy todir="${project.build.classes}">
  +            <fileset dir="${project.src.java}">
                   <exclude name="**/*.java"/>
  -                <exclude name="**/CVS/*"/>
               </fileset>
           </copy>
  -
  -        <generatemeta dest="${build.classes}">
  -            <fileset dir="${java.dir}">
  -                <include name="**/*.java" />
  -            </fileset>
  -        </generatemeta>
  -    </target>
  -
  -
  -    <!--
  -       ===================================================================
  -                                     Javadocs
  -       ===================================================================
  -    -->
  -    <target name="javadocs">
  -    <echo message="Making Javadocs"/>
  -        <delete dir="${build.javadocs}"/>
  -        <mkdir dir="${build.javadocs}"/>
  -        <javadoc packagenames="org.apache.*" sourcepath="${java.dir}" destdir="${build.javadocs}">
  -            <classpath refid="project.class.path"/>
  -            <doclet name="com.sun.tools.doclets.standard.Standard">
  -                <param name="-author"/>
  -                <param name="-version"/>
  -                <param name="-use"/>
  -                <param name="-breakiterator"/>
  -                <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="http://jakarta.apache.org/avalon/api"/>
  -                <param name="-link" value="http://jakarta.apache.org/avalon/phoenix/api"/>
  -                <param name="-link" value="http://jakarta.apache.org/avalon/cornerstone/api"/>
  -                <param name="-link" value="http://jakarta.apache.org/avalon/logkit/api"/>
  -                <param name="-doctitle" value="${Name} ${version}"/>
  -                <param name="-windowtitle" value="${Name} API"/>
  -                <param name="-bottom" value="&quot;Copyright &#169; ${year}
Apache Jakarta Project. All Rights Reserved.&quot;"/>
  -            </doclet>
  -        </javadoc>
  -    </target>
  -
  -    <!--
  -       ===================================================================
  -                          Build all distributions
  -       ===================================================================
  -    -->
  -    <target name="dist" depends="dist-bin,dist-src"/>
  -
  -
  -    <!--
  -       ===================================================================
  -                       Make sar and admin jar files
  -       ===================================================================
  -    -->
  -    <target name="jar" depends="compile">
  -    <echo message="Making ${Name} Sarfile (${name}.sar)"/>
  -
  -        <!-- builds ftp server jar file -->
  -        <mkdir dir="${build.lib}"/>
  -        <jar jarfile="${build.lib}/${name}.jar" basedir="${build.classes}">
  -            <exclude name="**/gui/*"/>
  -            <exclude name="**/gui/help/*"/>
  -        </jar>
  -
  -        <!-- make sar file -->
  -        <sar sarfile="${build.lib}/${name}.sar" config="${conf.dir}/config.xml" environment="${conf.dir}/environment.xml"
assembly="${conf.dir}/assembly.xml">
  -            <lib dir="${build.lib}/">
  -                <include name="*.jar"/>
  -            </lib>
  -            <lib dir="lib">
  -                <include name="*.jar"/>
  -            </lib>
  -        </sar>
  -
  -        <!-- remote admin jar file -->
  -        <jar jarfile="${build.lib}/${admin.name}.jar" manifest="${manifest.src}/ftp-admin.mf">
  -            <fileset dir="${build.classes}">
  -                <include name="**/gui/**"/>
  -                <include name="**/${name}/remote/**"/>
  -                <include name="**/${name}/FtpUser.class"/>
  -                <include name="**/usermanager/User.class"/>
  -                <include name="**/usermanager/UserManagerInterface.class"/>
  -                <include name="**/ip/IpRestrictorInterface.class"/>
  -                <include name="**/util/*"/>
  -            </fileset>
  -        </jar>
       </target>
   
  -
  -    <!--
  -       ===================================================================
  -                 Make dist directory with unpacked dist ready to run
  -       ===================================================================
  -    -->
  -    <target name="dist-lite" depends="jar">
  -    <echo message="Installing ${Name} to ${dist.dir}"/>
  -
  -        <!--installs sar into ./dist/ ready to test-->
  -        <copy file="${build.lib}/${name}.sar" todir="${dist.dir}/apps"/>
  +    <!-- remove all the generated files -->
  +    <target name="clean" depends="init">
  +        <delete dir="${project.build}"/>
  +    </target>    
  +    
  +    <!-- generate doc -->
  +    <target name="doc" depends="init,check-forrest-installed">
  +        <condition property="forrest.script" value="${forrest.home}/bin/forrest">
  +            <os family="unix"/>
  +        </condition>
  +        <condition property="forrest.script" value="${forrest.home}/bin/forrest.bat">
  +            <os family="windows"/>
  +        </condition>
           
  +        <exec dir="${project.dir}" executable="${forrest.script}">
  +            <arg line="site"/>
  +        </exec>
       </target>
       
  -
  -    <!--
  -       ===================================================================
  -                                  binary distributions
  -       ===================================================================
  -    -->
  -    <target name="dist-bin-phoenix-warn" depends="dist-bin-common" unless="phoenix.bin.present">
  -        <echo message ="The Phoenix distribution is not present - the ${Name} w/Phoenix
binary distribution will not be built."/>
  +    <!-- check forrest installation -->
  +    <target name="check-forrest-installed" unless="env.FORREST_HOME">
  +        <echo message="Please install Apache Forrest (http://xml.apache.org/forrest/index.html)."/>
  +        <echo message="After that set FORREST_HOME environment variable."/>
  +        <fail message="Apache Forrest is not installed."/>
       </target>
  -
  -    <target name="dist-bin-phoenix" depends="dist-bin-common" if="phoenix.bin.present">
  -        <echo message ="Building binary w/Phoenix distributions"/>
  -        <zip zipfile="${dist.binary.dir}/${name}-binary-${version}.zip">
  -            <fileset dir="dist">
  -                <include name="${name}-${version}/**"/>
  -                <exclude name="${name}-${version}/downloads/**"/>
  -                <include name="release-notes.txt"/>
  -                <include name="LICENSE.txt"/>
  -            </fileset>
  -        </zip>
  -        <tar longfile="gnu" tarfile="${dist.binary.dir}/${name}-binary-${version}.tar">
  -            <tarfileset dir="dist" username="${name}" group="${name}">
  -                <include name="${name}-${version}/**"/>
  -                <exclude name="${name}-${version}/downloads/**"/>
  -                <include name="release-notes.txt"/>
  -                <include name="LICENSE.txt"/>
  -            </tarfileset>
  -        </tar>
  -        <gzip zipfile="${dist.binary.dir}/${name}-binary-${version}.tar.gz" src="${dist.binary.dir}/${name}-binary-${version}.tar"/>
  -        <delete file="${dist.binary.dir}/${name}-binary-${version}.tar"/>
  -    </target>
  -
  -    <target name="dist-bin-common" depends="dist-lite,javadocs">
  -        <echo message ="Building binary distributions"/>
  +    
  +    <!-- generate the javadocs -->
  +    <target name="javadoc" depends="init">
  +        <mkdir dir="${project.build.javadoc}"/>
  +        <javadoc sourcepath="${project.src.java}" 
  +                 destdir="${project.build.javadoc}"
  +                 packagenames="*" 
  +                 author="true"
  +                 windowtitle="${project.title} API"/>
  +    </target>
  +
  +    <!-- generate all binary distributions  -->
  +    <target name="dist" depends="init,build,doc,javadoc">
  +        <mkdir dir="${project.build.dist}"/>
  +        <jar destfile="${project.build.dist}/${project.name}.jar" basedir="${project.build.classes}"/>
  +        <fixcrlf srcdir="${project.dir}" eol="lf" eof="remove" includes="**/*.sh"/>
  +        <fixcrlf srcdir="${project.dir}" eol="crlf" includes="**/*.bat"/>
           
  -        <mkdir dir="${dist.binary.dir}"/>
  -        <copy file="${dist.dir}/apps/${name}.sar" todir="${dist.binary.dir}"/>
  -        <copy file="${build.lib}/${admin.name}.jar" todir="${dist.binary.dir}"/>
  -    </target>
  -
  -    <target name="dist-bin" depends="dist-bin-common,dist-bin-phoenix-warn,dist-bin-phoenix"/>
  -
  -
  -    <!--
  -       ===================================================================
  -                                  source distributions
  -       ===================================================================
  -    -->
  -    <target name="dist-src-phoenix-warn" depends="dist-src-common" unless="phoenix.bin.present">
  -        <echo message ="The Phoenix distribution is not present."/> 
  -        <echo message="The ${name} source distribution with Phoenix binaries will not
be built."/>
  -    </target>
  -
  -    <target name="dist-src-phoenix" depends="dist-src-common" if="phoenix.bin.present">
  -        <!--Source With Phoenix -->
  -        <echo message ="Building source distributions with Phoenix binaries"/>
  -        <zip zipfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.zip">
  -            <fileset dir=".">
  -                <include name="${dist.dir}/**"/>
  -                <exclude name="${dist.dir}/downloads/**"/>
  -                <exclude name="${dist.dir}/apps/*.sar"/>
  -                <exclude name=""/>
  -                <include name="*.txt"/>
  -                <include name="*.xml"/>
  -                <include name="KEYS"/>
  -                <include name="README"/>
  -                <include name="build.*"/>
  -                <include name="lib/**"/>
  -                <include name="${phoenix.dir}/**"/>
  -                <include name="src/**"/>
  -                <include name="tools/**"/>
  -                <include name="www/**"/>
  -            </fileset>
  +        <zip destfile="${project.build.dist}/${project.name}-${project.version}-bin.zip">
  +            <zipfileset dir="${project.build.dist}"  prefix="${project.name}-${project.version}/lib"
includes="*.jar"/>
  +            <zipfileset dir="${project.src.bin}"     prefix="${project.name}-${project.version}"/>
  +            <zipfileset dir="${project.build.site}"  prefix="${project.name}-${project.version}/doc"/>
  +            <zipfileset dir="${project.dir}"         prefix="${project.name}-${project.version}"
includes="*.txt"/>
  +            <zipfileset dir="${project.dir}/res"     prefix="${project.name}-${project.version}/res"
excludes="**/*.gen"/>
           </zip>
  -        <tar longfile="gnu" tarfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar">
  -            <tarfileset dir="." username="${name}" group="${name}">
  -                <include name="${dist.dir}/**"/>
  -                <exclude name="${dist.dir}/downloads/**"/>
  -                <exclude name="${dist.dir}/apps/*.sar"/>
  -                <include name="*.txt"/>
  -                <include name="*.xml"/>
  -                <include name="KEYS"/>
  -                <include name="README"/>
  -                <include name="build.*"/>
  -                <include name="lib/**"/>
  -                <include name="${phoenix.dir}/**"/>
  -                <include name="src/**"/>
  -                <include name="tools/**"/>
  -                <include name="www/**"/>
  -            </tarfileset>
  -        </tar>
  -        <gzip zipfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar.gz"
src="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar"/>
  -        <delete file="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar"/>
  -    </target>
  -
  -    <target name="dist-src-common" depends="dist-lite,javadocs">
  -        <echo message ="Building source distributions"/>
  -        <mkdir dir="${dist.source.dir}"/>
  -        <zip zipfile="${dist.source.dir}/${dist.name}-src.zip">
  -            <fileset dir=".">
  -                <include name="src/**"/>
  -                <include name="lib/**"/>
  -                <include name="${phoenix.lib.dir}/**"/>
  -                <include name="www/**"/>
  -                <include name="tools/**"/>
  -                <include name="*.xml"/>
  -                <include name="*.txt"/>
  -                <include name="README"/>
  -                <include name="KEYS"/>
  -                <include name="build.*"/>
  -            </fileset>
  +        
  +        <zip destfile="${project.build.dist}/${project.name}-${project.version}-src.zip">
  +            <zipfileset dir="${project.src}"     prefix="${project.name}-${project.version}/src"/>
  +            <zipfileset dir="${project.dir}"     prefix="${project.name}-${project.version}"
includes="*.bat"/>
  +            <zipfileset dir="${project.dir}"     prefix="${project.name}-${project.version}"
includes="*.txt"/>
  +            <zipfileset dir="${project.dir}"     prefix="${project.name}-${project.version}"
includes="*.xml"/>
  +            <zipfileset dir="${project.dir}"     prefix="${project.name}-${project.version}"
includes="*.properties"/>
  +            <zipfileset dir="${project.dir}/res" prefix="${project.name}-${project.version}/res"
excludes="**/*.gen"/>
           </zip>
  -        <tar longfile="gnu" tarfile="${dist.source.dir}/${dist.name}-src.tar">
  -            <tarfileset dir="." username="${name}" group="${name}">
  -                <include name="src/**"/>
  -                <include name="lib/**"/>
  -                <include name="${phoenix.lib.dir}/**"/>
  -                <include name="www/**"/>
  -                <include name="tools/**"/>
  -                <include name="*.xml"/>
  -                <include name="*.txt"/>
  -                <include name="README"/>
  -                <include name="KEYS"/>
  -                <include name="build.*"/>
  -            </tarfileset>
  -        </tar>
  -        <gzip zipfile="${dist.source.dir}/${dist.name}-src.tar.gz" src="${dist.source.dir}/${dist.name}-src.tar"/>
  -        <delete file="${dist.source.dir}/${dist.name}-src.tar"/>
       </target>
   
  -    <target name="dist-src" depends="dist-src-common,dist-src-phoenix-warn,dist-src-phoenix"/>
  -
  -    <!--
  -       ===================================================================
  -                                  delete dist/ and build/
  -       ===================================================================
  -    -->
  -    <target name="clean">
  -        <echo message ="deleting working directories ready for a clean build"/>
  -        <delete dir="${dist.dir}"/>
  -        <delete dir="${build.dir}"/>
  +    <!-- generate site -->
  +    <target name="site" depends="init,dist">
  +        <mkdir dir="${project.build.site}"/>
  +        <copy file="${project.build.dist}/${project.name}-${project.version}-bin.zip"
todir="${project.build.site}"/>
  +        <copy file="${project.build.dist}/${project.name}-${project.version}-src.zip"
todir="${project.build.site}"/>
       </target>
  -
  -    &forrest-targets;
  -
  +    
   </project>
  
  
  
  1.2       +3 -3      incubator-ftpserver/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/forrest.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- forrest.properties	31 Mar 2003 19:13:11 -0000	1.1
  +++ forrest.properties	7 Sep 2005 05:13:18 -0000	1.2
  @@ -12,7 +12,7 @@
   #project.skin=forrest-site
   #project.skin=avalon-tigris
   #project.skin=krysalis-site
  -
  +project.skin=poi-site
   
   ##############
   # layout properties
  @@ -23,7 +23,7 @@
   # project.content-dir if any other property using it is uncommented
   
   #project.status=status.xml
  -#project.content-dir=src/documentation
  +project.content-dir=src/doc
   #project.conf-dir=${project.content-dir}/conf
   #project.sitemap=${project.content-dir}/sitemap.xmap
   #project.xdocs-dir=${project.content-dir}/content/xdocs
  @@ -52,7 +52,7 @@
   # These props determine if validation is performed at all
   # Values are inherited unless overridden.
   # Eg, if forrest.validate=false, then all others are false unless set to true.
  -#forrest.validate=true
  +forrest.validate=false
   #forrest.validate.xdocs=${forrest.validate}
   #forrest.validate.skinconf=${forrest.validate}
   #forrest.validate.sitemap=${forrest.validate}
  
  
  

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


Mime
View raw message