diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 35b76e4379..a2e8b726e7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,23 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-24 13:36 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * INSTALL + + Added MinGW + msys specific entry. + + * bin/postinst.sh + + Added generation of hbcc.bat, hbcmp.bat, hblnk.bat + to be in complete feature sync with the non-msys method. + NOTE: non-msys method isn't recommended. + + * make_gnu_os2.cmd + + Added automatic HB_*_INSTALL setup based on HB_INSTALL_PREFIX + to be in sync with the rest of Harbour. + + * make_gnu.bat + ! Fixed forward slashed to backslashes. + * Changed default compiler from mingw to msvc. + 2009-02-24 11:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Refined autodetection of msvc to not be confused by diff --git a/harbour/INSTALL b/harbour/INSTALL index dd7de445ef..76cb483f1d 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -22,13 +22,28 @@ Linux/Darwin/BSD/HP-UX/Solaris $ ./hello You should see: 'Hello world!' on screen. -Windows -------- +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. + + > set HB_INSTALL_PREFIX= (use forward slashes and msys drive notation: /c/) + > sh make_gnu.bat install + + 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. - > set HB_COMPILER=<[mingw]|msvc|bcc32|owatcom|...> + > set HB_COMPILER= > set HB_INSTALL_PREFIX= > make_gnu.bat install diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh index fac806f1f5..d07167f448 100755 --- a/harbour/bin/postinst.sh +++ b/harbour/bin/postinst.sh @@ -91,6 +91,12 @@ then ln -s hb-mkdyn "${hb_mkdyn}" fi + if [ "$HB_COMPILER" = "mingw" ]; then + echo "@\"%~dp0hbmk2.exe\"" -hbcc %*> ${HB_BIN_INSTALL}/hbcc.bat + echo "@\"%~dp0hbmk2.exe\"" -hbcmp %*> ${HB_BIN_INSTALL}/hbcmp.bat + echo "@\"%~dp0hbmk2.exe\"" -hblnk %*> ${HB_BIN_INSTALL}/hblnk.bat + fi + mk_hbtools "${HB_BIN_INSTALL}" "$@" if [ "$HB_COMPILER" = "gcc" ] || [ "$HB_COMPILER" = "gpp" ] || \ [ "$HB_COMPILER" = "mingw" ] || [ "$HB_COMPILER" = "mingwce" ] || \ diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index fca89784e4..98edeedc49 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -26,14 +26,14 @@ rem --------------------------------------------------------------- if "%HB_ARCHITECTURE%" == "" if not "%WINDIR%" == "" set HB_ARCHITECTURE=win if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos -if "%HB_COMPILER%" == "" if not "%WINDIR%" == "" set HB_COMPILER=mingw +if "%HB_COMPILER%" == "" if not "%WINDIR%" == "" set HB_COMPILER=msvc if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp rem Set to constant value to be consistent with the non-GNU make files. -if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%/bin -if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%/lib -if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%/include +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include :START diff --git a/harbour/make_gnu_os2.cmd b/harbour/make_gnu_os2.cmd index 80eeda854c..57927dae46 100644 --- a/harbour/make_gnu_os2.cmd +++ b/harbour/make_gnu_os2.cmd @@ -10,6 +10,12 @@ rem for further information about see make_gnu.bat if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=os2 if "%HB_COMPILER%" == "" set HB_COMPILER=gcc +rem Set to constant value to be consistent with the non-GNU make files. + +if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin +if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib +if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include + rem In GCC3.2.2 the TCP/IP headers and libraries scheme have been changed. rem The default is the current OS/2 tcpip toolkit (BSD 4.4 based).