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

2010-08-18 22:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
    + Some binary link.

  * utils/hbmk2/hbmk2.prg
    ! Changed the way links are installed. This should fix it
      for win platform.
    * Will now delete link before trying to create it in install phase.
This commit is contained in:
Viktor Szakats
2010-08-18 20:46:00 +00:00
parent b5269fd82b
commit 4cfad619bd
3 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -16,6 +16,15 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-08-18 22:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
+ Some binary link.
* utils/hbmk2/hbmk2.prg
! Changed the way links are installed. This should fix it
for win platform.
* Will now delete link before trying to create it in install phase.
2010-08-18 12:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtgui/g/QGraphicsScene.cpp
* contrib/hbqt/qtgui/qth/QGraphicsScene.qth

1
harbour/INSTALL
View File

@@ -1487,6 +1487,7 @@ HARBOUR
http://www.oracle.com/technology/tech/oci/instantclient/index.html
HB_WITH_OPENSSL - OpenSSL [multiplatform, free, open-source]
http://www.openssl.org/
http://www.openssl.org/related/binaries.html
HB_WITH_PCRE - Perl Compatible Regular Expressions [multiplatform, free, open-source]
http://www.pcre.org/
HB_WITH_PGSQL - PostgreSQL [multiplatform, free, open-source]

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

@@ -6176,27 +6176,8 @@ STATIC PROCEDURE vxworks_env_init( hbmk )
RETURN
STATIC PROCEDURE DoLinkCalc( hbmk )
LOCAL tmp
FOR EACH tmp IN hbmk[ _HBMK_aLINK ]
tmp := PathNormalize( PathMakeAbsolute( tmp, hbmk[ _HBMK_cPROGNAME ] ) )
NEXT
RETURN
STATIC FUNCTION DoLinkDelete( hbmk )
LOCAL tmp
FOR EACH tmp IN hbmk[ _HBMK_aLINK ]
FErase( tmp )
NEXT
RETURN .T.
STATIC FUNCTION DoLink( hbmk )
LOCAL cDir, cName, cExt
LOCAL tmp
LOCAL tmp1
LOCAL tmp, tmp1
FOR EACH tmp IN hbmk[ _HBMK_aLINK ]
tmp1 := DirAddPathSep( PathMakeRelative( FNameDirGet( tmp ), FNameDirGet( hbmk[ _HBMK_cPROGNAME ] ), .T. ) ) + FNameNameExtGet( hbmk[ _HBMK_cPROGNAME ] )
@@ -6208,11 +6189,30 @@ STATIC FUNCTION DoLink( hbmk )
cDir := ""
ENDIF
tmp1 := hb_FNameMerge( cDir, cName, cExt )
tmp := { PathNormalize( PathMakeAbsolute( tmp, hbmk[ _HBMK_cPROGNAME ] ) ),;
tmp1 }
NEXT
IF hb_FLinkSym( tmp1, tmp ) == F_ERROR
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Failed creating symbolic link %1$s to %2$s" ), tmp, tmp1 ) )
RETURN
STATIC FUNCTION DoLinkDelete( hbmk )
LOCAL tmp
FOR EACH tmp IN hbmk[ _HBMK_aLINK ]
FErase( tmp[ 1 ] )
NEXT
RETURN .T.
STATIC FUNCTION DoLink( hbmk )
LOCAL tmp
FOR EACH tmp IN hbmk[ _HBMK_aLINK ]
IF hb_FLinkSym( tmp[ 2 ], tmp[ 1 ] ) == F_ERROR
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Failed creating symbolic link %1$s to %2$s" ), tmp[ 1 ], tmp[ 2 ] ) )
ELSE
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created symbolic link %1$s to %2$s" ), tmp, tmp1 ) )
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created symbolic link %1$s to %2$s" ), tmp[ 1 ], tmp[ 2 ] ) )
ENDIF
NEXT
@@ -6300,7 +6300,13 @@ STATIC PROCEDURE DoInstCopy( hbmk )
nCopied := 0 /* files copied */
FOR EACH aInstFile IN hbmk[ _HBMK_aINSTFILE ]
cInstFile := aInstFile[ _INST_cData ]
IF ISARRAY( aInstFile[ _INST_cData ] )
cInstFile := aInstFile[ _INST_cData ][ 1 ]
cLink := aInstFile[ _INST_cData ][ 2 ]
ELSE
cInstFile := aInstFile[ _INST_cData ]
cLink := NIL
ENDIF
IF aInstPath[ _INST_cGroup ] == aInstFile[ _INST_cGroup ]
IF Empty( FNameNameExtGet( cInstPath ) )
@@ -6325,7 +6331,8 @@ STATIC PROCEDURE DoInstCopy( hbmk )
IF DirBuild( FNameDirGet( cDestFileName ) )
++nCopied
IF ! Empty( cLink := hb_FLinkRead( cInstFile ) )
IF cLink != NIL
FErase( cDestFileName )
IF hb_FLinkSym( cLink, cDestFileName ) == F_ERROR
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Copying symbolic link %1$s to %2$s failed with %3$s." ), cInstFile, cDestFileName, hb_ntos( FError() ) ) )
ELSEIF hbmk[ _HBMK_lInfo ]