From 19ee99fb0f7e4a1c7bae6ad35c196a3d850190f0 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 6 Sep 2008 23:45:17 +0000
Subject: [PATCH] 2008-09-07 01:44 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)    * contrib/hbcurl/make_vc.bat      ! Fixed external .lib handling for
 MSVC.

   * contrib/rddads/make_vc.bat
     ! Fixed external .lib handling for MSVC
       (for older ACE versions).

   * contrib/hbhpdf/make_b32.bat
   * contrib/hbhpdf/make_vc.bat
     + Added .lib/.dll support for libharu 2.1.0
       binary distribution version.
---
 harbour/ChangeLog                   | 13 +++++++++++++
 harbour/contrib/hbcurl/make_vc.bat  | 19 +++++++++++++++++--
 harbour/contrib/hbhpdf/make_b32.bat |  5 ++++-
 harbour/contrib/hbhpdf/make_vc.bat  |  7 +++++--
 harbour/contrib/rddads/make_vc.bat  |  2 +-
 5 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 333d687cd3..3b2094c4a7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,19 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-07 01:44 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/hbcurl/make_vc.bat
+     ! Fixed external .lib handling for MSVC.
+
+   * contrib/rddads/make_vc.bat
+     ! Fixed external .lib handling for MSVC 
+       (for older ACE versions).
+
+   * contrib/hbhpdf/make_b32.bat
+   * contrib/hbhpdf/make_vc.bat
+     + Added .lib/.dll support for libharu 2.1.0 
+       binary distribution version.
+
 2008-09-06 12:38 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * source/hbpcre/pcre.h
    * source/hbpcre/config.h
diff --git a/harbour/contrib/hbcurl/make_vc.bat b/harbour/contrib/hbcurl/make_vc.bat
index 01e34be740..05d4020709 100644
--- a/harbour/contrib/hbcurl/make_vc.bat
+++ b/harbour/contrib/hbcurl/make_vc.bat
@@ -47,8 +47,23 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_BUILD
 
-   rem Use supplied .lib file.
-   if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_CURL%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul
+   rem ---------------------------------------------------------------
+   rem This .dll to .lib conversion needs GNU sed.exe in the path
+   rem ---------------------------------------------------------------
+   echo./[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _temp.sed
+   echo. /^^[ \t]\+[0-9]\+/{>> _temp.sed
+   echo.   s/^^[ \t]\+[0-9]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+\(.*\)/\1/p>> _temp.sed
+   echo. }>> _temp.sed
+   echo.}>> _temp.sed
+   DUMPBIN /EXPORTS "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" > _dump.tmp
+   echo.LIBRARY "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" > _temp.def
+   echo.EXPORTS >> _temp.def
+   sed -nf _temp.sed < _dump.tmp >> _temp.def
+   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib >> %_HB_MAKELOG%
+   del _dump.tmp
+   del _temp.def
+   del _temp.sed
+   rem ---------------------------------------------------------------
    goto POST_EXIT
 
 :POST_CLEAN
diff --git a/harbour/contrib/hbhpdf/make_b32.bat b/harbour/contrib/hbhpdf/make_b32.bat
index 77d5f163c3..3b7fef5807 100644
--- a/harbour/contrib/hbhpdf/make_b32.bat
+++ b/harbour/contrib/hbhpdf/make_b32.bat
@@ -21,7 +21,10 @@ goto POST_EXIT
 if "%HB_INC_LIBHARU%" == "" set HB_INC_LIBHARU=%HB_DIR_LIBHARU%\include
 set CFLAGS=-I"%HB_INC_LIBHARU%"
 set _HB_DLL_NAME=libhpdf
-set _HB_DLL_DIR=%HB_DIR_LIBHARU%
+if exist "%HB_DIR_LIBHARU%\%_HB_DLL_NAME%.dll"         set _HB_DLL_DIR=%HB_DIR_LIBHARU%
+if exist "%HB_DIR_LIBHARU%\lib_dll\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_LIBHARU%\lib_dll
+
+if not "%HB_DIR_LIBHARU%" == "" echo Using .dll: "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll"
 
 rem ---------------------------------------------------------------
 
diff --git a/harbour/contrib/hbhpdf/make_vc.bat b/harbour/contrib/hbhpdf/make_vc.bat
index 5b8f209732..ac993bb8da 100644
--- a/harbour/contrib/hbhpdf/make_vc.bat
+++ b/harbour/contrib/hbhpdf/make_vc.bat
@@ -21,7 +21,10 @@ goto POST_EXIT
 if "%HB_INC_LIBHARU%" == "" set HB_INC_LIBHARU=%HB_DIR_LIBHARU%\include
 set CFLAGS=-I"%HB_INC_LIBHARU%"
 set _HB_DLL_NAME=libhpdf
-set _HB_DLL_DIR=%HB_DIR_LIBHARU%
+if exist "%HB_DIR_LIBHARU%\%_HB_DLL_NAME%.dll"         set _HB_DLL_DIR=%HB_DIR_LIBHARU%
+if exist "%HB_DIR_LIBHARU%\lib_dll\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_LIBHARU%\lib_dll
+
+if not "%HB_DIR_LIBHARU%" == "" echo Using .dll: "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll"
 
 rem ---------------------------------------------------------------
 
@@ -46,7 +49,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
 :POST_BUILD
 
    rem Use supplied .lib file.
-   if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_LIBHARU%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul
+   if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%_HB_DLL_DIR%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul
    goto POST_EXIT
 
 :POST_CLEAN
diff --git a/harbour/contrib/rddads/make_vc.bat b/harbour/contrib/rddads/make_vc.bat
index 2a6d232830..c65a663add 100644
--- a/harbour/contrib/rddads/make_vc.bat
+++ b/harbour/contrib/rddads/make_vc.bat
@@ -49,7 +49,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
 :POST_BUILD
 
    rem Use supplied .lib file.
-   if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_ADS%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul
+   if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%_HB_DLL_DIR%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul
    goto POST_EXIT
 
 :POST_CLEAN