paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 07:39:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

implemented make bigide

Browse Source 
git-svn-id: trunk@8412 -
This commit is contained in:
mattias 2006-01-02 20:39:49 +00:00
parent 92ced1f2c8
commit 17092a4e58
15 changed files with 459 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
Makefile
View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/08]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/09/23]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom
@ -282,6 +282,9 @@ endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
endif
ifeq ($(FULL_TARGET),i386-wince)
override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
endif
@ -333,9 +336,15 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
endif
ifeq ($(FULL_TARGET),arm-wince)
override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
endif
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
@ -381,6 +390,9 @@ endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
ifeq ($(FULL_TARGET),i386-wince)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
@ -432,9 +444,15 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
ifeq ($(FULL_TARGET),arm-wince)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_EXAMPLEDIRS+=examples
endif
@ -480,6 +498,9 @@ endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),i386-wince)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_EXAMPLEDIRS+=examples
endif
@ -531,9 +552,15 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),arm-wince)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),i386-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
@ -579,6 +606,9 @@ endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),i386-wince)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),m68k-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
@ -630,9 +660,15 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),arm-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),arm-wince)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
override INSTALL_BASEDIR=share/lazarus
override INSTALL_FPCPACKAGE=n
override DIST_DESTDIR=$(BASEDIR)/dist
@ -1393,6 +1429,7 @@ endif
override REQUIRE_PACKAGES=rtl fcl regexpr
ifeq ($(FULL_TARGET),i386-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1403,10 +1440,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),i386-go32v2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1416,6 +1455,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-win32)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_FCL=1
@ -1424,11 +1464,13 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-os2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_FCL=1
@ -1438,6 +1480,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1448,10 +1491,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),i386-beos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1461,6 +1506,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1470,10 +1516,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),i386-solaris)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1483,6 +1531,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-qnx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1492,6 +1541,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-netware)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1501,6 +1551,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-openbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1510,10 +1561,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),i386-wdosx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1523,6 +1576,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-emx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_FCL=1
@ -1532,6 +1586,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-watcom)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1541,6 +1596,17 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-wince)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1550,6 +1616,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1560,10 +1627,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1574,10 +1643,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1587,10 +1658,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),m68k-amiga)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1600,6 +1673,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),m68k-atari)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1609,6 +1683,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1618,10 +1693,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),m68k-palmos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1631,6 +1708,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),powerpc-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1641,10 +1719,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1654,10 +1734,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),powerpc-macos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1667,6 +1749,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1677,10 +1760,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1690,6 +1775,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),sparc-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1700,10 +1786,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1713,10 +1801,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),sparc-solaris)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1726,6 +1816,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),x86_64-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1736,10 +1827,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1750,10 +1843,22 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),arm-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1764,8 +1869,19 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),arm-wince)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),)
@ -1792,6 +1908,32 @@ ifdef UNITDIR_RTL
override COMPILER_UNITDIR+=$(UNITDIR_RTL)
endif
endif
ifdef REQUIRE_PACKAGES_HASH
PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_HASH),)
ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
else
UNITDIR_HASH=$(PACKAGEDIR_HASH)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_HASH)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
endif
else
PACKAGEDIR_HASH=
UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_HASH),)
UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
else
UNITDIR_HASH=
endif
endif
ifdef UNITDIR_HASH
override COMPILER_UNITDIR+=$(UNITDIR_HASH)
endif
endif
ifdef REQUIRE_PACKAGES_PASZLIB
PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_PASZLIB),)
@ -2052,6 +2194,32 @@ ifdef UNITDIR_MYSQL
override COMPILER_UNITDIR+=$(UNITDIR_MYSQL)
endif
endif
ifdef REQUIRE_PACKAGES_ODBC
PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_ODBC),)
ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX)),)
UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX)
else
UNITDIR_ODBC=$(PACKAGEDIR_ODBC)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_ODBC)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_ODBC)/$(FPCMADE)
endif
else
PACKAGEDIR_ODBC=
UNITDIR_ODBC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /odbc/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_ODBC),)
UNITDIR_ODBC:=$(firstword $(UNITDIR_ODBC))
else
UNITDIR_ODBC=
endif
endif
ifdef UNITDIR_ODBC
override COMPILER_UNITDIR+=$(UNITDIR_ODBC)
endif
endif
ifdef REQUIRE_PACKAGES_SQLITE
PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_SQLITE),)
@ -2127,7 +2295,7 @@ else
FPCCPUOPT:=
endif
endif
override FPCOPT+=-Xs $(FPCCPUOPT) -n
override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
override FPCOPTDEF+=RELEASE
endif
ifdef STRIP
@ -2738,6 +2906,14 @@ TARGET_DIRS_IDEINTF=1
TARGET_DIRS_DESIGNER=1
TARGET_DIRS_PACKAGER=1
endif
ifeq ($(FULL_TARGET),i386-wince)
TARGET_DIRS_LCL=1
TARGET_DIRS_COMPONENTS=1
TARGET_DIRS_PACKAGER/REGISTRATION=1
TARGET_DIRS_IDEINTF=1
TARGET_DIRS_DESIGNER=1
TARGET_DIRS_PACKAGER=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
TARGET_DIRS_LCL=1
TARGET_DIRS_COMPONENTS=1
@ -2874,6 +3050,14 @@ TARGET_DIRS_IDEINTF=1
TARGET_DIRS_DESIGNER=1
TARGET_DIRS_PACKAGER=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
TARGET_DIRS_LCL=1
TARGET_DIRS_COMPONENTS=1
TARGET_DIRS_PACKAGER/REGISTRATION=1
TARGET_DIRS_IDEINTF=1
TARGET_DIRS_DESIGNER=1
TARGET_DIRS_PACKAGER=1
endif
ifeq ($(FULL_TARGET),arm-linux)
TARGET_DIRS_LCL=1
TARGET_DIRS_COMPONENTS=1
@ -2882,6 +3066,14 @@ TARGET_DIRS_IDEINTF=1
TARGET_DIRS_DESIGNER=1
TARGET_DIRS_PACKAGER=1
endif
ifeq ($(FULL_TARGET),arm-wince)
TARGET_DIRS_LCL=1
TARGET_DIRS_COMPONENTS=1
TARGET_DIRS_PACKAGER/REGISTRATION=1
TARGET_DIRS_IDEINTF=1
TARGET_DIRS_DESIGNER=1
TARGET_DIRS_PACKAGER=1
endif
ifdef TARGET_DIRS_LCL
lcl_all:
$(MAKE) -C lcl all
@ -3197,6 +3389,9 @@ endif
ifeq ($(FULL_TARGET),i386-netwlibc)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),i386-wince)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
@ -3248,9 +3443,15 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),arm-linux)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),arm-wince)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifdef TARGET_EXAMPLEDIRS_EXAMPLES
examples_all:
$(MAKE) -C examples all
@ -3316,11 +3517,15 @@ makefiles: fpc_makefiles
ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc
endif
.PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge examples install
.PHONY: lcl components packager/registration ideintf packager bigidecomponents ide idepkg bigide starter tools all clean cleanide purge examples install
ide:
$(MAKE) -C ide ide
idepkg:
$(MAKE) -C ide idepkg
bigide:
$(MAKE) -C ide bigide
bigidecomponents:
$(MAKE) -C components bigidecomponents
starter:
$(MAKE) -C ide starter
tools: lcl components

