From bc73992c1a8d3f95bfff6be55e2b55a824157ac1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 28 Mar 2010 17:23:00 +0000 Subject: [PATCH] 2010-03-28 19:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * bin/postinst.prg * Corrected double pathseps in one place. * ChangeLog + Marked TODO's as DONE. ! Fixed timezone for today. * utils/hbrun/hbrun.rc + Added support for OS/2. Can someone test it? --- harbour/ChangeLog | 71 +++++++++++++++++++++--------------- harbour/bin/postinst.prg | 2 +- harbour/utils/hbrun/hbrun.rc | 4 +- 3 files changed, 45 insertions(+), 32 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 42b4b53c60..3cf6d13d4b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,13 +17,24 @@ past entries belonging to author(s): Viktor Szakats. */ -2010-03-28 13:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) +2010-03-28 19:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * bin/postinst.prg + * Corrected double pathseps in one place. + + * ChangeLog + + Marked TODO's as DONE. + ! Fixed timezone for today. + + * utils/hbrun/hbrun.rc + + Added support for OS/2. Can someone test it? + +2010-03-28 13:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/rules.mk ! Added hack to make it build hbpp after latest change. Again hbpp, I couldn't find out what was the real problem, so there may be a better fix. -2010-03-28 12:14 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) +2010-03-28 12:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) - bin/postinst.bat * bin/postinst.prg * INSTALL @@ -33,7 +44,7 @@ tweaks for these platforms in case it's necessary. ; Harbour doesn't use a single line of .bat anymore in the build process. -2010-03-28 11:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) +2010-03-28 11:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/wce/mingwarm.mk * config/win/mingw.mk * config/win/cygwin.mk @@ -49,7 +60,7 @@ * bin/postinst.bat - Deleted no more necessary hack to build hbrun with icon using hbmk2. -2010-03-28 11:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) +2010-03-28 11:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * config/rules.mk + config/res.mk @@ -1038,7 +1049,7 @@ 2010-03-16 16:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbbzip2/Makefile + Added bzip2 header detection and setup. - ; TOFIX: Some warnings: + ; TOFIX: Some warnings: [DONE] mingw: hbbzip2.c: In function 'hb_bz2Compress': hbbzip2.c:96: warning: left shift count >= width of type @@ -1659,7 +1670,7 @@ There was no reason to revert macro names, so I kept these in sync with the rest of Harbour, only colors are kept as non-MS-DOS compatible. - ; TOFIX: Palette indexing. + ; TOFIX: Palette indexing. [DONE] * examples/hbdoc2/gentxt.prg ! Fixed to previous fix to rather delete unused @@ -3911,7 +3922,7 @@ - Deleted code section which is superfluous after merging HB_OS_WIN and HB_IO_WIN modes. ; TODO: Clean the rest. - ; TODO: Use native Windows API in the remaining places. + ; TODO: Use native Windows API in the remaining places. [DONE] * include/hbdefs.h ! Disabled drive letter for __CYGWIN__. @@ -5037,7 +5048,7 @@ + Added placeholder for CE/MIPS/SH CPU dump code. + Added iTODO warnings for non-implemented code sections. + Tweaked and enabled module listing code for WinCE. - ; TOFIX: UNICODE conversion is missing from there. + ; TOFIX: UNICODE conversion is missing from there. [DONE] ; TODO: Enable exception handler for WinCE. How? * contrib/hbwin/wapi_wingdi.c @@ -6963,7 +6974,7 @@ - Replace current windows.h inclusion hack with regular method [DONE] - Delete hacks dealing with former type chaos: HB_DONT_DEFINE_BASIC_TYPES, HB_DONT_DEFINE_BOOL, HB_DONT_DEFINE_BYTE, HB_DONT_DEFINE_LONG - - Normalize HB_BYTE vs. HB_UCHAR usage + - Normalize HB_BYTE vs. HB_UCHAR usage [DONE - both stays] - Type cleanups, f.e. HB_SIZE vs. HB_ULONG - Add new special types (see above) - Switch HB_SIZE to signed (big project), and delete HB_ISIZ afterwards. @@ -7171,7 +7182,7 @@ * HB_UCHAR is now a synonym for HB_BYTE. It's now also legacy. * HB_SCHAR is now a synonym for HB_CHAR. It's now also legacy. ; TODO: Replace all HB_SCHAR with HB_CHAR and HB_UCHAR with HB_BYTE, - and move the old types to compatibility status. + and move the old types to compatibility status. [CANCELLED] * ChangeLog ! Fixed date in my today's entries. @@ -16115,7 +16126,7 @@ (for now this is the only active mode). ! DllCall() made static function. * Renamed some constants, functions and variables. - ; TODO: Add logic to enable UNICODE mode when needed. + ; TODO: Add logic to enable UNICODE mode when needed. [DONE] 2009-12-20 05:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/vm/dynlibhb.c @@ -16140,7 +16151,7 @@ * contrib/hbwin/win_dll.c + Added portable Win64 support (both x86_64 and IA64 and anything else). ; TODO: double parameters and return value. - ; TODO: parameters passed by reference. + ; TODO: parameters passed by reference. [DONE] * Renamed some structure to not look like Windows ones. * Using HB_BOOL. @@ -17534,8 +17545,8 @@ ; TOFIX: hb_parclen() usage. [DONE] ; TOFIX: HB_ARRAYSETSTR() with NULL string parameter. [DONE] ; TOFIX: HB_PARSTRDEF() to really default to empty string for non-string params. [DONE] - ; TODO: Remaining HB_TCHAR_*() usages. - ; TODO: Peer-review what I did. + ; TODO: Remaining HB_TCHAR_*() usages. [DONE - except GTWVG] + ; TODO: Peer-review what I did. [DONE] * contrib/hbwin/wapi_winbase.c ! Fixed for WinCE after recent addition of new wrappers. @@ -31863,7 +31874,7 @@ ! Reverted prev. It does all sort of strange things. ; TODO: So the only way is the proper fix: Cleaning Harbour source from BOOL, BYTE, LONG, ULONG and all other - 'legacy' types. + 'legacy' types. [DONE] 2009-09-11 17:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hbdefs.h @@ -39094,7 +39105,7 @@ There is currently HAS*, HAVE*, HB_HAVE*, HB_WITHOUT* plus some other variations. We should probably stick to HB_BUILD_WITH_* for user - level control, and HB_HAS_* for internal detection logic. + level control, and HB_HAS_* for internal detection logic. [DONE] 2009-08-12 12:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/gtxwc/Makefile @@ -40287,7 +40298,7 @@ variables work in case we're relying on autodetection. ; TODO: May need to do this for a few other cases where detection is relying on some additional variables. Like HB_XBUILD, which needs to be - cleaned further, maybe autodetection added. + cleaned further, maybe autodetection added. [DONE] ; NOTE: Above changes mean that from now on for basic build usage it's enough to have the compiler in PATH and to issue a simple 'make' or 'mingw32-make' (or whatever GNU Make is called in that environment), @@ -52073,7 +52084,7 @@ * Changed a few inter-contrib reference to refer to .hbc file rather than lib directly. ; TODO: Change inter-contrib references to hbwin to refer - to hbwin.hbc. + to hbwin.hbc. [DONE] 2009-06-15 13:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/legacy.prg @@ -53480,7 +53491,7 @@ it's proper place. * Separated test program extra lib requirements from contrib lib requirements in hbblat and hbhpdf. - ; TODO: Do this for the rest of contribs. + ; TODO: Do this for the rest of contribs. [DONE] 2009-06-10 09:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL @@ -53966,7 +53977,7 @@ and it will be included in binary builds to help users. HB_COMPILER, HB_LIB_INSTALL and HB_DIR_* envvars have to be set to make it work. - ; TODO: Add documentation to INSTALL. + ; TODO: Add documentation to INSTALL. [DONE] * utils/hbmk2/hbmk2.prg + Recognizing SVN repositories in a rare configuration. @@ -55801,7 +55812,7 @@ and they also have to be renamed. I don't know what we should stay compatible with so it's difficult to make any moves. Some test code showing the usefulness of - these function would be probably help. + these function would be probably help. [DONE] 2009-05-27 05:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/harbour.spec @@ -57254,8 +57265,8 @@ ! DLLLOAD() changed back to return numeric pointer. This is required to stay compatible with XBase++. ; TODO: - - Add C API to make DLL calls. - - Move CALLDLL*() functions to xhb lib. + - Add C API to make DLL calls. [DONE] + - Move CALLDLL*() functions to xhb lib. [DONE] - Add WAPI_LOADLIBRARY()/WAPI_FREELIBRARY()/WIN_GETPROCADDRESS() functions to replace current LOADLIBRARY()/FREELIBRARY()/GETPROCADDRESS() calls, fixing them to work on pointers only. [DONE] @@ -57285,7 +57296,7 @@ is passed. + DLLCALL() will now accept pointer type for dll handle. + GETPROCADDRESS() will now accept pointer type for dll handle. - ; TODO: Remove compatibility with numeric pointers. + ; TODO: Remove compatibility with numeric pointers. [DONE] * contrib/hbwin/win_misc.c * WIN_SHELLEXECUTE() no longer accepts numeric pointers @@ -57407,15 +57418,15 @@ + Added deprecated compatibility wrapper TOLEAUTO for HB_OLEAUTO class. This is probably not enough as there are other remaining incompatibilities. - ; TODO: users needing this please tweak it further. + ; TODO: users needing this please tweak it further. [DONE] + Added deprecated compatibility wrapper hb_oleWideToAnsi(), which now calls hb_mbtowc(). Not fully compatible for error cases, old one could return NULL in some cases. - ; TODO: Switch to hb_mbntowc(). + ; TODO: Switch to hb_mbntowc(). [SOLVED] + Added deprecated compatibility wrapper hb_oleAnsiToWide(), which now calls hb_wctomb(). Not fully compatible for error cases, old one could return NULL in some cases. - ; TODO: Switch to hb_wcntomb(). + ; TODO: Switch to hb_wcntomb(). [SOLVED] * contrib/hbwin/win_misc.c + Added WAPI_MESSAGEBOX() @@ -59857,7 +59868,7 @@ QT standard and pass each QT lib header dir on the command line instead of using subdirs in #include directives. ; TODO: Probably this change should be applied to all .qth files, - but on Darwin it worked without this change for some reason. + but on Darwin it worked without this change for some reason. [DONE] * contrib/hbqt/tests/demoqt.prg * contrib/hbqt/TQPixmap.prg @@ -60811,7 +60822,7 @@ * config/wce/global.cf - Removed gtwin. - ; TODO: Move GT inclusion logic to GT local Makefiles. + ; TODO: Move GT inclusion logic to GT local Makefiles. [DONE] 2009-04-03 15:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * harbour-wce-spec @@ -67576,7 +67587,7 @@ 2009-02-25 11:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + INSTALL + Installation docs kept simple. - ; TODO: Add it to install packages. Test and extend as needed. + ; TODO: Add it to install packages. Test and extend as needed. [DONE] 2009-02-25 10:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * bin/postinst.bat diff --git a/harbour/bin/postinst.prg b/harbour/bin/postinst.prg index 72ebc013d7..be9db3a85d 100644 --- a/harbour/bin/postinst.prg +++ b/harbour/bin/postinst.prg @@ -107,7 +107,7 @@ PROCEDURE Main() IF ! Empty( GetEnv( tmp[ 2 ] ) ) hb_processRun( GetEnv( "HB_HOST_BIN_DIR" ) + _PS_ + "hbmk2" +; " " + Chr( 34 ) + "-mkimplib=" + GetEnv( "HB_LIB_INSTALL" ) + _PS_ + tmp[ 1 ] + Chr( 34 ) +; - " " + Chr( 34 ) + GetEnv( tmp[ 2 ] ) + _PS_ + StrTran( tmp[ 3 ], "\", _PS_ ) + Chr( 34 ) +; + " " + Chr( 34 ) + GetEnv( tmp[ 2 ] ) + StrTran( tmp[ 3 ], "\", _PS_ ) + Chr( 34 ) +; iif( tmp[ 4 ], " -mkimplibms", "" ) ) ENDIF NEXT diff --git a/harbour/utils/hbrun/hbrun.rc b/harbour/utils/hbrun/hbrun.rc index 776b4ae7d1..617d7f5fd6 100644 --- a/harbour/utils/hbrun/hbrun.rc +++ b/harbour/utils/hbrun/hbrun.rc @@ -2,7 +2,9 @@ * $Id$ */ -#if defined( __BORLANDC__ ) +#if defined( OS2 ) || defined( __OS2__ ) || defined( OS_2 ) +ICON 1 DISCARDABLE "..\\..\\..\\..\\..\\package\\harbour.ico" +#elif defined( __BORLANDC__ ) ICON1 ICON DISCARDABLE "..\..\..\..\..\package\harbour.ico" #else ICON1 ICON DISCARDABLE "..\\..\\..\\..\\..\\package\\harbour.ico"