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

Fixed fpmake.pp files:

Browse Source 
* ExternalURL does not exist anymore
 * Do not add dependencies on files in other packages, add a package dependency
   on the package where the files are in instead
 * Replaced the copy of fcl-base's fpmake.pp in fcl-extra with a real one
 * Fixed some dependencies and file-names

git-svn-id: trunk@15148 -
This commit is contained in:
joost 2010-04-15 20:26:03 +00:00
parent fe85ed0345
commit 855cbebf19
14 changed files with 30 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/cairo/fpmake.pp
View File

@ -33,21 +33,15 @@ begin
with T.Dependencies do
begin
AddUnit('cairo');
AddUnit('freetypeh');
end;
T:=P.Targets.AddUnit('cairoxlib.pp',AllUnixOSes);
with T.Dependencies do
begin
AddUnit('cairo');
AddUnit('xlib');
AddUnit('xrender');
end;
T:=P.Targets.AddUnit('cairowin32.pp',AllWindowsOses);
with T.Dependencies do
begin
AddUnit('cairo');
AddUnit('windows');
end;
{$ifndef ALLPACKAGES}
Run;
end;

8
packages/fcl-base/fpmake.pp
View File

@ -21,7 +21,6 @@ begin
P.Author := '<various>';
P.License := 'LGPL with modification, ';
P.ExternalURL := 'www.freepascal.org';
P.Email := '';
P.Description := 'Base library of Free Component Libraries(FCL), FPC''s OOP library.';
P.NeedLibC:= false;
@ -46,13 +45,6 @@ begin
T:=P.Targets.AddUnit('contnrs.pp');
T:=P.Targets.AddUnit('custapp.pp');
T.ResourceStrings:=true;
T:=P.Targets.AddUnit('daemonapp.pp',AllWindowsOSes+AllUnixOSes);
with T.Dependencies do
begin
AddInclude('daemonapp.inc');
AddUnit('custapp');
AddUnit('eventlog');
end;
T:=P.Targets.AddUnit('eventlog.pp');
T.ResourceStrings:=true;
with T.Dependencies do

27
packages/fcl-db/fpmake.pp
View File

@ -52,6 +52,15 @@ begin
P.IncludePath.Add('src/sqlite');
P.IncludePath.Add('src/dbase');
P.Dependencies.Add('fcl-base');
P.Dependencies.Add('ibase');
P.Dependencies.Add('mysql');
P.Dependencies.Add('odbc');
P.Dependencies.Add('oracle');
P.Dependencies.Add('postgres');
P.Dependencies.Add('sqlite');
P.Dependencies.Add('pxlib');
T:=P.Targets.AddUnit('bufdataset.pas');
with T.Dependencies do
@ -259,7 +268,6 @@ begin
with T.Dependencies do
begin
AddUnit('db');
AddUnit('whtml');
AddUnit('dbconst');
end;
T:=P.Targets.AddUnit('fpcgcreatedbf.pp');
@ -294,16 +302,12 @@ begin
T:=P.Targets.AddUnit('fpdatadict.pp');
with T.Dependencies do
begin
AddUnit('inicol');
AddUnit('inifiles');
AddUnit('contnrs');
AddUnit('db');
end;
T:=P.Targets.AddUnit('fpdbexport.pp');
with T.Dependencies do
begin
AddUnit('db');
AddUnit('streamio');
end;
T:=P.Targets.AddUnit('fpdbfexport.pp');
with T.Dependencies do
@ -467,7 +471,6 @@ begin
AddUnit('db');
AddUnit('dbconst');
AddUnit('bufdataset');
AddUnit('ibase60dyn');
end;
T:=P.Targets.AddUnit('memds.pp');
with T.Dependencies do
@ -481,7 +484,6 @@ begin
AddUnit('bufdataset');
AddUnit('sqldb');
AddUnit('db');
AddUnit('mysql40dyn');
AddUnit('dbconst');
end;
T:=P.Targets.AddUnit('mysql41conn.pas');
@ -491,7 +493,6 @@ begin
AddUnit('bufdataset');
AddUnit('sqldb');
AddUnit('db');
AddUnit('mysql41dyn');
AddUnit('dbconst');
end;
T:=P.Targets.AddUnit('mysql4conn.pas');
@ -501,7 +502,6 @@ begin
AddUnit('bufdataset');
AddUnit('sqldb');
AddUnit('db');
AddUnit('mysql40dyn');
AddUnit('dbconst');
end;
T:=P.Targets.AddUnit('mysql50conn.pas');
@ -511,7 +511,6 @@ begin
AddUnit('bufdataset');
AddUnit('sqldb');
AddUnit('db');
AddUnit('mysql50dyn');
AddUnit('dbconst');
end;
T:=P.Targets.AddUnit('odbcconn.pas');
@ -519,7 +518,6 @@ begin
begin
AddUnit('sqldb');
AddUnit('db');
AddUnit('odbcsqldyn');
AddUnit('bufdataset');
AddUnit('dbconst');
end;
@ -529,14 +527,11 @@ begin
AddUnit('sqldb');
AddUnit('db');
AddUnit('dbconst');
AddUnit('ocidyn');
AddUnit('oratypes');
end;
T:=P.Targets.AddUnit('paradox.pp');
with T.Dependencies do
begin
AddUnit('db');
AddUnit('pxlib');
AddUnit('bufdataset_parser');
end;
T:=P.Targets.AddUnit('pqconnection.pp');
@ -546,7 +541,6 @@ begin
AddUnit('db');
AddUnit('dbconst');
AddUnit('bufdataset');
AddUnit('postgres3dyn');
end;
T:=P.Targets.AddUnit('sdfdata.pp');
with T.Dependencies do
@ -566,21 +560,18 @@ begin
AddUnit('db');
AddUnit('bufdataset');
AddUnit('sqldb');
AddUnit('sqlite3dyn');
AddUnit('dbconst');
end;
T:=P.Targets.AddUnit('sqlite3ds.pas');
with T.Dependencies do
begin
AddUnit('customsqliteds');
AddUnit('sqlite3');
AddUnit('db');
end;
T:=P.Targets.AddUnit('sqliteds.pas');
with T.Dependencies do
begin
AddUnit('customsqliteds');
AddUnit('sqlite');
AddUnit('db');
end;

