diff --git a/ChangeLog.txt b/ChangeLog.txt index 12fd71e0be..55b25e3bcf 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,10 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-04-05 18:58 UTC+0200 Viktor Szakats (harbour syenar.net) + * bin/check.hb + ! two fixes for uncrustify parameter when called for automatic fixup + 2013-04-05 18:29 UTC+0200 Viktor Szakats (harbour syenar.net) * src/vm/hvm.c * more minor cleanups in comments diff --git a/bin/check.hb b/bin/check.hb index 6060d30e53..b28a4edac1 100644 --- a/bin/check.hb +++ b/bin/check.hb @@ -567,10 +567,10 @@ STATIC FUNCTION FNameExc( cName, aList ) STATIC PROCEDURE ProcFile( cFileName ) - STATIC sc_hProc := { ; + LOCAL hProc := { ; ".png" => { "avdpng -z -4 %1$s", "optipng -o7 %1$s" }, ; ".jpg" => { "jpegoptim --strip-all %1$s" }, ; - ".c" => { "uncrustify -c bin/harbour.ucf %1$s", @FixFuncCase() }, ; + ".c" => { hb_StrFormat( "uncrustify -c %1$s %%1$s", hb_DirSepToOS( _HBROOT_ + "bin/harbour.ucf" ) ), @FixFuncCase() }, ; ".cpp" => ".c", ; ".h" => ".c", ; ".api" => ".c", ; @@ -581,7 +581,7 @@ STATIC PROCEDURE ProcFile( cFileName ) LOCAL aProc := hb_FNameExt( cFileName ) LOCAL xCmd - DO WHILE HB_ISSTRING( aProc := hb_HGetDef( sc_hProc, aProc, NIL ) ) + DO WHILE HB_ISSTRING( aProc := hb_HGetDef( hProc, aProc, NIL ) ) ENDDO IF HB_ISARRAY( aProc )