From b5c0243e6f9a702980ddf907366d7e3bade1b251 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 26 Mar 2010 14:06:03 +0000 Subject: [PATCH] 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. --- harbour/ChangeLog | 7 +++++++ harbour/bin/postinst.bat | 2 +- harbour/utils/hbmk2/hbmk2.prg | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 731034dd76..5eddcb9b52 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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 diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index 8b1499bac8..51974049bc 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -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" diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 6c03c0a003..2bfea2d4ac 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -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 ) )