Return-Path: <bodewig@bost.de>
Mailing-List: contact regexp-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list regexp-dev@jakarta.apache.org
Received: (qmail 92029 invoked from network); 16 Oct 2000 16:09:09 -0000
Received: from public.ndh.net (HELO public.ndh.com) (195.94.90.21)
  by locus.apache.org with SMTP; 16 Oct 2000 16:09:09 -0000
Received: from sbodewig.bost.de ([195.227.98.11]) by public.ndh.com
 (8.9.3/8.8.0) with ESMTP id SAA05809 for <regexp-dev@jakarta.apache.org>;
 Mon, 16 Oct 2000 18:09:06 +0200 (MET DST)
Received: (from bodewig@localhost)
	by sbodewig.bost.de (8.9.3/8.9.3) id SAA18004;
	Mon, 16 Oct 2000 18:09:06 +0200
X-Authentication-Warning: sbodewig.bost.de: bodewig set sender to
 bodewig@bost.de using -f
To: regexp-dev@jakarta.apache.org
Subject: [PATCH] make build.xml Ant 1.2 compatible
From: Stefan Bodewig <bodewig@bost.de>
Date: 16 Oct 2000 18:09:06 +0200
Message-ID: <m3em1gn4yl.fsf@sbodewig.bost.de>
Lines: 16
User-Agent: Gnus/5.0807 (Gnus v5.8.7) XEmacs/21.1 (Channel Islands)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Rating: locus.apache.org 1.6.2 0/1000/N

--=-=-=

Hi,

regexp's build file won't work with Ant 1.2 any more (chmod's src
attribute has been removed) - the appended patch makes it compatible
with Ant 1.1 and 1.2.

Also I've rephrased Jon's paragraph about where to find the sources of
Ant - given that Ant is approaching its second stand alone release we
should point people to the distribution area of Ant.

Cheers

        Stefan


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=regexp-ant1.2.patch

Index: build/README
===================================================================
RCS file: /home/cvspublic/jakarta-regexp/build/README,v
retrieving revision 1.1
diff -u -b -r1.1 README
--- build/README	2000/04/27 01:23:43	1.1
+++ build/README	2000/10/11 11:53:55
@@ -5,8 +5,8 @@
 Jakarta was released as Open Source, the developer community also obtained 
 the source to Ant as well. This is a great addition to the community.
 
-You can obtain the Ant source code from <http://jakarta.apache.org/>. It is 
-currently located in the jakarta-tools CVS repository.
+You can obtain the Ant source code and binary distributions from
+<http://jakarta.apache.org/ant>.
 
 The build-regexp.xml file is the "code" that tells Ant what to do. The 
 beauty of Ant is that it is entirely XML based so creating installation 
Index: build/build-regexp.xml
===================================================================
RCS file: /home/cvspublic/jakarta-regexp/build/build-regexp.xml,v
retrieving revision 1.3
diff -u -b -r1.3 build-regexp.xml
--- build/build-regexp.xml	2000/05/14 21:51:14	1.3
+++ build/build-regexp.xml	2000/10/11 11:53:55
@@ -3,13 +3,12 @@
 <!-- ======================================================================= -->
 <!-- Build file                                                      -->
 <!-- ======================================================================= -->
-<project name="Jakarta-Regexp" default="main" basedir=".">
+<project name="Jakarta-Regexp" default="jar" basedir=".">
 
     <!-- =================================================================== -->
     <!-- Initializes some variables                                          -->
     <!-- =================================================================== -->
     <target name="init">    
-        <property name="ant.home" value="."/>
         <property name="Name" value="Jakarta-Regexp"/>
         <property name="year" value="2000"/>
         <property name="version" value="1.1"/>
@@ -38,7 +37,7 @@
         <mkdir dir="${build.dir}"/>
         <mkdir dir="${build.dest}"/>
         <mkdir dir="${build.src}"/>
-        <chmod src="bin/antRun" perm="744"/>
+        <chmod file="bin/antRun" perm="744"/>
 
         <copydir src="${src.java.dir}" dest="${build.src}" 
             includes="**/*.java **/*.properties"
@@ -48,7 +47,7 @@
     <!-- =================================================================== -->
     <!-- Compiles the source directory                                       -->
     <!-- =================================================================== -->
-    <target name="compile" depends="prepare">
+    <target name="compile" depends="prepare" description="builds core classes">
         <javac srcdir="${build.src}"
             destdir="${build.dest}"
             debug="${debug}"
@@ -59,7 +58,7 @@
     <!-- =================================================================== -->
     <!-- Compiles the source directory and creates a .jar file               -->
     <!-- =================================================================== -->
-    <target name="jar" depends="compile">
+    <target name="jar" depends="compile" description="builds core + jar">
         <jar jarfile="${build.dir}/${final.name}.jar"
             basedir="${build.dest}"
             includes="org/**"
@@ -69,7 +68,7 @@
     <!-- =================================================================== -->
     <!-- Creates the API documentation                                       -->
     <!-- =================================================================== -->
-    <target name="javadocs" depends="prepare">
+    <target name="javadocs" depends="prepare" description="builds the javadoc">
         <mkdir dir="${javadoc.destdir}"/>
         <javadoc packagenames="org.apache.regexp.*"
             sourcepath="${build.src}"
@@ -86,7 +85,7 @@
     <!-- =================================================================== -->
     <!-- Package                                                             -->
     <!-- =================================================================== -->
-    <target name="package" depends="jar,javadocs">
+    <target name="package" depends="jar,javadocs" description="builds core + jar + javadoc + distribution">
         <mkdir dir="${final.dir}"/>
         <mkdir dir="${final.dir}/src/java"/>
         <copydir src="${build.dir}/src/" dest="${final.dir}/src/java/"/>
@@ -116,6 +115,14 @@
     <!-- =================================================================== -->
     <!-- Packages the distribution with ZIP and TAG-GZIP                     -->
     <!-- =================================================================== -->
-    <target name="package-all" depends="package-zip, package-tgz">
+    <target name="package-all" depends="package-zip, package-tgz"/>
+
+    <!-- =================================================================== -->
+    <!-- removes all things generated by the build process                   -->
+    <!-- =================================================================== -->
+    <target name="clean" depends="init" description="removes bin directory">
+      <deltree dir="${build.dir}" />
+      <deltree dir="${final.dir}" />
+      <deltree dir="${javadoc.destdir}" />
     </target>
 </project>

--=-=-=--