2009-06-15 11:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* tests/bnch_win.bat
  * bin/postinst.cmd
  * bin/postinst.bat
  * bin/hb-mkimp.bat
  * bin/hb-mkdyn.bat
  * mpkg_dos.bat
  * mpkg_win.bat
    + Added display of error message if run on non-NT systems.
    * Some formatting.
This commit is contained in:
Viktor Szakats
2009-06-15 09:41:48 +00:00
parent efb85b04d2
commit 89eb6c5dd9
8 changed files with 54 additions and 36 deletions

View File

@@ -17,6 +17,17 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-15 11:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* tests/bnch_win.bat
* bin/postinst.cmd
* bin/postinst.bat
* bin/hb-mkimp.bat
* bin/hb-mkdyn.bat
* mpkg_dos.bat
* mpkg_win.bat
+ Added display of error message if run on non-NT systems.
* Some formatting.
2009-06-15 10:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/legacy.prg
! Trying to implement TOLEAUTO():NEW() compatibility

View File

@@ -12,7 +12,8 @@ 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 :EOF )
if not "%OS%" == "Windows_NT" echo "This Harbour build script requires Windows NT or upper."
if not "%OS%" == "Windows_NT" goto EOF
setlocal

View File

@@ -18,6 +18,7 @@ rem
rem See COPYING for licensing terms.
rem ---------------------------------------------------------------
if not "%OS%" == "Windows_NT" echo "This Harbour build script requires Windows NT or upper."
if not "%OS%" == "Windows_NT" goto END
if not "%HB_LIB_INSTALL%" == "" (

View File

@@ -19,44 +19,46 @@ echo # Generated by Harbour build process>> %HB_BIN_INSTALL%\hbmk.cfg
echo arch=%HB_ARCHITECTURE%>> %HB_BIN_INSTALL%\hbmk.cfg
echo comp=%HB_COMPILER%>> %HB_BIN_INSTALL%\hbmk.cfg
goto inst_%HB_ARCHITECTURE%
goto INST_%HB_ARCHITECTURE%
:inst_win
:inst_wce
rem Windows post install part
if not "%OS%" == "Windows_NT" goto end
:INST_WIN
:INST_WCE
if "%HB_COMPILER%" == "mingw" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "mingw64" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "mingwarm" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "cygwin" set HB_DYNLIB=yes
rem Windows post install part
if not "%HB_DYNLIB%" == "yes" goto _SKIP_DLL_BIN
if not "%OS%" == "Windows_NT" echo "This Harbour build script requires Windows NT or upper."
if not "%OS%" == "Windows_NT" goto END
call %~dp0hb-mkdyn.bat
if "%HB_COMPILER%" == "mingw" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "mingw64" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "mingwarm" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "cygwin" set HB_DYNLIB=yes
setlocal
if "%HB_BIN_COMPILE%" == "" set HB_BIN_COMPILE=%HB_BIN_INSTALL%
if exist "%HB_BIN_INSTALL%\*.dll" (
%HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbrun-dll %~dp0..\utils\hbrun\hbrun.hbp
%HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbmk2-dll %~dp0..\utils\hbmk2\hbmk2.hbp
%HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbtest-dll %~dp0..\utils\hbtest\hbtest.hbp
%HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbi18n-dll %~dp0..\utils\hbi18n\hbi18n.hbp
%HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbformat-dll %~dp0..\utils\hbformat\hbformat.hbp
)
endlocal
if not "%HB_DYNLIB%" == "yes" goto _SKIP_DLL_BIN
:_SKIP_DLL_BIN
call %~dp0hb-mkdyn.bat
if "%HB_BUILD_IMPLIB%" == "yes" call %~dp0hb-mkimp.bat
setlocal
if "%HB_BIN_COMPILE%" == "" set HB_BIN_COMPILE=%HB_BIN_INSTALL%
if exist "%HB_BIN_INSTALL%\*.dll" (
%HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbrun-dll %~dp0..\utils\hbrun\hbrun.hbp
%HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbmk2-dll %~dp0..\utils\hbmk2\hbmk2.hbp
%HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbtest-dll %~dp0..\utils\hbtest\hbtest.hbp
%HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbi18n-dll %~dp0..\utils\hbi18n\hbi18n.hbp
%HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbformat-dll %~dp0..\utils\hbformat\hbformat.hbp
)
endlocal
goto end
:_SKIP_DLL_BIN
if "%HB_BUILD_IMPLIB%" == "yes" call %~dp0hb-mkimp.bat
:inst_dos
rem DOS post install part
goto end
goto END
:INST_DOS
:inst_
:end
rem DOS post install part
goto END
:INST_
:END

View File

@@ -21,12 +21,12 @@ echo arch=%HB_ARCHITECTURE%>> %_HBMK_CFG%
echo comp=%HB_COMPILER%>> %_HBMK_CFG%
set _HBMK_CFG=
goto inst_%HB_ARCHITECTURE%
goto INST_%HB_ARCHITECTURE%
:inst_os2
rem OS/2 post install part
goto end
:INST_OS2
rem OS/2 post install part
goto END
:inst_
:end
:INST_
:END

View File

@@ -18,6 +18,7 @@ rem - HB_COMPILER envvar configured (see INSTALL doc)
rem - C compiler and GNU Make configured (see INSTALL doc)
rem ---------------------------------------------------------------
if not "%OS%" == "Windows_NT" echo "This Harbour build script requires Windows NT or upper."
if not "%OS%" == "Windows_NT" goto END
setlocal

View File

@@ -22,6 +22,7 @@ rem - HB_COMPILER envvar configured (see INSTALL doc)
rem - C compiler and GNU Make configured (see INSTALL doc)
rem ---------------------------------------------------------------
if not "%OS%" == "Windows_NT" echo "This Harbour build script requires Windows NT or upper."
if not "%OS%" == "Windows_NT" goto END
setlocal

View File

@@ -25,6 +25,7 @@
@rem 'bnch_win.bat > results.txt 2>&1'
@rem ---------------------------------------------------------------
@if not "%OS%" == "Windows_NT" echo "This script requires Windows NT or upper."
@if not "%OS%" == "Windows_NT" goto END
@rem ; Default settings