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

2010-03-26 15:04 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    * Minor cleanup to use native pathseps in hb_FileExists() call.

  * bin/postinst.bat
    ! Fixed missing '\' when forming PGSQL .dll path.
This commit is contained in:
Viktor Szakats
2010-03-26 14:06:03 +00:00
parent 2b2e337735
commit b5c0243e6f
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-03-26 15:04 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
* Minor cleanup to use native pathseps in hb_FileExists() call.
* bin/postinst.bat
! Fixed missing '\' when forming PGSQL .dll path.
2010-03-26 13:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbssl/ssl.c
* contrib/hbssl/x509.c

2
harbour/bin/postinst.bat
View File

@@ -106,7 +106,7 @@ if "%HB_SHELL%" == "nt" goto _SH_NT
if not "%HB_WITH_OPENSSL%" == "" "%HB_HOST_BIN_DIR%\hbmk2" "-mkimplib=%HB_LIB_INSTALL%\ssleay32" "%HB_WITH_OPENSSL%\..\dll\ssleay32.dll" -mkimplibms
if not "%HB_WITH_OPENSSL%" == "" "%HB_HOST_BIN_DIR%\hbmk2" "-mkimplib=%HB_LIB_INSTALL%\libeay32" "%HB_WITH_OPENSSL%\..\libeay32.dll" -mkimplibms
if not "%HB_WITH_OPENSSL%" == "" "%HB_HOST_BIN_DIR%\hbmk2" "-mkimplib=%HB_LIB_INSTALL%\ssleay32" "%HB_WITH_OPENSSL%\..\ssleay32.dll" -mkimplibms
if not "%HB_WITH_PGSQL%" == "" "%HB_HOST_BIN_DIR%\hbmk2" "-mkimplib=%HB_LIB_INSTALL%\libpq" "%HB_WITH_PGSQL%..\lib\libpq.dll" -mkimplibms
if not "%HB_WITH_PGSQL%" == "" "%HB_HOST_BIN_DIR%\hbmk2" "-mkimplib=%HB_LIB_INSTALL%\libpq" "%HB_WITH_PGSQL%\..\lib\libpq.dll" -mkimplibms
rem ; Exception: We use static libs with mingw.
if "%HB_COMPILER%" == "mingw" copy /b /y "%HB_WITH_OCILIB%\..\lib32\libociliba.a" "%HB_LIB_INSTALL%\libociliba.a"

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

@@ -3610,7 +3610,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF lMakeImpLib
IF ISBLOCK( bBlk_ImpLib )
IF ! Empty( cMakeImpLibDLL ) .AND. ! Empty( cMakeImpLibLib )
IF hb_FileExists( cMakeImpLibDLL )
IF hb_FileExists( PathSepToSelf( cMakeImpLibDLL ) )
tmp := FN_CookLib( hbmk, cMakeImpLibLib, cLibLibPrefix, cLibLibExt )
IF Eval( bBlk_ImpLib, cMakeImpLibDLL, tmp, cOpt_ImpLib )
hbmk_OutStd( hbmk, hb_StrFormat( I_( "Created import library: %1$s <= %2$s" ), tmp, cMakeImpLibDLL ) )