diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3f89abb239..fef4948442 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-28 01:22 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * INSTALL + + Added win/owatcom. + + Added contrib control options. + + * bin/postinst.bat + % Optimized, cleaned. + + * mpkg_win.nsi + - Turned off checkbox in "view readme" option. + 2009-02-27 23:40 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + mpkg_win.nsi + Added NSIS Windows installer script. diff --git a/harbour/INSTALL b/harbour/INSTALL index 8440b6c98a..9fd3e1003f 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -148,8 +148,9 @@ SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS ------- mingw - MinGW GNU C msvc - Microsoft Visual C++ - gcc - Cygwin GNU C + owatcom - Open Watcom C++ bcc32 - Borland/CodeGear C++ 4.x and above + gcc - Cygwin GNU C rxsnt - EMX/RSXNT/Windows GNU C icc - IBM Visual Age C++ dmc - Digital Mars C @@ -199,10 +200,16 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR - HB_BUILD_DLL=yes To create a full build with .dlls. This is only needed and available for non-GNU Windows compilers. + - HB_CONTRIBLIBS=no Don't build any contrib libraries. + - HB_CONTRIBLIBS=[] Build space separated of + contrib libraries. Build all if + left empty. + - HB_CONTRIB_ADDONS= Build additional libraries stored + in the contrib directory. - HB_REBUILD_PARSER=yes To rebuild the language parses. This requires GNU Bison. - HB_VISUALC_VER_PRE80=yes Set this if you're using a pre-8.0 - version of MSVC compiler. + (= pre-MSVS 2005) version of MSVC compiler. Cross building -------------- diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index 7eb8519a9c..819147deab 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -58,7 +58,6 @@ if "%HB_DIR_IMPLIB%" == "yes" ( if exist "%HB_DIR_LIBHARU%\libhpdf.dll" implib "%HB_LIB_INSTALL%\libhpdf.lib" "%HB_DIR_LIBHARU%\libhpdf.dll" if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.dll" implib "%HB_LIB_INSTALL%\libhpdf.lib" "%HB_DIR_LIBHARU%\lib_dll\libhpdf.dll" if exist "%HB_DIR_MYSQL%\bin\libmySQL.dll" implib "%HB_LIB_INSTALL%\libmysql.lib" "%HB_DIR_MYSQL%\bin\libmySQL.dll" - if exist "%SystemRoot%\system32\odbc32.dll" implib "%HB_LIB_INSTALL%\odbc32.lib" "%SystemRoot%\system32\odbc32.dll" if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\out32dll\libeay32.dll" if exist "%HB_DIR_OPENSSL%\dll\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\dll\libeay32.dll" if exist "%HB_DIR_OPENSSL%\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\libeay32.dll" @@ -67,6 +66,8 @@ if "%HB_DIR_IMPLIB%" == "yes" ( if exist "%HB_DIR_OPENSSL%\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\ssleay32.dll" if exist "%HB_DIR_PGSQL%\lib\libpq.dll" implib -a "%HB_LIB_INSTALL%\libpq.lib" "%HB_DIR_PGSQL%\lib\libpq.dll" + if exist "%SystemRoot%\system32\odbc32.dll" implib "%HB_LIB_INSTALL%\odbc32.lib" "%SystemRoot%\system32\odbc32.dll" + goto END ) @@ -76,9 +77,10 @@ if "%HB_DIR_IMPLIB%" == "yes" ( if exist "%HB_DIR_ADS%\ace32.lib" copy /b /y "%HB_DIR_ADS%\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" if exist "%HB_DIR_ADS%\32bit\ace32.lib" copy /b /y "%HB_DIR_ADS%\32bit\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" if exist "%HB_DIR_ALLEGRO%\lib\alleg.lib" copy /b /y "%HB_DIR_ALLEGRO%\lib\alleg.lib" "%HB_LIB_INSTALL%\alleg.lib" - call :MK_APOLLO_IMPORT + if exist "%HB_DIR_APOLLO%\sde61.dll" call :P_MSVC_IMPLIB "%HB_DIR_APOLLO%\sde61.dll" "%HB_LIB_INSTALL%\sde61.lib" if exist "%HB_DIR_BLAT%\full\blat.lib" copy /b /y "%HB_DIR_BLAT%\full\blat.lib" "%HB_LIB_INSTALL%\blat.lib" - call :MK_CURL_IMPORT + if exist "%HB_DIR_CURL%\libcurl.dll" call :P_MSVC_IMPLIB "%HB_DIR_CURL%\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" + if exist "%HB_DIR_CURL%\bin\libcurl.dll" call :P_MSVC_IMPLIB "%HB_DIR_CURL%\bin\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" if exist "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\fbclient.lib" if exist "%HB_DIR_FREEIMAGE%\Dist\FreeImage.lib" copy /b /y "%HB_DIR_FREEIMAGE%\Dist\FreeImage.lib" "%HB_LIB_INSTALL%\FreeImage.lib" if exist "%HB_DIR_GD%\lib\bgd.lib" copy /b /y "%HB_DIR_GD%\lib\bgd.lib" "%HB_LIB_INSTALL%\bgd.lib" @@ -104,51 +106,23 @@ rem --------------------------------------------------------------- rem These .dll to .lib conversions need GNU sed.exe in the path rem --------------------------------------------------------------- -:MK_APOLLO_IMPORT - - if exist "%HB_DIR_APOLLO%\sde61.dll" set _HB_DLL_NAME=%HB_DIR_APOLLO%\sde61.dll - if "%_HB_DLL_NAME%" == "" goto END +:P_MSVC_IMPLIB echo /[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _hbtemp.sed echo /^^[ \t]\+[0-9]\+/{>> _hbtemp.sed echo s/^^[ \t]\+[0-9]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+\(.*\)/\1/p>> _hbtemp.sed echo }>> _hbtemp.sed echo }>> _hbtemp.sed - dumpbin /exports "%_HB_DLL_NAME%" > _dump.tmp - echo LIBRARY "%_HB_DLL_NAME%" > _temp.def + dumpbin /exports "%1" > _dump.tmp + echo LIBRARY "%1" > _temp.def echo EXPORTS >> _temp.def sed -nf _hbtemp.sed < _dump.tmp >> _temp.def - lib /machine:x86 /def:_temp.def /out:"%HB_LIB_INSTALL%\sde61.lib" + lib /machine:x86 /def:_temp.def /out:"%2" del _dump.tmp del _temp.def del _hbtemp.sed rem --------------------------------------------------------------- - set _HB_DLL_NAME= - goto END - -:MK_CURL_IMPORT - - if exist "%HB_DIR_CURL%\libcurl.dll" set _HB_DLL_NAME=%HB_DIR_CURL%\libcurl.dll - if exist "%HB_DIR_CURL%\bin\libcurl.dll" set _HB_DLL_NAME=%HB_DIR_CURL%\bin\libcurl.dll - if "%_HB_DLL_NAME%" == "" goto END - - echo /[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _hbtemp.sed - echo /^^[ \t]\+[0-9]\+/{>> _hbtemp.sed - echo s/^^[ \t]\+[0-9]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+\(.*\)/\1/p>> _hbtemp.sed - echo }>> _hbtemp.sed - echo }>> _hbtemp.sed - dumpbin /exports "%_HB_DLL_NAME%" > _dump.tmp - echo LIBRARY "%_HB_DLL_NAME%" > _temp.def - echo EXPORTS >> _temp.def - sed -nf _hbtemp.sed < _dump.tmp >> _temp.def - lib /machine:x86 /def:_temp.def /out:"%HB_LIB_INSTALL%\libcurl.lib" - del _dump.tmp - del _temp.def - del _hbtemp.sed - rem --------------------------------------------------------------- - - set _HB_DLL_NAME= goto END goto end diff --git a/harbour/mpkg_win.nsi b/harbour/mpkg_win.nsi index 7f94053081..21deed006f 100644 --- a/harbour/mpkg_win.nsi +++ b/harbour/mpkg_win.nsi @@ -18,7 +18,7 @@ !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp" - !define MUI_FINISHPAGE_RUN_NOTCHECKED + !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\readme.txt" SetDateSave on