fpmake: Switched to fpmake.pp files that do not need setting the source-directory of the package manually

git-svn-id: trunk@47265 -
This commit is contained in:
joost 2014-12-29 22:11:35 +00:00
parent 5bf9c49357
commit 40a902ea07
12 changed files with 60 additions and 79 deletions

View File

@ -3,7 +3,7 @@
fpmake.pp for CodeTools 1.0.1
This file was generated on 23-12-2014
This file was generated on 28-12-2014
}
{$ifndef ALLPACKAGES}
@ -13,7 +13,7 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_CodeTools;
procedure add_CodeTools(const ADirectory: string);
var
P : TPackage;
@ -25,10 +25,7 @@ begin
P:=AddPAckage('codetools');
P.Version:='1.0.1';
{$ifdef ALLPACKAGES}
// when this is part of a meta package, set here the sub directory
P.Directory:='components/codetools';
{$endif ALLPACKAGES}
P.Directory:=ADirectory;
P.Dependencies.Add('lazutils');
P.Options.Add('-MObjFPC');
@ -164,7 +161,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_CodeTools;
add_CodeTools('');
Installer.Run;
end.
{$endif ALLPACKAGES}

View File

@ -3,7 +3,7 @@
fpmake.pp for DebuggerIntf 0.1
This file was generated on 25-12-2014
This file was generated on 28-12-2014
}
{$ifndef ALLPACKAGES}
@ -13,7 +13,7 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_DebuggerIntf;
procedure add_DebuggerIntf(const ADirectory: string);
var
P : TPackage;
@ -25,10 +25,7 @@ begin
P:=AddPAckage('debuggerintf');
P.Version:='0.1';
{$ifdef ALLPACKAGES}
// when this is part of a meta package, set here the sub directory
P.Directory:='components' + PathDelim + 'debuggerintf';
{$endif ALLPACKAGES}
P.Directory:=ADirectory;
P.Dependencies.Add('lclbase');
P.Options.Add('-MObjFPC');
@ -62,7 +59,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_DebuggerIntf;
add_DebuggerIntf('');
Installer.Run;
end.
{$endif ALLPACKAGES}

View File

@ -3,7 +3,7 @@
fpmake.pp for IDEIntf 1.0
This file was generated on 23-12-2014
This file was generated on 28-12-2014
}
{$ifndef ALLPACKAGES}
@ -13,7 +13,7 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_IDEIntf;
procedure add_IDEIntf(const ADirectory: string);
var
P : TPackage;
@ -25,10 +25,7 @@ begin
P:=AddPAckage('ideintf');
P.Version:='1.0';
{$ifdef ALLPACKAGES}
// when this is part of a meta package, set here the sub directory
P.Directory:='components/ideintf';
{$endif ALLPACKAGES}
P.Directory:=ADirectory;
P.Dependencies.Add('lazcontrols');
P.Options.Add('-MObjFPC');
@ -176,7 +173,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_IDEIntf;
add_IDEIntf('');
Installer.Run;
end.
{$endif ALLPACKAGES}

View File

@ -3,7 +3,7 @@
fpmake.pp for LazControls 1.0.1
This file was generated on 23-12-2014
This file was generated on 28-12-2014
}
{$ifndef ALLPACKAGES}
@ -13,7 +13,7 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_LazControls;
procedure add_LazControls(const ADirectory: string);
var
P : TPackage;
@ -25,10 +25,7 @@ begin
P:=AddPAckage('lazcontrols');
P.Version:='1.0.1';
{$ifdef ALLPACKAGES}
// when this is part of a meta package, set here the sub directory
P.Directory:='components/lazcontrols/';
{$endif ALLPACKAGES}
P.Directory:=ADirectory;
P.Dependencies.Add('lcl');
P.Options.Add('-MObjFPC');
@ -75,7 +72,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_LazControls;
add_LazControls('');
Installer.Run;
end.
{$endif ALLPACKAGES}

View File

@ -3,7 +3,7 @@
fpmake.pp for LazDebuggerGdbmi 0.1
This file was generated on 23-12-2014
This file was generated on 29-12-2014
}
{$ifndef ALLPACKAGES}
@ -13,7 +13,7 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_LazDebuggerGdbmi;
procedure add_LazDebuggerGdbmi(const ADirectory: string);
var
P : TPackage;
@ -25,10 +25,7 @@ begin
P:=AddPAckage('lazdebuggergdbmi');
P.Version:='0.1';
{$ifdef ALLPACKAGES}
// when this is part of a meta package, set here the sub directory
P.Directory:='components/lazdebuggergdbmi';
{$endif ALLPACKAGES}
P.Directory:=ADirectory;
P.Dependencies.Add('ideintf');
P.Dependencies.Add('debuggerintf');
@ -81,7 +78,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_LazDebuggerGdbmi;
add_LazDebuggerGdbmi('');
Installer.Run;
end.
{$endif ALLPACKAGES}

View File

@ -3,7 +3,7 @@
fpmake.pp for SynEdit 1.0
This file was generated on 23-12-2014
This file was generated on 28-12-2014
}
{$ifndef ALLPACKAGES}
@ -13,7 +13,7 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_SynEdit;
procedure add_SynEdit(const ADirectory: string);
var
P : TPackage;
@ -25,10 +25,7 @@ begin
P:=AddPAckage('synedit');
P.Version:='1.0';
{$ifdef ALLPACKAGES}
// when this is part of a meta package, set here the sub directory
P.Directory:='components/synedit';
{$endif ALLPACKAGES}
P.Directory:=ADirectory;
P.Dependencies.Add('lcl');
P.Options.Add('-MObjFPC');
@ -221,7 +218,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_SynEdit;
add_SynEdit('');
Installer.Run;
end.
{$endif ALLPACKAGES}

