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

2009-09-06 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.pt_BR.po
  * utils/hbmk2/hbmk2.hu_HU.po
  * utils/hbmk2/hbmk2.prg
    + Added '@.clp' to cmdline template in help.
    ! Fixed double linefeeds in output (visible in dos builds).
    ! Fixed syntax of generated .rc file for os2 targets.
      I can't check but the app icons still don't seem to
      be added, so this will need further attention from
      real OS/2 users.

  * config/detect.mk
  * config/dos/watcom.mk
  * config/dos/djgpp.mk
    ! Fixed to properly set watt lib location even when backslash
      is used in HB_INC_WATT setting.
This commit is contained in:
Viktor Szakats
2009-09-06 16:33:17 +00:00
parent 84336dfa3a
commit f6ef3e47eb
7 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog
View File

@@ -17,6 +17,23 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-06 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.pt_BR.po
* utils/hbmk2/hbmk2.hu_HU.po
* utils/hbmk2/hbmk2.prg
+ Added '@.clp' to cmdline template in help.
! Fixed double linefeeds in output (visible in dos builds).
! Fixed syntax of generated .rc file for os2 targets.
I can't check but the app icons still don't seem to
be added, so this will need further attention from
real OS/2 users.
* config/detect.mk
* config/dos/watcom.mk
* config/dos/djgpp.mk
! Fixed to properly set watt lib location even when backslash
is used in HB_INC_WATT setting.
2009-09-06 13:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+ tests/tb1.prg
+ Added Przemek's TBrowse() test code.

3
harbour/config/detect.mk
View File

@@ -124,6 +124,9 @@ _DET_FLT_COMP :=
_DET_INC_DEFP := $(if $(WATT_ROOT),$(WATT_ROOT)/inc,) /usr/include
_DET_INC_HEAD := /sys/socket.h
HB_LIB_WATT := $(HB_HAS_WATT:/inc=/lib)
HB_LIB_WATT := $(HB_LIB_WATT:\inc=\lib)
include $(TOP)$(ROOT)config/detfun.mk
# Finished

2
harbour/config/dos/djgpp.mk
View File

@@ -47,7 +47,7 @@ ifneq ($(HB_LINKING_RTL),)
LDLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(HB_HAS_WATT),)
LIBPATHS += -L$(HB_HAS_WATT:/inc=/lib)
LIBPATHS += -L$(HB_LIB_WATT)
LDLIBS += -lwatt
endif
endif

2
harbour/config/dos/watcom.mk
View File

@@ -67,7 +67,7 @@ LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
ifneq ($(HB_LINKING_RTL),)
ifneq ($(HB_HAS_WATT),)
LDLIBS += $(HB_HAS_WATT:/inc=/lib)/wattcpwf
LDLIBS += $(HB_LIB_WATT)/wattcpwf
endif
endif

4
harbour/utils/hbmk2/hbmk2.hu_HU.po
View File

@@ -724,8 +724,8 @@ msgstr "Hiba: C ford
#: hbmk2.prg:5661 hbmk2.prg:6366
#, c-format
msgid " hbmk2 [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl]>"
msgstr " hbmk2 [kapcsolók] [<parancsállomány[s]>] <forrás[.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl]>"
msgid " hbmk2 [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl|@.clp]>"
msgstr " hbmk2 [kapcsolók] [<parancsállomány[s]>] <forrás[.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl|@.clp]>"
#: hbmk2.prg:2937 hbmk2.prg:3341
#, c-format

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

