paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 02:59:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* rtldir removed, it's now handled like any other package

Browse Source
This commit is contained in:
peter 2000-01-06 15:49:23 +00:00
parent 2085b5abde
commit 4ad18caa84
3 changed files with 257 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

475
utils/fpcmake.inc
View File

File diff suppressed because it is too large Load Diff

26
utils/fpcmake.ini
View File

@ -132,7 +132,15 @@ endif
endif endif
[fpcdirsubs] [fpcdirsubs]
# Check if packagedir really exists else turn it off # Create units dir
ifneq ($(FPCDIR),.)
UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
endif
# Check if the dirs really exists, else turn it off
ifeq ($(wildcard $(UNITSDIR)),)
UNITSDIR=
endif
ifeq ($(wildcard $(PACKAGEDIR)),) ifeq ($(wildcard $(PACKAGEDIR)),)
PACKAGEDIR= PACKAGEDIR=
endif endif
@ -140,16 +148,6 @@ ifeq ($(wildcard $(COMPONENTDIR)),)
COMPONENTDIR= COMPONENTDIR=
endif endif
# Create rtl,units dir
ifneq ($(FPCDIR),.)
override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
ifneq ($(wildcard $(FPCDIR)/rtl),)
override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
else
override RTLDIR=$(UNITSDIR)/rtl
endif
endif
[defaultsettings] [defaultsettings]
##################################################################### #####################################################################
@ -309,12 +307,6 @@ override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
endif endif
[command_rtldir]
ifdef RTLDIR
override FPCOPT+=-Fu$(RTLDIR)
endif
[command_unitsdir] [command_unitsdir]
ifdef UNITSDIR ifdef UNITSDIR
override FPCOPT+=-Fu$(UNITSDIR) override FPCOPT+=-Fu$(UNITSDIR)

22
utils/fpcmake.pp
View File

@ -332,6 +332,13 @@ begin
RequireOptions:=ReadString(ini_require,'options',''); RequireOptions:=ReadString(ini_require,'options','');
ReadTargetsString(requireComponents,ini_require,'components',''); ReadTargetsString(requireComponents,ini_require,'components','');
ReadTargetsString(requirePackages,ini_require,'packages',''); ReadTargetsString(requirePackages,ini_require,'packages','');
if userini.RequireRTL then
begin
if userini.Requirepackages[0]<>'' then
userini.Requirepackages[0]:='rtl '+userini.Requirepackages[0]
else
userini.Requirepackages[0]:='rtl';
end;
{ dirs } { dirs }
DirFpc:=ReadString(ini_dirs,'fpcdir',''); DirFpc:=ReadString(ini_dirs,'fpcdir','');
DirPackage:=ReadString(ini_dirs,'packagedir','$(FPCDIR)/packages'); DirPackage:=ReadString(ini_dirs,'packagedir','$(FPCDIR)/packages');
@ -751,7 +758,7 @@ begin
Add('ifndef COMPONENTDIR'); Add('ifndef COMPONENTDIR');
Add('COMPONENTDIR='+userini.dircomponent); Add('COMPONENTDIR='+userini.dircomponent);
Add('endif'); Add('endif');
AddSection(true,'fpcdirsubs'); AddSection(userini.requirertl,'fpcdirsubs');
{ write the default & user settings } { write the default & user settings }
AddSection(true,'defaultsettings'); AddSection(true,'defaultsettings');
@ -829,11 +836,6 @@ begin
{ Packages } { Packages }
AddHead('Packages'); AddHead('Packages');
if userini.RequireRTL then
begin
Add('override PACKAGES=rtl');
Add('PACKAGEDIR_RTL=$(FPCDIR)/rtl/$(OS_TARGET)');
end;
AddTargets('PACKAGES',userini.Requirepackages,false); AddTargets('PACKAGES',userini.Requirepackages,false);
AddTargets('COMPONENTS',userini.Requirecomponents,false); AddTargets('COMPONENTS',userini.Requirecomponents,false);
AddTargetsUnitDir('$(PACKAGEDIR)',userini.Requirepackages); AddTargetsUnitDir('$(PACKAGEDIR)',userini.Requirepackages);
@ -891,12 +893,11 @@ begin
Add(''); Add('');
AddSection(true,'command_begin'); AddSection(true,'command_begin');
AddSection((userini.Requireoptions<>''),'command_needopt'); AddSection((userini.Requireoptions<>''),'command_needopt');
AddSection((userini.dirfpc<>''),'command_unitsdir');
AddSection((userini.dirfpc<>''),'command_rtldir');
AddSection((userini.dirunit<>'') or AddSection((userini.dirunit<>'') or
(not TargetStringEmpty(userini.Requirepackages)) or (not TargetStringEmpty(userini.Requirepackages)) or
(not TargetStringEmpty(userini.Requirecomponents)) (not TargetStringEmpty(userini.Requirecomponents))
,'command_needunit'); ,'command_needunit');
AddSection(true,'command_unitsdir');
AddSection((userini.dirlib<>''),'command_needlib'); AddSection((userini.dirlib<>''),'command_needlib');
AddSection((userini.dirobj<>''),'command_needobj'); AddSection((userini.dirobj<>''),'command_needobj');
AddSection((userini.dirinc<>''),'command_needinc'); AddSection((userini.dirinc<>''),'command_needinc');
@ -1092,7 +1093,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.18 2000-01-06 01:29:59 peter Revision 1.19 2000-01-06 15:49:23 peter
* rtldir removed, it's now handled like any other package
Revision 1.18 2000/01/06 01:29:59 peter
* FPCDIR setting/detect * FPCDIR setting/detect
* lot of other updates to create .deb files correctly * lot of other updates to create .deb files correctly