From 3e0bb1af407bee797775c4a7a284dcb2cf53658f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 7 Mar 2000 16:41:33 +0000 Subject: [PATCH] 20000307-17:34 GMT+1 Victor Szakats --- harbour/ChangeLog | 27 +++++++++++++++++++++++++++ harbour/Makefile | 1 - harbour/bin/b16/empty | 1 + harbour/bin/b32/empty | 1 + harbour/bin/bld_b16.bat | 2 +- harbour/bin/bld_b32.bat | 2 +- harbour/bin/bld_b32o.bat | 2 +- harbour/bin/bld_b32w.bat | 2 +- harbour/bin/bld_vc.bat | 2 +- harbour/bin/vc/empty | 1 + harbour/contrib/rdd_ads/make_rdd.bat | 3 ++- harbour/make_b16.bat | 14 ++++++++++++-- harbour/make_b32.bat | 15 ++++++++++++--- harbour/make_vc.bat | 14 ++++++++++++-- harbour/makefile.bc | 3 ++- harbour/makefile.vc | 2 +- harbour/obj/Makefile | 7 ------- harbour/source/rtl/console.c | 16 ++++++++-------- harbour/utils/Makefile | 1 + 19 files changed, 85 insertions(+), 31 deletions(-) create mode 100644 harbour/bin/b16/empty create mode 100644 harbour/bin/b32/empty create mode 100644 harbour/bin/vc/empty delete mode 100644 harbour/obj/Makefile diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 017dbde811..f7d452e243 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,30 @@ +20000307-17:34 GMT+1 Victor Szakats + ; Now the non-GNU make process reorganization can be considered done. + * make_b16.bat + make_b32.bat + make_vc.bat + contrib/rdd_ads/make_rdd.bat + + After a successful make process they will now copy all executables and + libraries to their final directory bin/ and lib/. + * bin/bld_b16.bat + bin/bld_b32*.bat + bin/bld_vc.bat + * Now they all look for the libraries directly in the lib/ directory, this + way these batch files are compatible with the GNU-make system. + + bin/b16/empty + + bin/b32/empty + + bin/vc/empty + makefile.bc + makefile.vc + + The Borland and MSVC build process changed to generate the executables + in different bin directories to completely separate them and to be + compatible with the GNU-make system. + * Makefile + - obj/Makefile + - obj dir removed from the GNU-make process. + * source/rtl/console.c + ! USHORT changed to SHORT for MSVC. + 20000307-16:36 GMT+1 Victor Szakats * bin/bld*.* - "-5" options removed (again). diff --git a/harbour/Makefile b/harbour/Makefile index 9e98bc9f49..ec4721ce1b 100644 --- a/harbour/Makefile +++ b/harbour/Makefile @@ -7,7 +7,6 @@ ROOT = ./ DIRS=\ include \ source \ - obj \ utils \ tests \ # samples \ diff --git a/harbour/bin/b16/empty b/harbour/bin/b16/empty new file mode 100644 index 0000000000..c6cac69265 --- /dev/null +++ b/harbour/bin/b16/empty @@ -0,0 +1 @@ +empty diff --git a/harbour/bin/b32/empty b/harbour/bin/b32/empty new file mode 100644 index 0000000000..c6cac69265 --- /dev/null +++ b/harbour/bin/b32/empty @@ -0,0 +1 @@ +empty diff --git a/harbour/bin/bld_b16.bat b/harbour/bin/bld_b16.bat index aeef932a7e..bfb5e1b519 100644 --- a/harbour/bin/bld_b16.bat +++ b/harbour/bin/bld_b16.bat @@ -4,7 +4,7 @@ rem $Id$ rem ..\bin\harbour %1 %2 %3 /n /i..\include -echo -O2 -mh -I..\include -L..\lib\b16 > build.tmp +echo -O2 -mh -I..\include -L..\lib > build.tmp echo -e%1.exe %1.c >> build.tmp echo tools.lib >> build.tmp echo debug.lib >> build.tmp diff --git a/harbour/bin/bld_b32.bat b/harbour/bin/bld_b32.bat index 019698fccc..38b8204860 100644 --- a/harbour/bin/bld_b32.bat +++ b/harbour/bin/bld_b32.bat @@ -4,6 +4,6 @@ rem $Id$ rem ..\bin\harbour %1 %2 %3 /n /i..\include -bcc32 -O2 -I..\include -L..\lib\b32 -e%1.exe %1.c tools.lib debug.lib vm.lib rtl.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib +bcc32 -O2 -I..\include -L..\lib -e%1.exe %1.c tools.lib debug.lib vm.lib rtl.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib rem del %1.c diff --git a/harbour/bin/bld_b32o.bat b/harbour/bin/bld_b32o.bat index 48419ecb8b..1efabb1e49 100644 --- a/harbour/bin/bld_b32o.bat +++ b/harbour/bin/bld_b32o.bat @@ -6,6 +6,6 @@ rem rem NOTE: Experimental ..\bin\harbour %1 %2 %3 /n /i..\include /gf -tlink32 -L..\lib\b32 c0x32.obj %1.obj hvm.obj,%1.exe,, import32.lib cw32mt.lib tools.lib debug.lib vm.lib rtl.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib +tlink32 -L..\lib c0x32.obj %1.obj hvm.obj,%1.exe,, import32.lib cw32mt.lib tools.lib debug.lib vm.lib rtl.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib del %1.obj diff --git a/harbour/bin/bld_b32w.bat b/harbour/bin/bld_b32w.bat index 725c85b441..7ba668e365 100644 --- a/harbour/bin/bld_b32w.bat +++ b/harbour/bin/bld_b32w.bat @@ -4,6 +4,6 @@ rem $Id$ rem ..\bin\harbour %1 %2 %3 /n /i..\include -bcc32 -O2 -tW -I..\include -L..\lib\b32 -e%1.exe %1.c tools.lib debug.lib vm.lib rtl.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib +bcc32 -O2 -tW -I..\include -L..\lib -e%1.exe %1.c tools.lib debug.lib vm.lib rtl.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib rem del %1.c diff --git a/harbour/bin/bld_vc.bat b/harbour/bin/bld_vc.bat index 88cb3c27fe..81c0a2c796 100644 --- a/harbour/bin/bld_vc.bat +++ b/harbour/bin/bld_vc.bat @@ -4,6 +4,6 @@ rem $Id$ rem ..\bin\harbour %1 %2 %3 /n /i..\include -cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\vc\rtl.lib ..\lib\vc\common.lib ..\lib\vc\tools.lib ..\lib\vc\rdd.lib ..\lib\vc\nulsys.lib ..\lib\vc\dbfntx.lib ..\lib\vc\dbfcdx.lib ..\lib\vc\debug.lib ..\lib\vc\macro.lib ..\lib\vc\vm.lib +cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib rem del %1.c diff --git a/harbour/bin/vc/empty b/harbour/bin/vc/empty new file mode 100644 index 0000000000..c6cac69265 --- /dev/null +++ b/harbour/bin/vc/empty @@ -0,0 +1 @@ +empty diff --git a/harbour/contrib/rdd_ads/make_rdd.bat b/harbour/contrib/rdd_ads/make_rdd.bat index ebee159a7c..955fc7cc60 100644 --- a/harbour/contrib/rdd_ads/make_rdd.bat +++ b/harbour/contrib/rdd_ads/make_rdd.bat @@ -1 +1,2 @@ -make -frddads.b32 > make.err \ No newline at end of file +make -frddads.b32 > make_b32.log +copy ..\..\lib\b32\rddads.lib ..\..\lib\ > nul diff --git a/harbour/make_b16.bat b/harbour/make_b16.bat index 745a44fad6..4514825e22 100644 --- a/harbour/make_b16.bat +++ b/harbour/make_b16.bat @@ -9,12 +9,22 @@ if "%1" == "CLEAN" goto CLEAN :BUILD make -fmakefile.bc -DB16 %1 %2 %3 > make_b16.log - if errorlevel 1 edit make_b16.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy bin\b16\*.exe bin\ > nul + copy lib\b16\*.lib lib\ > nul + goto EXIT + +:BUILD_ERR + + edit make_b16.log goto EXIT :CLEAN - echo Y | del bin\*.exe > nul + echo Y | del bin\b16\*.* > nul echo Y | del obj\b16\*.* > nul echo Y | del lib\b16\*.* > nul echo Y | del make_b16.log > nul diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index c7dbf46b52..cdb369ac48 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -9,13 +9,22 @@ if "%1" == "CLEAN" goto CLEAN :BUILD make -fmakefile.bc %1 %2 %3 > make_b32.log - if errorlevel 1 notepad make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy bin\b32\*.exe bin\ > nul + copy lib\b32\*.lib lib\ > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log goto EXIT :CLEAN - echo Y | del bin\*.exe > nul - echo Y | del bin\*.tds > nul + echo Y | del bin\b32\*.* > nul echo Y | del obj\b32\*.* > nul echo Y | del lib\b32\*.* > nul echo Y | del make_b32.log > nul diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index 1d5cfe0696..2ce4b9f4b1 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -9,12 +9,22 @@ if "%1" == "CLEAN" goto CLEAN :BUILD nmake /f makefile.vc %1 %2 %3 > make_vc.log - if errorlevel 1 notepad make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy bin\vc\*.exe bin\ > nul + copy lib\vc\*.lib lib\ > nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log goto EXIT :CLEAN - echo Y | del bin\*.exe > nul + echo Y | del bin\vc\*.* > nul echo Y | del obj\vc\*.* > nul echo Y | del lib\vc\*.* > nul echo Y | del make_vc.log > nul diff --git a/harbour/makefile.bc b/harbour/makefile.bc index d9a99c7a8c..f72df7281f 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -15,6 +15,7 @@ HARBOUR_OPT = $(HARBOUR_OPT) -q0 -w -es2 -gc0 BCC_EXE = bcc BCC_OPT = $(BCC_OPT) -DHARBOUR_USE_DOS_GTAPI -mh TASM_EXE = tasm +BIN_DIR = bin\b16 OBJ_DIR = obj\b16 LIB_DIR = lib\b16 BCC_OPT = $(BCC_OPT) -O2 @@ -25,6 +26,7 @@ BCC_OPT = $(BCC_OPT) -O2 BCC_EXE = bcc32 BCC_OPT = $(BCC_OPT) -DHARBOUR_USE_WIN_GTAPI TASM_EXE = tasm32 +BIN_DIR = bin\b32 OBJ_DIR = obj\b32 LIB_DIR = lib\b32 @@ -45,7 +47,6 @@ MACRO_DIR = source\macro RDD_DIR = source\rdd RUNNER_DIR = source\runner DEBUG_DIR = source\debug -BIN_DIR = bin HBTEST_DIR = utils\hbtest HBDOC_DIR = utils\hbdoc diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 48ba4ed3a2..77fb110c5c 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -25,7 +25,7 @@ TOOLS_DIR=source\tools DEBUG_DIR=source\debug VM_DIR=source\vm INCLUDE_DIR=include -BIN_DIR=bin +BIN_DIR=bin\vc LIB_DIR=lib\vc OBJ_DIR=obj\vc RUNNER_DIR=source\runner diff --git a/harbour/obj/Makefile b/harbour/obj/Makefile deleted file mode 100644 index 900a02c8ec..0000000000 --- a/harbour/obj/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# $Id$ -# - -ROOT = ../ - -include $(TOP)$(ROOT)config/dir.cf diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c index 9ba6b15305..92f9bc67c6 100644 --- a/harbour/source/rtl/console.c +++ b/harbour/source/rtl/console.c @@ -694,22 +694,22 @@ HARBOUR HB_MAXCOL( void ) /* Return the maximum screen column number (zero origi HARBOUR HB_ROW( void ) /* Return the current screen row position (zero origin) */ { - USHORT uiRow; - USHORT uiCol; + SHORT iRow; + SHORT iCol; - hb_gtGetPos( &uiRow, &uiCol ); + hb_gtGetPos( &iRow, &iCol ); - hb_retni( uiRow ); + hb_retni( iRow ); } HARBOUR HB_COL( void ) /* Return the current screen column position (zero origin) */ { - USHORT uiRow; - USHORT uiCol; + SHORT iRow; + SHORT iCol; - hb_gtGetPos( &uiRow, &uiCol ); + hb_gtGetPos( &iRow, &iCol ); - hb_retni( uiCol ); + hb_retni( iCol ); } HARBOUR HB_DISPBOX( void ) diff --git a/harbour/utils/Makefile b/harbour/utils/Makefile index 5acde16121..a340f7f493 100644 --- a/harbour/utils/Makefile +++ b/harbour/utils/Makefile @@ -7,5 +7,6 @@ ROOT = ../ DIRS=\ hbdoc \ hbtest \ +# hbextern \ include $(ROOT)config/dir.cf