Skip to content

Commit

Permalink
* FPMake-option NoIDE added
Browse files Browse the repository at this point in the history
git-svn-id: trunk@44152 -
  • Loading branch information
JoostVanDerSluis committed Feb 11, 2020
1 parent 39c48f0 commit 79bbc20
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
1 change: 1 addition & 0 deletions fpmake.pp
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ procedure add_fpc(const ADirectory: string);
end;

begin
add_packages_comandlineoptions();
add_fpc('');
Installer.Run;
end.
Expand Down
10 changes: 8 additions & 2 deletions packages/fpmake.pp
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,16 @@

{$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}

Expand All @@ -47,6 +52,7 @@ procedure add_packages(const ADirectory: string);

{$ifdef no_parent}
begin
add_packages_comandlineoptions();
add_packages('');
Installer.Run;
end.
Expand Down
18 changes: 14 additions & 4 deletions packages/ide/fpmake.pp
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,15 @@ procedure ide_check_gdb_availability(Sender: TObject);
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');
end;

procedure add_ide(const ADirectory: string);

Var
Expand All @@ -150,12 +159,12 @@ procedure add_ide(const ADirectory: string);
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;
Expand Down Expand Up @@ -319,6 +328,7 @@ procedure add_ide(const ADirectory: string);

{$ifndef ALLPACKAGES}
begin
add_ide_comandlineoptions();
add_ide('');
Installer.Run;
end.
Expand Down

0 comments on commit 79bbc20

Please sign in to comment.