158
packages/fcl-extra/fpmake.pp
View File

@ -12,182 +12,38 @@ begin
begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-base');
P:=AddPackage('fcl-extra');
{$ifdef ALLPACKAGES}
P.Directory:='fcl-base';
P.Directory:='fcl-extra';
{$endif ALLPACKAGES}
P.Version:='2.2.2-0';
P.Dependencies.Add('fcl-base');
P.Dependencies.Add('winunits-jedi',[Win32,Win64]);
P.Dependencies.Add('winunits-base',[Win32,Win64]);
P.Dependencies.Add('univint',[darwin]);
P.Author := '<various>';
P.License := 'LGPL with modification, ';
P.ExternalURL := 'www.freepascal.org';
P.Email := '';
P.Description := 'Base library of Free Component Libraries(FCL), FPC''s OOP library.';
P.Description := 'Extra libraries of Free Component Libraries(FCL), FPC''s OOP library.';
P.NeedLibC:= false;
P.SourcePath.Add('src');
P.SourcePath.Add('src/unix',AllUnixOSes);
P.SourcePath.Add('src/win',AllWindowsOSes);
P.SourcePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
P.IncludePath.Add('src');
P.IncludePath.Add('src/unix',AllUnixOSes);
P.IncludePath.Add('src/win',AllWindowsOSes);
P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
P.IncludePath.Add('src/dummy',AllOSes);
T:=P.Targets.AddUnit('ascii85.pp');
T:=P.Targets.AddUnit('avl_tree.pp');
T:=P.Targets.AddUnit('base64.pp');
T:=P.Targets.AddUnit('blowfish.pp');
T:=P.Targets.AddUnit('bufstream.pp');
T:=P.Targets.AddUnit('cachecls.pp');
T.ResourceStrings:=true;
T:=P.Targets.AddUnit('contnrs.pp');
T:=P.Targets.AddUnit('custapp.pp');
T.ResourceStrings:=true;
T:=P.Targets.AddUnit('daemonapp.pp',AllWindowsOSes+AllUnixOSes);
with T.Dependencies do
begin
AddInclude('daemonapp.inc');
AddUnit('custapp');
AddUnit('eventlog');
end;
T:=P.Targets.AddUnit('eventlog.pp');
T.ResourceStrings:=true;
with T.Dependencies do
begin
AddInclude('eventlog.inc');
end;
T:=P.Targets.AddUnit('fptimer.pp',AllWindowsOSes+AllUnixOSes);
T:=P.Targets.AddUnit('gettext.pp');
T:=P.Targets.AddUnit('idea.pp');
T:=P.Targets.AddUnit('inicol.pp');
T.ResourceStrings:=true;
with T.Dependencies do
begin
AddUnit('inifiles');
end;
T:=P.Targets.AddUnit('inifiles.pp');
with T.Dependencies do
begin
AddUnit('contnrs');
end;
T:=P.Targets.AddUnit('iostream.pp');
T:=P.Targets.AddUnit('libtar.pp');
T:=P.Targets.AddUnit('maskutils.pp');
T:=P.Targets.AddUnit('pooledmm.pp');
T:=P.Targets.AddUnit('rtfpars.pp');
with T.Dependencies do
begin
AddInclude('rtfdata.inc');
end;
T:=P.Targets.AddUnit('rttiutils.pp');
T:=P.Targets.AddUnit('streamcoll.pp');
T.ResourceStrings:=true;
T:=P.Targets.AddUnit('streamex.pp');
T:=P.Targets.AddUnit('streamio.pp');
T:=P.Targets.AddUnit('syncobjs.pp',AllOSes-[GO32v2,OS2,EMX]);
T:=P.Targets.AddUnit('uriparser.pp');
T:=P.Targets.AddUnit('wformat.pp');
T:=P.Targets.AddUnit('whtml.pp');
with T.Dependencies do
begin
AddUnit('wformat');
end;
T:=P.Targets.AddUnit('wtex.pp');
with T.Dependencies do
begin
AddUnit('wformat');
end;
T:=P.Targets.AddUnit('fpexprpars.pp');
// Windows units
T:=P.Targets.AddUnit('ServiceManager.pas',[Win32,Win64]);
T:=P.Targets.AddUnit('fileinfo.pp',AllWindowsOSes);
// Additional sources
P.Sources.AddSrcFiles('src/win/fclel.*');
// Examples
P.ExamplePath.Add('examples');
T:=P.Targets.AddExampleProgram('asiotest.pp');
T:=P.Targets.AddExampleProgram('b64dec.pp');
T:=P.Targets.AddExampleProgram('b64enc.pp');
T:=P.Targets.AddExampleProgram('b64.pp');
T:=P.Targets.AddExampleProgram('b64test2.pp');
T:=P.Targets.AddExampleProgram('b64test.pp');
T:=P.Targets.AddExampleProgram('base64decodingtestcase.pas');
T:=P.Targets.AddExampleProgram('cachetest.pp');
T:=P.Targets.AddExampleProgram('cfgtest.pp');
T:=P.Targets.AddExampleProgram('daemon.pp');
T:=P.Targets.AddExampleProgram('daemon.txt');
T:=P.Targets.AddExampleProgram('dbugsrv.pp');
T:=P.Targets.AddExampleProgram('debugtest.pp');
T:=P.Targets.AddExampleProgram('doecho.pp');
T:=P.Targets.AddExampleProgram('dparser.pp');
T:=P.Targets.AddExampleProgram('dsockcli.pp');
T:=P.Targets.AddExampleProgram('dsocksvr.pp');
T:=P.Targets.AddExampleProgram('fpdoc.dtd');
T:=P.Targets.AddExampleProgram('fstream.pp');
T:=P.Targets.AddExampleProgram('htdump.pp');
T:=P.Targets.AddExampleProgram('ipcclient.pp');
T:=P.Targets.AddExampleProgram('ipcserver.pp');
T:=P.Targets.AddExampleProgram('isockcli.pp');
T:=P.Targets.AddExampleProgram('isocksvr.pp');
T:=P.Targets.AddExampleProgram('istream.pp');
T:=P.Targets.AddExampleProgram('list.pp');
T:=P.Targets.AddExampleProgram('mstream.pp');
T:=P.Targets.AddExampleProgram('poolmm1.pp');
T:=P.Targets.AddExampleProgram('poolmm2.pp');
T:=P.Targets.AddExampleProgram('restest.pp');
T:=P.Targets.AddExampleProgram('showver.pp');
T:=P.Targets.AddExampleProgram('sockcli.pp');
T:=P.Targets.AddExampleProgram('socksvr.pp');
T:=P.Targets.AddExampleProgram('sstream.pp');
T:=P.Targets.AddExampleProgram('stringl.pp');
T:=P.Targets.AddExampleProgram('tarmakerconsgzip.pas');
T:=P.Targets.AddExampleProgram('tarmakercons.pas');
T:=P.Targets.AddExampleProgram('testapp.pp');
T:=P.Targets.AddExampleProgram('testbf.pp');
T:=P.Targets.AddExampleProgram('testbs.pp');
T:=P.Targets.AddExampleProgram('testcgi.pp');
T:=P.Targets.AddExampleProgram('testcont.pp');
T:=P.Targets.AddExampleProgram('testez.pp');
T:=P.Targets.AddExampleProgram('testhres.pp');
T:=P.Targets.AddExampleProgram('testnres.pp');
T:=P.Targets.AddExampleProgram('testol.pp');
T:=P.Targets.AddExampleProgram('testproc.pp');
T:=P.Targets.AddExampleProgram('testreg.pp');
T:=P.Targets.AddExampleProgram('testrhre.pp');
T:=P.Targets.AddExampleProgram('testrnre.pp');
T:=P.Targets.AddExampleProgram('testrsre.pp');
T:=P.Targets.AddExampleProgram('testrtf.pp');
T:=P.Targets.AddExampleProgram('testser.pp');
T:=P.Targets.AddExampleProgram('testsres.pp');
T:=P.Targets.AddExampleProgram('testtimer.pp');
T:=P.Targets.AddExampleProgram('testunzip.pp');
T:=P.Targets.AddExampleProgram('testur.pp');
T:=P.Targets.AddExampleProgram('testweb.pp');
T:=P.Targets.AddExampleProgram('testz2.pp');
T:=P.Targets.AddExampleProgram('testzip.pp');
T:=P.Targets.AddExampleProgram('testz.pp');
T:=P.Targets.AddExampleProgram('threads.pp');
T:=P.Targets.AddExampleProgram('tidea.pp');
T:=P.Targets.AddExampleProgram('tstelcmd.pp');
T:=P.Targets.AddExampleProgram('tstelgtk.pp');
T:=P.Targets.AddExampleProgram('txmlreg.pp');
T:=P.Targets.AddExampleProgram('xmldump.pp');
// example data files.
// README
// kword.xml
// overview.rtf
// showver.rc
// showver.res
// simple.xml
// parser.dat
// testcgi.html
T.ResourceStrings:=true;
{$ifndef ALLPACKAGES}
Run;

