Re: Applying patches
I'd still recommend installing cygwin (http://www.cygwin.com/). The fileutils and patchutils packages contain many important utilities, including dos2unix and unix2dos for batch line ending conversion. Be sure you install with "using DOS line endings". IIRC this way most tools can use both LF and CRLF line endings (but always create CRLF line endings). J.Pietschmann
Re: Applying patches
Glen Mazza wrote: I use this tool (I couldn't find a patch program in WinCVS): http://marc.theaimsgroup.com/?l=fop-dev&m=105874140111833&w=2 Two other notes to read: http://marc.theaimsgroup.com/?l=fop-dev&m=106961785412734&w=2 http://marc.theaimsgroup.com/?l=fop-dev&m=106962776820285&w=2 to apply the patch, I use: "patch < somepatch.txt". Only annoying issue is that, with the version I'm using, I need to change the source files from Windows to Unix line endings before proceeding. I use JEdit to do that. Hi Glen, thanks for the links they are useful. Chris
Re: Applying patches
Jeremias Maerki wrote: Hi Chris, I'm applying the patches directly in Eclipse which provides graphical helpers to resolve problems like this. Patches can even be copy/pasted. I've had problem with the patch.exe myself in the past, but since I'm using Eclipse I've had almost no problems anymore. Thanks Jeremias and Christian. I'm not about to switch to Eclipse, as we are a JBuilder shop, but changing the Index entry to include the full path solved my problem. Thanks, Chris
Re: Applying patches
I use this tool (I couldn't find a patch program in WinCVS): http://marc.theaimsgroup.com/?l=fop-dev&m=105874140111833&w=2 Two other notes to read: http://marc.theaimsgroup.com/?l=fop-dev&m=106961785412734&w=2 http://marc.theaimsgroup.com/?l=fop-dev&m=106962776820285&w=2 to apply the patch, I use: "patch < somepatch.txt". Only annoying issue is that, with the version I'm using, I need to change the source files from Windows to Unix line endings before proceeding. I use JEdit to do that. Glen Christian Geisert schrieb: Chris Bowditch wrote: Team, sorry but another newbie committer question: I downloaded a patch program from the internet. Not sure if there is a specific one I need, or whether they all conform to a standard. When I try to run the patch program with unified patch file in the xml-fop directory, it cant figure out the locations of the files its supposed to be patching. I thought it would just read the following line: RCS file: /home/cvspublic/xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java,v I think it's the first line which matters Index: LineLayoutManager.java === So it looks like path was done from the xml-fop/src/java/org/apache/fop/layoutmgr/ directory I need a patch program for windows. Can anyone offer advice? I ended up applying the patch manually. IIRC WinCVS includes a patch.exe or could install cygwin.
Re: Applying patches
Hi Chris, I'm applying the patches directly in Eclipse which provides graphical helpers to resolve problems like this. Patches can even be copy/pasted. I've had problem with the patch.exe myself in the past, but since I'm using Eclipse I've had almost no problems anymore. On 02.04.2004 12:26:20 Chris Bowditch wrote: > Team, > > sorry but another newbie committer question: > > I downloaded a patch program from the internet. Not sure if there is a > specific one I need, or whether they all conform to a standard. When I try to > run the patch program with unified patch file in the xml-fop directory, it > cant figure out the locations of the files its supposed to be patching. I > thought it would just read the following line: > > RCS file: > /home/cvspublic/xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java,v > > I tried telling it to strip the first 2 components of the path, but no difference. > > I need a patch program for windows. Can anyone offer advice? I ended up > applying the patch manually. > > Chris > Jeremias Maerki
Re: Applying patches
Chris Bowditch wrote: Team, sorry but another newbie committer question: I downloaded a patch program from the internet. Not sure if there is a specific one I need, or whether they all conform to a standard. When I try to run the patch program with unified patch file in the xml-fop directory, it cant figure out the locations of the files its supposed to be patching. I thought it would just read the following line: RCS file: /home/cvspublic/xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java,v I think it's the first line which matters Index: LineLayoutManager.java === So it looks like path was done from the xml-fop/src/java/org/apache/fop/layoutmgr/ directory I need a patch program for windows. Can anyone offer advice? I ended up applying the patch manually. IIRC WinCVS includes a patch.exe or could install cygwin. -- Christian G.
