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

2009-03-27 16:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* debian/dirs
    * Changed en -> en-EN.

  * external/sqlite3/Makefile
  * external/sqlite3/_sqlite3.c
    + Disabled warnings and forced C mode for sqlite3.
    - Deleted no longer needed stub.

  * include/hbsetup.h
    + Added HB_PATH_MAX.

  * source/compiler/genc.c
    * Minor modification to recent addition to make code
      more grep friendly.

  * config/win/msvc.cf
  * config/win/msvcce.cf
    + Added HB_BUILD_MODE=c and HB_BUILD_MODE=cpp support
      to force specific build mode.
      ATTENTION: Don't use this for normal Harbour code,
                 it's only meant for external libs hosted
                 inside Harbour source tree.

  * config/win/pocc.cf
  * config/win/poccce.cf
    + Added -w3 (default is -w2).

  * config/darwin/gcc.cf
  * config/hpux/gcc.cf
  * config/dos/owatcom.cf
  * config/dos/djgpp.cf
  * config/win/mingwce.cf
  * config/win/poccce.cf
  * config/win/icc.cf
  * config/win/cygwin.cf
  * config/win/msvc.cf
  * config/win/owatcom.cf
  * config/win/msvcce.cf
  * config/win/mingw.cf
  * config/win/pocc.cf
  * config/win/bcc.cf
  * config/linux/owatcom.cf
  * config/linux/gcc.cf
  * config/linux/icc.cf
  * config/os2/owatcom.cf
  * config/os2/gcc.cf
  * config/sunos/gcc.cf
  * config/bsd/gcc.cf
    + Added support for HB_BUILD_WARN=no to reset warning levels
      to compiler defaults.
      ATTENTION: Don't use this for normal Harbour code,
                 it's only meant for external libs hosted
                 inside Harbour source tree.
This commit is contained in:
Viktor Szakats
2009-03-27 15:40:18 +00:00
parent ed9059b8f8
commit 72bb7bff3b
27 changed files with 197 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
harbour/ChangeLog
View File

@@ -8,6 +8,61 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-27 16:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* debian/dirs
* Changed en -> en-EN.
* external/sqlite3/Makefile
* external/sqlite3/_sqlite3.c
+ Disabled warnings and forced C mode for sqlite3.
- Deleted no longer needed stub.
* include/hbsetup.h
+ Added HB_PATH_MAX.
* source/compiler/genc.c
* Minor modification to recent addition to make code
more grep friendly.
* config/win/msvc.cf
* config/win/msvcce.cf
+ Added HB_BUILD_MODE=c and HB_BUILD_MODE=cpp support
to force specific build mode.
ATTENTION: Don't use this for normal Harbour code,
it's only meant for external libs hosted
inside Harbour source tree.
* config/win/pocc.cf
* config/win/poccce.cf
+ Added -w3 (default is -w2).
* config/darwin/gcc.cf
* config/hpux/gcc.cf
* config/dos/owatcom.cf
* config/dos/djgpp.cf
* config/win/mingwce.cf
* config/win/poccce.cf
* config/win/icc.cf
* config/win/cygwin.cf
* config/win/msvc.cf
* config/win/owatcom.cf
* config/win/msvcce.cf
* config/win/mingw.cf
* config/win/pocc.cf
* config/win/bcc.cf
* config/linux/owatcom.cf
* config/linux/gcc.cf
* config/linux/icc.cf
* config/os2/owatcom.cf
* config/os2/gcc.cf
* config/sunos/gcc.cf
* config/bsd/gcc.cf
+ Added support for HB_BUILD_WARN=no to reset warning levels
to compiler defaults.
ATTENTION: Don't use this for normal Harbour code,
it's only meant for external libs hosted
inside Harbour source tree.
2009-03-27 15:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* external/sqlite3/Makefile
* Don't build it for linux and darwin.

6
harbour/config/bsd/gcc.cf
View File

@@ -13,7 +13,11 @@ CC = $(HB_CCACHE) gcc
CC_IN = -c
CC_OUT = -o
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -Wall -W
CFLAGS =
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -Wall -W
endif
ifneq ($(HB_BUILD_OPTIM),no)
CFLAGS += -O3

6
harbour/config/darwin/gcc.cf
View File

@@ -29,7 +29,11 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CPPFLAGS += -no-cpp-precomp
# -fno-common enables building .dylib files
CFLAGS = -fno-common -Wall -W
CFLAGS = -fno-common
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -Wall -W
endif
ifneq ($(HB_BUILD_OPTIM),no)
CFLAGS += -O3

6
harbour/config/dos/djgpp.cf
View File