9
packages/fcl-registry/fpmake.pp
View File

@ -17,6 +17,8 @@ begin
P.Directory:='fcl-registry';
{$endif ALLPACKAGES}
P.Version:='2.2.2-0';
P.Dependencies.Add('fcl-base');
P.Dependencies.Add('fcl-xml');
P.Author := 'FPC development team';
P.License := 'LGPL with modification, ';
@ -33,16 +35,9 @@ begin
AddInclude('regdef.inc');
AddInclude('xregreg.inc');
AddInclude('regini.inc');
AddUnit('inifiles');
AddUnit('xmlreg');
end;
T:=P.Targets.AddUnit('xmlreg.pp');
with T.Dependencies do
begin
AddUnit('dom');
AddUnit('xmlread');
AddUnit('xmlwrite');
end;
P.ExamplePath.Add('examples');
P.Targets.AddExampleProgram('tests/testbasics.pp');

11
packages/fpgtk/fpmake.pp
View File

@ -24,27 +24,18 @@ begin
P.Description := 'Lightweight OOP wrapper over GTK1.';
P.NeedLibC:= True;
P.Dependencies.Add('gtk1');
P.SourcePath.Add('src');
T:=P.Targets.AddUnit('fpglib.pp');
with T.Dependencies do
begin
AddUnit('glib');
end;
T:=P.Targets.AddUnit('fpgtkext.pp');
with T.Dependencies do
begin
AddUnit('fpgtk');
AddUnit('gtk');
AddUnit('gdk');
AddUnit('glib');
end;
T:=P.Targets.AddUnit('fpgtk.pp');
with T.Dependencies do
begin
AddUnit('gtk');
AddUnit('gdk');
AddUnit('glib');
AddUnit('fpglib');
end;