@@ -3441,7 +3441,11 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
cFile := '/* This temp source file was generated by hbmk2 tool. */' + Chr( 10 ) +;
'/* You can safely delete it. */' + Chr( 10 ) +;
'' + Chr( 10 )
AEval( hbmk[ _HBMK_aICON ], {|tmp, tmp1| cFile += 'ICON' + hb_ntos( tmp1 ) + ' ICON DISCARDABLE "' + FN_Escape( PathSepToTarget( hbmk, tmp ), _ESC_BACKSLASH ) + '"' + Chr( 10 ) } )
IF hbmk[ _HBMK_cPLAT ] == "os2"
AEval( hbmk[ _HBMK_aICON ], {|tmp, tmp1| cFile += 'ICON ' + hb_ntos( tmp1 ) + ' DISCARDABLE "' + FN_Escape( PathSepToTarget( hbmk, tmp ), _ESC_BACKSLASH ) + '"' + Chr( 10 ) } )
ELSE
AEval( hbmk[ _HBMK_aICON ], {|tmp, tmp1| cFile += 'ICON' + hb_ntos( tmp1 ) + ' ICON DISCARDABLE "' + FN_Escape( PathSepToTarget( hbmk, tmp ), _ESC_BACKSLASH ) + '"' + Chr( 10 ) } )
ENDIF
IF hbmk[ _HBMK_lINC ]
IF hbmk[ _HBMK_lREBUILD ] .OR. !( hb_MemoRead( l_cRESSTUB ) == cFile )
@@ -6775,7 +6779,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
LOCAL aText_Basic := {;
I_( "Syntax:" ),;
"",;
I_( " hbmk2 [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl]>" ),;
I_( " hbmk2 [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl|@.clp]>" ),;
"",;
I_( "Options:" ) }
@@ -6931,14 +6935,13 @@ STATIC PROCEDURE OutOpt( hbmk, aOpt )
OutStd( hb_osNewLine() )
ELSE
aOpt[ 2 ] := StrTran( aOpt[ 2 ], "\n", hb_osNewLine() )
nLines := MLCount( aOpt[ 2 ], MaxCol() - 19 )
nLines := MLCount( aOpt[ 2 ], MaxCol() - 21 )
FOR nLine := 1 TO nLines
IF ! Empty( tmp := MemoLine( aOpt[ 2 ], MaxCol() - 19, nLine ) )
OutStd( " " )
IF ! Empty( tmp := MemoLine( aOpt[ 2 ], MaxCol() - 21, nLine ) )
IF nLine == 1
OutStd( PadR( aOpt[ 1 ], 19 ) )
OutStd( PadR( Space( 2 ) + aOpt[ 1 ], 21 ) )
ELSE
OutStd( Space( 19 ) )
OutStd( Space( 21 ) )
ENDIF
OutStd( tmp + hb_osNewLine() )
ENDIF
@@ -6957,9 +6960,9 @@ STATIC PROCEDURE OutNote( hbmk, cText )
FOR nLine := 1 TO nLines
IF ! Empty( tmp := MemoLine( cText, MaxCol() - 4, nLine ) )
IF nLine == 1
OutStd( " - " )
OutStd( PadR( " -", 4 ) )
ELSE
OutStd( " " )
OutStd( Space( 4 ) )
ENDIF
OutStd( tmp + hb_osNewLine() )
ENDIF
@@ -6977,9 +6980,9 @@ STATIC PROCEDURE hbmk_OutStd( hbmk, cText )
FOR nLine := 1 TO nLines
IF ! Empty( tmp := MemoLine( cText, MaxCol() - 7, nLine ) )
IF nLine == 1
OutStd( "hbmk2: " )
OutStd( PadR( "hbmk2:", 7 ) )
ELSE
OutStd( " " )
OutStd( Space( 7 ) )
ENDIF
OutStd( tmp + hb_osNewLine() )
ENDIF
@@ -6997,9 +7000,9 @@ STATIC PROCEDURE hbmk_OutErr( hbmk, cText )
FOR nLine := 1 TO nLines
IF ! Empty( tmp := MemoLine( cText, MaxCol() - 7, nLine ) )
IF nLine == 1
OutErr( "hbmk2: " )
OutErr( PadR( "hbmk2:", 7 ) )
ELSE
OutErr( " " )
OutErr( Space( 7 ) )
ENDIF
OutErr( tmp + hb_osNewLine() )
ENDIF

4
harbour/utils/hbmk2/hbmk2.pt_BR.po
View File

@@ -372,8 +372,8 @@ msgstr "paths adicionais para pesquisa de arquivos headers"
#: hbmk2.prg:6582
#, c-format
msgid " hbmk2 [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl]>"
msgstr " hbmk2 [op‡äes] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl]>"
msgid " hbmk2 [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl|@.clp]>"
msgstr " hbmk2 [op‡äes] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl|@.clp]>"
#: hbmk2.prg:3663
#: hbmk2.prg:4162