diff --git a/ChangeLog.txt b/ChangeLog.txt index f0a8a2f2a9..e4c7e71768 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,15 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-04-16 01:25 UTC+0200 Viktor Szakats (harbour syenar.net) + * config/postinst.hb + ! updated dir where .po files are looked for + for util .hbl creation + + * contrib/make.hb + ! fixed to convert dirseps and missing trim before + existence check of hbplist.txt items + 2013-04-10 01:10 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbhpdf/3rd/libhpdf/hpdfimap.c * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif diff --git a/config/postinst.hb b/config/postinst.hb index b01e0e2a4c..ce6a5acb48 100644 --- a/config/postinst.hb +++ b/config/postinst.hb @@ -175,8 +175,8 @@ PROCEDURE Main( ... ) FOR EACH tmp IN Directory( "utils" + hb_ps() + hb_osFileMask(), "D" ) IF "D" $ tmp[ F_ATTR ] .AND. !( tmp[ F_NAME ] == "." ) .AND. !( tmp[ F_NAME ] == ".." ) - FOR EACH aFile IN Directory( "utils" + hb_ps() + tmp[ F_NAME ] + hb_ps() + "*.po" ) - mk_hbl( "utils" + hb_ps() + tmp[ F_NAME ] + hb_ps() + aFile[ F_NAME ], ; + FOR EACH aFile IN Directory( hb_DirSepToOS( "utils/" + tmp[ F_NAME ] + "/po/*.po" ) ) + mk_hbl( hb_DirSepToOS( "utils/" + tmp[ F_NAME ] + "/po/" + aFile[ F_NAME ] ), ; hb_DirSepToOS( GetEnvC( "HB_INSTALL_BIN" ) ) + hb_ps() + hb_FNameExtSet( aFile[ F_NAME ], ".hbl" ) ) NEXT ENDIF diff --git a/contrib/make.hb b/contrib/make.hb index 6a0c06fc9d..1089acfa39 100755 --- a/contrib/make.hb +++ b/contrib/make.hb @@ -762,7 +762,7 @@ PROCEDURE LoadProjectListFromFile( hProjectList, cFileName ) IF "#" $ cItem cItem := Left( cItem, At( "#", cItem ) - 1 ) ENDIF - IF hb_FileExists( s_cBase + s_cHome + cItem ) + IF hb_FileExists( s_cBase + s_cHome + hb_DirSepToOS( AllTrim( cItem ) ) ) AddProject( hProjectList, cItem ) ENDIF NEXT