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

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

Browse Source 
* source/common/hbver.c
     ! Version detection fixed for __DMC__
       [TOMERGE 1.0.1]

   * contrib/mtpl_gcc.mak
     % One unnecessary C -I option deleted.
       [TOMERGE 1.0.1]

   - contrib/hbsqlit2
   + contrib/examples/hbsqlit2
   * doc/whatsnew.txt
     * Moved hbsqlit2 to examples.
       [TOMERGE 1.0.1]

   * contrib/examples/hbsqlit2/Makefile
   * contrib/examples/hbsqlit2/make_b32.bat
   * contrib/examples/hbsqlit2/make_gcc.sh
   * contrib/examples/hbsqlit2/make_vc.bat
   * contrib/examples/hbsqlit2/common.mak
   * contrib/examples/hbsqlit2/tests/bld_b32.bat
   * contrib/examples/hbsqlit2/tests/bld_vc.bat
     * Modified make files to work from the new location.
     * Location of sqlite2 headers can be specified by HB_INC_SQLITE2.
     ; Notice that sqlite2 lib itself should now be build separately.
       [TOMERGE 1.0.1]
This commit is contained in:
Viktor Szakats
2008-09-05 10:04:58 +00:00
parent 33f0a43bfb
commit d21af17b6d
24 changed files with 194 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
harbour/ChangeLog
View File

@@ -8,6 +8,37 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-09-05 12:01 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* source/common/hbver.c
! Version detection fixed for __DMC__
[TOMERGE 1.0.1]
* contrib/mtpl_gcc.mak
% One unnecessary C -I option deleted.
[TOMERGE 1.0.1]
- contrib/hbsqlit2
+ contrib/examples/hbsqlit2
* doc/whatsnew.txt
* Moved hbsqlit2 to examples.
[TOMERGE 1.0.1]
* contrib/examples/hbsqlit2/Makefile
* contrib/examples/hbsqlit2/make_b32.bat
* contrib/examples/hbsqlit2/make_gcc.sh
* contrib/examples/hbsqlit2/make_vc.bat
* contrib/examples/hbsqlit2/common.mak
* contrib/examples/hbsqlit2/tests/bld_b32.bat
* contrib/examples/hbsqlit2/tests/bld_vc.bat
* Modified make files to work from the new location.
* Location of sqlite2 headers can be specified by HB_INC_SQLITE2.
; Notice that sqlite2 lib itself should now be build separately.
[TOMERGE 1.0.1]
2008-09-05 11:23 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* source/common/hbver.c
! Version detection fixed for __DMC__.
2008-09-05 11:12 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/mtpl_vc.mak
- Removed recently (and mistakenly) added unnecessary option.

26
harbour/contrib/examples/hbsqlit2/Makefile Normal file
View File

@@ -0,0 +1,26 @@
#
# $Id$
#
ROOT = ../../../
LIBNAME=hbsqlit2
ifneq ($(HB_ARCHITECTURE),dos)
C_SOURCES =\
hbsqlit2.c \
PRG_HEADERS=\
hbsqlit2.ch
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
else
include $(TOP)$(ROOT)config/none.cf
endif

0
harbour/contrib/hbsqlit2/TODO.txt → harbour/contrib/examples/hbsqlit2/TODO.txt
View File

16
harbour/contrib/examples/hbsqlit2/common.mak Normal file
View File

@@ -0,0 +1,16 @@
#
# $Id$
#
LIBNAME = $(LIBPREF)hbsqlit2
LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)
PRG_HEADERS = \
hbsqlit2.ch \
LIB_OBJS = \
$(OBJ_DIR)hbsqlit2$(OBJEXT) \
all: \
$(LIB_PATH) \

0
harbour/contrib/hbsqlit2/hbsqlit2.c → harbour/contrib/examples/hbsqlit2/hbsqlit2.c
View File

0
harbour/contrib/hbsqlit2/hbsqlit2.ch → harbour/contrib/examples/hbsqlit2/hbsqlit2.ch
View File

29
harbour/contrib/examples/hbsqlit2/make_b32.bat Normal file
View File

@@ -0,0 +1,29 @@
@echo off
rem
rem $Id$
rem
if not "%HB_INC_SQLITE2% == "" goto DIR_OK
echo ---------------------------------------------------------------
echo IMPORTANT: You'll need SQLite 2.8.16 package and this envvar
echo to be set to successfully build this library:
echo set HB_INC_SQLITE2=C:\sqlite2
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%HB_INC_SQLITE2%"
set HB_ROOT=..\..\..
set HB_MAKEFILE=..\..\mtpl_b32.mak
call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
set HB_ROOT=
set HB_MAKEFILE=
set CFLAGS=
:POST_EXIT

31
harbour/contrib/examples/hbsqlit2/make_gcc.sh Executable file
View File

@@ -0,0 +1,31 @@
#!/bin/sh
#
# $Id$
#
if [ "${HB_INC_SQLITE2}" = "" ]
then
echo "---------------------------------------------------------------"
echo "IMPORTANT: You will need SQLite 2.8.16 package package installed and this"
echo " envvar to be set to successfully build this library:"
echo " export HB_INC_SQLITE2=C:/sqlite2"
echo " or"
echo " export HB_INC_SQLITE2=/usr/include/sqlite2"
echo "---------------------------------------------------------------"
exit 1
fi
export HB_ROOT=../../..
export HB_MAKEFILE=../../mtpl_gcc.mak
export CFLAGS=""
for I in ${HB_INC_SQLITE2}; do
CFLAGS="${CFLAGS} -I${I}"
done
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
unset CFLAGS
unset HB_ROOT
unset HB_MAKEFILE

29
harbour/contrib/examples/hbsqlit2/make_vc.bat Normal file
View File

@@ -0,0 +1,29 @@
@echo off
rem
rem $Id$
rem
if not "%HB_INC_SQLITE2% == "" goto DIR_OK
echo ---------------------------------------------------------------
echo IMPORTANT: You'll need SQLite 2.8.16 package and this envvar
echo to be set to successfully build this library:
echo set HB_INC_SQLITE2=C:\sqlite2
echo ---------------------------------------------------------------
goto POST_EXIT
:DIR_OK
set CFLAGS=-I"%HB_INC_SQLITE2%"
set HB_ROOT=..\..\..
set HB_MAKEFILE=..\..\mtpl_vc.mak
call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
set HB_ROOT=
set HB_MAKEFILE=
set CFLAGS=
:POST_EXIT

0
harbour/contrib/hbsqlit2/readme.txt → harbour/contrib/examples/hbsqlit2/readme.txt
View File

14
harbour/contrib/examples/hbsqlit2/tests/bld_b32.bat Normal file
View File

@@ -0,0 +1,14 @@
@echo off
rem
rem $Id$
rem
if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\..\bin
if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\..\lib
if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\..\include
set HB_ARCHITECTURE=w32
set HB_COMPILER=bcc32
set HB_USER_LIBS=hbsqlit2.lib sqlite2.lib
call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

14
harbour/contrib/examples/hbsqlit2/tests/bld_vc.bat Normal file
View File

@@ -0,0 +1,14 @@
@echo off
rem
rem $Id$
rem
if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\..\bin
if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\..\lib
if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\..\include
set HB_ARCHITECTURE=w32
set HB_COMPILER=msvc
set HB_USER_LIBS=hbsqlit2.lib sqlite2.lib
call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

0
harbour/contrib/hbsqlit2/tests/example.db → harbour/contrib/examples/hbsqlit2/tests/example.db
View File

0
harbour/contrib/hbsqlit2/tests/hbsqlite.prg → harbour/contrib/examples/hbsqlit2/tests/hbsqlite.prg
View File

57
harbour/contrib/hbsqlit2/Makefile
View File

@@ -1,57 +0,0 @@
#
# $Id$
#
ROOT = ../../
LIBNAME=hbsqlit2
ifneq ($(HB_ARCHITECTURE),dos)
C_SOURCES =\
hbsqlit2.c \
attach.c \
auth.c \
btree.c \
btree_rb.c \
build.c \
copy.c \
date.c \
delete.c \
encode.c \
expr.c \
func.c \
hash.c \
insert.c \
main.c \
opcodes.c \
os.c \
pager.c \
parse.c \
pragma.c \
printf.c \
random.c \
select.c \
table.c \
tokenize.c \
trigger.c \
update.c \
util.c \
vacuum.c \
vdbe.c \
vdbeaux.c \
where.c \
PRG_HEADERS=\
hbsqlit2.ch
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
else
include $(TOP)$(ROOT)config/none.cf
endif

47
harbour/contrib/hbsqlit2/common.mak
View File

@@ -1,47 +0,0 @@
#
# $Id$
#
LIBNAME = $(LIBPREF)hbsqlit2
LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)
PRG_HEADERS = \
hbsqlit2.ch \
LIB_OBJS = \
$(OBJ_DIR)hbsqlit2$(OBJEXT) \
$(OBJ_DIR)attach$(OBJEXT) \
$(OBJ_DIR)auth$(OBJEXT) \
$(OBJ_DIR)btree$(OBJEXT) \
$(OBJ_DIR)btree_rb$(OBJEXT) \
$(OBJ_DIR)build$(OBJEXT) \
$(OBJ_DIR)copy$(OBJEXT) \
$(OBJ_DIR)date$(OBJEXT) \
$(OBJ_DIR)delete$(OBJEXT) \
$(OBJ_DIR)encode$(OBJEXT) \
$(OBJ_DIR)expr$(OBJEXT) \
$(OBJ_DIR)func$(OBJEXT) \
$(OBJ_DIR)hash$(OBJEXT) \
$(OBJ_DIR)insert$(OBJEXT) \
$(OBJ_DIR)main$(OBJEXT) \
$(OBJ_DIR)opcodes$(OBJEXT) \
$(OBJ_DIR)os$(OBJEXT) \
$(OBJ_DIR)pager$(OBJEXT) \
$(OBJ_DIR)parse$(OBJEXT) \
$(OBJ_DIR)pragma$(OBJEXT) \
$(OBJ_DIR)printf$(OBJEXT) \
$(OBJ_DIR)random$(OBJEXT) \
$(OBJ_DIR)select$(OBJEXT) \
$(OBJ_DIR)table$(OBJEXT) \
$(OBJ_DIR)tokenize$(OBJEXT) \
$(OBJ_DIR)trigger$(OBJEXT) \
$(OBJ_DIR)update$(OBJEXT) \
$(OBJ_DIR)util$(OBJEXT) \
$(OBJ_DIR)vacuum$(OBJEXT) \
$(OBJ_DIR)vdbe$(OBJEXT) \
$(OBJ_DIR)vdbeaux$(OBJEXT) \
$(OBJ_DIR)where$(OBJEXT) \
all: \
$(LIB_PATH) \

6
harbour/contrib/hbsqlit2/make_b32.bat
View File

@@ -1,6 +0,0 @@
@echo off
rem
rem $Id$
rem
call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

7
harbour/contrib/hbsqlit2/make_gcc.sh
View File

@@ -1,7 +0,0 @@
#!/bin/sh
#
# $Id$
#
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

9
harbour/contrib/hbsqlit2/make_vc.bat
View File

@@ -1,9 +0,0 @@
@echo off
rem
rem $Id$
rem
rem ; sqlite won't compile in C++ mode.
set CFLAGS=-TC
call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

14
harbour/contrib/hbsqlit2/tests/bld_b32.bat
View File

@@ -1,14 +0,0 @@
@echo off
rem
rem $Id$
rem
if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin
if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib
if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
set HB_ARCHITECTURE=w32
set HB_COMPILER=bcc32
set HB_USER_LIBS=hbsqlit2.lib
call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

14
harbour/contrib/hbsqlit2/tests/bld_vc.bat
View File

@@ -1,14 +0,0 @@
@echo off
rem
rem $Id$
rem
if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin
if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib
if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
set HB_ARCHITECTURE=w32
set HB_COMPILER=msvc
set HB_USER_LIBS=hbsqlit2.lib
call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

2
harbour/contrib/mtpl_gcc.mak
View File

@@ -126,7 +126,7 @@ ifndef GCC_NOOPTIM
CFLAGS := -O3 $(CFLAGS)
endif
CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -I$(OBJ_DIR)
CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)
CLIBFLAGS := -c $(CFLAGS) $(CLIBFLAGS)
HARBOURFLAGS := -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km $(PRG_USR) $(HARBOURFLAGS)
LDFLAGS := $(LDFLAGS)

2
harbour/doc/whatsnew.txt
View File

@@ -177,6 +177,8 @@ Contrib
- Remaining code (hbwhat32, hbnf) fixed to always use
Harbour C API, instead of legacy Clipper C API (*.api,
clipdefs.h and extend.h).
- hbsqlit2 lib was moved to examples and sqlite2 sources
removed. Please use hbsqlit3 instead.
- hbziparch heavy rework/refactor/reduce effort, what
resulted in hbziparc, which implements the same old
ZipArchive interface with similar functionality (except

2
harbour/source/common/hbver.c
View File

@@ -224,7 +224,7 @@ char * hb_verPlatform( void )
if( osVer.dwMajorVersion == 6 )
{
#if !defined(HB_WINCE) && (!defined(_MSC_VER) || _MSC_VER >= 1400)
#if !defined(HB_WINCE) && !defined(__DMC__) && (!defined(_MSC_VER) || _MSC_VER >= 1400)
OSVERSIONINFOEXA osVerEx;
osVerEx.dwOSVersionInfoSize = sizeof( osVerEx );