Viktor Szakáts napsal(a):
I've committed another tweak to 'patch' command options
to work around line ending space stripping done by hbformat,
but for me even without this there was only three failing
HUNKs with 5.2 sources in dbu.prg, tested on Darwin.
After this commit the process is cleanly done without errors
with all .dif files as per readme.txt on Darwin. Linux
*should be* the same, but I didn't try.
Brgds,
Viktor
r...@siki:/opt/clipp/harbour/examples/dbu/test_src# rm *
r...@siki:/opt/clipp/harbour/examples/dbu/test_src# cp ../ori_src/dbu* .
r...@siki:/opt/clipp/harbour/examples/dbu/test_src# cp ../dbu52.dif .
r...@siki:/opt/clipp/harbour/examples/dbu/test_src# dos2unix *.prg
r...@siki:/opt/clipp/harbour/examples/dbu/test_src# patch -lNi dbu52.dif
patching file dbu.prg
Hunk #2 succeeded at 384 (offset 3 lines).
Hunk #3 succeeded at 401 (offset 3 lines).
patching file dbucopy.prg
Hunk #3 succeeded at 741 (offset 6 lines).
Hunk #4 succeeded at 756 (offset 6 lines).
Hunk #5 succeeded at 819 (offset 6 lines).
Hunk #6 succeeded at 834 (offset 6 lines).
patching file dbuindx.prg
patching file dbustru.prg
patching file dbuutil.prg
patching file dbuview.prg
Hunk #3 succeeded at 2789 (offset -1 lines).
Hunk #4 succeeded at 2798 (offset -1 lines).
Hunk #5 succeeded at 2840 (offset -1 lines).
Hunk #6 succeeded at 3009 (offset -1 lines).
Hunk #7 succeeded at 3080 (offset -1 lines).
using hbformat work after alex update, note change in command line !
("*.prg") for hbformat
or it not work and change eols if filenames are in lowercase before
r...@siki:/opt/clipp/harbour/examples/dbu/test_src# rm *
r...@siki:/opt/clipp/harbour/examples/dbu/test_src# cp ../ori_src/dbu*
.r...@siki:/opt/clipp/harbour/examples/dbu/test_src# hbformat
-lFCaseLow=yes -nEol=0 -lIndent=no -lCase=no -lSpaces=no
"*.prg"
Reformatting ./dbuhelp.prg
<................................................>
Reformatting ./dbuindx.prg
<.............................................>
Reformatting ./dbustru.prg
<.........................................>
Reformatting ./dbucopy.prg
<.........................................>
Reformatting ./dbuutil.prg
<.........................................>
Reformatting ./dbunet.prg
<............................................>
Reformatting ./dbuview.prg
<.........................................>
Reformatting ./dbuedit.prg
<.........................................>
Reformatting ./dbu.prg
<.........................................>
r...@siki:/opt/clipp/harbour/examples/dbu/test_src# patch -lNi ../dbu52.dif
patching file dbu.prg
Hunk #2 succeeded at 384 (offset 3 lines).
Hunk #3 succeeded at 401 (offset 3 lines).
patching file dbucopy.prg
Hunk #3 succeeded at 741 (offset 6 lines).
Hunk #4 succeeded at 756 (offset 6 lines).
Hunk #5 succeeded at 819 (offset 6 lines).
Hunk #6 succeeded at 834 (offset 6 lines).
patching file dbuindx.prg
patching file dbustru.prg
patching file dbuutil.prg
patching file dbuview.prg
Hunk #3 succeeded at 2789 (offset -1 lines).
Hunk #4 succeeded at 2798 (offset -1 lines).
Hunk #5 succeeded at 2840 (offset -1 lines).
Hunk #6 succeeded at 3009 (offset -1 lines).
Hunk #7 succeeded at 3080 (offset -1 lines).
r...@siki:/opt/clipp/harbour/examples/dbu/test_src#
regards
Davor
On 2009.06.12., at 11:47, Davor Siklic wrote:
Viktor Szakáts napsal(a):
Hunk #7 succeeded at 3080 (offset -1 lines).
Could be the EOL conversion is also wrong, but this last
series of errors are a clear sign that you're trying to
patch 5.3 sources with the 5.2 .dif file.
I never used 5.3, this is 5.2e sources, but maybe are
touched/changed I'm not sure
If the header of dbu.prg says 'Copyright (c) 1987 - 1996'
it's 5.3, if it says '1990-1993' it's 5.2.
I'm getting the *exact* same errors you posted when patching
5.3 with dbu52.dif. In fact these error were the reason I've
added dbu53.dif.
Please double check.
double checked
/***
*
* Dbu.prg
*
* DBU Main Module
*
* Copyright (c) 1990-1993, Computer Associates International, Inc.
* All rights reserved.
*
*/
Brgds,
Viktor
_______________________________________________
Harbour mailing list
Harbour@harbour-project.org
http://lists.harbour-project.org/mailman/listinfo/harbour
_______________________________________________
Harbour mailing list
Harbour@harbour-project.org
http://lists.harbour-project.org/mailman/listinfo/harbour
_______________________________________________
Harbour mailing list
Harbour@harbour-project.org
http://lists.harbour-project.org/mailman/listinfo/harbour
_______________________________________________
Harbour mailing list
Harbour@harbour-project.org
http://lists.harbour-project.org/mailman/listinfo/harbour
