mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-22 14:59:30 +02:00
fixed right control release
git-svn-id: trunk@4097 -
This commit is contained in:
mattias
parent
fa9c84c773
commit
bb0e72a894
@ -1,8 +1,8 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 1.1 [2003/03/28]
|
||||
# Don't edit, this file is generated by FPCMake Version 1.1 [2003/04/19]
|
||||
#
|
||||
default: all
|
||||
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
|
||||
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos macosx emx
|
||||
override PATH:=$(subst \,/,$(PATH))
|
||||
ifeq ($(findstring ;,$(PATH)),)
|
||||
inUnix=1
|
||||
@ -110,38 +110,11 @@ endif
|
||||
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
|
||||
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
|
||||
ifndef FPC_VERSION
|
||||
FPC_VERSION:=$(shell $(FPC) -iV)
|
||||
FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)
|
||||
FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
|
||||
endif
|
||||
export FPC FPC_VERSION
|
||||
export FPC FPC_VERSION FPC_COMPILERINFO
|
||||
unexport CHECKDEPEND ALLDEPENDENCIES
|
||||
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
|
||||
COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
|
||||
ifndef CPU_SOURCE
|
||||
CPU_SOURCE:=$(word 1,$(COMPILERINFO))
|
||||
endif
|
||||
ifndef CPU_TARGET
|
||||
CPU_TARGET:=$(word 2,$(COMPILERINFO))
|
||||
endif
|
||||
ifndef OS_SOURCE
|
||||
OS_SOURCE:=$(word 3,$(COMPILERINFO))
|
||||
endif
|
||||
ifndef OS_TARGET
|
||||
OS_TARGET:=$(word 4,$(COMPILERINFO))
|
||||
endif
|
||||
else
|
||||
ifndef CPU_SOURCE
|
||||
CPU_SOURCE:=$(shell $(FPC) -iSP)
|
||||
endif
|
||||
ifndef CPU_TARGET
|
||||
CPU_TARGET:=$(shell $(FPC) -iTP)
|
||||
endif
|
||||
ifndef OS_SOURCE
|
||||
OS_SOURCE:=$(shell $(FPC) -iSO)
|
||||
endif
|
||||
ifndef OS_TARGET
|
||||
OS_TARGET:=$(shell $(FPC) -iTO)
|
||||
endif
|
||||
endif
|
||||
ifndef CPU_TARGET
|
||||
ifdef CPU_TARGET_DEFAULT
|
||||
CPU_TARGET=$(CPU_TARGET_DEFAULT)
|
||||
@ -152,6 +125,24 @@ ifdef OS_TARGET_DEFAULT
|
||||
OS_TARGET=$(OS_TARGET_DEFAULT)
|
||||
endif
|
||||
endif
|
||||
ifneq ($(words $(FPC_COMPILERINFO)),5)
|
||||
FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
|
||||
FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
|
||||
FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
|
||||
FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
|
||||
endif
|
||||
ifndef CPU_SOURCE
|
||||
CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
|
||||
endif
|
||||
ifndef CPU_TARGET
|
||||
CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))
|
||||
endif
|
||||
ifndef OS_SOURCE
|
||||
OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))
|
||||
endif
|
||||
ifndef OS_TARGET
|
||||
OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
|
||||
endif
|
||||
FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
|
||||
FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
|
||||
ifneq ($(FULL_TARGET),$(FULL_SOURCE))
|
||||
@ -217,7 +208,7 @@ override TARGET_UNITS+=allunits
|
||||
override TARGET_IMPLICITUNITS+=syntextdrawer syneditkeycmds synedittypes syneditstrconst syneditsearch syneditmiscprocs syneditmiscclasses synedittextbuffer synedit synedithighlighter synhighlightermulti synregexpr synexporthtml syneditexport synmemo synmacrorecorder syneditplugins syneditregexsearch synhighlighterposition synhighlighterjava
|
||||
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||
override COMPILER_OPTIONS+=-gl
|
||||
override COMPILER_UNITDIR+=../../lcl/units
|
||||
override COMPILER_UNITDIR+=../../lcl/units .
|
||||
override COMPILER_UNITTARGETDIR+=../units
|
||||
ifdef REQUIRE_UNITSDIR
|
||||
override UNITSDIR+=$(REQUIRE_UNITSDIR)
|
||||
@ -438,6 +429,97 @@ SHAREDLIBEXT=.so
|
||||
STATICLIBPREFIX=libp
|
||||
RSTEXT=.rst
|
||||
FPCMADE=fpcmade
|
||||
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
|
||||
ifeq ($(OS_TARGET),go32v1)
|
||||
STATICLIBPREFIX=
|
||||
FPCMADE=fpcmade.v1
|
||||
PACKAGESUFFIX=v1
|
||||
endif
|
||||
ifeq ($(OS_TARGET),go32v2)
|
||||
STATICLIBPREFIX=
|
||||
FPCMADE=fpcmade.dos
|
||||
ZIPSUFFIX=go32
|
||||
endif
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
FPCMADE=fpcmade.lnx
|
||||
ZIPSUFFIX=linux
|
||||
endif
|
||||
ifeq ($(OS_TARGET),freebsd)
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
FPCMADE=fpcmade.freebsd
|
||||
ZIPSUFFIX=freebsd
|
||||
endif
|
||||
ifeq ($(OS_TARGET),netbsd)
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
FPCMADE=fpcmade.netbsd
|
||||
ZIPSUFFIX=netbsd
|
||||
endif
|
||||
ifeq ($(OS_TARGET),openbsd)
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
FPCMADE=fpcmade.openbsd
|
||||
ZIPSUFFIX=openbsd
|
||||
endif
|
||||
ifeq ($(OS_TARGET),win32)
|
||||
SHAREDLIBEXT=.dll
|
||||
FPCMADE=fpcmade.w32
|
||||
ZIPSUFFIX=w32
|
||||
endif
|
||||
ifeq ($(OS_TARGET),os2)
|
||||
AOUTEXT=.out
|
||||
STATICLIBPREFIX=
|
||||
SHAREDLIBEXT=.dll
|
||||
FPCMADE=fpcmade.os2
|
||||
ZIPSUFFIX=os2
|
||||
ECHO=echo
|
||||
endif
|
||||
ifeq ($(OS_TARGET),emx)
|
||||
AOUTEXT=.out
|
||||
STATICLIBPREFIX=
|
||||
SHAREDLIBEXT=.dll
|
||||
FPCMADE=fpcmade.emx
|
||||
ZIPSUFFIX=emx
|
||||
ECHO=echo
|
||||
endif
|
||||
ifeq ($(OS_TARGET),amiga)
|
||||
EXEEXT=
|
||||
SHAREDLIBEXT=.library
|
||||
FPCMADE=fpcmade.amg
|
||||
endif
|
||||
ifeq ($(OS_TARGET),atari)
|
||||
EXEEXT=.ttp
|
||||
FPCMADE=fpcmade.ata
|
||||
endif
|
||||
ifeq ($(OS_TARGET),beos)
|
||||
EXEEXT=
|
||||
FPCMADE=fpcmade.be
|
||||
ZIPSUFFIX=be
|
||||
endif
|
||||
ifeq ($(OS_TARGET),sunos)
|
||||
EXEEXT=
|
||||
FPCMADE=fpcmade.sun
|
||||
ZIPSUFFIX=sun
|
||||
endif
|
||||
ifeq ($(OS_TARGET),qnx)
|
||||
EXEEXT=
|
||||
FPCMADE=fpcmade.qnx
|
||||
ZIPSUFFIX=qnx
|
||||
endif
|
||||
ifeq ($(OS_TARGET),netware)
|
||||
EXEEXT=.nlm
|
||||
STATICLIBPREFIX=
|
||||
FPCMADE=fpcmade.nw
|
||||
ZIPSUFFIX=nw
|
||||
endif
|
||||
ifeq ($(OS_TARGET),macos)
|
||||
EXEEXT=
|
||||
FPCMADE=fpcmade.mcc
|
||||
endif
|
||||
else
|
||||
ifeq ($(OS_TARGET),go32v1)
|
||||
PPUEXT=.pp1
|
||||
OEXT=.o1
|
||||
@ -552,8 +634,8 @@ ZIPSUFFIX=qnx
|
||||
endif
|
||||
ifeq ($(OS_TARGET),netware)
|
||||
STATICLIBPREFIX=
|
||||
PPUEXT=.ppn
|
||||
OEXT=.on
|
||||
PPUEXT=.ppu
|
||||
OEXT=.o
|
||||
ASMEXT=.s
|
||||
SMARTEXT=.sl
|
||||
STATICLIBEXT=.a
|
||||
@ -562,6 +644,16 @@ FPCMADE=fpcmade.nw
|
||||
ZIPSUFFIX=nw
|
||||
EXEEXT=.nlm
|
||||
endif
|
||||
ifeq ($(OS_TARGET),macos)
|
||||
PPUEXT=.ppu
|
||||
ASMEXT=.s
|
||||
OEXT=.o
|
||||
SMARTEXT=.sl
|
||||
STATICLIBEXT=.a
|
||||
EXEEXT=
|
||||
FPCMADE=fpcmade.mcc
|
||||
endif
|
||||
endif
|
||||
ifndef ECHO
|
||||
ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(ECHO),)
|
||||
@ -787,8 +879,7 @@ override REQUIRE_PACKAGES=rtl fcl regexpr
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_INET=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
@ -803,7 +894,6 @@ endif
|
||||
ifeq ($(OS_TARGET),win32)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
@ -818,8 +908,7 @@ endif
|
||||
ifeq ($(OS_TARGET),freebsd)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_INET=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
@ -834,8 +923,7 @@ endif
|
||||
ifeq ($(OS_TARGET),netbsd)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_INET=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
@ -874,8 +962,7 @@ endif
|
||||
ifeq ($(OS_TARGET),openbsd)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_INET=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
@ -887,6 +974,30 @@ REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
endif
|
||||
ifeq ($(OS_TARGET),palmos)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
endif
|
||||
ifeq ($(OS_TARGET),macos)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
endif
|
||||
ifeq ($(OS_TARGET),macosx)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
endif
|
||||
ifeq ($(OS_TARGET),emx)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
endif
|
||||
ifdef REQUIRE_PACKAGES_RTL
|
||||
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
ifneq ($(PACKAGEDIR_RTL),)
|
||||
@ -939,56 +1050,30 @@ ifdef UNITDIR_PASZLIB
|
||||
override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
|
||||
endif
|
||||
endif
|
||||
ifdef REQUIRE_PACKAGES_NETDB
|
||||
PACKAGEDIR_NETDB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /netdb/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
ifneq ($(PACKAGEDIR_NETDB),)
|
||||
ifneq ($(wildcard $(PACKAGEDIR_NETDB)/$(OS_TARGET)),)
|
||||
UNITDIR_NETDB=$(PACKAGEDIR_NETDB)/$(OS_TARGET)
|
||||
ifdef REQUIRE_PACKAGES_INET
|
||||
PACKAGEDIR_INET:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /inet/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
ifneq ($(PACKAGEDIR_INET),)
|
||||
ifneq ($(wildcard $(PACKAGEDIR_INET)/$(OS_TARGET)),)
|
||||
UNITDIR_INET=$(PACKAGEDIR_INET)/$(OS_TARGET)
|
||||
else
|
||||
UNITDIR_NETDB=$(PACKAGEDIR_NETDB)
|
||||
UNITDIR_INET=$(PACKAGEDIR_INET)
|
||||
endif
|
||||
ifdef CHECKDEPEND
|
||||
$(PACKAGEDIR_NETDB)/$(FPCMADE):
|
||||
$(MAKE) -C $(PACKAGEDIR_NETDB) $(FPCMADE)
|
||||
override ALLDEPENDENCIES+=$(PACKAGEDIR_NETDB)/$(FPCMADE)
|
||||
$(PACKAGEDIR_INET)/$(FPCMADE):
|
||||
$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
|
||||
override ALLDEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
|
||||
endif
|
||||
else
|
||||
PACKAGEDIR_NETDB=
|
||||
UNITDIR_NETDB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /netdb/Package.fpc,$(UNITSDIR)))))
|
||||
ifneq ($(UNITDIR_NETDB),)
|
||||
UNITDIR_NETDB:=$(firstword $(UNITDIR_NETDB))
|
||||
PACKAGEDIR_INET=
|
||||
UNITDIR_INET:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /inet/Package.fpc,$(UNITSDIR)))))
|
||||
ifneq ($(UNITDIR_INET),)
|
||||
UNITDIR_INET:=$(firstword $(UNITDIR_INET))
|
||||
else
|
||||
UNITDIR_NETDB=
|
||||
UNITDIR_INET=
|
||||
endif
|
||||
endif
|
||||
ifdef UNITDIR_NETDB
|
||||
override COMPILER_UNITDIR+=$(UNITDIR_NETDB)
|
||||
endif
|
||||
endif
|
||||
ifdef REQUIRE_PACKAGES_LIBASYNC
|
||||
PACKAGEDIR_LIBASYNC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libasync/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
ifneq ($(PACKAGEDIR_LIBASYNC),)
|
||||
ifneq ($(wildcard $(PACKAGEDIR_LIBASYNC)/$(OS_TARGET)),)
|
||||
UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC)/$(OS_TARGET)
|
||||
else
|
||||
UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC)
|
||||
endif
|
||||
ifdef CHECKDEPEND
|
||||
$(PACKAGEDIR_LIBASYNC)/$(FPCMADE):
|
||||
$(MAKE) -C $(PACKAGEDIR_LIBASYNC) $(FPCMADE)
|
||||
override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBASYNC)/$(FPCMADE)
|
||||
endif
|
||||
else
|
||||
PACKAGEDIR_LIBASYNC=
|
||||
UNITDIR_LIBASYNC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libasync/Package.fpc,$(UNITSDIR)))))
|
||||
ifneq ($(UNITDIR_LIBASYNC),)
|
||||
UNITDIR_LIBASYNC:=$(firstword $(UNITDIR_LIBASYNC))
|
||||
else
|
||||
UNITDIR_LIBASYNC=
|
||||
endif
|
||||
endif
|
||||
ifdef UNITDIR_LIBASYNC
|
||||
override COMPILER_UNITDIR+=$(UNITDIR_LIBASYNC)
|
||||
ifdef UNITDIR_INET
|
||||
override COMPILER_UNITDIR+=$(UNITDIR_INET)
|
||||
endif
|
||||
endif
|
||||
ifdef REQUIRE_PACKAGES_FCL
|
||||
@ -1185,6 +1270,11 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
|
||||
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
ifeq ($(FPC_VERSION),1.0.6)
|
||||
override FPCOPTDEF+=HASUNIX
|
||||
endif
|
||||
endif
|
||||
ifdef GCCLIBDIR
|
||||
override FPCOPT+=-Fl$(GCCLIBDIR)
|
||||
endif
|
||||
|
||||
@ -62,6 +62,8 @@ type
|
||||
FileType: TPkgFileType;
|
||||
PkgFileFlags: TPkgFileFlags;
|
||||
UsedUnitname: string;
|
||||
AutoAddLFMFile: boolean;
|
||||
AutoAddLRSFile: boolean;
|
||||
end;
|
||||
|
||||
TOnGetUnitRegisterInfo = procedure(Sender: TObject; const AFilename: string;
|
||||
@ -81,6 +83,7 @@ type
|
||||
AddUnitSrcNameLabel: TLabel;
|
||||
AddUnitSrcNameEdit: TEdit;
|
||||
AddUnitHasRegisterCheckBox: TCheckBox;
|
||||
AddSecondaryFilesCheckBox: TCheckBox;
|
||||
AddUnitUpdateButton: TButton;
|
||||
AddUnitButton: TButton;
|
||||
CancelAddUnitButton: TButton;
|
||||
@ -366,12 +369,15 @@ end;
|
||||
|
||||
procedure TAddToPackageDlg.AddUnitButtonClick(Sender: TObject);
|
||||
begin
|
||||
FillChar(Params,SizeOf(Params),0);
|
||||
Params.AddType:=d2ptUnit;
|
||||
|
||||
Params.UnitFilename:=AddUnitFilenameEdit.Text;
|
||||
Params.UnitName:=AddUnitSrcNameEdit.Text;
|
||||
Params.FileType:=pftUnit;
|
||||
Params.PkgFileFlags:=[];
|
||||
Params.AutoAddLFMFile:=AddSecondaryFilesCheckBox.Checked;
|
||||
Params.AutoAddLRSFile:=AddSecondaryFilesCheckBox.Checked;
|
||||
if AddUnitHasRegisterCheckBox.Checked then
|
||||
Include(Params.PkgFileFlags,pffHasRegisterProc);
|
||||
|
||||
@ -460,6 +466,7 @@ var
|
||||
i: Integer;
|
||||
CurPFT: TPkgFileType;
|
||||
begin
|
||||
FillChar(Params,SizeOf(Params),0);
|
||||
Params.AddType:=d2ptUnit;
|
||||
Params.UnitFilename:=AddFilenameEdit.Text;
|
||||
Params.FileType:=pftText;
|
||||
@ -545,9 +552,13 @@ begin
|
||||
x:=5;
|
||||
|
||||
with AddUnitHasRegisterCheckBox do
|
||||
SetBounds(x,y,200,Height);
|
||||
SetBounds(x,y,Parent.ClientWidth-2*x,Height);
|
||||
inc(y,AddUnitHasRegisterCheckBox.Height+5);
|
||||
|
||||
with AddSecondaryFilesCheckBox do
|
||||
SetBounds(x,y,Parent.ClientWidth-2*x,Height);
|
||||
inc(y,AddSecondaryFilesCheckBox.Height+5);
|
||||
|
||||
with AddUnitUpdateButton do
|
||||
SetBounds(x,y,300,Height);
|
||||
inc(y,AddUnitUpdateButton.Height+25);
|
||||
@ -629,6 +640,7 @@ var
|
||||
PkgComponent: TPkgComponent;
|
||||
ARequiredPackage: TLazPackage;
|
||||
begin
|
||||
FillChar(Params,SizeOf(Params),0);
|
||||
Params.AddType:=d2ptNewComponent;
|
||||
Params.FileType:=pftUnit;
|
||||
Params.PkgFileFlags:=[pffHasRegisterProc];
|
||||
@ -809,6 +821,9 @@ procedure TAddToPackageDlg.NewDependButtonClick(Sender: TObject);
|
||||
var
|
||||
NewDependency: TPkgDependency;
|
||||
begin
|
||||
FillChar(Params,SizeOf(Params),0);
|
||||
Params.AddType:=d2ptRequiredPkg;
|
||||
|
||||
NewDependency:=TPkgDependency.Create;
|
||||
try
|
||||
// check minimum version
|
||||
@ -844,7 +859,6 @@ begin
|
||||
// ok
|
||||
Params.Dependency:=NewDependency;
|
||||
NewDependency:=nil;
|
||||
Params.AddType:=d2ptRequiredPkg;
|
||||
|
||||
ModalResult:=mrOk;
|
||||
finally
|
||||
@ -968,6 +982,14 @@ begin
|
||||
Caption:='Has Register procedure';
|
||||
end;
|
||||
|
||||
AddSecondaryFilesCheckBox:=TCheckBox.Create(Self);
|
||||
with AddSecondaryFilesCheckBox do begin
|
||||
Name:='AddSecondaryFilesCheckBox';
|
||||
Parent:=AddUnitPage;
|
||||
Caption:='Add LFM, LRS files, if they exist';
|
||||
Checked:=true;
|
||||
end;
|
||||
|
||||
AddUnitUpdateButton:=TButton.Create(Self);
|
||||
with AddUnitUpdateButton do begin
|
||||
Name:='AddUnitUpdateButton';
|
||||
@ -1198,7 +1220,6 @@ begin
|
||||
end;
|
||||
EndUpdate;
|
||||
end;
|
||||
OnClick:=@AddUnitUpdateButtonClick;
|
||||
end;
|
||||
|
||||
AddFileButton:=TButton.Create(Self);
|
||||
|
||||
@ -674,7 +674,7 @@ begin
|
||||
|
||||
// components for dependencies
|
||||
x:=5;
|
||||
y:=5;
|
||||
y:=3;
|
||||
with UseMinVersionCheckBox do
|
||||
SetBounds(x,y,150,MinVersionEdit.Height);
|
||||
inc(x,UseMinVersionCheckBox.Width+5);
|
||||
@ -690,9 +690,9 @@ begin
|
||||
|
||||
with MaxVersionEdit do
|
||||
SetBounds(x,y,MinVersionEdit.Width,Height);
|
||||
|
||||
x:=MinVersionEdit.Left+MinVersionEdit.Width+30;
|
||||
y:=5;
|
||||
inc(y,MaxVersionEdit.Height+10);
|
||||
|
||||
x:=5;
|
||||
with ApplyDependencyButton do
|
||||
SetBounds(x,y,150,Height);
|
||||
end;
|
||||
@ -700,6 +700,7 @@ end;
|
||||
procedure TPackageEditorForm.AddBitBtnClick(Sender: TObject);
|
||||
var
|
||||
AddParams: TAddToPkgResult;
|
||||
NewFilename: String;
|
||||
begin
|
||||
if LazPackage.ReadOnly then begin
|
||||
UpdateButtons;
|
||||
@ -717,9 +718,23 @@ begin
|
||||
|
||||
d2ptUnit:
|
||||
begin
|
||||
// add file
|
||||
// add unit file
|
||||
with AddParams do
|
||||
LazPackage.AddFile(UnitFilename,UnitName,FileType,PkgFileFlags,cpNormal);
|
||||
// add lfm file
|
||||
if AddParams.AutoAddLFMFile then begin
|
||||
NewFilename:=ChangeFileExt(AddParams.UnitFilename,'.lfm');
|
||||
if FileExists(NewFilename)
|
||||
and (LazPackage.FindPkgFile(NewFilename,false,true)=nil) then
|
||||
LazPackage.AddFile(NewFilename,'',pftLFM,[],cpNormal);
|
||||
end;
|
||||
// add lrs file
|
||||
if AddParams.AutoAddLRSFile then begin
|
||||
NewFilename:=ChangeFileExt(AddParams.UnitFilename,'.lrs');
|
||||
if FileExists(NewFilename)
|
||||
and (LazPackage.FindPkgFile(NewFilename,false,true)=nil) then
|
||||
LazPackage.AddFile(NewFilename,'',pftLRS,[],cpNormal);
|
||||
end;
|
||||
UpdateAll;
|
||||
end;
|
||||
|
||||
|
||||
@ -1653,13 +1653,14 @@ begin
|
||||
and (CurFile.FileType=pftUnit) then begin
|
||||
CodeBuffer:=CodeToolBoss.LoadFile(CurFile.Filename,false,false);
|
||||
if CodeBuffer<>nil then begin
|
||||
// if the unit is edited, the unitname is probably already cached
|
||||
CurUnitName:=CodeToolBoss.GetCachedSourceName(CodeBuffer);
|
||||
if AnsiCompareText(CurUnitName,CurFile.UnitName)<>0 then begin
|
||||
// if not then parse it
|
||||
if AnsiCompareText(CurUnitName,CurFile.UnitName)<>0 then
|
||||
CurUnitName:=CodeToolBoss.GetSourceName(CodeBuffer,false);
|
||||
end;
|
||||
if AnsiCompareText(CurUnitName,CurFile.UnitName)=0 then begin
|
||||
// if it makes sense, update unitname
|
||||
if AnsiCompareText(CurUnitName,CurFile.UnitName)=0 then
|
||||
CurFile.UnitName:=CurUnitName;
|
||||
end;
|
||||
end;
|
||||
CurUnitName:=CurFile.UnitName;
|
||||
if (CurUnitName<>'') and IsValidIdent(CurUnitName) then begin
|
||||
|
||||
Loading…
Reference in New Issue
Block a user