Skip to content

packagess moved, package generator updated, missing fulld_xxx.bat add… #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vincentparrett wants to merge 11 commits into
base: Indy-10.7
Choose a base branch
from
Open

packagess moved, package generator updated, missing fulld_xxx.bat add… #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6e2d5ac
packagess moved, package generator updated, missing fulld_xxx.bat add…
vincentparrett Jun 28, 2026
0eb7b9b
review fixes
vincentparrett Jul 2, 2026
4740a5c
removed most uses of %~dp0
vincentparrett Jul 2, 2026
4bfe01e
review changes - moved inc files to Lib\Include, always generate with…
vincentparrett Jul 2, 2026
fcf1dd0
Missed a copyright symbol
vincentparrett Jul 2, 2026
58c6f83
Moved source folder from Lib to Lib\Source
vincentparrett Jul 2, 2026
ea6f0a5
Updated package generator for new paths
vincentparrett Jul 2, 2026
00809fc
Moved packages to \Lib\Packages
vincentparrett Jul 3, 2026
7813406
Use resinator for RS 13 or later, rc for earlier versions
vincentparrett Jul 4, 2026
a98ea87
Changed the generated buildres.bat to decide which resource compiler …
vincentparrett Jul 4, 2026
82ed574
Merge branch 'Indy-10.7' into package-restructure
vincentparrett Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,10 @@ __recovery/
# Boss dependency manager vendor folder https://github.com/HashLoad/boss
modules/

# Indy package build output - all Full*.bat scripts emit here
/Output/

# Transient temp build dir used by the C++Builder Fullc_*.bat scripts (artifacts are relocated to /Output/)
/Lib/Output/

# End of https://www.gitignore.io/api/delphi
6 changes: 3 additions & 3 deletions Builder/Package Generator/DModule.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ procedure TDM.CheckForMissingFiles;
SR: TSearchRec;
UnitName: String;
begin
if FindFirst(GIndyPath + 'Lib\System\*.pas', faAnyFile, SR) = 0 then
if FindFirst(GIndyPath + 'Lib\Source\System\*.pas', faAnyFile, SR) = 0 then
try
repeat
UnitName := ChangeFileExt(SR.Name, '');
Expand All @@ -139,7 +139,7 @@ procedure TDM.CheckForMissingFiles;
FindClose(SR);
end;

if FindFirst(GIndyPath + 'Lib\Core\*.pas', faAnyFile, SR) = 0 then
if FindFirst(GIndyPath + 'Lib\Source\Core\*.pas', faAnyFile, SR) = 0 then
try
repeat
UnitName := ChangeFileExt(SR.Name, '');
Expand All @@ -154,7 +154,7 @@ procedure TDM.CheckForMissingFiles;
FindClose(SR);
end;

if FindFirst(GIndyPath + 'Lib\Protocols\*.pas', faAnyFile, SR) = 0 then
if FindFirst(GIndyPath + 'Lib\Source\Protocols\*.pas', faAnyFile, SR) = 0 then
try
repeat
UnitName := ChangeFileExt(SR.Name, '');
Expand Down
3 changes: 3 additions & 0 deletions Builder/Package Generator/Data/PkgGen.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Settings]
LastVersion=10.7.0.0

92 changes: 46 additions & 46 deletions Builder/Package Generator/LazPkgGen.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,44 +62,44 @@ The format is like this:

===
<Files Count="9">
<Item1>
<Filename Value="IdAbout.pas"/>
<UnitName Value="IdAbout"/>
</Item1>
<Item2>
<Filename Value="IdAboutVCL.pas"/>
<UnitName Value="IdAboutVCL"/>
</Item2>
<Item3>
<Filename Value="IdAboutVCL.lrs"/>
<Type Value="LRS"/>
</Item3>
<Item4>
<Filename Value="IdAntiFreeze.pas"/>
<UnitName Value="IdAntiFreeze"/>
</Item4>
<Item5>
<Filename Value="IdDsnBaseCmpEdt.pas"/>
<UnitName Value="IdDsnBaseCmpEdt"/>
</Item5>
<Item6>
<Filename Value="IdDsnCoreResourceStrings.pas"/>
<UnitName Value="IdDsnCoreResourceStrings"/>
</Item6>
<Item7>
<Filename Value="IdRegisterCore.pas"/>
<HasRegisterProc Value="True"/>
<UnitName Value="IdRegisterCore"/>
</Item7>
<Item8>
<Filename Value="IdRegisterCore.lrs"/>
<Type Value="LRS"/>
</Item8>
<Item9>
<Filename Value="IdCoreDsnRegister.pas"/>
<HasRegisterProc Value="True"/>
<UnitName Value="IdCoreDsnRegister"/>
</Item9>
<Item1>
<Filename Value="IdAbout.pas"/>
<UnitName Value="IdAbout"/>
</Item1>
<Item2>
<Filename Value="IdAboutVCL.pas"/>
<UnitName Value="IdAboutVCL"/>
</Item2>
<Item3>
<Filename Value="IdAboutVCL.lrs"/>
<Type Value="LRS"/>
</Item3>
<Item4>
<Filename Value="IdAntiFreeze.pas"/>
<UnitName Value="IdAntiFreeze"/>
</Item4>
<Item5>
<Filename Value="IdDsnBaseCmpEdt.pas"/>
<UnitName Value="IdDsnBaseCmpEdt"/>
</Item5>
<Item6>
<Filename Value="IdDsnCoreResourceStrings.pas"/>
<UnitName Value="IdDsnCoreResourceStrings"/>
</Item6>
<Item7>
<Filename Value="IdRegisterCore.pas"/>
<HasRegisterProc Value="True"/>
<UnitName Value="IdRegisterCore"/>
</Item7>
<Item8>
<Filename Value="IdRegisterCore.lrs"/>
<Type Value="LRS"/>
</Item8>
<Item9>
<Filename Value="IdCoreDsnRegister.pas"/>
<HasRegisterProc Value="True"/>
<UnitName Value="IdCoreDsnRegister"/>
</Item9>
</Files>
===
}
Expand Down Expand Up @@ -348,16 +348,16 @@ begin
Exit;
end;

MakeFPCPackage('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=System', 'indysystemfpc', OutputPath + '\Lib\System');
WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=System', 'indysystemlaz.lpk', OutputPath + '\Lib\System');
MakeFPCPackage('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=System', 'indysystemfpc', OutputPath + '\Lib\Source\System');
WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=System', 'indysystemlaz.lpk', OutputPath + '\Lib\Source\System');

MakeFPCPackage('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=Core', 'indycorefpc', OutputPath + '\Lib\Core');
WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=Core', 'indycorelaz.lpk', OutputPath + '\Lib\Core');
WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=True, Pkg=Core', 'dclindycorelaz.lpk', OutputPath + '\Lib\Core');
MakeFPCPackage('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=Core', 'indycorefpc', OutputPath + '\Lib\Source\Core');
WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=Core', 'indycorelaz.lpk', OutputPath + '\Lib\Source\Core');
WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=True, Pkg=Core', 'dclindycorelaz.lpk', OutputPath + '\Lib\Source\Core');

MakeFPCPackage('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=Protocols', 'indyprotocolsfpc', OutputPath + '\Lib\Protocols');
WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=Protocols', 'indyprotocolslaz.lpk', OutputPath + '\Lib\Protocols');
WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=True, Pkg=Protocols', 'dclindyprotocolslaz.lpk', OutputPath + '\Lib\Protocols');
MakeFPCPackage('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=Protocols', 'indyprotocolsfpc', OutputPath + '\Lib\Source\Protocols');
WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=False, Pkg=Protocols', 'indyprotocolslaz.lpk', OutputPath + '\Lib\Source\Protocols');
WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=True, Pkg=Protocols', 'dclindyprotocolslaz.lpk', OutputPath + '\Lib\Source\Protocols');

WriteLPK('FPC=True, FPCListInPkg=True, DesignUnit=True', 'indylaz.lpk', OutputPath + '\Lib');

Expand Down
Loading