@@ -13,7 +13,11 @@ CC = gcc
CC_IN = -c
CC_OUT = -o
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -Wall -W
CFLAGS =
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -Wall -W
endif
ifneq ($(HB_BUILD_OPTIM),no)
CFLAGS += -O3

8
harbour/config/dos/owatcom.cf
View File

@@ -25,8 +25,12 @@ CC = wpp386
CC_IN =
CC_OUT = -fo=
#CPPFLAGS = -j -w3 -5s -5r -oehtz -s -zq -zt0 -bt=DOS
CPPFLAGS = -w3 -zq -bt=DOS
#CPPFLAGS = -j -5s -5r -oehtz -s -zq -zt0 -bt=DOS
CPPFLAGS = -zq -bt=DOS
ifneq ($(HB_BUILD_WARN),no)
CPPFLAGS += -w3
endif
ifneq ($(HB_BUILD_OPTIM),no)
# architecture flags

6
harbour/config/hpux/gcc.cf
View File

@@ -14,9 +14,13 @@ CC_IN = -c
CC_OUT = -o
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -Wall -W
CFLAGS =
LDFLAGS =
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -Wall -W
endif
ifneq ($(HB_BUILD_OPTIM),no)
CFLAGS += -O3
endif

9
harbour/config/linux/gcc.cf
View File

@@ -24,9 +24,16 @@ ifeq ($(HB_COMPILER),icc)
CFLAGS = -D_GNU_SOURCE
#CFLAGS += -std=c99
#CFLAGS += -xHOST
else
CFLAGS =
endif
ifneq ($(HB_BUILD_WARN),no)
ifeq ($(HB_COMPILER),icc)
#CFLAGS += -w2 -Wall
else
CFLAGS = -Wall -W
CFLAGS += -Wall -W
endif
endif
ifneq ($(HB_BUILD_OPTIM),no)

3
harbour/config/linux/icc.cf
View File

@@ -21,7 +21,10 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
#CFLAGS = -xHOST
CFLAGS = -D_GNU_SOURCE
#CFLAGS += -std=c99
ifneq ($(HB_BUILD_WARN),no)
#CFLAGS += -w2 -Wall
endif
ifneq ($(HB_BUILD_OPTIM),no)
CFLAGS += -O3

8
harbour/config/linux/owatcom.cf
View File

@@ -15,8 +15,12 @@ CC = wpp386
CC_IN =
CC_OUT = -fo=
#CPPFLAGS = -j -w3 -5s -5r -fp5 -oehtz -s -zq -zt0 -bt=linux
CPPFLAGS = -w3 -zq -bt=linux
#CPPFLAGS = -j -5s -5r -oehtz -zq -bt=linux
CPPFLAGS = -zq -bt=linux
ifneq ($(HB_BUILD_WARN),no)
CPPFLAGS += -w3
endif
ifneq ($(HB_BUILD_OPTIM),no)
# architecture flags

6
harbour/config/os2/gcc.cf
View File

@@ -13,7 +13,11 @@ CC = gcc
CC_IN = -c
CC_OUT = -o
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -Wall -W
CFLAGS =
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -Wall -W
endif
ifneq ($(HB_BUILD_OPTIM),no)
CFLAGS += -O3

8
harbour/config/os2/owatcom.cf
View File

@@ -15,8 +15,12 @@ CC = wpp386
CC_IN =
CC_OUT = -fo=
#CPPFLAGS = -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2
CPPFLAGS = -w3 -zq -bt=OS2
#CPPFLAGS = -j -5s -5r -oxehtz -zq -mf -bt=OS2
CPPFLAGS = -zq -bt=OS2
ifneq ($(HB_BUILD_WARN),no)
CPPFLAGS += -w3
endif
ifneq ($(HB_BUILD_OPTIM),no)
# architecture flags

6
harbour/config/sunos/gcc.cf
View File

@@ -14,7 +14,11 @@ CC_IN = -c
CC_OUT = -o
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -Wall -W
CFLAGS =
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -Wall -W
endif
ifneq ($(HB_BUILD_OPTIM),no)
CFLAGS += -O3

6
harbour/config/win/bcc.cf
View File

@@ -16,7 +16,11 @@ CC = bcc32.exe
CC_IN = -c
CC_OUT = -o
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -q -Q -w -w-sig- -tWM
CFLAGS = -q -tWM
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -w -w-sig- -Q
endif
ifneq ($(HB_BUILD_OPTIM),no)
CFLAGS += -d -4 -O2 -OS -Ov -Oi -Oc

6
harbour/config/win/cygwin.cf
View File

