Return-Path: 
 <bsf-dev-return-839-apmail-jakarta-bsf-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-bsf-dev-archive@www.apache.org
Received: (qmail 27466 invoked from network); 31 Aug 2006 07:33:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 31 Aug 2006 07:33:02 -0000
Received: (qmail 50562 invoked by uid 500); 31 Aug 2006 07:33:02 -0000
Delivered-To: apmail-jakarta-bsf-dev-archive@jakarta.apache.org
Received: (qmail 50542 invoked by uid 500); 31 Aug 2006 07:33:02 -0000
Mailing-List: contact bsf-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:bsf-dev-unsubscribe@jakarta.apache.org>
List-Help: <mailto:bsf-dev-help@jakarta.apache.org>
List-Post: <mailto:bsf-dev@jakarta.apache.org>
List-Id: "Bean Scripting Framework developers" <bsf-dev.jakarta.apache.org>
Reply-To: "Bean Scripting Framework developers" <bsf-dev@jakarta.apache.org>
Delivered-To: mailing list bsf-dev@jakarta.apache.org
Received: (qmail 50531 invoked by uid 99); 31 Aug 2006 07:33:02 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Aug 2006 00:33:02 -0700
X-ASF-Spam-Status: No, hits=0.5 required=10.0
	tests=DNS_FROM_RFC_ABUSE,SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: domain of foamdino@gmail.com designates
 64.233.166.182 as permitted sender)
Received: from [64.233.166.182] (HELO py-out-1112.google.com) (64.233.166.182)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Aug 2006 00:33:01 -0700
Received: by py-out-1112.google.com with SMTP id d80so612715pyd
        for <bsf-dev@jakarta.apache.org>;
 Thu, 31 Aug 2006 00:32:40 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
        s=beta; d=gmail.com;
        h=received:subject:from:to:content-type:date:message-id:mime-version:x-mailer;
        b=PcBfsCMn33668uJjOcQEAM3zK7sAGtXmULzvGZ1z5Rv7wXieCjxPaXCvMW8fpIZ6LbD/klnzeWghshYaVsOgTWq/l0RBLyeY9bxdCWjxpdeeDcYBpfrRuPV8219oKvV1EK+8rYYWAbkA4MrP6lToxxLgSWQDZIr9BqXagZLPIjw=
Received: by 10.35.45.14 with SMTP id x14mr181566pyj;
        Thu, 31 Aug 2006 00:32:40 -0700 (PDT)
Received: from ?192.168.5.16? ( [58.186.88.117])
        by mx.gmail.com with ESMTP id r9sm437181nza.2006.08.31.00.32.38;
        Thu, 31 Aug 2006 00:32:40 -0700 (PDT)
Subject: [patch] slightly cleaner build.xml
From: Kev Jackson <foamdino@gmail.com>
To: bsf-dev@jakarta.apache.org
Content-Type: multipart/mixed; boundary="=-G1RPgbNfUsUPBaoq3nVb"
Date: Thu, 31 Aug 2006 14:32:34 +0700
Message-Id: <1157009554.5587.8.camel@linux-dev>
Mime-Version: 1.0
X-Mailer: Evolution 2.6.1 
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

--=-G1RPgbNfUsUPBaoq3nVb
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi,

Here's a mildly cleaner build.xml for BSF.  We are looking at including
arbitrary conditions on all tasks based on the fact that to clean up
this build file further I'd like to be able to do:

<echo message="bar" if="${foo}"/>

And at the moment ant doesn't support this.

Anyway, here's the patch.

Kev

--=-G1RPgbNfUsUPBaoq3nVb
Content-Disposition: attachment; filename=build.xml.patch
Content-Type: text/x-patch; name=build.xml.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: .
===================================================================
--- .	(revision 438751)
+++ .	(working copy)
@@ -62,11 +62,9 @@
 	<!-- =================================================================== -->
 	<patternset id="java.source.files">
 		<!-- Optionally includes engines based on dependencies being present -->
-		<!-- FIXME: Exclude the first three, temporarily -->
 
 		<include name="**/bsf/*.java" />
 		<include name="**/util/**/*.java" />
-
 		<include name="**/jacl/**" if="jacl.present" />
 		<include name="**/javascript/**" if="rhino.present" />
 		<include name="**/jython/**" if="jython.present" />
@@ -179,7 +177,6 @@
 		<antcall target="checkJython" />
 		<antcall target="checkNetRexx" />
 		<antcall target="checkRhino" />
-		<!--<echo message="Warning: Rhino dependencies were not resolved." unless="rhino.present"/>-->
 		<antcall target="checkXalan" />
 		<antcall target="checkJUnit" />
 	</target>
@@ -184,11 +181,6 @@
 		<antcall target="checkJUnit" />
 	</target>
 
-
-
-
-
-
 	<!-- =================================================================== -->
 	<!-- Compiles the source directory                                       -->
 	<!-- =================================================================== -->
@@ -196,9 +188,11 @@
 		<mkdir dir="${build.dest}"/>
 		<javac srcdir="${src.dir}" destdir="${build.dest}" debug="${project.debug}" deprecation="${project.deprecation}">
 			<classpath>
-				<fileset dir="lib"><include name="*.jar"/></fileset>
+				<fileset dir="lib">
+					<include name="*.jar"/>
+				</fileset>
 			</classpath>
-			<patternset refid="java.source.files"></patternset>			
+			<patternset refid="java.source.files"/>
 		</javac>
 	</target>
 
@@ -252,11 +246,9 @@
 			<classpath refid="anakia.classpath" />
 		</taskdef>
 
-		<anakia basedir="${site.src}" destdir="${site.dest}/" extension=".html" style="./site.vsl" projectFile="${site.projectFile}" excludes="**/stylesheets/** faq.xml" includes="**/*.xml" lastModifiedCheck="true" templatePath="${templ.path}" velocityPropertiesFile="${velocity.props}">
-		</anakia>
+		<anakia basedir="${site.src}" destdir="${site.dest}/" extension=".html" style="./site.vsl" projectFile="${site.projectFile}" excludes="**/stylesheets/** faq.xml" includes="**/*.xml" lastModifiedCheck="true" templatePath="${templ.path}" velocityPropertiesFile="${velocity.props}"/>
 
-		<anakia basedir="${site.src}" destdir="${site.dest}/" extension=".html" style="./faq.vsl" projectFile="${site.projectFile}" includes="faq.xml" lastModifiedCheck="true" templatePath="${templ.path}" velocityPropertiesFile="${velocity.props}">
-		</anakia>
+		<anakia basedir="${site.src}" destdir="${site.dest}/" extension=".html" style="./faq.vsl" projectFile="${site.projectFile}" includes="faq.xml" lastModifiedCheck="true" templatePath="${templ.path}" velocityPropertiesFile="${velocity.props}"/>
 
 		<copy todir="${site.dest}/images" filtering="no">
 			<fileset dir="${site.src}/images">


--=-G1RPgbNfUsUPBaoq3nVb
Content-Type: text/plain; charset=us-ascii

---------------------------------------------------------------------
To unsubscribe, e-mail: bsf-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: bsf-dev-help@jakarta.apache.org
--=-G1RPgbNfUsUPBaoq3nVb--