fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-09-17 01:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* debian/changelog
    * Synced with 1.0.1.

  * source/pp/ppcore.c
    ! Minor typo in one PP error message. (sync 1.0.1)
    * Cleaned ":" from all PP error/warning messages to be 
      friendly with Eclipse.

  * source/compiler/hbgenerr.c
    * Cleaned some more ":" chars from compiler error/warning 
      messages to be friendly with Eclipse.
    ; NOTE: Few more still remain. If you have an idea how to rephrase these, pls tell:
            "Bound error: '%s'"
            "Syntax error: '%s'"
            "Syntax error: \"%s at '%s'\""
            "Invalid lvalue: '%s'"
            "Invalid use of '@' (pass by reference): '%s'"
            "3Incompatible type in assignment to declared array element expected: '%s'"
            "4Suspicious type in assignment to declared array element expected: '%s'"

  * utils/hbmake/hbmake.prg
    * Updated by large patch from Bill Robertson.
      Adds several enhancements, fixes and optimizations 
      to the previous version.

  * utils/hbdoc/hbdoc.prg
  * utils/hbmake/hbmake.prg
  * utils/hbrun/hbrun.prg
    * Changed the way version number is shown.

  * utils/hbmake/hbmake.prg
    * Updated MT lib lists. (untested)

  * make_b32.mak
    * Minor sync with make_vc.mak.

  * make_vc.mak
    * Attempt to implement hbvmmt.lib just like in 
      make_b32.mak to make them synced.
This commit is contained in:
Viktor Szakats
2008-09-16 23:18:21 +00:00
parent 18aa26dfc0
commit 80829934ea
9 changed files with 1116 additions and 1288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
harbour/ChangeLog
View File

@@ -8,6 +8,47 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-09-17 01:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* debian/changelog
* Synced with 1.0.1.
* source/pp/ppcore.c
! Minor typo in one PP error message. (sync 1.0.1)
* Cleaned ":" from all PP error/warning messages to be
friendly with Eclipse.
* source/compiler/hbgenerr.c
* Cleaned some more ":" chars from compiler error/warning
messages to be friendly with Eclipse.
; NOTE: Few more still remain. If you have an idea how to rephrase these, pls tell:
"Bound error: '%s'"
"Syntax error: '%s'"
"Syntax error: \"%s at '%s'\""
"Invalid lvalue: '%s'"
"Invalid use of '@' (pass by reference): '%s'"
"3Incompatible type in assignment to declared array element expected: '%s'"
"4Suspicious type in assignment to declared array element expected: '%s'"
* utils/hbmake/hbmake.prg
* Updated by large patch from Bill Robertson.
Adds several enhancements, fixes and optimizations
to the previous version.
* utils/hbdoc/hbdoc.prg
* utils/hbmake/hbmake.prg
* utils/hbrun/hbrun.prg
* Changed the way version number is shown.
* utils/hbmake/hbmake.prg
* Updated MT lib lists. (untested)
* make_b32.mak
* Minor sync with make_vc.mak.
* make_vc.mak
* Attempt to implement hbvmmt.lib just like in
make_b32.mak to make them synced.
2008-09-16 19:11 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/utils/hbtest/rt_class.prg
! fixed description message

6
harbour/debian/changelog
View File

@@ -1,3 +1,9 @@
harbour (1.0.1-1) unstable; urgency=low
* Please see doc/whatsnew.txt
-- Viktor Szakats <harbour___@syenar.hu> Tue, 16 Sep 2008 14:54:38 +0200
harbour (1.0.0-1) unstable; urgency=low
* Lot of new stuff see changelog

2
harbour/make_b32.mak
View File

@@ -665,10 +665,10 @@ doClean:
-if exist $(MT_OBJ_DIR)\*.obj $(DEL) $(MT_OBJ_DIR)\*.obj > nul
-if exist $(MT_OBJ_DIR)\*.c $(DEL) $(MT_OBJ_DIR)\*.c > nul
-if exist $(MT_OBJ_DIR)\*.h $(DEL) $(MT_OBJ_DIR)\*.h > nul
-if exist $(INCLUDE_DIR)\hbverbld.h $(DEL) $(INCLUDE_DIR)\hbverbld.h > nul
-if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul
-if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul
-if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul
-if exist $(INCLUDE_DIR)\hbverbld.h $(DEL) $(INCLUDE_DIR)\hbverbld.h > nul
-if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul
-if exist bin\*.exe $(DEL) bin\*.exe > nul
-if exist bin\*.dll $(DEL) bin\*.dll > nul

