sgala       01/09/04 04:10:39

  Modified:    build    build.xml
  Log:
  Changes to avoid deleting CVS directories on build clean, new targets 
war_fullrelease to include site and unzip-war to leave war unizpped in build.dir
  
  Revision  Changes    Path
  1.100     +67 -5     jakarta-jetspeed/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- build.xml 2001/08/23 23:30:20     1.99
  +++ build.xml 2001/09/04 11:10:39     1.100
  @@ -331,12 +331,14 @@
                   <include name="**/*.gif"/>
                   <include name="**/*.jpeg"/>
                   <include name="**/*.jpg"/>
  +                <exclude name=".#*"/>
               </fileset>
           </copy>
           <!-- In case we have CSS someday
           <copy todir="${docs.dest}" filtering="no">
               <fileset dir="${docs.src}">
                   <include name="**/*.css"/>
  +                <exclude name=".#*"/>
               </fileset>
           </copy>
           -->
  @@ -358,7 +360,12 @@
           
           <!-- regen psml -->
         
  -        <delete dir="${src.java.dir}/org/apache/jetspeed/xml/api/portletmarkup"/>   
     
  +        <delete>
  +        <fileset dir="${src.java.dir}/org/apache/jetspeed/xml/api/portletmarkup">
  +            <exclude name="CVS"/>
  +        </fileset>
  +        </delete>
  +
           <java classname="org.exolab.castor.builder.SourceGenerator" fork="yes">
               <classpath refid="classpath"/>
               <arg value="-i" />
  @@ -372,7 +379,11 @@
   
           <!-- regen jcm -->
            
  -        <delete dir="${src.java.dir}/org/apache/jetspeed/xml/api/jcm"/>
  +        <delete>
  +        <fileset dir="${src.java.dir}/org/apache/jetspeed/xml/api/jcm">
  +            <exclude name="CVS"/>
  +        </fileset>
  +        </delete>
           <java classname="org.exolab.castor.builder.SourceGenerator" fork="yes">
               <classpath refid="classpath"/>
               <arg value="-i" />
  @@ -443,6 +454,44 @@
                   <exclude name="servlet*.jar"/>
               </lib>            
               
  +            <lib dir="${build.dir}">
  +                <include name="jetspeed.jar"/>                
  +                <exclude name="servlet*.jar"/>
  +            </lib>            
  +            
  +            <fileset dir="${webapp.dir}"> 
  +                <exclude name="WEB-INF/web.xml"/>
  +                <exclude name="apidocs/index.html"/>
  +            </fileset>
  +            
  +            <zipfileset dir="${javadocs.destdir}" 
  +              prefix="apidocs"/>
  +
  +        </war>
  +    </target>
  +    
  +    <!-- =================================================================== -->
  +    <!-- Creates a full binary release war file with all docs                -->
  +    <!-- =================================================================== -->
  +    <target 
  +        name="war_fullrelease" depends="jar,docs,javadocs" 
  +        description="Creates a binary release war file with javadocs api"
  +    >
  +        
  +        <!-- Create the war file -->
  +        <war warfile="${build.dir}/${project.name}.war"
  +            webxml="${webapp.dir}/WEB-INF/web.xml">
  +
  +            <lib dir="${lib.dir}">
  +                <include name="*.jar"/>                
  +                <exclude name="servlet*.jar"/>
  +            </lib>            
  +            
  +            <lib dir="${build.dir}">
  +                <include name="jetspeed.jar"/>                
  +                <exclude name="servlet*.jar"/>
  +            </lib>            
  +            
               <fileset dir="${webapp.dir}"> 
                   <exclude name="WEB-INF/web.xml"/>
                   <exclude name="apidocs/index.html"/>
  @@ -450,6 +499,10 @@
               
               <zipfileset dir="${javadocs.destdir}" 
                 prefix="apidocs"/>
  +            <zipfileset dir="${docs.dest}" 
  +              prefix="docs">
  +           <exclude name=".#*"/>
  +           </zipfileset>
   
           </war>
       </target>
  @@ -638,9 +691,18 @@
       <!-- =================================================================== -->
       <target name="clean" description="Cleans up the distribution"
       >
  -        <delete dir="${build.dir}"/>
  -        <delete dir="${src.java.dir}/org/apache/jetspeed/xml/api/portletmarkup"/>
  -        <delete dir="${src.java.dir}/org/apache/jetspeed/xml/api/jcm"/>
  +        <delete >
  +        <fileset dir="${build.dir}">
  +            <!-- Everything in the build lib dir -->
  +            <exclude name="CVS"/>
  +        </fileset>
  +        <fileset dir="${src.java.dir}/org/apache/jetspeed/xml/api/portletmarkup">
  +            <exclude name="CVS"/>
  +        </fileset>
  +        <fileset dir="${src.java.dir}/org/apache/jetspeed/xml/api/jcm">
  +            <exclude name="CVS"/>
  +        </fileset>
  +        </delete>
       </target>
   
       <!-- =================================================================== -->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to