2
packages/fpvectorial/fpmake.pp
View File

@ -41,7 +41,7 @@ begin
T:=P.Targets.AddImplicitUnit('pdfvrsintaticoa');
// Build unit depending on all implicit units
TBuild:=P.Targets.AddUnit('fpvectorialbuildunit.pp');
TBuild:=P.Targets.AddUnit('fpvectbuildunit.pas');
TBuild.Install:=False;
For I:=0 to P.Targets.Count-1 do
begin

3
packages/hash/fpmake.pp
View File

@ -29,13 +29,12 @@ begin
T:=P.Targets.AddUnit('src/sha1.pp');
T:=P.Targets.AddUnit('src/crc.pas');
T:=P.Targets.AddUnit('src/ntlm.pas');
T:=P.Targets.AddUnit('src/sha1.pas');
T:=P.Targets.AddUnit('src/uuid.pas');
T:=P.Targets.AddUnit('src/unixcrypt.pas');
T.OSes:=[Linux];
T:=P.Targets.AddExampleunit('examples/mdtest.pas');
T:=P.Targets.AddExampleunit('examples/crctest.pas');
T:=P.Targets.AddExampleunit('examples/sha1test.pas');
T:=P.Targets.AddExampleunit('examples/sha1test.pp');
// md5.ref
{$ifndef ALLPACKAGES}
Run;