View File

@ -1,9 +1,11 @@
{$ifndef ALLPACKAGES}
{$mode objfpc}{$H+}
{$define allpackages}
{$define no_parent}
program fpmake;
uses fpmkunit, sysutils, Classes;
{$endif ALLPACKAGES}
(*
The include files are generated with the following commands:
@ -14,8 +16,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);
begin
{$include fpmake_add.inc}
end;
{$ifdef no_parent}
begin
add_packages('');
Installer.Run;
end.
{$endif no_parent}

View File

@ -1,11 +1,11 @@
add_LCLBase;
add_LazUtils;
add_FCL;
add_LCL;
add_LazControls;
add_IDEIntf;
add_CodeTools;
add_SynEdit;
add_DebuggerIntf;
add_LazDebuggerGdbmi;
add_ide;
add_LCLBase(ADirectory+IncludeTrailingPathDelimiter('lcl'));
add_LazUtils(ADirectory+IncludeTrailingPathDelimiter('components')+IncludeTrailingPathDelimiter('lazutils'));
add_FCL(ADirectory+IncludeTrailingPathDelimiter('packager')+IncludeTrailingPathDelimiter('registration'));
add_LCL(ADirectory+IncludeTrailingPathDelimiter('lcl')+IncludeTrailingPathDelimiter('interfaces'));
add_LazControls(ADirectory+IncludeTrailingPathDelimiter('components')+IncludeTrailingPathDelimiter('lazcontrols'));
add_IDEIntf(ADirectory+IncludeTrailingPathDelimiter('components')+IncludeTrailingPathDelimiter('ideintf'));
add_CodeTools(ADirectory+IncludeTrailingPathDelimiter('components')+IncludeTrailingPathDelimiter('codetools'));
add_SynEdit(ADirectory+IncludeTrailingPathDelimiter('components')+IncludeTrailingPathDelimiter('synedit'));
add_DebuggerIntf(ADirectory+IncludeTrailingPathDelimiter('components')+IncludeTrailingPathDelimiter('debuggerintf'));
add_LazDebuggerGdbmi(ADirectory+IncludeTrailingPathDelimiter('components')+IncludeTrailingPathDelimiter('lazdebuggergdbmi'));
add_ide(ADirectory+IncludeTrailingPathDelimiter('ide'));

View File

@ -5,7 +5,7 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_ide;
procedure add_ide(const ADirectory: string);
var
P : TPackage;
@ -17,10 +17,7 @@ begin
P:=AddPAckage('lazaruside');
P.Version:='1.3';
{$ifdef ALLPACKAGES}
// when this is part of a meta package, set here the sub directory
P.Directory:='ide';
{$endif ALLPACKAGES}
P.Directory:=ADirectory;
P.Dependencies.Add('lcl');
P.Dependencies.Add('synedit');
@ -348,7 +345,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_ide;
add_ide('');
Installer.Run;
end.
{$endif ALLPACKAGES}

View File

@ -3,7 +3,7 @@
fpmake.pp for LCLBase 1.3
This file was generated on 25-12-2014
This file was generated on 29-12-2014
}
{$ifndef ALLPACKAGES}
@ -13,7 +13,7 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_LCLBase;
procedure add_LCLBase(const ADirectory: string);
var
P : TPackage;
@ -25,10 +25,7 @@ begin
P:=AddPAckage('lclbase');
P.Version:='1.3';
{$ifdef ALLPACKAGES}
// when this is part of a meta package, set here the sub directory
P.Directory:='lcl';
{$endif ALLPACKAGES}
P.Directory:=ADirectory;
P.Dependencies.Add('lazutils');
P.Options.Add('-MObjFPC');
@ -288,7 +285,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_LCLBase;
add_LCLBase('');
Installer.Run;
end.
{$endif ALLPACKAGES}

View File

@ -13,7 +13,7 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_LCL;
procedure add_LCL(const ADirectory: string);
var
P : TPackage;
@ -75,9 +75,7 @@ begin
GlobalDictionary.AddVariable('CPU_TARGET', '$(cpu)');
GlobalDictionary.AddVariable('OS_TARGET', '$(os)');
{$ifdef ALLPACKAGES}
P.Directory:='lcl/interfaces/';
{$endif ALLPACKAGES}
P.Directory:=ADirectory;
P.SupportBuildModes := [bmBuildUnit];
P.Dependencies.Add('lclbase');
@ -412,7 +410,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_LCL;
add_LCL('');
Installer.Run;
end.
{$endif ALLPACKAGES}

View File

@ -3,7 +3,7 @@
fpmake.pp for FCL 1.0.1
This file was generated on 23-12-2014
This file was generated on 28-12-2014
}
{$ifndef ALLPACKAGES}
@ -13,7 +13,7 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_FCL;
procedure add_FCL(const ADirectory: string);
var
P : TPackage;
@ -25,10 +25,7 @@ begin
P:=AddPAckage('fcl');
P.Version:='1.0.1';
{$ifdef ALLPACKAGES}
// when this is part of a meta package, set here the sub directory
P.Directory:='packager/registration/';
{$endif ALLPACKAGES}
P.Directory:=ADirectory;
P.Options.Add('-MObjFPC');
P.Options.Add('-Scghi');
@ -52,7 +49,7 @@ end;
{$ifndef ALLPACKAGES}
begin
add_FCL;
add_FCL('');
Installer.Run;
end.
{$endif ALLPACKAGES}