From 65460d88a1e96906c8b03b69ecbdab5c18965b8c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 1 Apr 2007 12:04:58 +0000 Subject: [PATCH] 2007-04-01 13:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * harbour/makefile.bc * harbour/makefile.vc * harbour/config/rules.cf * harbour/contrib/btree/makefile.bc * harbour/contrib/htmllib/Makefile.bc * harbour/contrib/htmllib/makefile.vc * harbour/contrib/libct/makefile.bc * harbour/contrib/libct/makefile.vc * harbour/contrib/libgt/makefile.bc * harbour/contrib/libgt/makefile.vc * harbour/contrib/libmisc/makefile.bc * harbour/contrib/libmisc/makefile.vc * harbour/contrib/libnf/makefile.vc * harbour/contrib/libnf/nanfor.bc * harbour/contrib/samples/makefile.bc * harbour/contrib/samples/makefile.vc + harbour/contrib/samples/make_b32.bat + harbour/contrib/samples/make_vc.bat - harbour/contrib/samples/makevc.bat + -w default Harbour build switch changed to -w2, to further maintain code quality. ; Notice that CONTRIB might need some fixing here. + Added proper BC/VC make batch files for "samples". * harbour/include/hbclass.ch * harbour/source/debug/dbgmenu.prg * harbour/source/debug/debugger.prg * harbour/source/rtl/teditor.prg * harbour/utils/hbdoc/genchm.prg * harbour/utils/hbdoc/genhtm.prg * harbour/utils/hbdoc/genng.prg * harbour/utils/hbdoc/genos2.prg * harbour/utils/hbdoc/genpdf1.prg * harbour/utils/hbdoc/genrtf.prg * harbour/utils/hbdoc/os2.prg * harbour/utils/hbmake/hbmake.prg * harbour/utils/hbmake/radios.prg * harbour/utils/hbpptest/pretest.prg * harbour/utils/hbtest/rt_misc.prg + Added HB_SYMBOL_UNUSED() inside codeblocks. ! Removed a few uneeded codeblock parameters. + Added HB_SYMBOL_UNUSED() to some class syntax generated code to avoid unused "Self" var warnings. * harbour/ChangeLog.017 ! Typos. --- harbour/ChangeLog | 48 ++++++++++++++++++++++++++++ harbour/ChangeLog.017 | 4 +-- harbour/config/rules.cf | 2 +- harbour/contrib/btree/makefile.bc | 2 +- harbour/contrib/htmllib/Makefile.bc | 2 +- harbour/contrib/htmllib/makefile.vc | 2 +- harbour/contrib/libct/makefile.bc | 2 +- harbour/contrib/libct/makefile.vc | 2 +- harbour/contrib/libgt/makefile.bc | 2 +- harbour/contrib/libgt/makefile.vc | 2 +- harbour/contrib/libmisc/makefile.bc | 2 +- harbour/contrib/libmisc/makefile.vc | 2 +- harbour/contrib/libnf/makefile.vc | 2 +- harbour/contrib/libnf/nanfor.bc | 2 +- harbour/contrib/samples/make_b32.bat | 28 ++++++++++++++++ harbour/contrib/samples/make_vc.bat | 19 +++++++++++ harbour/contrib/samples/makefile.bc | 2 +- harbour/contrib/samples/makefile.vc | 2 +- harbour/contrib/samples/makevc.bat | 14 -------- harbour/include/hbclass.ch | 8 ++--- harbour/makefile.bc | 2 +- harbour/makefile.vc | 2 +- harbour/source/debug/dbgmenu.prg | 2 +- harbour/source/debug/debugger.prg | 4 +-- harbour/source/rtl/teditor.prg | 2 +- harbour/utils/hbdoc/genchm.prg | 6 ++-- harbour/utils/hbdoc/genhtm.prg | 6 ++-- harbour/utils/hbdoc/genng.prg | 6 ++-- harbour/utils/hbdoc/genos2.prg | 6 ++-- harbour/utils/hbdoc/genpdf1.prg | 6 ++-- harbour/utils/hbdoc/genrtf.prg | 6 ++-- harbour/utils/hbdoc/os2.prg | 4 +-- harbour/utils/hbmake/hbmake.prg | 8 ++--- harbour/utils/hbmake/radios.prg | 11 ++++--- harbour/utils/hbpptest/pretest.prg | 12 +++++-- harbour/utils/hbtest/rt_misc.prg | 8 ++++- 36 files changed, 167 insertions(+), 73 deletions(-) create mode 100644 harbour/contrib/samples/make_b32.bat create mode 100644 harbour/contrib/samples/make_vc.bat delete mode 100644 harbour/contrib/samples/makevc.bat diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9f83ac6757..87803bebde 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,54 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-04-01 13:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * harbour/makefile.bc + * harbour/makefile.vc + * harbour/config/rules.cf + * harbour/contrib/btree/makefile.bc + * harbour/contrib/htmllib/Makefile.bc + * harbour/contrib/htmllib/makefile.vc + * harbour/contrib/libct/makefile.bc + * harbour/contrib/libct/makefile.vc + * harbour/contrib/libgt/makefile.bc + * harbour/contrib/libgt/makefile.vc + * harbour/contrib/libmisc/makefile.bc + * harbour/contrib/libmisc/makefile.vc + * harbour/contrib/libnf/makefile.vc + * harbour/contrib/libnf/nanfor.bc + * harbour/contrib/samples/makefile.bc + * harbour/contrib/samples/makefile.vc + + harbour/contrib/samples/make_b32.bat + + harbour/contrib/samples/make_vc.bat + - harbour/contrib/samples/makevc.bat + + -w default Harbour build switch changed to -w2, + to further maintain code quality. + ; Notice that CONTRIB might need some fixing here. + + Added proper BC/VC make batch files for "samples". + + * harbour/include/hbclass.ch + * harbour/source/debug/dbgmenu.prg + * harbour/source/debug/debugger.prg + * harbour/source/rtl/teditor.prg + * harbour/utils/hbdoc/genchm.prg + * harbour/utils/hbdoc/genhtm.prg + * harbour/utils/hbdoc/genng.prg + * harbour/utils/hbdoc/genos2.prg + * harbour/utils/hbdoc/genpdf1.prg + * harbour/utils/hbdoc/genrtf.prg + * harbour/utils/hbdoc/os2.prg + * harbour/utils/hbmake/hbmake.prg + * harbour/utils/hbmake/radios.prg + * harbour/utils/hbpptest/pretest.prg + * harbour/utils/hbtest/rt_misc.prg + + Added HB_SYMBOL_UNUSED() inside codeblocks. + ! Removed a few uneeded codeblock parameters. + + Added HB_SYMBOL_UNUSED() to some class syntax generated + code to avoid unused "Self" var warnings. + + * harbour/ChangeLog.017 + ! Typos. + 2007-03-31 12:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/Makefile + harbour/include/hbchksum.h diff --git a/harbour/ChangeLog.017 b/harbour/ChangeLog.017 index a2a535938b..9ece8160eb 100644 --- a/harbour/ChangeLog.017 +++ b/harbour/ChangeLog.017 @@ -3010,13 +3010,13 @@ ; Notes: - From now on, it possible to create/load files using the above functions/commands which have no extension. This - might be desirable in a few platform and/or situations. + might be desirable in a few platforms and/or situations. For example on Win32, it's possible to directly print to a shared Windows printer queue, using these commands: lOldValue := Set( _SET_DEFEXTENSIONS, .F. ) SET PRINTER TO \\myserver\myprinter Set( _SET_DEFEXTENSIONS, lOldValue ) - Or, it is possible to open a dbf file which has no extension: + Or, it is possible to open a dbf file which have no extension: dbUseArea(.T., NIL, "dbf_filename_with_no_extension", "w_DATA", .F., .F.) - Compiler is (of course) not affected by this setting. - Preprocessor (PP) lib flavour is not affected by this setting. diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf index 3a6563135c..897a5596bf 100644 --- a/harbour/config/rules.cf +++ b/harbour/config/rules.cf @@ -20,7 +20,7 @@ HB := $(HB_BIN_COMPILE)/ endif HB := $(HB)harbour$(EXE_EXT) -HB_FLAGS = -n -q0 -w -es2 -gc0 -I$(TOP) -I$(HB_INC_COMPILE) +HB_FLAGS = -n -q0 -w2 -es2 -gc0 -I$(TOP) -I$(HB_INC_COMPILE) # The rule to link an executable. ifeq ($(LD_RULE),) diff --git a/harbour/contrib/btree/makefile.bc b/harbour/contrib/btree/makefile.bc index f0cd98e76e..617a66e953 100644 --- a/harbour/contrib/btree/makefile.bc +++ b/harbour/contrib/btree/makefile.bc @@ -24,5 +24,5 @@ $(OBJ_DIR)\hb_btree.obj : hb_btree.c tlib $(LIB_DIR)\hb_btree.lib -+$@,, .prg.c: - $(BIN_DIR)\harbour.exe $< -q0 -w -es2 -gc0 -n -i$(INCLUDE_DIR) -o$@ + $(BIN_DIR)\harbour.exe $< -q0 -w2 -es2 -gc0 -n -i$(INCLUDE_DIR) -o$@ diff --git a/harbour/contrib/htmllib/Makefile.bc b/harbour/contrib/htmllib/Makefile.bc index 159cdb2fff..3f73fd5166 100644 --- a/harbour/contrib/htmllib/Makefile.bc +++ b/harbour/contrib/htmllib/Makefile.bc @@ -70,7 +70,7 @@ TOOLS1_DIR = examples CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -v $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -w0 -gc0 $(PRG_USR) $(HARBOURFLAGS) -p +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -w2 -gc0 $(PRG_USR) $(HARBOURFLAGS) -p LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/htmllib/makefile.vc b/harbour/contrib/htmllib/makefile.vc index d37b200886..996effa02d 100644 --- a/harbour/contrib/htmllib/makefile.vc +++ b/harbour/contrib/htmllib/makefile.vc @@ -19,7 +19,7 @@ CC = cl CFLAGS = -TP -W3 -nologo -I$(INCLUDE_DIR) CLIBFLAGS = $(CFLAGS) -c CLIBFLAGSDEBUG = $(CLIBFLAGS) -Zi -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -w0 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -w2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/libct/makefile.bc b/harbour/contrib/libct/makefile.bc index 0cb05ccc67..ab1d985bed 100644 --- a/harbour/contrib/libct/makefile.bc +++ b/harbour/contrib/libct/makefile.bc @@ -70,7 +70,7 @@ TOOLS_DIR = . CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -v $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/libct/makefile.vc b/harbour/contrib/libct/makefile.vc index 21d1cc257e..0a1053714a 100644 --- a/harbour/contrib/libct/makefile.vc +++ b/harbour/contrib/libct/makefile.vc @@ -69,7 +69,7 @@ AS = masm CFLAGS = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/libgt/makefile.bc b/harbour/contrib/libgt/makefile.bc index 52b63fcbbe..e0c9a51b12 100644 --- a/harbour/contrib/libgt/makefile.bc +++ b/harbour/contrib/libgt/makefile.bc @@ -70,7 +70,7 @@ TOOLS_DIR = . CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -v $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/libgt/makefile.vc b/harbour/contrib/libgt/makefile.vc index 18838b0902..d57b75703f 100644 --- a/harbour/contrib/libgt/makefile.vc +++ b/harbour/contrib/libgt/makefile.vc @@ -69,7 +69,7 @@ AS = masm CFLAGS = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/libmisc/makefile.bc b/harbour/contrib/libmisc/makefile.bc index ca19205594..0eadfd2c46 100644 --- a/harbour/contrib/libmisc/makefile.bc +++ b/harbour/contrib/libmisc/makefile.bc @@ -70,7 +70,7 @@ TOOLS_DIR = . CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -v $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/libmisc/makefile.vc b/harbour/contrib/libmisc/makefile.vc index a3ecf9ab46..7629437b80 100644 --- a/harbour/contrib/libmisc/makefile.vc +++ b/harbour/contrib/libmisc/makefile.vc @@ -69,7 +69,7 @@ AS = masm CFLAGS = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/libnf/makefile.vc b/harbour/contrib/libnf/makefile.vc index ddf80018ac..6836f0ac8f 100644 --- a/harbour/contrib/libnf/makefile.vc +++ b/harbour/contrib/libnf/makefile.vc @@ -69,7 +69,7 @@ AS = masm CFLAGS = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/libnf/nanfor.bc b/harbour/contrib/libnf/nanfor.bc index 999840529a..8f67f07def 100644 --- a/harbour/contrib/libnf/nanfor.bc +++ b/harbour/contrib/libnf/nanfor.bc @@ -76,7 +76,7 @@ HARBOUR_EXE = ..\..\bin\b32\harbour.exe CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) -DHB_LANG_DEFAULT=$(HB_LANG_DEFAULT) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -v $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # # Macros to access our library names diff --git a/harbour/contrib/samples/make_b32.bat b/harbour/contrib/samples/make_b32.bat new file mode 100644 index 0000000000..4d98c1c958 --- /dev/null +++ b/harbour/contrib/samples/make_b32.bat @@ -0,0 +1,28 @@ +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/samples/make_vc.bat b/harbour/contrib/samples/make_vc.bat new file mode 100644 index 0000000000..6447823183 --- /dev/null +++ b/harbour/contrib/samples/make_vc.bat @@ -0,0 +1,19 @@ +@echo off +rem +rem $Id$ +rem + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:EXIT diff --git a/harbour/contrib/samples/makefile.bc b/harbour/contrib/samples/makefile.bc index fce60d3172..27e24cac3e 100644 --- a/harbour/contrib/samples/makefile.bc +++ b/harbour/contrib/samples/makefile.bc @@ -36,7 +36,7 @@ SAMPLES_DIR = . CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) CLIBFLAGS =$(CFLAGS) HARBOUR_EXE = $(BIN_DIR)\harbour.exe -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/samples/makefile.vc b/harbour/contrib/samples/makefile.vc index ae40de2a84..d3dedf57b6 100644 --- a/harbour/contrib/samples/makefile.vc +++ b/harbour/contrib/samples/makefile.vc @@ -69,7 +69,7 @@ AS = masm CFLAGS = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS) -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) LDFLAGS = $(LDFLAGS) # diff --git a/harbour/contrib/samples/makevc.bat b/harbour/contrib/samples/makevc.bat deleted file mode 100644 index d304b77460..0000000000 --- a/harbour/contrib/samples/makevc.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -SET _LIB=%LIB% -SET _PATH=%PATH% -SET _INCLUDE=%INCLUDE% -SET LIB=C:\COMPILER\VC\LIB;%PATH% -SET PATH=C:\COMPILER\VC\BIN;%PATH% -SET INCLUDE=INCLUDE;C:\COMPILER\VC\INCLUDE;%_INCLUDE% -nmake /f makefile.vc %1 %2 %3 -SET LIB=%_LIB% -SET PATH=%_PATH% -SET INCLUDE=%_INCLUDE% -SET _LIB= -SET _PATH= -SET _INCLUDE= diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch index 61638e2106..3053ff3c70 100644 --- a/harbour/include/hbclass.ch +++ b/harbour/include/hbclass.ch @@ -321,7 +321,7 @@ DECLARE HBClass ; /* Operator overloading */ #xcommand OPERATOR [ ] [LOCAL ] INLINE [ ] [] [