diff --git a/ChangeLog.txt b/ChangeLog.txt index b64bf5dcf6..d4ace49439 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,10 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-04-30 13:30 UTC+0200 Tamas TEVESZ (ice extreme.hu) + * bin/3rdpatch.hb + * Tweak error counter a bit + 2013-04-30 12:30 UTC+0200 Tamas TEVESZ (ice extreme.hu) * bin/3rdpatch.hb * Change diff files to use Unix-style path separators; diff --git a/bin/3rdpatch.hb b/bin/3rdpatch.hb index d44ed33ab8..76e5b1b65f 100755 --- a/bin/3rdpatch.hb +++ b/bin/3rdpatch.hb @@ -415,8 +415,6 @@ PROCEDURE Main( ... ) QUIT ENDIF - s_nErrors := 0 - cCWD := hb_CurDrive() + hb_osDriveSeparator() + hb_ps() + CurDir() #if defined( _CURDIR ) @@ -458,6 +456,9 @@ PROCEDURE Main( ... ) * The pristine tree is for reference, used as the left component of the diff * Our tree will have the local diff applied, and used as the right component of the diff */ + + s_nErrors := 0 + FOR EACH aOneMap IN s_aChangeMap IF ! hb_FileExists( CombinePath( s_cSourceRoot, aOneMap[ FN_ORIG ] ) ) OutStd( "W: `" + aOneMap[ FN_ORIG ] + "' does not exist in the source tree" + hb_eol() ) @@ -888,8 +889,6 @@ STATIC PROCEDURE DOSToUnixPathSep( cFileName ) RETURN ENDIF - s_nErrors := 0 - cFile := hb_MemoRead( cFileName ) cNewFile := "" cLookFor := hb_eol()