@@ -13,7 +13,11 @@ CC = gcc
CC_IN = -c
CC_OUT = -o
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -Wall -W
CFLAGS =
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -Wall -W
endif
ifneq ($(HB_BUILD_OPTIM),no)
CFLAGS += -O3

6
harbour/config/win/icc.cf
View File

@@ -16,7 +16,11 @@ CC = icl.exe
CC_IN = -c
CC_OUT = -Fo
CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE)
CFLAGS = -W3 -Gs
CFLAGS = -Gs
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -W3
endif
ifneq ($(HB_BUILD_OPTIM),no)
# maximum optimizations

6
harbour/config/win/mingw.cf
View File

@@ -13,7 +13,11 @@ CC = $(HB_CCPREFIX)gcc
CC_IN = -c
CC_OUT = -o
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -Wall -W
CFLAGS =
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -Wall -W
endif
ifneq ($(HB_BUILD_OPTIM),no)
CFLAGS += -O3

6
harbour/config/win/mingwce.cf
View File

@@ -16,7 +16,11 @@ CC = $(HB_CCPREFIX)gcc
CC_IN = -c
CC_OUT = -o
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -Wall -W
CFLAGS =
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -Wall -W
endif
ifneq ($(HB_BUILD_OPTIM),no)
# Use -O2 instead of -O3 here.

17
harbour/config/win/msvc.cf
View File

@@ -12,7 +12,22 @@ LIB_EXT = .lib
CC = cl.exe
CC_IN = -c
CC_OUT = -Fo
CPPFLAGS = -nologo -W4 -wd4127 -Gs -I. -I$(HB_INC_COMPILE) -TP
CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE) -Gs
ifeq ($(HB_BUILD_MODE),c)
CPPFLAGS += -TC
endif
ifeq ($(HB_BUILD_MODE),cpp)
CPPFLAGS += -TP
endif
# Build in C++ mode by default
ifeq ($(HB_BUILD_MODE),)
CPPFLAGS += -TP
endif
ifneq ($(HB_BUILD_WARN),no)
CPPFLAGS += -W4 -wd4127
endif
ifneq ($(HB_BUILD_OPTIM),no)
ifeq ($(HB_VISUALC_VER_PRE80),)

13
harbour/config/win/msvcce.cf
View File

@@ -22,7 +22,18 @@ endif
CC_IN = -c
CC_OUT = -Fo
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS = -nologo -W4 -D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -D"WIN32_PLATFORM_PSPC" -D"WINCE" -D"_WINCE" -D"_WINDOWS" -D"ARM" -D"_ARM_" -D"ARMV4" -D"POCKETPC2003_UI_MODEL" -D"_M_ARM" -D"UNICODE" -D"_UNICODE" -D_UWIN
CFLAGS = -nologo -D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -D"WIN32_PLATFORM_PSPC" -D"WINCE" -D"_WINCE" -D"_WINDOWS" -D"ARM" -D"_ARM_" -D"ARMV4" -D"POCKETPC2003_UI_MODEL" -D"_M_ARM" -D"UNICODE" -D"_UNICODE" -D_UWIN
ifeq ($(HB_BUILD_MODE),c)
CFLAGS += -TC
endif
ifeq ($(HB_BUILD_MODE),cpp)
CFLAGS += -TP
endif
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -W4
endif
ifneq ($(HB_BUILD_OPTIM),no)
ifeq ($(HB_VISUALC_VER_PRE80),)

8
harbour/config/win/owatcom.cf
View File

@@ -15,8 +15,12 @@ CC = wpp386
CC_IN =
CC_OUT = -fo=
#CPPFLAGS = -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT
CPPFLAGS = -w3 -zq -bt=NT -bm
#CPPFLAGS = -j -5r -oxehtz -zq -mf -bt=NT
CPPFLAGS = -zq -bt=NT -bm
ifneq ($(HB_BUILD_WARN),no)
CPPFLAGS += -w3
endif
ifneq ($(HB_BUILD_OPTIM),no)
# architecture flags

4
harbour/config/win/pocc.cf
View File

@@ -18,6 +18,10 @@ CPPFLAGS = -I.
CPPFLAGS += -Ze -Go -MT
ifneq ($(HB_BUILD_WARN),no)
CPPFLAGS += -W2
endif
ifneq ($(HB_BUILD_OPTIM),no)
CPPFLAGS += -Ot
# -Ox: can cause GPF in 4.50/5.00, so it's disabled.

4
harbour/config/win/poccce.cf
View File