7
packages/libpng/fpmake.pp
View File

@ -17,15 +17,10 @@ begin
P.Directory:='libpng';
{$endif ALLPACKAGES}
P.Version:='2.2.2-0';
P.Dependencies.Add('zlib');
P.SourcePath.Add('src');
T:=P.Targets.AddUnit('png.pp');
with T.Dependencies do
begin
AddUnit('zlib');
end;
{$ifndef ALLPACKAGES}
Run;
end;

13
packages/ptc/fpmake.pp
View File

@ -37,6 +37,9 @@ begin
P.IncludePath.Add('src/wince',[wince]);
P.IncludePath.Add('src/x11',AllUnixOSes);
P.Dependencies.Add('hermes');
P.Dependencies.Add('x');
T:=P.Targets.AddUnit('ptc.pp');
with T.Dependencies do
begin
@ -95,16 +98,6 @@ begin
AddInclude('x11dga2displayi.inc',allunixoses);
AddInclude('x11consolei.inc',allunixoses);
AddInclude('consolei.inc');
AddUnit('hermes');
AddUnit('x',AllUnixOSes);
AddUnit('xlib',AllUnixOSes);
AddUnit('xutil',AllUnixOSes);
AddUnit('xatom',AllUnixOSes);
AddUnit('keysym',AllUnixOSes);
AddUnit('xrandr',AllUnixOSes);
AddUnit('xf86vmode',AllUnixOSes);
AddUnit('xf86dga',AllUnixOSes);
AddUnit('xshm',AllUnixOSes);
AddUnit('directdr',[Win32,win64]);
AddUnit('p_gx',[Wince]);
AddUnit('textfx2',[Go32v2]);

7
packages/sdl/fpmake.pp
View File

@ -62,8 +62,6 @@ begin
with T.Dependencies do
begin
AddInclude('jedi-sdl.inc');
AddUnit('pthreads');
AddUnit('xlib');
end;
T:=P.Targets.AddUnit('sdl_ttf.pas');
with T.Dependencies do
@ -71,11 +69,10 @@ begin
AddInclude('jedi-sdl.inc');
AddUnit('sdl');
end;
T:=P.Targets.AddUnit('sdlutils.pas');
T:=P.Targets.AddUnit('sdlutils.pas',[i386,powerpc],[linux,freebsd,win32,darwin]);
with T.Dependencies do
begin
AddInclude('jedi-sdl.inc');
AddUnit('xlib');
AddUnit('sdl');
end;
T:=P.Targets.AddUnit('smpeg.pas');
@ -98,4 +95,4 @@ end.

2
packages/unzip/fpmake.pp
View File

@ -19,7 +19,7 @@ begin
P.Version:='2.2.2-0';
P.SourcePath.Add('src');
T:=P.Targets.AddUnit('unzip.pp');
T:=P.Targets.AddUnit('unzip51g.pp');
with T.Dependencies do
begin
AddUnit('ziptypes');

2
packages/xforms/fpmake.pp
View File

@ -25,8 +25,6 @@ begin
with T.Dependencies do
begin
AddInclude('cursorfont.inc');
AddUnit('xlib');
AddUnit('xresource');
end;

4
packages/zorba/fpmake.pp
View File

@ -29,14 +29,14 @@ begin
T:=P.Targets.AddUnit('zorbadyn.pas');
with T.Dependencies do
begin
AddUnit('xqc.pas');
AddUnit('xqc');
AddInclude('zorba.inc');
AddInclude('zorba_options.inc');
end;
T:=P.Targets.AddUnit('zorba.pas');
with T.Dependencies do
begin
AddUnit('xqc.pas');
AddUnit('xqc');
AddInclude('zorba.inc');
AddInclude('zorba_options.inc');
end;