* split packages in multiple procedures to prevent

    procedure too complex
  * use separate includes so they can be regenerated
    with simple unix commands that are listed in fpmake.pp


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@12162 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 20 insertions, 109 deletions

diff --git a/packages/fpmake.pp b/packages/fpmake.pp
index 421314d376..a37edfca94 100644
--- a/packages/fpmake.pp
+++ b/packages/fpmake.pp
@@ -9,122 +9,33 @@ Var
   PBuild,P : TPackage;
   D : TDependency;
   I : Integer;
-begin
-  With Installer do
-    begin
 
 (*
-The include lines below are generated with the following command:
 
-/bin/ls -1 */fpmake.pp | sed 's+\(.*\)+{$include \1}+'
-*)
+The include files are generated with the following commands:
 
-{$include a52/fpmake.pp}
+/bin/ls -1 */fpmake.pp | awk -F '/' '/fpmake.pp/ { printf "procedure add_%s;\nbegin\n  with Installer do\n{$include %s}\nend;\n\n",gensub("-","_","g",$1),$0; }' > fpmake_proc.inc
+/bin/ls -1 */fpmake.pp | awk -F '/' '/fpmake.pp/ { printf "  add_%s;\n",gensub("-","_","g",$1); }' > fpmake_add.inc
 
-{$include aspell/fpmake.pp}
-{$include bfd/fpmake.pp}
-{$include bzip2/fpmake.pp}
-{$include cairo/fpmake.pp}
-{$include cdrom/fpmake.pp}
-{$include chm/fpmake.pp}
-{$include dbus/fpmake.pp}
-{$include dts/fpmake.pp}
-{$include fcl-async/fpmake.pp}
-{$include fcl-base/fpmake.pp}
-{$include fcl-db/fpmake.pp}
-{$include fcl-fpcunit/fpmake.pp}
-{$include fcl-image/fpmake.pp}
-{$include fcl-json/fpmake.pp}
-{$include fcl-net/fpmake.pp}
-{$include fcl-passrc/fpmake.pp}
-{$include fcl-process/fpmake.pp}
-{$include fcl-registry/fpmake.pp}
-{$include fcl-res/fpmake.pp}
-{$include fcl-web/fpmake.pp}
-{$include fcl-xml/fpmake.pp}
-{$include fftw/fpmake.pp}
-{$include fpgtk/fpmake.pp}
-{$include fpmkunit/fpmake.pp}
-{$include fv/fpmake.pp}
-{$include gdbint/fpmake.pp}
-{$include gdbm/fpmake.pp}
-{$include ggi/fpmake.pp}
-{$include gnome1/fpmake.pp}
-{$include graph/fpmake.pp}
-{$include gtk1/fpmake.pp}
-{$include gtk2/fpmake.pp}
-{$include hash/fpmake.pp}
-{$include hermes/fpmake.pp}
-{$include httpd13/fpmake.pp}
-{$include httpd20/fpmake.pp}
-{$include httpd22/fpmake.pp}
-{$include ibase/fpmake.pp}
-{$include iconvenc/fpmake.pp}
-{$include imagemagick/fpmake.pp}
-{$include imlib/fpmake.pp}
-{$include ldap/fpmake.pp}
-{$include libc/fpmake.pp}
-{$include libcurl/fpmake.pp}
-{$include libgbafpc/fpmake.pp}
-{$include libgd/fpmake.pp}
-{$include libndsfpc/fpmake.pp}
-{$include libpng/fpmake.pp}
-{$include libxml/fpmake.pp}
-{$include lua/fpmake.pp}
-{$include mad/fpmake.pp}
-{$include matroska/fpmake.pp}
-{$include modplug/fpmake.pp}
-{$include mysql/fpmake.pp}
-{$include ncurses/fpmake.pp}
-{$include newt/fpmake.pp}
-{$include numlib/fpmake.pp}
-{$include odbc/fpmake.pp}
-{$include oggvorbis/fpmake.pp}
-{$include openal/fpmake.pp}
-{$include opengl/fpmake.pp}
-{$include openssl/fpmake.pp}
-{$include oracle/fpmake.pp}
-{$include os2units/fpmake.pp}
-{$include palmunits/fpmake.pp}
-{$include pasjpeg/fpmake.pp}
-{$include paszlib/fpmake.pp}
-{$include pcap/fpmake.pp}
-{$include postgres/fpmake.pp}
-{$include ptc/fpmake.pp}
-{$include pthreads/fpmake.pp}
-{$include pxlib/fpmake.pp}
-{$include regexpr/fpmake.pp}
-{$include rexx/fpmake.pp}
-{$include sdl/fpmake.pp}
-{$include sndfile/fpmake.pp}
-{$include sqlite/fpmake.pp}
-{$include svgalib/fpmake.pp}
-{$include symbolic/fpmake.pp}
-{$include syslog/fpmake.pp}
-{$include tcl/fpmake.pp}
-{$include univint/fpmake.pp}
-{$include unixutil/fpmake.pp}
-{$include unzip/fpmake.pp}
-{$include users/fpmake.pp}
-{$include utmp/fpmake.pp}
-{$include uuid/fpmake.pp}
-{$include winunits-base/fpmake.pp}
-{$include winunits-jedi/fpmake.pp}
-{$include x11/fpmake.pp}
-{$include xforms/fpmake.pp}
-{$include zlib/fpmake.pp}
+*)
 
-{$include amunits/fpmake.pp}
+{$include fpmake_proc.inc}
 
-    // Create fpc-all package
-    PBuild:=AddPackage('fpc-all');
-    PBuild.Version:='2.2.2-0';
-    for i:=0 to Packages.Count-1 do
-      begin
-        P:=Packages.PackageItems[i];
-        D:=PBuild.Dependencies.Add(P.Name);
-      end;
+begin
+{$include fpmake_add.inc}
 
-    Run;
+  With Installer do
+    begin
+      // Create fpc-all package
+      PBuild:=AddPackage('fpc-all');
+      PBuild.Version:='2.2.2-0';
+      for i:=0 to Packages.Count-1 do
+        begin
+          P:=Packages.PackageItems[i];
+          if P.Name<>'fpc-all' then
+            D:=PBuild.Dependencies.Add(P.Name);
+        end;
+
+      Run;
     end;
 end.