paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 11:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging (from foreign repository) r44152 into '.':

Browse Source 
U    fpmake.pp
U    packages/fpmake.pp
U    packages/ide/fpmake.pp
--- Merging (from foreign repository) r44154 into '.':
G    packages/ide/fpmake.pp

git-svn-id: branches/fixes_3_2@44229 -
This commit is contained in:
joost 2020-02-21 14:50:44 +00:00
parent 4b06ea7fe7
commit 313ff530ff
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fpmake.pp
View File

@ -47,6 +47,7 @@ begin
end;
begin
add_packages_comandlineoptions();
add_fpc('');
Installer.Run;
end.

10
packages/fpmake.pp
View File

@ -24,11 +24,16 @@ rm fpmake_proc.inc fpmake_add.inc ; /bin/ls -1 */fpmake.pp| while read file; do
{$include fpmake_proc.inc}
procedure add_packages(const ADirectory: string);
procedure add_packages_comandlineoptions();
begin
AddCustomFpmakeCommandlineOption('data2inc', 'Use indicated data2inc executable.');
AddCustomFpmakeCommandlineOption('genfpmkunit', 'Regenerate the fpmkunitsrc.inc file (fppkg).');
add_ide_comandlineoptions();
end;
procedure add_packages(const ADirectory: string);
begin
{$include fpmake_add.inc}
@ -42,6 +47,7 @@ end;
{$ifdef no_parent}
begin
add_packages_comandlineoptions();
add_packages('');
Installer.Run;
end.

25
packages/ide/fpmake.pp
View File

@ -140,6 +140,16 @@ begin
end;
end;
procedure add_ide_comandlineoptions();
begin
AddCustomFpmakeCommandlineOption('CompilerTarget','Target CPU for the IDE''s compiler');
AddCustomFpmakeCommandlineOption('NoGDB','If value=1 or ''Y'', no GDB support');
AddCustomFpmakeCommandlineOption('NoGDBMI','If value=1 or ''Y'', explicitly disable GDB/MI option');
AddCustomFpmakeCommandlineOption('GDBMI','If value=1 or ''Y'', builds IDE with GDB/MI support (no need for LibGDB)');
AddCustomFpmakeCommandlineOption('NoIDE','If value=1 or ''Y'', the IDE will be skipped');
AddCustomFpmakeCommandlineOption('IDE','If value=1 or ''Y'', the IDE will be build for each target');
end;
procedure add_ide(const ADirectory: string);
Var
@ -150,12 +160,12 @@ Var
s: string;
begin
AddCustomFpmakeCommandlineOption('CompilerTarget','Target CPU for the IDE''s compiler');
AddCustomFpmakeCommandlineOption('NoGDB','If value=1 or ''Y'', no GDB support');
AddCustomFpmakeCommandlineOption('NOGDBMI','If value=1 or ''Y'', explicitly disable GDB/MI option');
AddCustomFpmakeCommandlineOption('GDBMI','If value=1 or ''Y'', builds IDE with GDB/MI support (no need for LibGDB)');
With Installer do
begin
s := GetCustomFpmakeCommandlineOptionValue('NoIDE');
if (s='1') or (s='Y') then
Exit;
s := GetCustomFpmakeCommandlineOptionValue('NoGDB');
if (s='1') or (s='Y') then
NoGDBOption := true;
@ -194,6 +204,12 @@ begin
P.Directory:=ADirectory;
{$endif ALLPACKAGES}
s :=GetCustomFpmakeCommandlineOptionValue('IDE');
if (s='1') or (s='Y') then
P.OSes := AllOSes
else
P.OSes := AllOSes-[darwin];
P.Dependencies.Add('rtl-extra');
P.Dependencies.Add('fv');
P.Dependencies.Add('chm');
@ -311,6 +327,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_ide_comandlineoptions();
add_ide('');
Installer.Run;
end.