fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-12-17 18:35 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! hbshell_DirBase()/hbshell_ProgName() fixed to
      return proper non-ASCII chars (= if hbrun/hbmk2 resides
      in a directory with non-ASCII chars) even if the .hb 
      script or a shell command had changed the default codepage.
This commit is contained in:
Viktor Szakats
2012-12-17 17:38:44 +00:00
parent acb3b1ed69
commit d7d04f5c79
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog.txt
View File

@@ -10,6 +10,13 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-12-17 18:35 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
! hbshell_DirBase()/hbshell_ProgName() fixed to
return proper non-ASCII chars (= if hbrun/hbmk2 resides
in a directory with non-ASCII chars) even if the .hb
script or a shell command had changed the default codepage.
2012-12-16 19:04 UTC+0100 Viktor Szakats (harbour syenar.net)
* include/hbdefs.h
- deleted redundant type: 'HB_FUNC_PTR'

16
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -12902,13 +12902,15 @@ STATIC PROCEDURE __hbshell( cFile, ... )
LOCAL hHRB
LOCAL cVersion
s_cDirBase_hbshell := hb_DirBase()
s_cProgName_hbshell := hb_ProgName()
/* Set CP and language */
SetUILang( GetUILang() )
/* Save originals */
s_cDirBase_hbshell := hb_DirBase()
s_cProgName_hbshell := hb_ProgName()
/* Detect Harbour dir layout */
hbmk := s_hbmk := hbmk_new()
@@ -13987,8 +13989,8 @@ STATIC FUNCTION __hbshell_TryHeader( cName )
BEGIN SEQUENCE WITH {| oErr | Break( oErr ) }
IF ! Empty( hb_compileFromBuf( "", hbmk_CoreHeaderFiles(), hb_ProgName(), "-q2", ;
"-i" + s_hbmk[ _HBMK_cHB_INSTALL_INC ], ;
"-u+" + cName ) )
"-i" + s_hbmk[ _HBMK_cHB_INSTALL_INC ], ;
"-u+" + cName ) )
lRetVal := .T.
ENDIF
@@ -14027,10 +14029,10 @@ PROCEDURE hbshell_include_list()
/* Public hbshell API */
FUNCTION hbshell_DirBase()
RETURN s_cDirBase_hbshell
RETURN hb_UTF8ToStr( s_cDirBase_hbshell )
FUNCTION hbshell_ProgName()
RETURN s_cProgName_hbshell
RETURN hb_UTF8ToStr( s_cProgName_hbshell )
FUNCTION hbshell_gtSelect( cGT )