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

2008-05-21 16:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* make_b32.mak
   * make_vc.mak
   * make_vcce.mak
     + Added HBDOC_LIBS to specify external libs for HBDOC.
       Only for non-GNU B32/VC/VCCE builds! For non-GNU GCC 
       it's probably LDFLAGS, for GNU it's probably LDLIBS.
       NOTE: Use full path for the libs.
       Such dependency is anything by good though (the core 
       build depends on a contrib lib, the contrib lib depends 
       on the core build), so consider this a temporary solution.
       Moving HBDOC to the contrib area is one possibility, 
       dropping it is another one.
     ; There is quite a big mess regarding these envvars depending 
       on the type of make system, platform, compiler, etc, 
       that it's almost impossible to document or understand, so 
       maybe it'd be worth a review after the release, and sync 
       all these external flag and dir envvars.
       
   * utils/hbdoc/genpdf1.prg
     ! Fixed warnings in HBDOC_PDF guarded code.
This commit is contained in:
Viktor Szakats
2008-05-21 14:42:04 +00:00
parent e950f77eba
commit ce4dc8486c
5 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
harbour/ChangeLog
View File

@@ -8,6 +8,28 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-05-21 16:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* make_b32.mak
* make_vc.mak
* make_vcce.mak
+ Added HBDOC_LIBS to specify external libs for HBDOC.
Only for non-GNU B32/VC/VCCE builds! For non-GNU GCC
it's probably LDFLAGS, for GNU it's probably LDLIBS.
NOTE: Use full path for the libs.
Such dependency is anything by good though (the core
build depends on a contrib lib, the contrib lib depends
on the core build), so consider this a temporary solution.
Moving HBDOC to the contrib area is one possibility,
dropping it is another one.
; There is quite a big mess regarding these envvars depending
on the type of make system, platform, compiler, etc,
that it's almost impossible to document or understand, so
maybe it'd be worth a review after the release, and sync
all these external flag and dir envvars.
* utils/hbdoc/genpdf1.prg
! Fixed warnings in HBDOC_PDF guarded code.
2008-05-21 15:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* bin/bld.bat
* bin/bld_os2.cmd

5
harbour/make_b32.mak
View File

@@ -82,7 +82,7 @@ MKLIB = tlib.exe
#**********************************************************
# Include Common Object list files
# shared between Msvc and Borland
# shared between MSVC and Borland
!include common.mak
@@ -537,7 +537,7 @@ $(CFLAGS)
-e$(HBDOC_EXE)
$(**: = ^
)
$(STANDARD_STATIC_HBLIBS)
$(STANDARD_STATIC_HBLIBS) $(HBDOC_LIBS)
!
#**********************************************************
# HBMAKE build rule
@@ -677,7 +677,6 @@ doClean:
-if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul
-if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul
-if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul
-if exist gtlibs.mak $(DEL) gtlibs.mak > nul
-if exist bin\*.exe $(DEL) bin\*.exe > nul
-if exist lib\*.lib $(DEL) lib\*.lib > nul

4
harbour/make_vc.mak
View File

