mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-14 10:39:29 +02:00
7d8d0340b9
Correctly parse the directives DenyPackageUnit and WeakPackageUnit ppu.pas: + add flags uf_packagedeny and uf_packageweak scandir.pas: + new procedure do_moduleflagswitch() which parses a ON/OFF/+/- argument and sets or clears a flag in the current module + new procedure dir_denypackageunit which handles DenyPackageUnit * implement dir_weakpackageunit (and move to the correct location ;) ) * InitScannerDirectives: add dir_denypackageunit handler ........ Respect DenyPackageUnit flag. pmodules.pas, proc_package: * check all contained units that are not already part of a package for their uf_package_deny flag and report an error for each that has it set ........ Do not check whether all units are used as by definition all units of a package are considered as used. pmodules.pas, proc_package: - remove call to current_module.allunitsused ........ Check whether a unit has been implicitely imported in a package. A unit is considered as implicitely imported if it is not part of a required package nor part of the units listed in the contains section. This note is useful (Delphi even provides a dialog in that case) as a package with implicitely imported units /might/ become incompatible with other packages (e.g. if another package includes that unit uses that package and includes that unit explicitely; of course that is the same as if both package included it explicitely, but with the hint one knows where to look). pmodules.pas, proc_package: * while walking the loaded units also check whether any of them not contained in a package was part of the contained units which are the same as the current module's used units ........ Generate CRC for package files pcp.pas, tpcpfile: + new field do_crc which controls CRC generation + override putdata() method to generate CRC when data is written * resetfile: enable do_crc by default ........fppu.pas, tppumodule: * loadfrompackage: mention if a unit is loaded from a package ........ fpkg.pas, tcontainedunit: + new fields offset and size for the PPU data stored inside the PCP fpcp.pas, tpcppackage: * readcontainedunits & addunit: correctly initialize offset and size to 0 ........ Store the modified PPU files directly inside the PCP and thus get finally rid of the .ppl.ppu files. entfile.pas: + new entry type ibpputable pkgutil.pas: * adjust RewritePPU to work on a stream as output instead of a filename fpcp.pas, tpcppackage: + new method writepputable() which writes the offsets and sizes of all contained units (not part of CRC!) + new method writeppudata() which rewrites all contained PPUs directly into the PCP after the ibend entry (Note: the data is written 16 Byte aligned to ease viewing of the PCP and its contained PPUs in a hex editor) + new method readpputable() which reads the offsets and sizes of all contained units + new method getmodulestream() which returns a substream for a contained module * loadpcp: also call readpputable() * writepcp: first write an empty pputable, then finish writing all data that requires the put*/write* methods of the pcpfile, then use writeppudata() to write all PPUs and finally write the correct pputable at the original location fppu.pas, tppumodule: * loadfrompackage: don't read the PPU from a file if it is contained in a package, but using the new tpcppackage.getmodulestream() and tppumodule.openppustream() methods pmodules.pas, proc_package: * don't rewrite the PPUs here pcp.pas: * increase CurrentPCPVersion ........ Fix cycling ........ git-svn-id: trunk@33514 -
123 lines
2.9 KiB
ObjectPascal
123 lines
2.9 KiB
ObjectPascal
{
|
|
Copyright (c) 2013-2016 by Free Pascal Development Team
|
|
|
|
This unit implements basic parts of the package system
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
****************************************************************************
|
|
}
|
|
unit fpkg;
|
|
|
|
{$i fpcdefs.inc}
|
|
|
|
interface
|
|
|
|
uses
|
|
cclasses,
|
|
globtype,
|
|
finput;
|
|
|
|
type
|
|
tcontainedunit=record
|
|
module:tmodulebase;
|
|
ppufile:tpathstr;
|
|
offset:longint;
|
|
size:longint;
|
|
end;
|
|
pcontainedunit=^tcontainedunit;
|
|
|
|
tpackage=class
|
|
public
|
|
realpackagename,
|
|
packagename : pshortstring;
|
|
containedmodules : TFPHashList;
|
|
requiredpackages : TFPHashObjectList;
|
|
pcpfilename,
|
|
ppafilename,
|
|
pplfilename : tpathstr;
|
|
constructor create(const pn:string);
|
|
destructor destroy;override;
|
|
end;
|
|
|
|
tpackageentry=record
|
|
package : tpackage;
|
|
realpkgname : string;
|
|
usedunits : longint;
|
|
end;
|
|
ppackageentry=^tpackageentry;
|
|
|
|
implementation
|
|
|
|
uses
|
|
cutils,globals;
|
|
|
|
{ tpackage }
|
|
|
|
constructor tpackage.create(const pn: string);
|
|
begin
|
|
realpackagename:=stringdup(pn);
|
|
packagename:=stringdup(upper(pn));
|
|
containedmodules:=TFPHashList.Create;
|
|
requiredpackages:=TFPHashObjectList.Create(false);
|
|
end;
|
|
|
|
destructor tpackage.destroy;
|
|
var
|
|
p : pcontainedunit;
|
|
i : longint;
|
|
begin
|
|
if assigned(containedmodules) then
|
|
for i:=0 to containedmodules.count-1 do
|
|
begin
|
|
p:=pcontainedunit(containedmodules[i]);
|
|
dispose(p);
|
|
end;
|
|
containedmodules.free;
|
|
requiredpackages.free;
|
|
inherited destroy;
|
|
end;
|
|
|
|
|
|
procedure packageinit;
|
|
begin
|
|
packagelist:=TFPHashList.Create;
|
|
end;
|
|
|
|
|
|
procedure packagedone;
|
|
var
|
|
i : longint;
|
|
pkgentry : ppackageentry;
|
|
begin
|
|
if assigned(packagelist) then
|
|
begin
|
|
for i:=0 to packagelist.count-1 do
|
|
begin
|
|
pkgentry:=ppackageentry(packagelist[i]);
|
|
pkgentry^.package.free;
|
|
dispose(pkgentry);
|
|
end;
|
|
end;
|
|
packagelist.Free;
|
|
packagelist:=nil;
|
|
end;
|
|
|
|
|
|
initialization
|
|
register_initdone_proc(@packageinit,@packagedone);
|
|
end.
|
|
|