@@ -22,6 +22,10 @@ CPPFLAGS = -I.
CPPFLAGS += -Ze -Go
ifneq ($(HB_BUILD_WARN),no)
CPPFLAGS += -W2
endif
ifneq ($(HB_BUILD_OPTIM),no)
CPPFLAGS += -Ot
# -Ox: can cause GPF in 4.50/5.00, so it's disabled.

2
harbour/debian/dirs
View File

@@ -3,4 +3,4 @@ usr/bin
usr/lib/harbour
usr/include/harbour
usr/share/doc/harbour
usr/share/doc/harbour/en
usr/share/doc/harbour/en-EN

26
harbour/external/sqlite3/Makefile vendored
View File

@@ -2,31 +2,25 @@
# $Id$
#
HB_BUILD_WARN = no
HB_BUILD_MODE = c
ROOT = ../../
LIBNAME=sqlite3
ifeq ($(HB_WITHOUT_SQLIT3),)
ifeq ($(HB_ARCHITECTURE),dos)
HB_WITHOUT_SQLIT3=yes
ifeq ($(HB_WITH_SQLITE3),)
ifeq ($(HB_ARCHITECTURE),win)
HB_WITH_SQLITE3=yes
endif
ifeq ($(HB_ARCHITECTURE),bsd)
HB_WITHOUT_SQLIT3=yes
endif
ifeq ($(HB_ARCHITECTURE),hpux)
HB_WITHOUT_SQLIT3=yes
endif
ifeq ($(HB_ARCHITECTURE),linux)
HB_WITHOUT_SQLIT3=yes
endif
ifeq ($(HB_ARCHITECTURE),darwin)
HB_WITHOUT_SQLIT3=yes
ifeq ($(HB_ARCHITECTURE),os2)
HB_WITH_SQLITE3=yes
endif
endif
ifneq ($(HB_WITHOUT_SQLIT3),yes)
ifeq ($(HB_WITH_SQLITE3),yes)
C_SOURCES =\
_sqlite3.c \
sqlite3.c \
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)

83
harbour/external/sqlite3/_sqlite3.c vendored
View File

@@ -1,83 +0,0 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* SQLite3 stub
*
* Copyright 2009 Viktor Szakats <harbour 01 syenar hu>
* www - http://www.harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
#if !( defined( __WATCOMC__ ) || (defined(__POCC__) && __POCC__ <= 450) )
#if defined( __GCC__ ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
#pragma GCC diagnostic ignored "-Wunused"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wuninitialized"
#elif defined( __BORLANDC__ )
#pragma warn -aus
#pragma warn -use
#pragma warn -par
#pragma warn -prc
#pragma warn -eff
#pragma warn -amp
#elif defined( _MSC_VER )
#pragma warning( disable: 4018 4244 )
#endif
#include "sqlite3.c"
#if defined( __GCC__ ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
#pragma GCC diagnostic warning "-Wunused"
#pragma GCC diagnostic warning "-Wsign-compare"
#pragma GCC diagnostic warning "-Wuninitialized"
#elif defined( __BORLANDC__ )
#pragma warn +aus
/* #pragma warn +use */ /* This affects the whole file, so don't turn it back on. */
#pragma warn +par
#pragma warn +prc
#pragma warn +eff
#pragma warn +amp
#elif defined( _MSC_VER )
#pragma warning( default: 4018 4244 )
#endif
#endif

2
harbour/include/hbsetup.h
View File

@@ -229,6 +229,8 @@
#define _POSIX_PATH_MAX 255
#endif
#define HB_PATH_MAX 264 /* with trailing 0 byte */
/* NOTE:
Compiler _MSC_VER value
-------- --------------

6
harbour/source/compiler/genc.c
View File

@@ -247,9 +247,9 @@ void hb_compGenCCode( HB_COMP_DECL, PHB_FNAME pFileName ) /* generates the
if( ( pFuncall->cScope & ( HB_FS_DEFERRED | HB_FS_LOCAL ) ) == 0 &&
hb_compFunctionFind( HB_COMP_PARAM, pFuncall->szName ) == NULL &&
hb_compInlineFind( HB_COMP_PARAM, pFuncall->szName ) == NULL )
fprintf( yyc, "HB_FUNC_%s( %s );\n",
( pFuncall->cScope & HB_FS_STATIC ) ? "STATIC" : "EXTERN",
pFuncall->szName );
fprintf( yyc, ( pFuncall->cScope & HB_FS_STATIC ) ?
"HB_FUNC_STATIC( %s );\n" :
"HB_FUNC_EXTERN( %s );\n", pFuncall->szName );
pFuncall = pFuncall->pNext;
}