47
harbour/make_vc.mak
View File

@@ -116,6 +116,8 @@ MKLIB = lib.exe
DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\dll\vc)
VMMT_LIB_OBJS = $(VM_LIB_OBJS:obj\vc=obj\vc_mt)
#**********************************************************
# C compiler, Harbour compiler and Linker flags.
#**********************************************************
@@ -137,6 +139,8 @@ HB_BUILD_MODE = C
# C Compiler Flags
!if "$(HB_BUILD_WINCE)" == "yes"
HB_BUILD_ST = yes
!if $(HB_VISUALC_VER) >= 80
CFLAGS_VER = -Od -Os -Gy -GS- -EHsc- -fp:fast -Gm -Zi -GR- -D_CRT_SECURE_NO_DEPRECATE
!else
@@ -182,19 +186,23 @@ CFLAGS = -Zi $(CFLAGS)
DBGMARKER = d
!endif
CFLAGSMT = -MT$(DBGMARKER) -DHB_MT_VM $(CFLAGSMT)
!endif
#-----------
!if "$(HB_BUILD_ST)" != "yes"
CFLAGS = -MT$(DBGMARKER) -DHB_MT_VM $(CFLAGS)
CFLAGS = $(CFLAGS) $(CFLAGSMT)
!else
HB_BUILD_TARGETS = $(HB_BUILD_TARGETS) $(VMMT_LIB)
!endif
#-----------
!if "$(HB_GT_DEFAULT)" != ""
CFLAGS = -D"HB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=)" $(CFLAGS)
CFLAGS = -D"HB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=)" $(CFLAGS)
!endif
#-----------
!if "$(HB_GT_LIB)" != ""
CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS)
CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS)
!endif
#-----------
@@ -493,6 +501,21 @@ STANDARD_SYSLIBS = user32.lib wsock32.lib advapi32.lib gdi32.lib
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
#*******************************************************
#*******************************************************
# General *.c --> *.obj COMPILE rules for STATIC MT Libraries
#*******************************************************
{$(VM_DIR)}.c{$(MT_OBJ_DIR)}$(OBJEXT)::
$(CC) $(CLIBFLAGS) $(CFLAGSMT) -Fo$(MT_OBJ_DIR)\ $<
#*******************************************************
#*******************************************************
# General *.prg --> *.obj COMPILE rules for STATIC MT Libraries
#*******************************************************
{$(VM_DIR)}.prg{$(MT_OBJ_DIR)}$(OBJEXT):
$(HB) $(HARBOURFLAGS) -o$(MT_OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) $(CFLAGSMT) -Fo$(MT_OBJ_DIR)\ $(MT_OBJ_DIR)\$(*B).c
#*******************************************************
#*******************************************************
# General *.c --> *.obj COMPILE rules for SHARED Libraries
#*******************************************************
@@ -768,6 +791,9 @@ $(COMPILER_LIB) : $(COMPILER_LIB_OBJS)
$(VM_LIB) : $(VM_LIB_OBJS)
$(MKLIB) /out:$@ $**
#**********************************************************
$(VMMT_LIB) : $(VMMT_LIB_OBJS)
$(MKLIB) /out:$@ $**
#**********************************************************
$(RTL_LIB) : $(RTL_LIB_OBJS)
$(MKLIB) /out:$@ $**
#**********************************************************
@@ -1027,11 +1053,6 @@ doClean:
-if exist *.idb $(DEL) *.idb > nul
-if exist *.pch $(DEL) *.pch > nul
-if exist *.pdb $(DEL) *.pdb > nul
-if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul
-if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul
-if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul
-if exist $(OBJ_DIR)\*.pch $(DEL) $(OBJ_DIR)\*.pch > nul
-if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul
-if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul
-if exist $(BIN_DIR)\*.pdb $(DEL) $(BIN_DIR)\*.pdb > nul
-if exist $(BIN_DIR)\*.ilk $(DEL) $(BIN_DIR)\*.ilk > nul
@@ -1039,10 +1060,18 @@ doClean:
-if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul
-if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul
-if exist $(BIN_DIR)\*.exp $(DEL) $(BIN_DIR)\*.exp > nul
-if exist $(INCLUDE_DIR)\hbverbld.h $(DEL) $(INCLUDE_DIR)\hbverbld.h > nul
-if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul
-if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul
-if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul
-if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul
-if exist $(OBJ_DIR)\*.pch $(DEL) $(OBJ_DIR)\*.pch > nul
-if exist $(MT_OBJ_DIR)\*.obj $(DEL) $(MT_OBJ_DIR)\*.obj > nul
-if exist $(MT_OBJ_DIR)\*.c $(DEL) $(MT_OBJ_DIR)\*.c > nul
-if exist $(MT_OBJ_DIR)\*.h $(DEL) $(MT_OBJ_DIR)\*.h > nul
-if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul
-if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul
-if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul
-if exist $(INCLUDE_DIR)\hbverbld.h $(DEL) $(INCLUDE_DIR)\hbverbld.h > nul
-if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul
-if exist bin\*.exe $(DEL) bin\*.exe > nul
-if exist bin\*.dll $(DEL) bin\*.dll > nul

