cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/targets samples-build.xml init-build.xml
Date Fri, 18 Jul 2003 10:52:51 GMT
cziegeler    2003/07/18 03:52:51

  Modified:    src/targets samples-build.xml init-build.xml
  Log:
  Don't include scratchpad samples, if exclude.webapp.samples is set
  
  Revision  Changes    Path
  1.8       +1 -1      cocoon-2.1/src/targets/samples-build.xml
  
  Index: samples-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/samples-build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- samples-build.xml	14 May 2003 15:21:44 -0000	1.7
  +++ samples-build.xml	18 Jul 2003 10:52:50 -0000	1.8
  @@ -46,7 +46,7 @@
               includes="**/*.xwelcome"/>
     </target>
   
  -  <target name="scratchpad-samples" depends="prepare" unless="unless.exclude.scratchpad">
  +  <target name="scratchpad-samples" depends="prepare" unless="unless.exclude.scratchpad.samples">
    
       <!-- copy sample files -->
       <copy todir="${build.webapp.samples}" filtering="on">
  
  
  
  1.17      +6 -1      cocoon-2.1/src/targets/init-build.xml
  
  Index: init-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/init-build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- init-build.xml	16 Jul 2003 00:19:11 -0000	1.16
  +++ init-build.xml	18 Jul 2003 10:52:50 -0000	1.17
  @@ -66,6 +66,12 @@
       <condition property="unless.exclude.scratchpad">
         <istrue value="${exclude.scratchpad}"/>
       </condition>
  +    <condition property="unless.exclude.scratchpad.samples">
  +      <or>
  +        <istrue value="${unless.exclude.webapp.samples}"/>
  +        <istrue value="${unless.exclude.scratchpad}"/>
  +      </or>
  +    </condition>
       <condition property="unless.exclude.deprecated">
         <istrue value="${exclude.deprecated}"/>
       </condition>
  @@ -75,7 +81,6 @@
       <condition property="unless.exclude.idldocs">
         <istrue value="${exclude.idldocs}"/>
       </condition>
  -    
       <condition property="exclude.validate.jars">
         <isfalse value="${validate.jars}"/>
       </condition>
  
  
  

Mime
View raw message