@@ -80,7 +80,7 @@ MKLIB = lib.exe
#**********************************************************
# Include Common Object list files
# shared between Msvc and Borland
# shared between MSVC and Borland
!include common.mak
@@ -877,7 +877,7 @@ $(LDFLAGS)
/OUT:$(HBDOC_EXE)
$(**: = ^
)
$(STANDARD_STATIC_HBLIBS)
$(STANDARD_STATIC_HBLIBS $(HBDOC_LIBS)
user32.lib winspool.lib
<<$(KEEPSTATE)
#**********************************************************

4
harbour/make_vcce.mak
View File

@@ -85,7 +85,7 @@ MKLIB = lib.exe
#**********************************************************
# Include Common Object list files
# shared between Msvc and Borland
# shared between MSVC and Borland
!include common.mak
@@ -885,7 +885,7 @@ $(LDFLAGS)
/OUT:$(HBDOC_EXE)
$(**: = ^
)
$(STANDARD_STATIC_HBLIBS)
$(STANDARD_STATIC_HBLIBS) $(HBDOC_LIBS)
coredll.lib corelibc.lib winsock.lib ws2.lib
<<
#**********************************************************

26
harbour/utils/hbdoc/genpdf1.prg
View File

@@ -123,9 +123,7 @@ FUNCTION ProcessPdf(lMemory)
LOCAL lData := .F.
LOCAL lMethod := .F.
LOCAL cBuffEnd
LOCAL nPos
LOCAL nPosEND
LOCAL lIsDataLink := .F.
LOCAL lIsMethodLink := .F.
@@ -298,14 +296,14 @@ local hhh
FOR nAlso := 1 TO LEN( aalso )
IF nAlso == 1
nPos:=ascan(awww,{|a,b| Upper(a[1])== upper(aAlso[nAlso])})
nPos:=ascan(awww,{|a| Upper(a[1])== upper(aAlso[nAlso])})
if nPos>0
HB_PDFADDLINK(awww[ npos,1 ],aWww[nPos,2] )
else
HB_PDFADDLINK(awww[ 1,1 ],aWww[1,2] )
endif
ELSE
nPos:=ascan(awww,{|a,b| Upper(a[1])== upper(aAlso[nAlso])})
nPos:=ascan(awww,{|a| Upper(a[1])== upper(aAlso[nAlso])})
if nPos>0
HB_PDFADDLINK(awww[ npos,1 ],aWww[nPos,2] )
else
@@ -761,6 +759,8 @@ RETURN aAlso
*+
FUNCTION ProcStatusPdf( nWriteHandle, cBuffer )
HB_SYMBOL_UNUSED( nWriteHandle )
IF LEN( ALLTRIM( cBuffer ) ) > 1
hb_pdfWriteText( cBuffer )
ELSEIF SUBSTR( ALLTRIM( cBuffer ), 1 ) == "R"
@@ -785,7 +785,9 @@ RETURN nil
*+±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±±
*+
FUNCTION GenPdfTable( oPdf ,nNumTableItems)
FUNCTION GenPdfTable( oPdf, nNumTableItems)
HB_SYMBOL_UNUSED( oPdf )
if nNumTableItems <3
hb_pdfWriteText( " " )
@@ -823,7 +825,6 @@ FUNCTION ProcPdfTable( cBuffer, nNum )
LOCAL cItem2 := ''
LOCAL cItem3 := ''
LOCAL cItem4 := ''
LOCAL xtype
LOCAL nColorpos
LOCAL cColor
cBuffer := ALLTRIM( cBuffer )
@@ -838,7 +839,7 @@ FUNCTION ProcPdfTable( cBuffer, nNum )
cBuffer := STRTRAN( cbuffer, "<color:", "" )
cBuffer := STRTRAN( cbuffer, ">", "" )
cBuffer := STRTRAN( cBuffer, ccolor, '' )
nColorpos := ASCAN( aColorTable, { | x, y | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
nColorpos := ASCAN( aColorTable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
cColor := aColortable[ nColorPos, 2 ]
ENDIF
IF !EMPTY( cBuffer )
@@ -905,7 +906,6 @@ FUNCTION ProcPdfDesc( cBuffer, oPdf, cStyle )
LOCAL nColorPos
LOCAL ccolor := ''
LOCAL cReturn := ''
LOCAL ncolorend
LOCAL nIdentLevel
LOCAL cOldLine
LOCAL lEndPar := .F.
@@ -1214,7 +1214,7 @@ FUNC CheckPdfColor( cbuffer, ncolorpos )
cOldColorString := SUBSTR( cbuffer, ncolorpos )
nColorend := AT( ">", cOldColorString )
cOldColorString := SUBSTR( cOldColorString, 1, nColorEnd )
nreturn := ASCAN( acolortable, { | x, y | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
nreturn := ASCAN( acolortable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
IF nreturn > 0
cReturn := "^a" + acolortable[ nreturn, 2 ]
ENDIF
@@ -1238,7 +1238,6 @@ FUNC MaxElemPdf( a )
LOCAL tam := 0
LOCAL nMax2 := 0
LOCAL nPos := 1
LOCAL cString
LOCAL nCount
FOR nCount := 1 TO nSize
@@ -1268,10 +1267,13 @@ FUNCTION FormatPdfBuff( cBuffer, cStyle, oPdf )
LOCAL cBuffEnd := ''
LOCAL lEndBuffer := .f.
LOCAL nPos
LOCAL nPosend
LOCAL lArgBold := .f.
LOCAL LFstTableItem := .t.
HB_SYMBOL_UNUSED( oPdf )
cReturn := cBuffer + ' '
IF AT( '</par>', cReturn ) > 0 .OR. EMPTY( cBuffer )
IF EMPTY( cbuffer )
cReturn := ''
@@ -1369,7 +1371,6 @@ STATIC FUNCTION ReadFromTop( nh )
LOCAL cClassDoc := DELIM + "CLASSDOC" + DELIM
LOCAL cBuffer := ''
LOCAL NPOS := 0
LOCAL nlenpos
LOCAL aLocDoc := {}
DO WHILE FREADline( nH, @cBuffer, 4096 )
cBuffer := TRIM( SUBSTR( cBuffer, nCommentLen ) )
@@ -1397,7 +1398,6 @@ STATIC FUNCTION GetItem( cItem, nCurdoc )
LOCAL nPos
LOCAL cCuritem
LOCAL lReturn
LOCAL x
LOCAL xPos
xPos := aCurdoc[ nCurdoc ]
nPos := ASCAN( xPos, { | x | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )