mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-14 13:29:14 +02:00
+ Use of dbconst for resource strings
This commit is contained in:
parent
5ab50a2316
commit
a63a672f28
@ -1,8 +1,8 @@
|
|||||||
#
|
#
|
||||||
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/09/04]
|
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/31]
|
||||||
#
|
#
|
||||||
default: all
|
default: all
|
||||||
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
|
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos
|
||||||
BSDs = freebsd netbsd openbsd darwin
|
BSDs = freebsd netbsd openbsd darwin
|
||||||
UNIXs = linux $(BSDs) sunos qnx
|
UNIXs = linux $(BSDs) sunos qnx
|
||||||
FORCE:
|
FORCE:
|
||||||
@ -233,8 +233,8 @@ endif
|
|||||||
ifeq ($(OS_TARGET),darwin)
|
ifeq ($(OS_TARGET),darwin)
|
||||||
override TARGET_DIRS+=mysql interbase sqlite
|
override TARGET_DIRS+=mysql interbase sqlite
|
||||||
endif
|
endif
|
||||||
override TARGET_UNITS+=db ddg_ds ddg_rec dbwhtml
|
override TARGET_UNITS+=dbconst db ddg_ds ddg_rec dbwhtml
|
||||||
override TARGET_RSTS+=dbwhtml
|
override TARGET_RSTS+=dbwhtml dbconst
|
||||||
override TARGET_EXAMPLEDIRS+=tests
|
override TARGET_EXAMPLEDIRS+=tests
|
||||||
override INSTALL_FPCPACKAGE=y
|
override INSTALL_FPCPACKAGE=y
|
||||||
override COMPILER_OPTIONS+=-S2
|
override COMPILER_OPTIONS+=-S2
|
||||||
@ -573,12 +573,6 @@ STATICLIBPREFIX=
|
|||||||
FPCMADE=fpcmade.nw
|
FPCMADE=fpcmade.nw
|
||||||
ZIPSUFFIX=nw
|
ZIPSUFFIX=nw
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),netwlibc)
|
|
||||||
EXEEXT=.nlm
|
|
||||||
STATICLIBPREFIX=
|
|
||||||
FPCMADE=fpcmade.nwl
|
|
||||||
ZIPSUFFIX=nwl
|
|
||||||
endif
|
|
||||||
ifeq ($(OS_TARGET),macos)
|
ifeq ($(OS_TARGET),macos)
|
||||||
BATCHEXT=
|
BATCHEXT=
|
||||||
EXEEXT=
|
EXEEXT=
|
||||||
@ -731,18 +725,6 @@ FPCMADE=fpcmade.nw
|
|||||||
ZIPSUFFIX=nw
|
ZIPSUFFIX=nw
|
||||||
EXEEXT=.nlm
|
EXEEXT=.nlm
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),netwlibc)
|
|
||||||
STATICLIBPREFIX=
|
|
||||||
PPUEXT=.ppu
|
|
||||||
OEXT=.o
|
|
||||||
ASMEXT=.s
|
|
||||||
SMARTEXT=.sl
|
|
||||||
STATICLIBEXT=.a
|
|
||||||
SHAREDLIBEXT=.nlm
|
|
||||||
FPCMADE=fpcmade.nwl
|
|
||||||
ZIPSUFFIX=nwl
|
|
||||||
EXEEXT=.nlm
|
|
||||||
endif
|
|
||||||
ifeq ($(OS_TARGET),macos)
|
ifeq ($(OS_TARGET),macos)
|
||||||
BATCHEXT=
|
BATCHEXT=
|
||||||
PPUEXT=.ppu
|
PPUEXT=.ppu
|
||||||
@ -989,6 +971,7 @@ ifeq ($(OS_TARGET),linux)
|
|||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -997,6 +980,7 @@ ifeq ($(OS_TARGET),linux)
|
|||||||
ifeq ($(CPU_TARGET),m68k)
|
ifeq ($(CPU_TARGET),m68k)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1005,6 +989,7 @@ ifeq ($(OS_TARGET),linux)
|
|||||||
ifeq ($(CPU_TARGET),powerpc)
|
ifeq ($(CPU_TARGET),powerpc)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1013,6 +998,7 @@ ifeq ($(OS_TARGET),linux)
|
|||||||
ifeq ($(CPU_TARGET),sparc)
|
ifeq ($(CPU_TARGET),sparc)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1021,6 +1007,7 @@ ifeq ($(OS_TARGET),linux)
|
|||||||
ifeq ($(CPU_TARGET),x86_64)
|
ifeq ($(CPU_TARGET),x86_64)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1029,6 +1016,7 @@ ifeq ($(OS_TARGET),linux)
|
|||||||
ifeq ($(CPU_TARGET),arm)
|
ifeq ($(CPU_TARGET),arm)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1036,13 +1024,13 @@ endif
|
|||||||
ifeq ($(OS_TARGET),go32v2)
|
ifeq ($(OS_TARGET),go32v2)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),win32)
|
ifeq ($(OS_TARGET),win32)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1050,13 +1038,13 @@ endif
|
|||||||
ifeq ($(OS_TARGET),os2)
|
ifeq ($(OS_TARGET),os2)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),freebsd)
|
ifeq ($(OS_TARGET),freebsd)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1065,6 +1053,7 @@ ifeq ($(OS_TARGET),freebsd)
|
|||||||
ifeq ($(CPU_TARGET),m68k)
|
ifeq ($(CPU_TARGET),m68k)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1073,6 +1062,7 @@ ifeq ($(OS_TARGET),freebsd)
|
|||||||
ifeq ($(CPU_TARGET),x86_64)
|
ifeq ($(CPU_TARGET),x86_64)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1080,13 +1070,13 @@ endif
|
|||||||
ifeq ($(OS_TARGET),beos)
|
ifeq ($(OS_TARGET),beos)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),netbsd)
|
ifeq ($(OS_TARGET),netbsd)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1095,6 +1085,7 @@ ifeq ($(OS_TARGET),netbsd)
|
|||||||
ifeq ($(CPU_TARGET),m68k)
|
ifeq ($(CPU_TARGET),m68k)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1103,6 +1094,7 @@ ifeq ($(OS_TARGET),netbsd)
|
|||||||
ifeq ($(CPU_TARGET),powerpc)
|
ifeq ($(CPU_TARGET),powerpc)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1111,6 +1103,7 @@ ifeq ($(OS_TARGET),netbsd)
|
|||||||
ifeq ($(CPU_TARGET),sparc)
|
ifeq ($(CPU_TARGET),sparc)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1118,43 +1111,38 @@ endif
|
|||||||
ifeq ($(OS_TARGET),amiga)
|
ifeq ($(OS_TARGET),amiga)
|
||||||
ifeq ($(CPU_TARGET),m68k)
|
ifeq ($(CPU_TARGET),m68k)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),atari)
|
ifeq ($(OS_TARGET),atari)
|
||||||
ifeq ($(CPU_TARGET),m68k)
|
ifeq ($(CPU_TARGET),m68k)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),sunos)
|
ifeq ($(OS_TARGET),sunos)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),sunos)
|
ifeq ($(OS_TARGET),sunos)
|
||||||
ifeq ($(CPU_TARGET),sparc)
|
ifeq ($(CPU_TARGET),sparc)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),qnx)
|
ifeq ($(OS_TARGET),qnx)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),netware)
|
ifeq ($(OS_TARGET),netware)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),openbsd)
|
ifeq ($(OS_TARGET),openbsd)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1163,6 +1151,7 @@ ifeq ($(OS_TARGET),openbsd)
|
|||||||
ifeq ($(CPU_TARGET),m68k)
|
ifeq ($(CPU_TARGET),m68k)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1170,25 +1159,23 @@ endif
|
|||||||
ifeq ($(OS_TARGET),wdosx)
|
ifeq ($(OS_TARGET),wdosx)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),palmos)
|
ifeq ($(OS_TARGET),palmos)
|
||||||
ifeq ($(CPU_TARGET),m68k)
|
ifeq ($(CPU_TARGET),m68k)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),macos)
|
ifeq ($(OS_TARGET),macos)
|
||||||
ifeq ($(CPU_TARGET),powerpc)
|
ifeq ($(CPU_TARGET),powerpc)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),darwin)
|
ifeq ($(OS_TARGET),darwin)
|
||||||
ifeq ($(CPU_TARGET),powerpc)
|
ifeq ($(CPU_TARGET),powerpc)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_POSTGRES=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_SQLITE=1
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
@ -1196,25 +1183,16 @@ endif
|
|||||||
ifeq ($(OS_TARGET),emx)
|
ifeq ($(OS_TARGET),emx)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),watcom)
|
ifeq ($(OS_TARGET),watcom)
|
||||||
ifeq ($(CPU_TARGET),i386)
|
ifeq ($(CPU_TARGET),i386)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),morphos)
|
ifeq ($(OS_TARGET),morphos)
|
||||||
ifeq ($(CPU_TARGET),powerpc)
|
ifeq ($(CPU_TARGET),powerpc)
|
||||||
REQUIRE_PACKAGES_RTL=1
|
REQUIRE_PACKAGES_RTL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifeq ($(OS_TARGET),netwlibc)
|
|
||||||
ifeq ($(CPU_TARGET),i386)
|
|
||||||
REQUIRE_PACKAGES_RTL=1
|
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifdef REQUIRE_PACKAGES_RTL
|
ifdef REQUIRE_PACKAGES_RTL
|
||||||
@ -1269,6 +1247,32 @@ ifdef UNITDIR_IBASE
|
|||||||
override COMPILER_UNITDIR+=$(UNITDIR_IBASE)
|
override COMPILER_UNITDIR+=$(UNITDIR_IBASE)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
ifdef REQUIRE_PACKAGES_POSTGRES
|
||||||
|
PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR))))))
|
||||||
|
ifneq ($(PACKAGEDIR_POSTGRES),)
|
||||||
|
ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/$(OS_TARGET)),)
|
||||||
|
UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/$(OS_TARGET)
|
||||||
|
else
|
||||||
|
UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)
|
||||||
|
endif
|
||||||
|
ifdef CHECKDEPEND
|
||||||
|
$(PACKAGEDIR_POSTGRES)/$(FPCMADE):
|
||||||
|
$(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE)
|
||||||
|
override ALLDEPENDENCIES+=$(PACKAGEDIR_POSTGRES)/$(FPCMADE)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
PACKAGEDIR_POSTGRES=
|
||||||
|
UNITDIR_POSTGRES:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /postgres/Package.fpc,$(UNITSDIR)))))
|
||||||
|
ifneq ($(UNITDIR_POSTGRES),)
|
||||||
|
UNITDIR_POSTGRES:=$(firstword $(UNITDIR_POSTGRES))
|
||||||
|
else
|
||||||
|
UNITDIR_POSTGRES=
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifdef UNITDIR_POSTGRES
|
||||||
|
override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
ifdef REQUIRE_PACKAGES_MYSQL
|
ifdef REQUIRE_PACKAGES_MYSQL
|
||||||
PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR))))))
|
PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR))))))
|
||||||
ifneq ($(PACKAGEDIR_MYSQL),)
|
ifneq ($(PACKAGEDIR_MYSQL),)
|
||||||
|
@ -14,9 +14,9 @@ dirs_darwin=mysql interbase sqlite
|
|||||||
dirs_netbsd=mysql interbase sqlite
|
dirs_netbsd=mysql interbase sqlite
|
||||||
dirs_openbsd=mysql interbase sqlite
|
dirs_openbsd=mysql interbase sqlite
|
||||||
dirs_win32=mysql interbase sqlite dbase
|
dirs_win32=mysql interbase sqlite dbase
|
||||||
units=db ddg_ds ddg_rec dbwhtml
|
units=dbconst db ddg_ds ddg_rec dbwhtml
|
||||||
exampledirs=tests
|
exampledirs=tests
|
||||||
rsts=dbwhtml
|
rsts=dbwhtml dbconst
|
||||||
|
|
||||||
[compiler]
|
[compiler]
|
||||||
options=-S2
|
options=-S2
|
||||||
|
@ -1389,6 +1389,8 @@ Procedure DatabaseErrorFmt (Const Fmt : String; Args : Array Of const;
|
|||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
|
uses dbconst;
|
||||||
|
|
||||||
{ ---------------------------------------------------------------------
|
{ ---------------------------------------------------------------------
|
||||||
Auxiliary functions
|
Auxiliary functions
|
||||||
---------------------------------------------------------------------}
|
---------------------------------------------------------------------}
|
||||||
@ -1420,8 +1422,6 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
{$i dbs.inc}
|
|
||||||
|
|
||||||
{ TIndexDef }
|
{ TIndexDef }
|
||||||
|
|
||||||
constructor TIndexDef.Create(Owner: TIndexDefs; const AName, TheFields: string;
|
constructor TIndexDef.Create(Owner: TIndexDefs; const AName, TheFields: string;
|
||||||
@ -1572,7 +1572,10 @@ end.
|
|||||||
|
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.25 2004-10-10 14:25:21 michael
|
Revision 1.26 2004-10-10 14:45:51 michael
|
||||||
|
+ Use of dbconst for resource strings
|
||||||
|
|
||||||
|
Revision 1.25 2004/10/10 14:25:21 michael
|
||||||
+ Small fix for close so it does not check browsemode
|
+ Small fix for close so it does not check browsemode
|
||||||
|
|
||||||
Revision 1.24 2004/09/26 16:55:24 michael
|
Revision 1.24 2004/09/26 16:55:24 michael
|
||||||
|
71
fcl/db/dbconst.pp
Normal file
71
fcl/db/dbconst.pp
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
{
|
||||||
|
$Id$
|
||||||
|
This file is part of the Free Pascal run time library.
|
||||||
|
Copyright (c) 1999-2000 by Michael Van Canneyt, member of the
|
||||||
|
Free Pascal development team
|
||||||
|
|
||||||
|
Constants used for displaying messages in DB units
|
||||||
|
|
||||||
|
See the file COPYING.FPC, included in this distribution,
|
||||||
|
for details about the copyright.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
**********************************************************************}
|
||||||
|
|
||||||
|
unit dbconst;
|
||||||
|
|
||||||
|
Interface
|
||||||
|
|
||||||
|
Const
|
||||||
|
SActiveDataset = 'Operation cannot be performed on an active dataset';
|
||||||
|
SCantSetAutoIncFields = 'AutoInc Fields are read-only';
|
||||||
|
SConnected = 'Operation cannot be performed on an connected database';
|
||||||
|
SDatasetReadOnly = 'Dataset is read-only.';
|
||||||
|
SDatasetRegistered = 'Dataset already registered : "%s"';
|
||||||
|
SDuplicateFieldName = 'Duplicate fieldname : "%s"';
|
||||||
|
SErrAssTransaction = 'Cannot assign transaction while old transaction active!';
|
||||||
|
SErrDatabasenAssigned = 'Database not assigned!';
|
||||||
|
SErrNoDatabaseAvailable = 'Invalid operation: Not attached to database';
|
||||||
|
SErrNoSelectStatement = 'Cannot open a non-select statement';
|
||||||
|
SErrNoStatement = 'SQL statement not set';
|
||||||
|
SErrTransactionnSet = 'Transaction not set';
|
||||||
|
SFieldNotFound = 'Field not found : "%s"';
|
||||||
|
SInactiveDataset = 'Operation cannot be performed on an inactive dataset';
|
||||||
|
SInvalidDisplayValues = '"%s" are not valid boolean displayvalues';
|
||||||
|
SInvalidFieldKind = '%s : invalid field kind : ';
|
||||||
|
SInvalidFieldSize = 'Invalid field size : %d';
|
||||||
|
SInvalidTypeConversion = 'Invalid type conversion to %s in field %s';
|
||||||
|
SNeedField = 'Field %s is required, but not supplied.';
|
||||||
|
SNeedFieldName = 'Field needs a name';
|
||||||
|
SNoDataset = 'No dataset asssigned for field : "%s"';
|
||||||
|
SNoDatasetRegistered = 'No such dataset registered : "%s"';
|
||||||
|
SNoDatasets = 'No datasets are attached to the database';
|
||||||
|
SNoSuchRecord = 'Could not find the requested record.';
|
||||||
|
SNoTransactionRegistered = 'No such transaction registered : "%s"';
|
||||||
|
SNoTransactions = 'No transactions are attached to the database';
|
||||||
|
SNotABoolean = '"%s" is not a valid boolean';
|
||||||
|
SNotAFloat = '"%s" is not a valid float';
|
||||||
|
SNotAninteger = '"%s" is not a valid integer';
|
||||||
|
SNotConnected = 'Operation cannot be performed on an disconnected database';
|
||||||
|
SNotInEditState = 'Operation not allowed, dataset "%s" is not in an edit state.';
|
||||||
|
SRangeError = '%f is not between %f and %f for %s';
|
||||||
|
SReadOnlyField = 'Field %s cannot be modified, it is read-only.';
|
||||||
|
STransactionRegistered = 'Transaction already registered : "%s"';
|
||||||
|
SUniDirectional = 'Operation cannot be performed on an unidirectional dataset';
|
||||||
|
SUnknownField = 'No field named "%s" was found in dataset "%s"';
|
||||||
|
SUnknownFieldType = 'Unknown field type : %s';
|
||||||
|
|
||||||
|
Implementation
|
||||||
|
|
||||||
|
end.
|
||||||
|
|
||||||
|
{
|
||||||
|
$Log$
|
||||||
|
Revision 1.1 2004-10-10 14:45:51 michael
|
||||||
|
+ Use of dbconst for resource strings
|
||||||
|
|
||||||
|
|
||||||
|
}
|
@ -1,77 +0,0 @@
|
|||||||
{
|
|
||||||
$Id$
|
|
||||||
This file is part of the Free Pascal run time library.
|
|
||||||
Copyright (c) 1999-2000 by Michael Van Canneyt, member of the
|
|
||||||
Free Pascal development team
|
|
||||||
|
|
||||||
Constants used for displaying messages in DB unit
|
|
||||||
|
|
||||||
See the file COPYING.FPC, included in this distribution,
|
|
||||||
for details about the copyright.
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
**********************************************************************}
|
|
||||||
|
|
||||||
Const
|
|
||||||
SUnknownFieldType = 'Unknown field type : %s';
|
|
||||||
SUnknownField = 'No field named "%s" was found in dataset "%s"';
|
|
||||||
SNeedFieldName = 'Field needs a name';
|
|
||||||
SInvalidTypeConversion = 'Invalid type conversion to %s in field %s';
|
|
||||||
SReadOnlyField = 'Field %s cannot be modified, it is read-only.';
|
|
||||||
SInvalidFieldSize = 'Invalid field size : %d';
|
|
||||||
SNoDataset = 'No dataset asssigned for field : "%s"';
|
|
||||||
SDuplicateFieldName = 'Duplicate fieldname : "%s"';
|
|
||||||
SFieldNotFound = 'Field not found : "%s"';
|
|
||||||
SInvalidFieldKind = '%s : invalid field kind : ';
|
|
||||||
SRangeError = '%f is not between %f and %f for %s';
|
|
||||||
SNotAninteger = '"%s" is not a valid integer';
|
|
||||||
SCantSetAutoIncFields = 'AutoInc Fields are read-only';
|
|
||||||
SNotAFloat = '"%s" is not a valid float';
|
|
||||||
SInvalidDisplayValues = '"%s" are not valid boolean displayvalues';
|
|
||||||
SNotABoolean = '"%s" is not a valid boolean';
|
|
||||||
SInactiveDataset = 'Operation cannot be performed on an inactive dataset';
|
|
||||||
SActiveDataset = 'Operation cannot be performed on an active dataset';
|
|
||||||
SNoDatasets = 'No datasets are attached to the database';
|
|
||||||
SNoTransactions = 'No transactions are attached to the database';
|
|
||||||
SDatasetRegistered = 'Dataset already registered : "%s"';
|
|
||||||
STransactionRegistered = 'Transaction already registered : "%s"';
|
|
||||||
SNoDatasetRegistered = 'No such dataset registered : "%s"';
|
|
||||||
SNoTransactionRegistered = 'No such transaction registered : "%s"';
|
|
||||||
SNotConnected = 'Operation cannot be performed on an disconnected database';
|
|
||||||
SConnected = 'Operation cannot be performed on an connected database';
|
|
||||||
SUniDirectional = 'Operation cannot be performed on an unidirectional dataset';
|
|
||||||
SNoSuchRecord = 'Could not find the requested record.';
|
|
||||||
SDatasetReadOnly = 'Dataset is read-only.';
|
|
||||||
SNeedField = 'Field %s is required, but not supplied.';
|
|
||||||
SNotInEditState = 'Operation not allowed, dataset "%s" is not in an edit state.';
|
|
||||||
SErrNoDatabaseAvailable = 'Invalid operation: Not attached to database';
|
|
||||||
|
|
||||||
|
|
||||||
{
|
|
||||||
$Log$
|
|
||||||
Revision 1.7 2004-09-26 16:55:24 michael
|
|
||||||
* big patch from Joost van der Sluis
|
|
||||||
bufdataset.inc:
|
|
||||||
fix getrecord (prior)
|
|
||||||
getcanmodify default false
|
|
||||||
database.inc / db.inc:
|
|
||||||
Added transactions
|
|
||||||
dataset.inc:
|
|
||||||
raise error if trying to insert into an readonly dataset
|
|
||||||
db.inc:
|
|
||||||
remove published properties from bufdataset
|
|
||||||
changed ancestor of tbufdataset to tdbdataset
|
|
||||||
|
|
||||||
Revision 1.6 2004/08/13 07:06:02 michael
|
|
||||||
+ Rework of buffer management by Joost Van der Sluis
|
|
||||||
|
|
||||||
Revision 1.5 2003/08/16 16:42:21 michael
|
|
||||||
+ Fixes in TDBDataset etc. Changed MySQLDb to use database as well
|
|
||||||
|
|
||||||
Revision 1.4 2002/09/07 15:15:23 peter
|
|
||||||
* old logs removed and tabs fixed
|
|
||||||
|
|
||||||
}
|
|
@ -215,13 +215,8 @@ type
|
|||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
ResourceString
|
uses dbconst;
|
||||||
SErrAssTransaction = 'Cannot assign transaction while old transaction active!';
|
|
||||||
SErrDatabasenAssigned = 'Database not assigned!';
|
|
||||||
SErrTransactionnSet = 'Transaction not set';
|
|
||||||
SErrNoStatement = 'SQL statement not set';
|
|
||||||
SErrNoSelectStatement = 'Cannot open a non-select statement';
|
|
||||||
|
|
||||||
{ TSQLConnection }
|
{ TSQLConnection }
|
||||||
|
|
||||||
procedure TSQLConnection.SetTransaction(Value : TSQLTransaction);
|
procedure TSQLConnection.SetTransaction(Value : TSQLTransaction);
|
||||||
@ -654,7 +649,10 @@ end.
|
|||||||
|
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.4 2004-10-10 14:24:22 michael
|
Revision 1.5 2004-10-10 14:45:52 michael
|
||||||
|
+ Use of dbconst for resource strings
|
||||||
|
|
||||||
|
Revision 1.4 2004/10/10 14:24:22 michael
|
||||||
* Large patch from Joost Van der Sluis.
|
* Large patch from Joost Van der Sluis.
|
||||||
* Float fix in interbase
|
* Float fix in interbase
|
||||||
+ Commit and commitretaining for pqconnection
|
+ Commit and commitretaining for pqconnection
|
||||||
|
Loading…
Reference in New Issue
Block a user