Return-Path: 
 <cvs-return-21041-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 48204 invoked from network); 10 Nov 2004 20:54:37 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 10 Nov 2004 20:54:37 -0000
Received: (qmail 19340 invoked by uid 500); 10 Nov 2004 20:54:33 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 19247 invoked by uid 500); 10 Nov 2004 20:54:32 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 19180 invoked by uid 99); 10 Nov 2004 20:54:31 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 10 Nov 2004 12:54:31 -0800
Received: (qmail 48048 invoked by uid 65534); 10 Nov 2004 20:54:30 -0000
Date: 10 Nov 2004 20:54:30 -0000
Message-ID: <20041110205430.48046.qmail@minotaur.apache.org>
From: rgoers@apache.org
To: cvs@cocoon.apache.org
Subject: svn commit: rev 57367 - cocoon/trunk/tools/src
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: rgoers
Date: Wed Nov 10 12:54:30 2004
New Revision: 57367

Modified:
   cocoon/trunk/tools/src/blocks-build.xsl
Log:
bug 30738 - Don't compile samples if samples have been excluded.


Modified: cocoon/trunk/tools/src/blocks-build.xsl
==============================================================================
--- cocoon/trunk/tools/src/blocks-build.xsl	(original)
+++ cocoon/trunk/tools/src/blocks-build.xsl	Wed Nov 10 12:54:30 2004
@@ -450,21 +450,26 @@
       </if>
 
       <!-- exclude sample classes from the block package -->
-      <mkdir dir="${{build.blocks}}/{$block-name}/samples"/>
-      <javac destdir="${{build.blocks}}/{$block-name}/samples"
-             debug="${{compiler.debug}}"
-             optimize="${{compiler.optimize}}"
-             deprecation="${{compiler.deprecation}}"
-             target="${{target.vm}}"
-             nowarn="${{compiler.nowarn}}"
-             compiler="${{compiler}}">
-        <src path="${{blocks}}/{$block-name}/java"/>
-        <!-- Currently, we have no JVM dependent sources
-        <src path="${{blocks}}/{$block-name}/java${{dependend.vm}}"/>
-        -->
-        <classpath refid="{$block-name}.classpath"/>
-        <include name="**/samples/**/*.java"/>
-      </javac>
+      <if>
+        <isfalse value="${{internal.exclude.webapp.samples}}"/>
+        <then>
+          <mkdir dir="${{build.blocks}}/{$block-name}/samples"/>
+          <javac destdir="${{build.blocks}}/{$block-name}/samples"
+                 debug="${{compiler.debug}}"
+                 optimize="${{compiler.optimize}}"
+                 deprecation="${{compiler.deprecation}}"
+                 target="${{target.vm}}"
+                 nowarn="${{compiler.nowarn}}"
+                 compiler="${{compiler}}">
+            <src path="${{blocks}}/{$block-name}/java"/>
+            <!-- Currently, we have no JVM dependent sources
+            <src path="${{blocks}}/{$block-name}/java${{dependend.vm}}"/>
+            -->
+            <classpath refid="{$block-name}.classpath"/>
+            <include name="**/samples/**/*.java"/>
+          </javac>
+        </then>
+      </if>
     </target>
 
     <target name="{@name}-patch" unless="internal.exclude.block.{$block-name}">