Return-Path: 
 <user-return-38863-apmail-ant-user-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-user-archive@www.apache.org
Received: (qmail 18655 invoked from network); 23 Nov 2003 05:19:21 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 23 Nov 2003 05:19:21 -0000
Received: (qmail 44784 invoked by uid 500); 23 Nov 2003 05:18:52 -0000
Delivered-To: apmail-ant-user-archive@ant.apache.org
Received: (qmail 44759 invoked by uid 500); 23 Nov 2003 05:18:52 -0000
Mailing-List: contact user-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:user-unsubscribe@ant.apache.org>
List-Subscribe: <mailto:user-subscribe@ant.apache.org>
List-Help: <mailto:user-help@ant.apache.org>
List-Post: <mailto:user@ant.apache.org>
List-Id: "Ant Users List" <user.ant.apache.org>
Reply-To: "Ant Users List" <user@ant.apache.org>
Delivered-To: mailing list user@ant.apache.org
Received: (qmail 44746 invoked from network); 23 Nov 2003 05:18:52 -0000
Received: from unknown (HELO rwcrmhc12.comcast.net) (216.148.227.85)
  by daedalus.apache.org with SMTP; 23 Nov 2003 05:18:52 -0000
Received: from nicki.visi.com
 (c-24-118-19-12.mn.client2.attbi.com[24.118.19.12])
          by comcast.net (rwcrmhc12) with SMTP
          id <2003112305190101400oq67re>; Sun, 23 Nov 2003 05:19:02 +0000
Message-Id: <5.2.1.1.0.20031122230926.02698a28@shell.visi.com>
X-Sender: hoju@shell.visi.com
X-Mailer: QUALCOMM Windows Eudora Version 5.2.1
Date: Sat, 22 Nov 2003 23:19:00 -0600
To: "Ant Users List" <user@ant.apache.org>
From: Jacob Kjome <hoju@visi.com>
Subject: Re: <patch> task on win32?
In-Reply-To: <5.2.1.1.0.20031122212129.0269f0d0@cismail.creativeis.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; format=flowed
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N


Hmm....  I just got it to work with the gnuwin32 library.  However, it 
seems to me that the fact that it didn't work the original way I had it is 
a bug.  Here is what I did to make it work...

I changed this:
<patch patchfile="ant-patch.txt"/>

to this:
<patch dir="${basedir}/src" patchfile="ant-patch.txt" strip="1"/>


However, shouldn't the following be equivalent (which, according to the 
docs, is equivalent to the original basic syntax.)?
<patch dir="${basedir}" patchfile="ant-patch.txt"/>

See docs at:
http://ant.apache.org/manual-1.6beta/CoreTasks/patch.html

But that doesn't work.  Why do I have to change into the "src" dir, and 
then strip the "src/" part of "src/etc/testcases/taskdefs/typedef.xml"?  Am 
I missing something?  How is this not equivalent to the original basic syntax?

Can someone confirm whether or not this is a bug?

Jake

At 09:35 PM 11/22/2003 -0600, you wrote:

>Has anyone gotten the <patch> task to work for them on Win32?  That is, 
>without installing cygwin.  I tried some native patch programs linked to here:
>http://www.drupal.org/node/view/324
>
>The most up to date is the one here at the gnuwin32 project:
>http://sourceforge.net/projects/gnuwin32/
>
>However, all I ever get is...
>
>patch:
>     [patch] can't find file to patch at input line 8
>     [patch] Perhaps you should have used the -p or --strip option?
>     [patch] The text leading up to this was:
>     [patch] --------------------------
>     [patch] |Index: src/etc/testcases/taskdefs/typedef.xml
>     [patch] 
> |===================================================================
>
>     [patch] |RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/typedef.xml,v
>     [patch] |retrieving revision 1.2
>     [patch] |diff -u -r1.2 typedef.xml
>     [patch] |--- src/etc/testcases/taskdefs/typedef.xml 21 Jul 2003 
> 10:10:06 -0000      1.2
>     [patch] |+++ src/etc/testcases/taskdefs/typedef.xml 18 Nov 2003 
> 15:11:07 -0000
>     [patch] --------------------------
>     [patch] File to patch:
>     [patch] Skip this patch? [y]
>     [patch] Skipping patch.
>     [patch] 1 out of 1 hunk ignored
>
>I have the patch file in the correct relative location (the root of the 
>build for Ant) along with a patch-apply.xml build file....
>
><project default="patch" basedir=".">
>     <target name="patch">
>         <patch patchfile="ant-patch.txt"/>
>     </target>
></project>
>
>Any hints?  Is there any port for patch on win32 that works with the 
><patch> task?  BTW, this was tested with the latest Ant 1.6 Branch.
>
>
>Jake
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: user-unsubscribe@ant.apache.org
>For additional commands, e-mail: user-help@ant.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: user-unsubscribe@ant.apache.org
For additional commands, e-mail: user-help@ant.apache.org