Fixed fpmake.pp files:

 * 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: http://svn.freepascal.org/svn/fpc/trunk@15148 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 7 insertions, 151 deletions

diff --git a/packages/fcl-extra/fpmake.pp b/packages/fcl-extra/fpmake.pp
index 2c8982fb1f..bc7856d26c 100644
--- a/packages/fcl-extra/fpmake.pp
+++ b/packages/fcl-extra/fpmake.pp
@@ -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;