11
Makefile.fpc
View File

@ -35,10 +35,9 @@ else
LAZARUS_INSTALL_DIR=/usr/share/lazarus
endif
#-----------------------------------------------------------------------------
[rules]
.PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge examples install
.PHONY: lcl components packager/registration ideintf packager bigidecomponents ide idepkg bigide starter tools all clean cleanide purge examples install
#-----------------------------------------------------------------------------
ide:
@ -48,6 +47,14 @@ ide:
idepkg:
$(MAKE) -C ide idepkg
#-----------------------------------------------------------------------------
bigide:
$(MAKE) -C ide bigide
#-----------------------------------------------------------------------------
bigidecomponents:
$(MAKE) -C components bigidecomponents
#-----------------------------------------------------------------------------
starter:
$(MAKE) -C ide starter

3
components/Makefile
View File

@ -1737,4 +1737,7 @@ makefiles: fpc_makefiles $(addsuffix _makefiles,$(TARGET_DIRS))
ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc
endif
.phony: bigidecomponents
bigidecomponents: all
$(MAKE) -C rtticontrols
cleanlaz: clean

4
components/Makefile.fpc
View File

@ -18,5 +18,9 @@ files=$(wildcard ./units/*$(OEXT)) \
$(wildcard ./custom/*$(RSTEXT))
[rules]
.phony: bigidecomponents
bigidecomponents: all
$(MAKE) -C rtticontrols
cleanlaz: clean

1
components/rtticontrols/runtimetypeinfocontrols.lpk
View File

@ -13,6 +13,7 @@
</CodeGeneration>
<Other>
<CompilerPath Value="$(CompPath)"/>
<CreateMakefileOnBuild Value="True"/>
</Other>
</CompilerOptions>
<Description Value="LCL controls using the FreePascal RTTI to access TPersistent properties.

112
ide/Makefile
View File

@ -254,11 +254,10 @@ endif
export LAZARUS_CONFIG_DIR
LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
LAZARUS_OPT=$(LAZARUS_LIBPATHS)
ifdef LAZARUS_BIG
endif
ifeq ($(OS_TARGET),win32)
LAZARUS_OPT+= -WG
endif
BIG_IDE_OPTIONS=-dBigIDE -Fu../components/rtticontrols/lib/$(CPU_TARGET)-$(OS_TARGET)
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
@ -1775,6 +1774,7 @@ endif
override REQUIRE_PACKAGES=rtl fcl regexpr
ifeq ($(FULL_TARGET),i386-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1785,10 +1785,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),i386-go32v2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1798,6 +1800,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-win32)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_FCL=1
@ -1806,11 +1809,13 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-os2)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_FCL=1
@ -1820,6 +1825,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1830,10 +1836,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),i386-beos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1843,6 +1851,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1852,10 +1861,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),i386-solaris)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1865,6 +1876,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-qnx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1874,6 +1886,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-netware)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1883,6 +1896,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-openbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1892,10 +1906,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),i386-wdosx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1905,6 +1921,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-emx)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_FCL=1
@ -1914,6 +1931,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-watcom)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1923,6 +1941,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1932,6 +1951,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),i386-wince)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1941,6 +1961,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1951,10 +1972,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1965,10 +1988,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -1978,10 +2003,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),m68k-amiga)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -1991,6 +2018,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),m68k-atari)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -2000,6 +2028,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -2009,10 +2038,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),m68k-palmos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -2022,6 +2053,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),powerpc-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -2032,10 +2064,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -2045,10 +2079,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),powerpc-macos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -2058,6 +2094,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -2068,10 +2105,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -2081,6 +2120,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),sparc-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -2091,10 +2131,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -2104,10 +2146,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),sparc-solaris)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -2117,6 +2161,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),x86_64-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -2127,10 +2172,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -2141,10 +2188,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -2154,6 +2203,7 @@ REQUIRE_PACKAGES_LIBASYNC=1
endif
ifeq ($(FULL_TARGET),arm-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
@ -2164,10 +2214,12 @@ REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_ODBC=1
REQUIRE_PACKAGES_SQLITE=1
endif
ifeq ($(FULL_TARGET),arm-wince)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -2201,6 +2253,32 @@ ifdef UNITDIR_RTL
override COMPILER_UNITDIR+=$(UNITDIR_RTL)
endif
endif
ifdef REQUIRE_PACKAGES_HASH
PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_HASH),)
ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),)
UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
else
UNITDIR_HASH=$(PACKAGEDIR_HASH)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_HASH)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE)
endif
else
PACKAGEDIR_HASH=
UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_HASH),)
UNITDIR_HASH:=$(firstword $(UNITDIR_HASH))
else
UNITDIR_HASH=
endif
endif
ifdef UNITDIR_HASH
override COMPILER_UNITDIR+=$(UNITDIR_HASH)
endif
endif
ifdef REQUIRE_PACKAGES_PASZLIB
PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_PASZLIB),)
@ -2461,6 +2539,32 @@ ifdef UNITDIR_MYSQL
override COMPILER_UNITDIR+=$(UNITDIR_MYSQL)
endif
endif
ifdef REQUIRE_PACKAGES_ODBC
PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_ODBC),)
ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX)),)
UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX)
else
UNITDIR_ODBC=$(PACKAGEDIR_ODBC)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_ODBC)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_ODBC)/$(FPCMADE)
endif
else
PACKAGEDIR_ODBC=
UNITDIR_ODBC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /odbc/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_ODBC),)
UNITDIR_ODBC:=$(firstword $(UNITDIR_ODBC))
else
UNITDIR_ODBC=
endif
endif
ifdef UNITDIR_ODBC
override COMPILER_UNITDIR+=$(UNITDIR_ODBC)
endif
endif
ifdef REQUIRE_PACKAGES_SQLITE
PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_SQLITE),)
@ -3032,7 +3136,7 @@ makefiles: fpc_makefiles
ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc
endif
.PHONY: ide idepkg idebig starter all clean cleanide purge
.PHONY: ide idepkg bigide starter all clean cleanide purge
.SUFFIXES: .rc .res
%.res: %.rc
windres -i $< -o $@ --preprocessor $(RCPP)
@ -3053,6 +3157,8 @@ else
endif
idepkg: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=../lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
bigide: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=../lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
starter: $(COMPILER_UNITTARGETDIR)
ifeq ($(OS_TARGET), win32)
$(MAKE) startlazarus.res

19
ide/Makefile.fpc
View File

@ -84,23 +84,20 @@ export LAZARUS_CONFIG_DIR
LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
LAZARUS_OPT=$(LAZARUS_LIBPATHS)
#
# big ide
ifdef LAZARUS_BIG
#LAZARUS_IDE_CONFIG=bigidemake.cfg
#LAZARUS_CONFIG_DIR=.
#LAZARUS_BIG_COMPONENT_DIRS=rtticontrols
endif
#
# apptype gui
ifeq ($(OS_TARGET),win32)
LAZARUS_OPT+= -WG
endif
#
# Options to compile an IDE with a lot of packages
BIG_IDE_OPTIONS=-dBigIDE -Fu../components/rtticontrols/lib/$(CPU_TARGET)-$(OS_TARGET)
#-----------------------------------------------------------------------------
[rules]
.PHONY: ide idepkg idebig starter all clean cleanide purge
.PHONY: ide idepkg bigide starter all clean cleanide purge
.SUFFIXES: .rc .res
%.res: %.rc
@ -127,6 +124,10 @@ endif
idepkg: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=../lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
#-----------------------------------------------------------------------------
bigide: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=../lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
#-----------------------------------------------------------------------------
starter: $(COMPILER_UNITTARGETDIR)
ifeq ($(OS_TARGET), win32)

54
ide/compileroptions.pp
View File

@ -152,26 +152,33 @@ type
);
TCompilerCmdLineOptions = set of TCompilerCmdLineOption;
TCompileReason = (crCompile, crBuild, crRun);
TCompileReason = (
crCompile, // normal build current project/package
crBuild, // build all
crRun // quick build before run
);
TCompileReasons = set of TCompileReason;
const
crAll = [crCompile, crBuild, crRun];
type
TCompilationTool = class
{ TCompilationToolOptions }
TCompilationToolOptions = class
public
Command: string;
ScanForFPCMessages: boolean;
ScanForMakeMessages: boolean;
ShowAllMessages: boolean;
procedure Clear; virtual;
function IsEqual(Params: TCompilationTool): boolean; virtual;
procedure Assign(Src: TCompilationTool); virtual;
function IsEqual(Params: TCompilationToolOptions): boolean; virtual;
procedure Assign(Src: TCompilationToolOptions); virtual;
procedure LoadFromXMLConfig(XMLConfig: TXMLConfig; const Path: string;
DoSwitchPathDelims: boolean); virtual;
procedure SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string); virtual;
end;
TCompilationToolClass = class of TCompilationTool;
TCompilationToolClass = class of TCompilationToolOptions;
TBaseCompilerOptionsClass = class of TBaseCompilerOptions;
@ -194,8 +201,9 @@ type
// Compilation
fCompilerPath: String;
fExecuteBefore: TCompilationTool;
fExecuteAfter: TCompilationTool;
fExecuteBefore: TCompilationToolOptions;
fExecuteAfter: TCompilationToolOptions;
FCreateMakefileOnBuild: boolean;
protected
procedure SetBaseDirectory(const AValue: string); override;
procedure SetCompilerPath(const AValue: String); override;
@ -279,8 +287,10 @@ type
// compilation
property CompilerPath: String read fCompilerPath write SetCompilerPath;
property ExecuteBefore: TCompilationTool read fExecuteBefore;
property ExecuteAfter: TCompilationTool read fExecuteAfter;
property ExecuteBefore: TCompilationToolOptions read fExecuteBefore;
property ExecuteAfter: TCompilationToolOptions read fExecuteAfter;
property CreateMakefileOnBuild: boolean read FCreateMakefileOnBuild
write FCreateMakefileOnBuild;
end;
@ -651,7 +661,7 @@ end;
constructor TBaseCompilerOptions.Create(const AOwner: TObject);
begin
Create(AOwner, TCompilationTool);
Create(AOwner, TCompilationToolOptions);
end;
{------------------------------------------------------------------------------
@ -1001,6 +1011,7 @@ begin
ExecuteBefore.LoadFromXMLConfig(XMLConfigFile,p+'ExecuteBefore/',PathDelimChanged);
ExecuteAfter.LoadFromXMLConfig(XMLConfigFile,p+'ExecuteAfter/',PathDelimChanged);
CreateMakefileOnBuild:=XMLConfigFile.GetValue(p+'CreateMakefileOnBuild/Value',false);
end;
{------------------------------------------------------------------------------}
@ -1142,6 +1153,8 @@ begin
XMLConfigFile.SetDeleteValue(p+'CompilerPath/Value', CompilerPath,'');
ExecuteBefore.SaveToXMLConfig(XMLConfigFile,p+'ExecuteBefore/');
ExecuteAfter.SaveToXMLConfig(XMLConfigFile,p+'ExecuteAfter/');
XMLConfigFile.SetDeleteValue(p+'CreateMakefileOnBuild/Value',
CreateMakefileOnBuild,false);
// write
InvalidateFileStateCache;
@ -2204,6 +2217,7 @@ begin
CompilerPath := CompOpts.fCompilerPath;
ExecuteBefore.Assign(CompOpts.ExecuteBefore);
ExecuteAfter.Assign(CompOpts.ExecuteAfter);
CreateMakefileOnBuild:=CompOpts.CreateMakefileOnBuild;
end;
function TBaseCompilerOptions.IsEqual(CompOpts: TBaseCompilerOptions): boolean;
@ -2297,6 +2311,7 @@ begin
and (fCompilerPath = CompOpts.fCompilerPath)
and ExecuteBefore.IsEqual(CompOpts.ExecuteBefore)
and ExecuteAfter.IsEqual(CompOpts.ExecuteAfter)
and (CreateMakefileOnBuild=CompOpts.CreateMakefileOnBuild)
;
end;
@ -2537,16 +2552,9 @@ begin
ParsedStamp[Option]:=InvalidParseStamp;
end;
//{ TCompilerOptions }
{ TCompilationToolOptions }
//procedure TCompilerOptions.Clear;
//begin
// inherited Clear; // DUH!
//end;
{ TCompilationTool }
procedure TCompilationTool.Clear;
procedure TCompilationToolOptions.Clear;
begin
Command:='';
ScanForFPCMessages:=false;
@ -2554,7 +2562,7 @@ begin
ShowAllMessages:=false;
end;
function TCompilationTool.IsEqual(Params: TCompilationTool
function TCompilationToolOptions.IsEqual(Params: TCompilationToolOptions
): boolean;
begin
Result:= (Command=Params.Command)
@ -2564,7 +2572,7 @@ begin
;
end;
procedure TCompilationTool.Assign(Src: TCompilationTool);
procedure TCompilationToolOptions.Assign(Src: TCompilationToolOptions);
begin
Command:=Src.Command;
ScanForFPCMessages:=Src.ScanForFPCMessages;
@ -2572,7 +2580,7 @@ begin
ShowAllMessages:=Src.ShowAllMessages;
end;
procedure TCompilationTool.LoadFromXMLConfig(XMLConfig: TXMLConfig;
procedure TCompilationToolOptions.LoadFromXMLConfig(XMLConfig: TXMLConfig;
const Path: string; DoSwitchPathDelims: boolean);
begin
Command:=SwitchPathDelims(XMLConfig.GetValue(Path+'Command/Value',''),
@ -2582,7 +2590,7 @@ begin
ShowAllMessages:=XMLConfig.GetValue(Path+'ShowAllMessages/Value',false);
end;
procedure TCompilationTool.SaveToXMLConfig(XMLConfig: TXMLConfig;
procedure TCompilationToolOptions.SaveToXMLConfig(XMLConfig: TXMLConfig;
const Path: string);
begin
XMLConfig.SetDeleteValue(Path+'Command/Value',Command,'');

62
ide/compileroptionsdlg.pp
View File

@ -197,34 +197,33 @@ type
{ Compilation }
CompilationPage: TPage;
chkCreateMakefile: TCheckBox;
ExecuteBeforeGroupBox: TGroupBox;
lblRunIfExecBefore: TLabel;
chkExecBeforeCompile: TCheckBox;
chkExecBeforeBuild: TCheckBox;
chkExecBeforeRun: TCheckBox;
ExecuteBeforeGroupBox: TGroupBox;
ExecuteBeforeCommandLabel: TLabel;
ExecuteBeforeCommandEdit: TEdit;
ExecuteBeforeScanFPCCheckBox: TCheckBox;
ExecuteBeforeScanMakeCheckBox: TCheckBox;
ExecuteBeforeShowAllCheckBox: TCheckBox;
grpCompiler: TGroupBox;
lblRunIfCompiler: TLabel;
chkCompilerCompile: TCheckBox;
chkCompilerBuild: TCheckBox;
chkCompilerRun: TCheckBox;
grpCompiler: TGroupBox;
edtCompiler: TEdit;
btnCompiler: TButton;
lblCompiler: TLabel;
ExecuteAfterGroupBox: TGroupBox;
lblRunIfExecAfter: TLabel;
chkExecAfterCompile: TCheckBox;
chkExecAfterBuild: TCheckBox;
chkExecAfterRun: TCheckBox;
ExecuteAfterGroupBox: TGroupBox;
ExecuteAfterCommandLabel: TLabel;
ExecuteAfterCommandEdit: TEdit;
ExecuteAfterScanFPCCheckBox: TCheckBox;
@ -484,15 +483,6 @@ begin
with ExecuteAfterCommandEdit do
Width := w - Left - XMARGIN;
with ExecuteAfterScanFPCCheckBox do
Width := m - Left;
with ExecuteAfterScanMakeCheckBox do
SetBounds(m, Top, m - XMARGIN, Height);
with ExecuteAfterShowAllCheckBox do
Width := m - Left;
chkExecAfterBuild.Left := (chkExecAfterCompile.Left + m) div 2;
chkExecAfterRun.Left := m;
@ -508,15 +498,6 @@ begin
with ExecuteBeforeCommandEdit do
Width := w - Left - XMARGIN;
with ExecuteBeforeScanFPCCheckBox do
Width := m - Left;
with ExecuteBeforeScanMakeCheckBox do
SetBounds(m, Top, m - XMARGIN, Height);
with ExecuteBeforeShowAllCheckBox do
Width := m - Left;
chkExecBeforeBuild.Left := (chkExecBeforeCompile.Left + m) div 2;
chkExecBeforeRun.Left := m;
end;
@ -765,13 +746,15 @@ begin
UpdateInheritedTab;
// compilation
chkCreateMakefile.Checked:=Options.CreateMakefileOnBuild;
ExecuteBeforeCommandEdit.Text:=Options.ExecuteBefore.Command;
ExecuteBeforeScanFPCCheckBox.Checked:=Options.ExecuteBefore.ScanForFPCMessages;
ExecuteBeforeScanMakeCheckBox.Checked:=
Options.ExecuteBefore.ScanForMakeMessages;
ExecuteBeforeShowAllCheckBox.Checked:=Options.ExecuteBefore.ShowAllMessages;
if Options.ExecuteBefore is TProjectCompilationTool
then with TProjectCompilationTool(Options.ExecuteBefore) do begin
if Options.ExecuteBefore is TProjectCompilationToolOptions
then with TProjectCompilationToolOptions(Options.ExecuteBefore) do begin
chkExecBeforeCompile.Checked := crCompile in CompileReasons;
chkExecBeforeBuild.Checked := crBuild in CompileReasons;
chkExecBeforeRun.Checked := crRun in CompileReasons;
@ -821,8 +804,8 @@ begin
ExecuteAfterScanFPCCheckBox.Checked:=Options.ExecuteAfter.ScanForFPCMessages;
ExecuteAfterScanMakeCheckBox.Checked:=Options.ExecuteAfter.ScanForMakeMessages;
ExecuteAfterShowAllCheckBox.Checked:=Options.ExecuteAfter.ShowAllMessages;
if Options.ExecuteAfter is TProjectCompilationTool
then with TProjectCompilationTool(Options.ExecuteAfter) do begin
if Options.ExecuteAfter is TProjectCompilationToolOptions
then with TProjectCompilationToolOptions(Options.ExecuteAfter) do begin
chkExecAfterCompile.Checked := crCompile in CompileReasons;
chkExecAfterBuild.Checked := crBuild in CompileReasons;
chkExecAfterRun.Checked := crRun in CompileReasons;
@ -1026,15 +1009,17 @@ begin
Options.StopAfterErrCount := StrToIntDef(edtErrorCnt.Text,1);
// compilation
Options.CreateMakefileOnBuild := chkCreateMakefile.Checked;
Options.ExecuteBefore.Command := ExecuteBeforeCommandEdit.Text;
Options.ExecuteBefore.ScanForFPCMessages :=
ExecuteBeforeScanFPCCheckBox.Checked;
Options.ExecuteBefore.ScanForMakeMessages :=
ExecuteBeforeScanMakeCheckBox.Checked;
Options.ExecuteBefore.ShowAllMessages:=ExecuteBeforeShowAllCheckBox.Checked;
if Options.ExecuteBefore is TProjectCompilationTool
if Options.ExecuteBefore is TProjectCompilationToolOptions
then begin
TProjectCompilationTool(Options.ExecuteBefore).CompileReasons :=
TProjectCompilationToolOptions(Options.ExecuteBefore).CompileReasons :=
MakeCompileReasons(
chkExecBeforeCompile,
chkExecBeforeBuild,
@ -1062,9 +1047,9 @@ begin
Options.ExecuteAfter.ScanForMakeMessages :=
ExecuteAfterScanMakeCheckBox.Checked;
Options.ExecuteAfter.ShowAllMessages:=ExecuteAfterShowAllCheckBox.Checked;
if Options.ExecuteAfter is TProjectCompilationTool
if Options.ExecuteAfter is TProjectCompilationToolOptions
then begin
TProjectCompilationTool(Options.ExecuteAfter).CompileReasons :=
TProjectCompilationToolOptions(Options.ExecuteAfter).CompileReasons :=
MakeCompileReasons(
chkExecAfterCompile,
chkExecAfterBuild,
@ -2283,17 +2268,26 @@ begin
w := nbMain.ClientWidth - 2 * XMARGIN-4;
cm := w div 2 - 2 * XMARGIN;
chkCreateMakefile:=TCheckBox.Create(Self);
with chkCreateMakefile do begin
Name := 'chkCreateMakefile';
Caption := 'Create Makefile';
SetBounds(XMARGIN, y, Width, Height);
Parent := CompilationPage;
Inc(y, Height + YMARGIN);
end;
{------------------------------------------------------------}
ExecuteBeforeGroupBox:=TGroupBox.Create(Self);
with ExecuteBeforeGroupBox do
begin
Name := 'ExecuteBeforeGroupBox';
Parent := CompilationPage;
SetBounds(XMARGIN, y, w, 125);
Caption := lisCOExecuteBefore;
OnResize := @ExecuteBeforeGroupBoxResize;
Inc(y, Height + YMARGIN);
Parent := CompilationPage;
end;
cy := CreateGroupHead(ExecuteBeforeGroupBox,
@ -2306,9 +2300,9 @@ begin
ExecuteBeforeCommandLabel:=TLabel.Create(Self);
with ExecuteBeforeCommandLabel do begin
Name:='ExecuteBeforeCommandLabel';
Parent:=ExecuteBeforeGroupBox;
Caption:=lisCOCommand;
SetBounds(XMARGIN, cy + 2, WCOLABEL, Height);
Parent:=ExecuteBeforeGroupBox;
// Inc(cy, Height + YMARGIN);
end;

5
ide/lazarus.pp
View File

@ -40,7 +40,7 @@ program Lazarus;
{$R *.res}
{$ENDIF}
{off $DEFINE IDE_MEM_CHECK}
{ $DEFINE IDE_MEM_CHECK}
uses
//cmem,
@ -56,6 +56,9 @@ uses
{$IFDEF AddStaticPkgs}
{$I staticpackages.inc}
{$ENDIF}
{$IFDEF BigIDE}
RunTimeTypeInfoControls,
{$ENDIF}
MainBase;
{$I revision.inc}

12
ide/main.pp
View File

@ -669,7 +669,7 @@ type
function DoRunExternalTool(Index: integer): TModalResult;
function DoSaveBuildIDEConfigs(Flags: TBuildLazarusFlags): TModalResult; override;
function DoBuildLazarus(Flags: TBuildLazarusFlags): TModalResult; override;
function DoExecuteCompilationTool(Tool: TCompilationTool;
function DoExecuteCompilationTool(Tool: TCompilationToolOptions;
const WorkingDir, ToolTitle: string
): TModalResult; override;
function DoBuildFile: TModalResult;
@ -7190,8 +7190,8 @@ function TMainIDE.DoBuildProject(const AReason: TCompileReason;
Flags: TProjectBuildFlags): TModalResult;
var
SrcFilename: string;
ToolBefore: TProjectCompilationTool;
ToolAfter: TProjectCompilationTool;
ToolBefore: TProjectCompilationToolOptions;
ToolAfter: TProjectCompilationToolOptions;
PkgFlags: TPkgCompileFlags;
CompilerFilename: String;
WorkingDir: String;
@ -7258,7 +7258,7 @@ begin
end;
// execute compilation tool 'Before'
ToolBefore:=TProjectCompilationTool(Project1.CompilerOptions.ExecuteBefore);
ToolBefore:=TProjectCompilationToolOptions(Project1.CompilerOptions.ExecuteBefore);
if (AReason in ToolBefore.CompileReasons) then begin
Result:=DoExecuteCompilationTool(Project1.CompilerOptions.ExecuteBefore,
Project1.ProjectDirectory,
@ -7291,7 +7291,7 @@ begin
end;
// execute compilation tool 'After'
ToolAfter:=TProjectCompilationTool(Project1.CompilerOptions.ExecuteAfter);
ToolAfter:=TProjectCompilationToolOptions(Project1.CompilerOptions.ExecuteAfter);
if (Result = mrOk) and (AReason in ToolAfter.CompileReasons) then begin
Result:=DoExecuteCompilationTool(Project1.CompilerOptions.ExecuteAfter,
Project1.ProjectDirectory,
@ -7635,7 +7635,7 @@ begin
mnuRestartClicked(nil);
end;
function TMainIDE.DoExecuteCompilationTool(Tool: TCompilationTool;
function TMainIDE.DoExecuteCompilationTool(Tool: TCompilationToolOptions;
const WorkingDir, ToolTitle: string): TModalResult;
var
ProgramFilename, Params: string;

2
ide/mainintf.pas
View File

@ -164,7 +164,7 @@ type
function PrepareForCompile: TModalResult; virtual; abstract;
function DoSaveBuildIDEConfigs(Flags: TBuildLazarusFlags): TModalResult; virtual; abstract;
function DoBuildLazarus(Flags: TBuildLazarusFlags): TModalResult; virtual; abstract;
function DoExecuteCompilationTool(Tool: TCompilationTool;
function DoExecuteCompilationTool(Tool: TCompilationToolOptions;
const WorkingDir, ToolTitle: string
): TModalResult; virtual; abstract;
function DoSaveForBuild: TModalResult; virtual; abstract;

34
ide/project.pp
View File

@ -245,14 +245,14 @@ type
//---------------------------------------------------------------------------
{ TProjectCompilationTool }
TProjectCompilationTool = class(TCompilationTool)
{ TProjectCompilationToolOptions }
TProjectCompilationToolOptions = class(TCompilationToolOptions)
public
CompileReasons: TCompileReasons;
DefaultCompileReasons: TCompileReasons;
procedure Clear; override;
function IsEqual(Params: TCompilationTool): boolean; override;
procedure Assign(Src: TCompilationTool); override;
function IsEqual(Params: TCompilationToolOptions): boolean; override;
procedure Assign(Src: TCompilationToolOptions); override;
procedure LoadFromXMLConfig(XMLConfig: TXMLConfig; const Path: string;
DoSwitchPathDelims: boolean); override;
procedure SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string); override;
@ -3259,34 +3259,34 @@ begin
AnUnitInfo.fPrev[ListType]:=nil;
end;
{ TProjectCompilationTool }
{ TProjectCompilationToolOptions }
procedure TProjectCompilationTool.Clear;
procedure TProjectCompilationToolOptions.Clear;
begin
inherited Clear;
CompileReasons := crAll;
end;
function TProjectCompilationTool.IsEqual(Params: TCompilationTool): boolean;
function TProjectCompilationToolOptions.IsEqual(Params: TCompilationToolOptions): boolean;
begin
Result := (Params is TProjectCompilationTool)
and (CompileReasons = TProjectCompilationTool(Params).CompileReasons)
Result := (Params is TProjectCompilationToolOptions)
and (CompileReasons = TProjectCompilationToolOptions(Params).CompileReasons)
and inherited IsEqual(Params);
end;
procedure TProjectCompilationTool.Assign(Src: TCompilationTool);
procedure TProjectCompilationToolOptions.Assign(Src: TCompilationToolOptions);
begin
inherited Assign(Src);
if Src is TProjectCompilationTool
if Src is TProjectCompilationToolOptions
then begin
CompileReasons := TProjectCompilationTool(Src).CompileReasons;
CompileReasons := TProjectCompilationToolOptions(Src).CompileReasons;
end
else begin
CompileReasons := crAll;
end;
end;
procedure TProjectCompilationTool.LoadFromXMLConfig(XMLConfig: TXMLConfig;
procedure TProjectCompilationToolOptions.LoadFromXMLConfig(XMLConfig: TXMLConfig;
const Path: string; DoSwitchPathDelims: boolean);
begin
inherited LoadFromXMLConfig(XMLConfig, Path, DoSwitchPathDelims);
@ -3294,7 +3294,7 @@ begin
DefaultCompileReasons);
end;
procedure TProjectCompilationTool.SaveToXMLConfig(XMLConfig: TXMLConfig;
procedure TProjectCompilationToolOptions.SaveToXMLConfig(XMLConfig: TXMLConfig;
const Path: string);
begin
inherited SaveToXMLConfig(XMLConfig, Path);
@ -3429,12 +3429,12 @@ constructor TProjectCompilerOptions.Create(const AOwner: TObject);
begin
FGlobals := TGlobalCompilerOptions.Create;
FCompileReasons := [crCompile, crBuild, crRun];
inherited Create(AOwner, TProjectCompilationTool);
with TProjectCompilationTool(ExecuteBefore) do begin
inherited Create(AOwner, TProjectCompilationToolOptions);
with TProjectCompilationToolOptions(ExecuteBefore) do begin
DefaultCompileReasons:=crAll;
CompileReasons:=DefaultCompileReasons;
end;
with TProjectCompilationTool(ExecuteAfter) do begin
with TProjectCompilationToolOptions(ExecuteAfter) do begin
DefaultCompileReasons:=crAll;
CompileReasons:=DefaultCompileReasons;
end;

2
ideintf/propedits.pp
View File

@ -32,8 +32,6 @@ unit PropEdits;
interface
{$DEFINE NewListPropEdit}
uses
Classes, TypInfo, SysUtils, LCLProc, Forms, Controls, GraphType, Graphics,
StdCtrls, Buttons, ComCtrls, Menus, LCLType, ExtCtrls, LCLIntf, Dialogs,

36
packager/pkgmanager.pas
View File

@ -185,7 +185,8 @@ type
procedure SaveAutoInstallDependencies(SetWithStaticPcksFlagForIDE: boolean);
procedure LoadStaticBasePackages;
procedure LoadStaticCustomPackages;
function LoadInstalledPackage(const PackageName: string): TLazPackage;
function LoadInstalledPackage(const PackageName: string;
AddToAutoInstall: boolean): TLazPackage;
procedure LoadAutoInstallPackages;
procedure SortAutoInstallDependencies;
procedure AddUnitToProjectMainUsesSection(AProject: TProject;
@ -2014,26 +2015,37 @@ begin
end;
// load package
APackage:=LoadInstalledPackage(StaticPackage^.Name);
APackage:=LoadInstalledPackage(StaticPackage^.Name,
{$IFDEF BigIDE}True{$ELSE}False{$ENDIF});
// register
PackageGraph.RegisterStaticPackage(APackage,StaticPackage^.RegisterProc);
end;
SortAutoInstallDependencies;
ClearRegisteredPackages;
end;
function TPkgManager.LoadInstalledPackage(const PackageName: string
): TLazPackage;
function TPkgManager.LoadInstalledPackage(const PackageName: string;
AddToAutoInstall: boolean): TLazPackage;
var
NewDependency: TPkgDependency;
PackageList: TStringList;
begin
DebugLn('TPkgManager.LoadInstalledPackage PackageName="',PackageName,'"');
//DebugLn('TPkgManager.LoadInstalledPackage PackageName="',PackageName,'"');
NewDependency:=TPkgDependency.Create;
NewDependency.Owner:=Self;
NewDependency.PackageName:=PackageName;
PackageGraph.OpenInstalledDependency(NewDependency,pitStatic);
Result:=NewDependency.RequiredPackage;
NewDependency.Free;
if AddToAutoInstall and (Result<>nil) then begin
NewDependency.AddToList(FirstAutoInstallDependency,pdlRequires);
PackageList:=MiscellaneousOptions.BuildLazOpts.StaticAutoInstallPackages;
if PackageList.IndexOf(NewDependency.PackageName)<0 then
PackageList.Add(NewDependency.PackageName);
NewDependency.RequiredPackage.AutoInstall:=pitStatic;
end else begin
NewDependency.Free;
end;
end;
procedure TPkgManager.LoadAutoInstallPackages;
@ -2044,11 +2056,13 @@ var
Dependency: TPkgDependency;
begin
PkgList:=MiscellaneousOptions.BuildLazOpts.StaticAutoInstallPackages;
for i:=0 to PkgList.Count-1 do begin
PackageName:=PkgList[i];
if (PackageName='') or (not IsValidIdent(PackageName)) then continue;
Dependency:=FindDependencyByNameInList(FirstAutoInstallDependency,
pdlRequires,PackageName);
//DebugLn('TPkgManager.LoadAutoInstallPackages ',dbgs(Dependency),' ',PackageName);
if Dependency<>nil then continue;
Dependency:=TPkgDependency.Create;
Dependency.Owner:=Self;
@ -2836,7 +2850,7 @@ begin
CompilerFilename:=APackage.GetCompilerFilename;
CompilerParams:=APackage.CompilerOptions.MakeOptionsString(Globals,
APackage.CompilerOptions.DefaultMakeOptionsFlags)
+' '+CreateRelativePath(SrcFilename,APackage.Directory);
+' '+CreateRelativePath(SrcFilename,APackage.Directory);
// check if compilation is neccessary
if (pcfOnlyIfNeeded in Flags) then begin
@ -2876,9 +2890,13 @@ begin
end;
// create Makefile
if pcfCreateMakefile in Flags then begin
if (pcfCreateMakefile in Flags)
or (APackage.CompilerOptions.CreateMakefileOnBuild) then begin
Result:=DoWriteMakefile(APackage);
if Result<>mrOk then exit;
if Result<>mrOk then begin
DebugLn('TPkgManager.DoCompilePackage DoWriteMakefile failed');
exit;
end;
end;
// run compilation tool 'Before'