diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b8f4999b13..04583e70c6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-27 16:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * INSTALL + * bin/postinst.bat + * Formatting. + 2009-02-27 15:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * INSTALL + Added more information. diff --git a/harbour/INSTALL b/harbour/INSTALL index 072a57c2cb..0553d15c0b 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -5,101 +5,106 @@ HOW TO BUILD AND INSTALL HARBOUR ================================ -For all platforms you'll need: + For all platforms you'll need: -* GNU make -* Supported C compiler + * GNU make + * Supported C compiler -Linux/Darwin/BSD/HP-UX/Solaris ------------------------------- - $ export HB_COMPILER=<[gcc]|owatcom|icc|...> - $ export HB_INSTALL_PREFIX= - $ ./make_gnu.sh - $ sudo ./make_gnu.sh install + Linux/Darwin/BSD/HP-UX/Solaris + ------------------------------ + $ export HB_COMPILER=<[gcc]|owatcom|icc|...> + $ export HB_INSTALL_PREFIX= + $ ./make_gnu.sh + $ sudo ./make_gnu.sh install - To test it, go to /bin directory and type: - $ ./hbmk2 ../tests/hello.prg - $ ./hello - You should see: 'Hello world!' on screen. + To test it, go to /bin directory and type: + $ ./hbmk2 ../tests/hello.prg + $ ./hello + You should see: 'Hello world!' on screen. -Windows with MinGW + msys -------------------------- - This is the recommended way to build with MinGW. + Windows with MinGW + msys + ------------------------- + This is the recommended way to build with MinGW. - Make sure to have msys and MinGW properly installed - and setup. msys should be put in PATH _before_ MinGW. + Make sure to have msys and MinGW properly installed + and setup. msys should be put in PATH _before_ MinGW. - > set HB_INSTALL_PREFIX= (use forward slashes and msys drive notation: /c/) - > sh make_gnu.sh install + > set HB_INSTALL_PREFIX= + (use forward slashes and msys drive notation: /c/) + > sh make_gnu.sh install - To test it, go to /bin directory and type: - > hbmk2 ../tests/hello.prg - > hello - You should see: 'Hello world!' on screen. + To test it, go to /bin directory and type: + > hbmk2 ../tests/hello.prg + > hello + You should see: 'Hello world!' on screen. -Windows with other compilers ----------------------------- - Make sure to have your C compiler of choice properly - installed and GNU Make (with the name make.exe) - accessible in the PATH _before_ the compiler tools. - We recommend using the GNU Make from the MinGW binary - distribution. Use your search engine with 'mingw gnu make' - or try this link: - http://sourceforge.net/project/showfiles.php?group_id=2435 + Windows with other compilers + ---------------------------- + Make sure to have your C compiler of choice properly + installed and GNU Make (with the name make.exe) + accessible in the PATH _before_ the compiler tools. + We recommend using the GNU Make from the MinGW binary + distribution. Use your search engine with 'mingw gnu make' + or try this link: + http://sourceforge.net/project/showfiles.php?group_id=2435 - > set HB_COMPILER= - > set HB_INSTALL_PREFIX= - > make_gnu.bat install - or - > make_gnu.bat --install-with-dll + > set HB_COMPILER= + > set HB_INSTALL_PREFIX= + > make_gnu.bat install + or + > make_gnu.bat --install-with-dll - To test it, go to \bin directory and type: - > hbmk2 ..\tests\hello.prg - > hello - You should see: 'Hello world!' on screen. + To test it, go to \bin directory and type: + > hbmk2 ..\tests\hello.prg + > hello + You should see: 'Hello world!' on screen. - NOTE: is your destination directory where - executables, libraries and headers will be - created. For a peace of mind, avoid using - spaces, quotes in the name. + NOTE: is your destination directory where + executables, libraries and headers will be + created. For a peace of mind, avoid using + spaces, quotes in the name. -DOS ---- - > set HB_COMPILER=<[djgpp]|owatcom> - > set HB_INSTALL_PREFIX= - > make_gnu.bat install + DOS + --- + > set HB_COMPILER=<[djgpp]|owatcom> + > set HB_INSTALL_PREFIX= + > make_gnu.bat install -OS/2 ----- - > set HB_COMPILER=<[gcc]|owatcom|icc> - > set HB_INSTALL_PREFIX= - > make_gnu_os2.cmd install + OS/2 + ---- + > set HB_COMPILER=<[gcc]|owatcom|icc> + > set HB_INSTALL_PREFIX= + > make_gnu_os2.cmd install HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD ============================================== -On *nix systems most of these will be automatically picked up if -installed in some well-known standard system locations. + On *nix systems most of these will be automatically picked up if + installed in some well-known standard system locations. -You only need to use manual setup, if the dependency isn't available -on your platform on a system location, or you wish to use a non-standard -location. Typically you need to do that on non-*nix (Windows/DOS/OS/2) -systems for all packages and for a few packages on *nix which aren't -available through official package managers (ADS Client f.e.). Please -see a list of official packages in doc/linux1st.txt. + You only need to use manual setup, if the dependency isn't available + on your platform on a system location, or you wish to use + a non-standard location. Typically you need to do that on non-*nix + (Windows/DOS/OS2) systems for all packages and for a few packages on + *nix which aren't available through official package managers + (ADS Client f.e.). Please see a list of official packages in + doc/linux1st.txt. -You can use these environment variables: + You can use these environment variables (adjust to your own dirs): -HB_INC_ADS=C:\ads\acesdk -HB_INC_ALLEGRO=C:\allegro\include -HB_INC_APOLLO=C:\Apollo\include -HB_INC_BLAT=C:\blat\full\source -HB_INC_CURL=C:\curl\include -HB_INC_FIREBIRD=C:\Firebird\include -HB_INC_FREEIMAGE=C:\FreeImage\Dist -HB_INC_GD=-IC:\gd\include -HB_INC_LIBHARU=-IC:\libharu\include -HB_INC_MYSQL=C:\mysql\include -HB_INC_OPENSSL=C:\openssl -HB_INC_PGSQL=C:\pgsql\include + HB_INC_ADS=C:\ads\acesdk + HB_INC_ALLEGRO=C:\allegro\include + HB_INC_APOLLO=C:\Apollo\include + HB_INC_BLAT=C:\blat\full\source + HB_INC_CURL=C:\curl\include + HB_INC_FIREBIRD=C:\Firebird\include + HB_INC_FREEIMAGE=C:\FreeImage\Dist + HB_INC_GD=-IC:\gd\include + HB_INC_LIBHARU=-IC:\libharu\include + HB_INC_MYSQL=C:\mysql\include + HB_INC_OPENSSL=C:\openssl + HB_INC_PGSQL=C:\pgsql\include + + +[ Viktor Szakats ] diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index 5a83b1934b..7eb8519a9c 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -44,28 +44,28 @@ if "%HB_DIR_IMPLIB%" == "yes" ( if "%HB_COMPILER%" == "bcc32" ( - if exist "%HB_DIR_ADS%\Redistribute\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\Redistribute\ace32.dll" - if exist "%HB_DIR_ADS%\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\ace32.dll" - if exist "%HB_DIR_ADS%\32bit\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\32bit\ace32.dll" - if exist "%HB_DIR_ALLEGRO%\bin\alleg42.dll" implib -a "%HB_LIB_INSTALL%\alleg.lib" "%HB_DIR_ALLEGRO%\bin\alleg42.dll" - if exist "%HB_DIR_APOLLO%\sde61.dll" implib "%HB_LIB_INSTALL%\sde61.lib" "%HB_DIR_APOLLO%\sde61.dll" - if exist "%HB_DIR_BLAT%\full\blat.dll" implib -a "%HB_LIB_INSTALL%\blat.lib" "%HB_DIR_BLAT%\full\blat.dll" - if exist "%HB_DIR_CURL%\libcurl.dll" implib -a "%HB_LIB_INSTALL%\libcurl.lib" "%HB_DIR_CURL%\libcurl.dll" - if exist "%HB_DIR_CURL%\bin\libcurl.dll" implib -a "%HB_LIB_INSTALL%\libcurl.lib" "%HB_DIR_CURL%\bin\libcurl.dll" + if exist "%HB_DIR_ADS%\Redistribute\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\Redistribute\ace32.dll" + if exist "%HB_DIR_ADS%\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\ace32.dll" + if exist "%HB_DIR_ADS%\32bit\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\32bit\ace32.dll" + if exist "%HB_DIR_ALLEGRO%\bin\alleg42.dll" implib -a "%HB_LIB_INSTALL%\alleg.lib" "%HB_DIR_ALLEGRO%\bin\alleg42.dll" + if exist "%HB_DIR_APOLLO%\sde61.dll" implib "%HB_LIB_INSTALL%\sde61.lib" "%HB_DIR_APOLLO%\sde61.dll" + if exist "%HB_DIR_BLAT%\full\blat.dll" implib -a "%HB_LIB_INSTALL%\blat.lib" "%HB_DIR_BLAT%\full\blat.dll" + if exist "%HB_DIR_CURL%\libcurl.dll" implib -a "%HB_LIB_INSTALL%\libcurl.lib" "%HB_DIR_CURL%\libcurl.dll" + if exist "%HB_DIR_CURL%\bin\libcurl.dll" implib -a "%HB_LIB_INSTALL%\libcurl.lib" "%HB_DIR_CURL%\bin\libcurl.dll" if exist "%HB_DIR_FIREBIRD%\lib\fbclient_bor.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_bor.lib" "%HB_LIB_INSTALL%\fblient.lib" - if exist "%HB_DIR_FREEIMAGE%\Dist\FreeImage.dll" implib "%HB_LIB_INSTALL%\FreeImage.lib" "%HB_DIR_FREEIMAGE%\Dist\FreeImage.dll" - if exist "%HB_DIR_GD%\bin\bgd.dll" implib "%HB_LIB_INSTALL%\bgd.lib" "%HB_DIR_GD%\bin\bgd.dll" - 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" - if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll" - if exist "%HB_DIR_OPENSSL%\dll\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\dll\ssleay32.dll" - 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 "%HB_DIR_FREEIMAGE%\Dist\FreeImage.dll" implib "%HB_LIB_INSTALL%\FreeImage.lib" "%HB_DIR_FREEIMAGE%\Dist\FreeImage.dll" + if exist "%HB_DIR_GD%\bin\bgd.dll" implib "%HB_LIB_INSTALL%\bgd.lib" "%HB_DIR_GD%\bin\bgd.dll" + 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" + if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll" + if exist "%HB_DIR_OPENSSL%\dll\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\dll\ssleay32.dll" + 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" goto END )