20000307-17:34 GMT+1 Victor Szakats <info@szelvesz.hu>

2000-03-07 16:41:33 +00:00
parent f644fcee6e
commit 3e0bb1af40
19 changed files with 85 additions and 31 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,30 @@
+20000307-17:34 GMT+1 Victor Szakats <info@szelvesz.hu>
+   ; 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 <info@szelvesz.hu>
   * bin/bld*.*
     - "-5" options removed (again).
--- a/harbour/Makefile
+++ b/harbour/Makefile
@@ -7,7 +7,6 @@ ROOT = ./
 DIRS=\
 	include \
 	source \
-	obj \
        utils \
 	tests \
 #       samples \
--- a/harbour/bin/b16/empty
+++ b/harbour/bin/b16/empty
@@ -0,0 +1 @@
+empty
--- a/harbour/bin/b32/empty
+++ b/harbour/bin/b32/empty
@@ -0,0 +1 @@
+empty
--- 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
--- 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

--- 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

--- 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

--- 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

--- a/harbour/bin/vc/empty
+++ b/harbour/bin/vc/empty
@@ -0,0 +1 @@
+empty
--- a/harbour/contrib/rdd_ads/make_rdd.bat
+++ b/harbour/contrib/rdd_ads/make_rdd.bat
@@ -1 +1,2 @@
-make -frddads.b32 > make.err
+make -frddads.b32 > make_b32.log
+copy ..\..\lib\b32\rddads.lib ..\..\lib\ > nul
--- 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
--- 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
--- 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
--- 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

--- 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
--- a/harbour/obj/Makefile
+++ b/harbour/obj/Makefile
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-ROOT = ../
-
-include $(TOP)$(ROOT)config/dir.cf
--- 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 )
--- a/harbour/utils/Makefile
+++ b/harbour/utils/Makefile
@@ -7,5 +7,6 @@ ROOT = ../
 DIRS=\
        hbdoc \
        hbtest \
+#       hbextern \

 include $(ROOT)config/dir.cf