30
harbour/source/compiler/hbgenerr.c
View File

@@ -112,24 +112,24 @@ const char * hb_comp_szErrors[] =
*/
const char * hb_comp_szWarnings[] =
{
"1Ambiguous reference: '%s'",
"1Ambiguous reference, assuming memvar: '%s'",
"2Variable: '%s' declared but not used in function: '%s'",
"2Codeblock parameter: '%s' declared but not used in function: '%s'",
"1Ambiguous reference '%s'",
"1Ambiguous reference, assuming memvar '%s'",
"2Variable '%s' declared but not used in function '%s'",
"2Codeblock parameter '%s' declared but not used in function '%s'",
"1RETURN statement with no return value in function",
"1Procedure returns value",
"1Function '%s' does not end with RETURN statement",
"3Incompatible type in assignment to: '%s' expected: '%s'",
"3Incompatible operand type: '%s' expected: '%s'",
"3Incompatible operand types: '%s' and: '%s'",
"4Suspicious type in assignment to: '%s' expected: '%s'",
"4Suspicious operand type: 'unknown' expected: '%s'",
"3Incompatible type in assignment to '%s', expected '%s'",
"3Incompatible operand type '%s', expected '%s'",
"3Incompatible operand types '%s' and '%s'",
"4Suspicious type in assignment to '%s', expected '%s'",
"4Suspicious operand type 'unknown', expected '%s'",
"3Can't use array index with non-array",
"3Incompatible return type: '%s' expected: '%s'",
"4Suspicious return type: '%s' expected: '%s'",
"3Invalid number of parameters: %s expected: %s",
"3Incompatible parameter: %s expected: '%s'",
"4Suspicious parameter: %s expected: '%s'",
"3Incompatible return type '%s', expected '%s'",
"4Suspicious return type '%s', expected '%s'",
"3Invalid number of parameters %s, expected %s",
"3Incompatible parameter '%s', expected '%s'",
"4Suspicious parameter '%s', expected '%s'",
"3Duplicate declaration of %s '%s'",
"3Function '%s' conflicting with its declaration",
"3Variable '%s' used but never initialized",
@@ -138,7 +138,7 @@ const char * hb_comp_szWarnings[] =
"4Suspicious type in assignment to declared array element expected: '%s'",
"3Class '%s' not known in declaration of '%s'",
"3Message '%s' not known in class '%s'",
"0Meaningless use of expression: '%s'",
"0Meaningless use of expression '%s'",
"2Unreachable code",
"1Redundant 'ANNOUNCE %s' statement ignored",
"0Duplicate variable '%s' in nested FOR loop",

18
harbour/source/pp/ppcore.c
View File

@@ -111,8 +111,8 @@ static const char * hb_pp_szWarnings[] =
/* error messages */
static const char * hb_pp_szErrors[] =
{
"Illegal character: '\\x%s'", /* C2004 */
"Unterminated string: '%s'", /* C2007 */
"Illegal character '\\x%s'", /* C2004 */
"Unterminated string '%s'", /* C2007 */
"Missing ENDTEXT", /* C2033 */
"Syntax error in #define", /* C2055 */
"Label missing in #define", /* C2057 */
@@ -129,25 +129,25 @@ static const char * hb_pp_szErrors[] =
"Error in #undef", /* C2071 */
"Ambiguous match pattern in #translate/#command", /* C2072 */
"Result pattern contains nested clauses in #translate/#command", /* C2073 */
"#error: '%s'", /* C2074 */
"Circularity detected in #define: '%s'", /* C2078 */
"Circularity detected in #translate: '%s'", /* C2079 */
"Circularity detected in #command: '%s'", /* C2080 */
"#error '%s'", /* C2074 */
"Circularity detected in #define '%s'", /* C2078 */
"Circularity detected in #translate '%s'", /* C2079 */
"Circularity detected in #command '%s'", /* C2080 */
"Unterminated /* */ comment", /* C2083 */
"Error in #pragma", /* C20?? */
"Error in #if expression", /* C20?? */
"Cannot open input file: %s'", /* C30?? */
"Cannot open input file '%s'", /* C30?? */
"File %s is too long", /* C30?? */
"Can't create preprocessed output file", /* C3006 */
"Can't open #include file: '%s'", /* C3007 */
"Can't open #include file '%s'", /* C3007 */
"Bad filename in #include", /* C3008 */
"Too many nested #includes", /* C3009 */
"Invalid name follows #", /* C3010 */
"Can't open standard rule file: '%s'" /* C3011 */
"Can't open standard rule file '%s'" /* C3011 */
};

5
harbour/utils/hbdoc/hbdoc.prg
View File

@@ -270,7 +270,7 @@ FUNCTION MAIN( cFlags, cLinkName, cAtFile )
// Get the linkfile name and get the info in it
IF cLinkName == NIL
outstd( "Harbour Doc Extractor"+ hb_osnewline() )
outstd( "Harbour Doc Extractor " + HBRawVersion() + hb_osnewline() )
outstd( "Copyright (c) 1999-2008, http://www.harbour-project.org/"+ hb_osnewline() )
outstd( ""+ hb_osnewline() )
outstd( "Syntax: hbdoc [options] <linkname> [<ifile>]"+ hb_osnewline() )
@@ -1904,3 +1904,6 @@ FUNCTION TeeFiles()
NEXT
RETURN NIL
FUNCTION HBRawVersion()
RETURN StrTran( Version(), "Harbour ", "" )

2246
harbour/utils/hbmake/hbmake.prg
View File

File diff suppressed because it is too large Load Diff

9
harbour/utils/hbrun/hbrun.prg
View File

@@ -193,13 +193,11 @@ RETURN
STATIC PROCEDURE HB_DotUsage()
OutStd( 'Harbour "DOt Prompt" Console / runner' + HB_OSNewLine() +;
OutStd( 'Harbour "DOt Prompt" Console / runner ' + HBRawVersion() + HB_OSNewLine() +;
'Copyright (c) 1999-2008, Przemyslaw Czerpak' + HB_OSNewLine() + ;
'http://www.harbour-project.org/' + HB_OSNewLine() +;
HB_OSNewLine() +;
'Syntax: hbrun [<hrbfile[.prg|.hrb]> [<parameters,...>]]' + HB_OSNewLine() + ;
HB_OSNewLine() +;
"Note: Linked with " + Version() + HB_OSNewLine() )
'Syntax: hbrun [<hrbfile[.prg|.hrb]> [<parameters,...>]]' + HB_OSNewLine() )
RETURN
@@ -295,6 +293,9 @@ STATIC PROCEDURE HB_DotExec( cCommand )
RETURN
FUNCTION HBRawVersion()
RETURN StrTran( Version(), "Harbour ", "" )
/* ********************************************************************** */
/* request for full screen GT driver */