df007814b5
* config/rules.cf
* config/win/global.cf
* config/lib.cf
* config/bin.cf
* Make files changed to:
- add Harbour option -n1 for all lib .prgs.
- add Harbour option -n for all binary .prgs.
- use HB_GCMODE to override -gc mode for binaries.
- add C -DHB_DYNLIB option when HB_DLL envvar is set to 'yes'.
; This means that now 'set HB_DLL=yes' setting works as planned,
and will compile Harbour to allow the creation of .dlls
and will also create those (msvc, bcc32, owatcom).
(MinGW has been covered before these changes already.)
; TOFIX: .dlls still need tweaking to work properly.
owatcom doesn't create usable binaries when
using HB_DLL=yes f.e., also hbrun-dll cannot be
built with msvc/bcc32.
* config/win/owatcom.cf
% Removed DOS hack.
* bin/hb-mkdyn.bat
! Fixes to recent changes.
289 lines
9.1 KiB
Batchfile
289 lines
9.1 KiB
Batchfile
@rem
|
|
@rem $Id$
|
|
@rem
|
|
|
|
@echo off
|
|
|
|
rem ---------------------------------------------------------------
|
|
rem Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
|
|
rem See doc/license.txt for licensing terms.
|
|
rem ---------------------------------------------------------------
|
|
|
|
rem NOTE: .prg files have to be compiled with -n1
|
|
rem NOTE: .c files have to be compiled with -DHB_DYNLIB
|
|
|
|
if not "%OS%" == "Windows_NT" ( echo This script needs Windows NT or newer. && goto END )
|
|
if "%HB_ARCHITECTURE%" == "" ( echo HB_ARCHITECTURE needs to be set. && goto END )
|
|
if "%HB_COMPILER%" == "" ( echo HB_COMPILER needs to be set. && goto END )
|
|
if not "%HB_ARCHITECTURE%" == "win" goto END
|
|
|
|
set HB_DLL_VERSION=11
|
|
set HB_DLL_LIBS=hbcommon hbpp hbrtl hbmacro hblang hbcpage hbpcre hbzlib hbextern hbrdd rddntx rddnsx rddcdx rddfpt hbsix hbhsx hbusrrdd gtcgi gtpca gtstd gtwin gtwvt gtgui
|
|
set HB_DLL_LIBS_ST=hbvm
|
|
set HB_DLL_LIBS_MT=hbvmmt
|
|
|
|
if "%HB_COMPILER%" == "msvc" goto DO_MSVC
|
|
if "%HB_COMPILER%" == "msvc64" goto DO_MSVC
|
|
if "%HB_COMPILER%" == "bcc32" goto DO_BCC32
|
|
if "%HB_COMPILER%" == "owatcom" goto DO_OWATCOM
|
|
|
|
echo HB_COMPILER %HB_COMPILER% isn't supported.
|
|
goto END
|
|
|
|
:DO_MSVC
|
|
|
|
echo Making .dlls for %HB_COMPILER%...
|
|
|
|
md _dll
|
|
cd _dll
|
|
|
|
rem ; Extract neutral objects
|
|
echo.> _hboneut.txt
|
|
for %%f in (%HB_DLL_LIBS%) do (
|
|
if exist "%HB_LIB_INSTALL%\%%f.lib" (
|
|
echo Processing library: %%f
|
|
lib "%HB_LIB_INSTALL%\%%f.lib" /nologo /list > _hboraw.txt
|
|
for /F %%p in (_hboraw.txt) do (
|
|
lib "%HB_LIB_INSTALL%\%%f.lib" /nologo /extract:%%p
|
|
echo %%p>> _hboneut.txt
|
|
)
|
|
del _hboraw.txt
|
|
) else ( echo Library not found: %HB_LIB_INSTALL%\%%f.lib )
|
|
)
|
|
|
|
md _st
|
|
cd _st
|
|
rem ; Extract ST objects
|
|
echo.> ..\_hbost.txt
|
|
for %%f in (%HB_DLL_LIBS_ST%) do (
|
|
if exist "%HB_LIB_INSTALL%\%%f.lib" (
|
|
echo Processing library: %%f
|
|
lib "%HB_LIB_INSTALL%\%%f.lib" /nologo /list > _hboraw.txt
|
|
for /F %%p in (_hboraw.txt) do (
|
|
if not "%%p" == "maindll.obj" (
|
|
if not "%%p" == "maindllp.obj" (
|
|
lib "%HB_LIB_INSTALL%\%%f.lib" /nologo /extract:%%p
|
|
echo _st\%%p>> ..\_hbost.txt
|
|
)
|
|
)
|
|
)
|
|
del _hboraw.txt
|
|
) else ( echo Library not found: %HB_LIB_INSTALL%\%%f.lib )
|
|
)
|
|
cd ..
|
|
|
|
md _mt
|
|
cd _mt
|
|
rem ; Extract MT objects
|
|
echo.> ..\_hbomt.txt
|
|
for %%f in (%HB_DLL_LIBS_MT%) do (
|
|
if exist "%HB_LIB_INSTALL%\%%f.lib" (
|
|
echo Processing library: %%f
|
|
lib "%HB_LIB_INSTALL%\%%f.lib" /nologo /list > _hboraw.txt
|
|
for /F %%p in (_hboraw.txt) do (
|
|
if not "%%p" == "maindll.obj" (
|
|
if not "%%p" == "maindllp.obj" (
|
|
lib "%HB_LIB_INSTALL%\%%f.lib" /nologo /extract:%%p
|
|
echo _mt\%%p>> ..\_hbomt.txt
|
|
)
|
|
)
|
|
)
|
|
del _hboraw.txt
|
|
) else ( echo Library not found: %HB_LIB_INSTALL%\%%f.lib )
|
|
)
|
|
cd ..
|
|
|
|
set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-vc
|
|
set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-vc
|
|
|
|
echo Making %_DST_NAME_ST%.dll... && link /dll /out:"%HB_BIN_INSTALL%\%_DST_NAME_ST%.dll" @_hboneut.txt @_hbost.txt user32.lib wsock32.lib advapi32.lib gdi32.lib > nul
|
|
echo Making %_DST_NAME_MT%.dll... && link /dll /out:"%HB_BIN_INSTALL%\%_DST_NAME_MT%.dll" @_hboneut.txt @_hbomt.txt user32.lib wsock32.lib advapi32.lib gdi32.lib > nul
|
|
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_ST%.lib" move "%HB_BIN_INSTALL%\%_DST_NAME_ST%.lib" "%HB_LIB_INSTALL%\%_DST_NAME_ST%.lib"
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_MT%.lib" move "%HB_BIN_INSTALL%\%_DST_NAME_MT%.lib" "%HB_LIB_INSTALL%\%_DST_NAME_MT%.lib"
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_ST%.exp" move "%HB_BIN_INSTALL%\%_DST_NAME_ST%.exp" "%HB_LIB_INSTALL%\%_DST_NAME_ST%.exp"
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_MT%.exp" move "%HB_BIN_INSTALL%\%_DST_NAME_MT%.exp" "%HB_LIB_INSTALL%\%_DST_NAME_MT%.exp"
|
|
|
|
rem ; Cleanup
|
|
for /F %%o in (_hbost.txt) do ( del %%o )
|
|
del _hbost.txt
|
|
rmdir _st
|
|
|
|
for /F %%o in (_hbomt.txt) do ( del %%o )
|
|
del _hbomt.txt
|
|
rmdir _mt
|
|
|
|
for /F %%o in (_hboneut.txt) do ( del %%o )
|
|
del _hboneut.txt
|
|
cd ..
|
|
rmdir _dll
|
|
|
|
goto END
|
|
|
|
:DO_BCC32
|
|
|
|
echo Making .dlls for %HB_COMPILER%...
|
|
|
|
md _dll
|
|
cd _dll
|
|
|
|
echo. c0d32.obj +> _hballst.txt
|
|
echo. c0d32.obj +> _hballmt.txt
|
|
|
|
rem ; Extract neutral objects
|
|
echo.> _hboneut.txt
|
|
for %%f in (%HB_DLL_LIBS%) do (
|
|
if exist "%HB_LIB_INSTALL%\%%f.lib" (
|
|
echo Processing library: %%f
|
|
tlib "%HB_LIB_INSTALL%\%%f.lib", _hboraw.txt > nul
|
|
echo.> _hboraw2.txt
|
|
for /F "tokens=1,2" %%f in (_hboraw.txt) do (
|
|
if "%%g" == "size" (
|
|
echo %%f.obj >> _hboraw2.txt
|
|
)
|
|
)
|
|
del _hboraw.txt
|
|
for /F %%p in (_hboraw2.txt) do (
|
|
tlib "%HB_LIB_INSTALL%\%%f.lib" * %%p > nul
|
|
echo %%p +>> _hballst.txt
|
|
echo %%p +>> _hballmt.txt
|
|
echo %%p>> _hboneut.txt
|
|
)
|
|
del _hboraw2.txt
|
|
) else ( echo Library not found: %HB_LIB_INSTALL%\%%f.lib )
|
|
)
|
|
|
|
md _st
|
|
cd _st
|
|
rem ; Extract ST objects
|
|
echo.> ..\_hbost.txt
|
|
for %%f in (%HB_DLL_LIBS_ST%) do (
|
|
if exist "%HB_LIB_INSTALL%\%%f.lib" (
|
|
echo Processing library: %%f
|
|
tlib "%HB_LIB_INSTALL%\%%f.lib", _hboraw.txt > nul
|
|
echo.> _hboraw2.txt
|
|
for /F "tokens=1,2" %%f in (_hboraw.txt) do (
|
|
if "%%g" == "size" (
|
|
echo %%f.obj >> _hboraw2.txt
|
|
)
|
|
)
|
|
del _hboraw.txt
|
|
for /F %%p in (_hboraw2.txt) do (
|
|
if not "%%p" == "maindll.obj" (
|
|
if not "%%p" == "maindllp.obj" (
|
|
tlib "%HB_LIB_INSTALL%\%%f.lib" * %%p > nul
|
|
echo _st\%%p +>> ..\_hballst.txt
|
|
echo _st\%%p>> ..\_hbost.txt
|
|
)
|
|
)
|
|
)
|
|
del _hboraw2.txt
|
|
) else ( echo Library not found: %HB_LIB_INSTALL%\%%f.lib )
|
|
)
|
|
cd ..
|
|
|
|
md _mt
|
|
cd _mt
|
|
rem ; Extract MT objects
|
|
echo.> ..\_hbomt.txt
|
|
for %%f in (%HB_DLL_LIBS_MT%) do (
|
|
if exist "%HB_LIB_INSTALL%\%%f.lib" (
|
|
echo Processing library: %%f
|
|
tlib "%HB_LIB_INSTALL%\%%f.lib", _hboraw.txt > nul
|
|
echo.> _hboraw2.txt
|
|
for /F "tokens=1,2" %%f in (_hboraw.txt) do (
|
|
if "%%g" == "size" (
|
|
echo %%f.obj >> _hboraw2.txt
|
|
)
|
|
)
|
|
del _hboraw.txt
|
|
for /F %%p in (_hboraw2.txt) do (
|
|
if not "%%p" == "maindll.obj" (
|
|
if not "%%p" == "maindllp.obj" (
|
|
tlib "%HB_LIB_INSTALL%\%%f.lib" * %%p > nul
|
|
echo _mt\%%p +>> ..\_hballmt.txt
|
|
echo _mt\%%p>> ..\_hbomt.txt
|
|
)
|
|
)
|
|
)
|
|
del _hboraw2.txt
|
|
) else ( echo Library not found: %HB_LIB_INSTALL%\%%f.lib )
|
|
)
|
|
cd ..
|
|
|
|
set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-b32
|
|
set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-b32
|
|
|
|
echo. , "%HB_BIN_INSTALL%\%_DST_NAME_ST%.dll",, cw32mt.lib import32.lib >> _hballst.txt
|
|
echo. , "%HB_BIN_INSTALL%\%_DST_NAME_MT%.dll",, cw32mt.lib import32.lib >> _hballmt.txt
|
|
|
|
echo Making %_DST_NAME_ST%.dll... && ilink32 -Gn -C -aa -Tpd -Gi -x c0d32.obj @_hballst.txt
|
|
echo Making %_DST_NAME_MT%.dll... && ilink32 -Gn -C -aa -Tpd -Gi -x c0d32.obj @_hballmt.txt
|
|
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_ST%.lib" move "%HB_BIN_INSTALL%\%_DST_NAME_ST%.lib" "%HB_LIB_INSTALL%\%_DST_NAME_ST%.lib"
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_MT%.lib" move "%HB_BIN_INSTALL%\%_DST_NAME_MT%.lib" "%HB_LIB_INSTALL%\%_DST_NAME_MT%.lib"
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_ST%.exp" move "%HB_BIN_INSTALL%\%_DST_NAME_ST%.exp" "%HB_LIB_INSTALL%\%_DST_NAME_ST%.exp"
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_MT%.exp" move "%HB_BIN_INSTALL%\%_DST_NAME_MT%.exp" "%HB_LIB_INSTALL%\%_DST_NAME_MT%.exp"
|
|
|
|
del _hballst.txt
|
|
del _hballmt.txt
|
|
|
|
rem ; Cleanup
|
|
for /F %%o in (_hbost.txt) do ( del %%o )
|
|
del _hbost.txt
|
|
rmdir _st
|
|
|
|
for /F %%o in (_hbomt.txt) do ( del %%o )
|
|
del _hbomt.txt
|
|
rmdir _mt
|
|
|
|
for /F %%o in (_hboneut.txt) do ( del %%o )
|
|
del _hboneut.txt
|
|
cd ..
|
|
rmdir _dll
|
|
|
|
goto END
|
|
|
|
:DO_OWATCOM
|
|
|
|
echo Making .dlls for %HB_COMPILER%...
|
|
|
|
md _dll
|
|
cd _dll
|
|
|
|
echo.> _hbsst.txt
|
|
echo.> _hbsmt.txt
|
|
for %%f in (%HB_DLL_LIBS%) do (
|
|
echo FILE '%HB_LIB_INSTALL%\%%f.lib'>> _hbsst.txt
|
|
echo FILE '%HB_LIB_INSTALL%\%%f.lib'>> _hbsmt.txt
|
|
)
|
|
|
|
copy /b /y "%HB_LIB_INSTALL%\%HB_DLL_LIBS_ST%.lib" . && wlib -b "%HB_DLL_LIBS_ST%.lib" - mainstd.obj
|
|
copy /b /y "%HB_LIB_INSTALL%\%HB_DLL_LIBS_MT%.lib" . && wlib -b "%HB_DLL_LIBS_MT%.lib" - mainstd.obj
|
|
|
|
echo FILE '%HB_DLL_LIBS_ST%.lib'>> _hbsst.txt
|
|
echo FILE '%HB_DLL_LIBS_MT%.lib'>> _hbsmt.txt
|
|
|
|
set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-ow
|
|
set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-ow
|
|
|
|
echo Making %_DST_NAME_ST%.dll... && wlink SYS NT_DLL NAME '%HB_BIN_INSTALL%\%_DST_NAME_ST%.dll' OP IMPLIB @_hbsst.txt LIB user32.lib, wsock32.lib, advapi32.lib, gdi32.lib > nul
|
|
echo Making %_DST_NAME_MT%.dll... && wlink SYS NT_DLL NAME '%HB_BIN_INSTALL%\%_DST_NAME_MT%.dll' OP IMPLIB @_hbsmt.txt LIB user32.lib, wsock32.lib, advapi32.lib, gdi32.lib > nul
|
|
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_ST%.lib" move "%HB_BIN_INSTALL%\%_DST_NAME_ST%.lib" "%HB_LIB_INSTALL%\%_DST_NAME_ST%.lib"
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_MT%.lib" move "%HB_BIN_INSTALL%\%_DST_NAME_MT%.lib" "%HB_LIB_INSTALL%\%_DST_NAME_MT%.lib"
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_ST%.exp" move "%HB_BIN_INSTALL%\%_DST_NAME_ST%.exp" "%HB_LIB_INSTALL%\%_DST_NAME_ST%.exp"
|
|
if exist "%HB_BIN_INSTALL%\%_DST_NAME_MT%.exp" move "%HB_BIN_INSTALL%\%_DST_NAME_MT%.exp" "%HB_LIB_INSTALL%\%_DST_NAME_MT%.exp"
|
|
|
|
del %HB_DLL_LIBS_ST%.lib
|
|
del %HB_DLL_LIBS_MT%.lib
|
|
|
|
del _hbsst.txt
|
|
del _hbsmt.txt
|
|
cd ..
|
|
rmdir _dll
|
|
|
|
goto END
|
|
|
|
:END
|