myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject cvs commit: incubator-myfaces/build build-webapps.xml build.xml
Date Thu, 07 Apr 2005 13:52:31 GMT
schof       2005/04/07 06:52:31

  Modified:    build    build-webapps.xml build.xml
  Log:
  Fixes MYFACES-170.  Thanks to Jiri for point out the bug.
  
  Revision  Changes    Path
  1.3       +5 -2      incubator-myfaces/build/build-webapps.xml
  
  Index: build-webapps.xml
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/build/build-webapps.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build-webapps.xml	24 Mar 2005 16:47:11 -0000	1.2
  +++ build-webapps.xml	7 Apr 2005 13:52:31 -0000	1.3
  @@ -11,7 +11,6 @@
       <property name="build.classes" value="${build.dir}/classes"/>
       <property name="build.web.lib" value="${build.dir}/web/lib"/>
       <property name="jar.file" value="${webapp.name}.jar"/>
  -    <property name="build.web.lib" value="${build.dir}/web/lib"/>
       <property name="webapp.dist.dir" value="${build.dir}/dist"/>
       <property name="war.file" value="${webapp.dist.dir}/${webapp.name}.war"/>
   
  @@ -22,7 +21,7 @@
           <delete dir="${webapp.dist.dir}"/>
       </target>
   
  -    <target name="prepare">
  +    <target name="prepare" depends="prepare-wap">
   
           <!-- create required directories -->
           <mkdir dir="${build.dir}"/>
  @@ -43,6 +42,10 @@
   
       </target>
   
  +    <target name="prepare-wap" if="myfaces-wap.jar">
  +        <copy file="${myfaces-wap.jar}" todir="${build.web.lib}"/>
  +    </target>
  +
       <!-- compile source code -->
       <target name="compile" depends="prepare" description="Compiles all example source
code">
           <!-- compile regular classes -->
  
  
  
  1.92      +3 -1      incubator-myfaces/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/build/build.xml,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- build.xml	6 Apr 2005 23:31:01 -0000	1.91
  +++ build.xml	7 Apr 2005 13:52:31 -0000	1.92
  @@ -703,7 +703,7 @@
           <mkdir dir="${release.dir}"/>
       </target>
   
  -    <target name="app-dist" depends="myfaces-jar">
  +    <target name="app-dist" depends="myfaces-jar, myfaces-wap-jar">
   
           <!-- build blank webapp -->
           <copy file="${conf.dir}/blank/web.xml" todir="${apps.dir}/blank/web/WEB-INF"/>
  @@ -751,6 +751,8 @@
               <property name="web.dir" location="${apps.dir}/wap"/>
               <property name="webapp.dist.dir" location="${webapp.dist.dir}"/>
               <property name="src.dir" location="${apps.dir}/src/wap"/>
  +            <property name="myfaces-wap.jar" location="${myfaces-wap.jar}">
  +            </property>
           </ant>        
   
       </target>
  
  
  

Mime
View raw message