diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 43f1f6356d..2224c390ce 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,42 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-16 21:19 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + - tests/hbmk_gnu.bat + - Removed. + + * contrib/examples/uhttpd/hbmk.bat + * contrib/examples/dbu/hbmk.bat + * contrib/examples/rl/hbmk.bat + * Made them compatible with Win9x/NT systems again. + + * source/lang/msg_tpl.c + + Added NOTE about date format. + + * source/lang/msgbe866.c + * source/lang/msgbewin.c + * source/lang/msgbg866.c + * source/lang/msgbgiso.c + * source/lang/msgbgmik.c + * source/lang/msgbgwin.c + * source/lang/msgit.c + * source/lang/msgnl.c + * source/lang/msgsl437.c + * source/lang/msgsl852.c + * source/lang/msgsliso.c + * source/lang/msgslwin.c + ! Fixed date formats to only contain YYYY MM and DD. + Plus the format itself corrected in a few places. + + * utils/hbmk/hbmk.prg + + Added TODO + % Added ANNOUNCE HB_GTSYS / REQUEST HB_GT_STD_DEFAULT. + Since this tools doesn't need anything fullscreen, and + this way it's faster smaller, yet portable. + + * ChangeLog + * Few old TODO/TOFIX statuses updated. + 2009-02-16 18:48 UTC+0100 Viktor Szakats (harbour.01 syenar hu) - contrib/hbct/tests/hbmk.bat - contrib/hbcurl/tests/hbmk.bat @@ -424,8 +460,8 @@ - Support for POCC, DM. ; TODO: - Switch to portable command lines in hbmk.bat files. - (Win9x will be supported again). - - Remove bin/hbmk*.bat, bin/hbmk*.cmd, util/hbmake/*. + (Win9x will be supported again). [DONE] + - Remove bin/hbmk*.bat, bin/hbmk*.cmd, util/hbmake/*. [DONE] - Cleanup on variable names in hbmk.prg. * tests/testid.prg @@ -764,7 +800,7 @@ ; TODO: Test OpenWatcom. I had to remove -fo and FILE directives from script, if this was required we need to find a solution to support multiple - input files. + input files. [DONE] * bin/hbmk_b32.bat * bin/hbmk_vc.bat @@ -1168,6 +1204,7 @@ + added HB_FGETDATETIME(). A "brother" of function HB_FGETDATETIME(). ; TODO: BTW, hb_fs*() functions can get a better precision (milliseconds). It would be nice to support it also at .prg level. + [DONE] 2009-02-11 18:30 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/source/vm/proc.c @@ -2294,7 +2331,7 @@ methods are no longer available for regular GETs, only if they are explicitly created using Get():New(). If this is a problem for someone - we can start thinking of a solution. + we can start thinking of a solution. [OK] ; TODO: Do the same with TBrowse() and TColumn(). [DONE] 2009-02-04 09:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu) diff --git a/harbour/contrib/examples/dbu/hbmk.bat b/harbour/contrib/examples/dbu/hbmk.bat index 6f01b6ee70..1577e6f27a 100644 --- a/harbour/contrib/examples/dbu/hbmk.bat +++ b/harbour/contrib/examples/dbu/hbmk.bat @@ -24,6 +24,6 @@ if exist hb_dbu.dif patch -N -i hb_dbu.dif :DIR_OK -..\..\..\bin\hbmk %* %HB_DIR_DBU%\DBU.PRG %HB_DIR_DBU%\DBUCOPY.PRG %HB_DIR_DBU%\DBUEDIT.PRG %HB_DIR_DBU%\DBUHELP.PRG %HB_DIR_DBU%\DBUINDX.PRG %HB_DIR_DBU%\DBUNET.PRG %HB_DIR_DBU%\DBUSTRU.PRG %HB_DIR_DBU%\DBUUTIL.PRG %HB_DIR_DBU%\DBUVIEW.PRG +..\..\..\bin\hbmk %1 %2 %3 %4 %HB_DIR_DBU%\DBU.PRG %HB_DIR_DBU%\DBUCOPY.PRG %HB_DIR_DBU%\DBUEDIT.PRG %HB_DIR_DBU%\DBUHELP.PRG %HB_DIR_DBU%\DBUINDX.PRG %HB_DIR_DBU%\DBUNET.PRG %HB_DIR_DBU%\DBUSTRU.PRG %HB_DIR_DBU%\DBUUTIL.PRG %HB_DIR_DBU%\DBUVIEW.PRG :EXIT diff --git a/harbour/contrib/examples/rl/hbmk.bat b/harbour/contrib/examples/rl/hbmk.bat index 4b959019aa..f20040f6b2 100644 --- a/harbour/contrib/examples/rl/hbmk.bat +++ b/harbour/contrib/examples/rl/hbmk.bat @@ -24,6 +24,6 @@ if exist hb_rl.dif patch -N -i hb_rl.dif :DIR_OK -..\..\..\bin\hbmk %* %HB_DIR_RL%\RLBACK.PRG %HB_DIR_RL%\RLDIALG.PRG %HB_DIR_RL%\RLFRONT.PRG +..\..\..\bin\hbmk %1 %2 %3 %4 %HB_DIR_RL%\RLBACK.PRG %HB_DIR_RL%\RLDIALG.PRG %HB_DIR_RL%\RLFRONT.PRG :EXIT diff --git a/harbour/contrib/examples/uhttpd/hbmk.bat b/harbour/contrib/examples/uhttpd/hbmk.bat index dc33cf2e8b..e3dc3dad39 100644 --- a/harbour/contrib/examples/uhttpd/hbmk.bat +++ b/harbour/contrib/examples/uhttpd/hbmk.bat @@ -4,7 +4,7 @@ @echo off -cls +CLS SET UHTTP_INET_SUPPORT=no SET UHTTP_INET_DEF= @@ -50,7 +50,7 @@ if exist uhttpd.exe uhttpd -s set HB_USER_PRGFLAGS=%UHTTP_GD_DEF% %UHTTP_INET_DEF% set HB_USER_LIBS=xhb.lib hbct.lib %UHTTP_GD_LIBS% -@..\..\..\bin\hbmk -mt -gui %* uhttpd.prg cgifunc.prg cookie.prg session.prg uhttpdc.c %UHTTP_INET_SOCKET% +..\..\..\bin\hbmk -mt -gui %1 %2 %3 %4 uhttpd.prg cgifunc.prg cookie.prg session.prg uhttpdc.c %UHTTP_INET_SOCKET% if errorlevel 1 goto DOERROR if not exist uhttpd.exe goto :EXIT diff --git a/harbour/source/lang/msg_tpl.c b/harbour/source/lang/msg_tpl.c index f0b8b1f981..a47cbef553 100644 --- a/harbour/source/lang/msg_tpl.c +++ b/harbour/source/lang/msg_tpl.c @@ -194,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "YYYY/MM/DD", + "YYYY/MM/DD", /* NOTE: Use YYYY for year, MM for month and DD for days. */ "Y", "N" } diff --git a/harbour/source/lang/msgbe866.c b/harbour/source/lang/msgbe866.c index d1a5c80c01..3acc8cd499 100644 --- a/harbour/source/lang/msgbe866.c +++ b/harbour/source/lang/msgbe866.c @@ -194,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "ƒƒƒƒ/ŒŒ/„„", + "DD/MM/YYYY", "„", "" } diff --git a/harbour/source/lang/msgbewin.c b/harbour/source/lang/msgbewin.c index 6f3bece917..6c06a94228 100644 --- a/harbour/source/lang/msgbewin.c +++ b/harbour/source/lang/msgbewin.c @@ -194,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "УУУУ/ЬЬ/ФФ", + "DD/MM/YYYY", "Ф", "Э" } diff --git a/harbour/source/lang/msgbg866.c b/harbour/source/lang/msgbg866.c index 01bb7b288a..9d147c9bb6 100644 --- a/harbour/source/lang/msgbg866.c +++ b/harbour/source/lang/msgbg866.c @@ -194,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "YYYY/MM/DD", + "DD.MM.YYYY", "Y", "N" } diff --git a/harbour/source/lang/msgbgiso.c b/harbour/source/lang/msgbgiso.c index 36811d671f..4a5289d7c7 100644 --- a/harbour/source/lang/msgbgiso.c +++ b/harbour/source/lang/msgbgiso.c @@ -191,10 +191,10 @@ static HB_LANG s_lang = "hb_xgrab заявено да задели нула байта", "hb_xrealloc заявено да промени големината на нула байта", "hb_xalloc заявено да задели нула байта", - + /* Texts */ - "YYYY/MM/DD", + "DD.MM.YYYY", "Y", "N" } diff --git a/harbour/source/lang/msgbgmik.c b/harbour/source/lang/msgbgmik.c index 24377e0034..0a408a77a0 100644 --- a/harbour/source/lang/msgbgmik.c +++ b/harbour/source/lang/msgbgmik.c @@ -194,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "„„/ŒŒ/ƒƒƒƒ", + "DD.MM.YYYY", "„", "" } @@ -216,4 +216,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_BGMIK ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_BGMIK = hb_lang_Init_BGMIK; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msgbgwin.c b/harbour/source/lang/msgbgwin.c index e02e4a7ff2..b719ab1ef2 100644 --- a/harbour/source/lang/msgbgwin.c +++ b/harbour/source/lang/msgbgwin.c @@ -194,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "YYYY/MM/DD", + "DD.MM.YYYY", "Y", "N" } diff --git a/harbour/source/lang/msgit.c b/harbour/source/lang/msgit.c index 879c14391e..f57b57e1a6 100644 --- a/harbour/source/lang/msgit.c +++ b/harbour/source/lang/msgit.c @@ -194,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "AAAA/MM/GG", + "YYYY/MM/DD", "S", "N" } @@ -206,14 +206,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_IT ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_IT ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_IT +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_IT #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_IT = hb_lang_Init_IT; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_IT = hb_lang_Init_IT; #pragma data_seg() -#endif - +#endif diff --git a/harbour/source/lang/msgnl.c b/harbour/source/lang/msgnl.c index 512333f0fa..8786824e41 100644 --- a/harbour/source/lang/msgnl.c +++ b/harbour/source/lang/msgnl.c @@ -194,7 +194,7 @@ static HB_LANG s_lang = /* Texts */ - "JJJJ/MM/DD", + "YYYY/MM/DD", "J", "N" } diff --git a/harbour/source/lang/msgsl437.c b/harbour/source/lang/msgsl437.c index baabedfb64..29e90d3b7d 100644 --- a/harbour/source/lang/msgsl437.c +++ b/harbour/source/lang/msgsl437.c @@ -178,7 +178,7 @@ static HB_LANG s_lang = /* Texts */ - "DD-MM-LLLL", + "DD-MM-YYYY", "D", "N" } @@ -190,13 +190,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SL437 ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_SL437 ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SL437 +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_SL437 #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SL437 = hb_lang_Init_SL437; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_SL437 = hb_lang_Init_SL437; #pragma data_seg() -#endif +#endif diff --git a/harbour/source/lang/msgsl852.c b/harbour/source/lang/msgsl852.c index 823231e891..c583c9f28b 100644 --- a/harbour/source/lang/msgsl852.c +++ b/harbour/source/lang/msgsl852.c @@ -177,7 +177,7 @@ static HB_LANG s_lang = /* Texts */ - "DD-MM-LLLL", + "DD-MM-YYYY", "D", "N" } @@ -189,13 +189,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SL852 ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_SL852 ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SL852 +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_SL852 #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SL852 = hb_lang_Init_SL852; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_SL852 = hb_lang_Init_SL852; #pragma data_seg() -#endif +#endif diff --git a/harbour/source/lang/msgsliso.c b/harbour/source/lang/msgsliso.c index 64beb87597..f8d8fd374a 100644 --- a/harbour/source/lang/msgsliso.c +++ b/harbour/source/lang/msgsliso.c @@ -177,7 +177,7 @@ static HB_LANG s_lang = /* Texts */ - "YYYY/MM/DD", + "DD-MM-YYYY", "D", "N" } @@ -189,13 +189,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SLISO ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_SLISO ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SLISO +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_SLISO #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SLISO = hb_lang_Init_SLISO; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_SLISO = hb_lang_Init_SLISO; #pragma data_seg() -#endif +#endif diff --git a/harbour/source/lang/msgslwin.c b/harbour/source/lang/msgslwin.c index 58801e9d0a..e93da4ada1 100644 --- a/harbour/source/lang/msgslwin.c +++ b/harbour/source/lang/msgslwin.c @@ -177,7 +177,7 @@ static HB_LANG s_lang = /* Texts */ - "DD-MM-LLLL", + "DD-MM-YYYY", "D", "N" } @@ -189,13 +189,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_SLWIN ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_SLWIN ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_SLWIN +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_SLWIN #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_SLWIN = hb_lang_Init_SLWIN; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_SLWIN = hb_lang_Init_SLWIN; #pragma data_seg() -#endif +#endif diff --git a/harbour/tests/hbmk_gnu.bat b/harbour/tests/hbmk_gnu.bat deleted file mode 100644 index 77346e7ac8..0000000000 --- a/harbour/tests/hbmk_gnu.bat +++ /dev/null @@ -1,21 +0,0 @@ -@rem -@rem $Id$ -@rem - -@echo off - -if %HB_ARCHITECTURE%.==. goto BAD_ARCH -if %HB_COMPILER%.==. goto BAD_COMP - -if exist %HB_ARCHITECTURE%\%HB_COMPILER%\%1.* del %HB_ARCHITECTURE%\%HB_COMPILER%\%1.* -make -r "PRG_SOURCES=%1.prg" -if not errorlevel 1 %HB_ARCHITECTURE%\%HB_COMPILER%\%1 %2 %3 %4 %5 %6 %7 %8 %9 -goto EXIT - -:BAD_ARCH -echo HB_ARCHITECTURE is not set. -goto EXIT - -:BAD_COMP -echo HB_COMPILER is not set. -:EXIT diff --git a/harbour/utils/hbmk/hbmk.prg b/harbour/utils/hbmk/hbmk.prg index fab8e960fa..3041176d32 100644 --- a/harbour/utils/hbmk/hbmk.prg +++ b/harbour/utils/hbmk/hbmk.prg @@ -58,8 +58,12 @@ /* TODO: Add support for more hbmk script features. */ /* TODO: Add support for Windows resource files. */ +/* TODO: Add support for library creation. */ /* TODO: Support for more compilers/platforms. */ +ANNOUNCE HB_GTSYS +REQUEST HB_GT_STD_DEFAULT + REQUEST hbm_ARCH REQUEST hbm_COMP