--- Merging r19376 into '.':

U    packages/fcl-image/fpmake.pp
--- Recording mergeinfo for merge of r19376 into '.':
 U   .
--- Merging r19980 into '.':
U    packages/sdl/fpmake.pp
--- Recording mergeinfo for merge of r19980 into '.':
 G   .
--- Merging r19981 into '.':
G    packages/sdl/fpmake.pp
--- Recording mergeinfo for merge of r19981 into '.':
 G   .
--- Merging r19982 into '.':
U    packages/fcl-xml/fpmake.pp
--- Recording mergeinfo for merge of r19982 into '.':
 G   .
--- Merging r19984 into '.':
U    packages/fcl-db/fpmake.pp
U    packages/fpmake_proc.inc
--- Recording mergeinfo for merge of r19984 into '.':
 G   .
--- Merging r19985 into '.':
U    packages/fv/fpmake.pp
--- Recording mergeinfo for merge of r19985 into '.':
 G   .
--- Merging r19989 into '.':
U    packages/univint/fpmake.pp
--- Recording mergeinfo for merge of r19989 into '.':
 G   .
--- Merging r19990 into '.':
U    packages/gdbint/fpmake.pp
--- Recording mergeinfo for merge of r19990 into '.':
 G   .
--- Merging r19991 into '.':
G    packages/univint/fpmake.pp
--- Recording mergeinfo for merge of r19991 into '.':
 G   .
--- Merging r20002 into '.':
U    packages/graph/fpmake.pp
--- Recording mergeinfo for merge of r20002 into '.':
 G   .
--- Merging r20007 into '.':
U    packages/cocoaint/fpmake.pp
--- Recording mergeinfo for merge of r20007 into '.':
 G   .
--- Merging r20017 into '.':
U    packages/libgbafpc/fpmake.pp
U    packages/libndsfpc/fpmake.pp
--- Recording mergeinfo for merge of r20017 into '.':
 G   .
--- Merging r20019 into '.':
G    packages/libndsfpc/fpmake.pp
--- Recording mergeinfo for merge of r20019 into '.':
 G   .
--- Merging r20029 into '.':
G    packages/fpmake_proc.inc
U    packages/fpmake_add.inc
A    packages/fppkg/fpmake.pp
--- Recording mergeinfo for merge of r20029 into '.':
 G   .
--- Merging r20030 into '.':
U    packages/fcl-fpcunit/fpmake.pp
--- Recording mergeinfo for merge of r20030 into '.':
 G   .
--- Merging r20034 into '.':
U    packages/pxlib/fpmake.pp
--- Recording mergeinfo for merge of r20034 into '.':
 G   .

git-svn-id: branches/fixes_2_6@25439 -

.gitattributes

@@ -2828,6 +2828,7 @@ packages/fpmkunit/fpmake.pp svneol=native#text/plain
 packages/fpmkunit/src/fpmkunit.pp svneol=native#text/plain
 packages/fppkg/Makefile svneol=native#text/plain
 packages/fppkg/Makefile.fpc svneol=native#text/plain
+packages/fppkg/fpmake.pp svneol=native#text/plain
 packages/fppkg/src/fpmkunitsrc.inc svneol=native#text/plain
 packages/fppkg/src/fprepos.pp svneol=native#text/plain
 packages/fppkg/src/fpxmlrep.pp svneol=native#text/plain

packages/cocoaint/fpmake.pp

@@ -21,12 +21,12 @@ begin
     P.Dependencies.Add('univint');
     P.SourcePath.Add('src');
 
-    T:=P.Targets.AddUnit('CocoaAll.pp');
-    T:=P.Targets.AddUnit('WebKit.pp');
-    T:=P.Targets.AddUnit('CoreData.pp');
+    T:=P.Targets.AddUnit('CocoaAll.pas');
+    T:=P.Targets.AddUnit('WebKit.pas');
+    T:=P.Targets.AddUnit('CoreData.pas');
 
-    T:=P.Targets.AddImplicitUnit('AnonClassDefinitionsQuartzcore.pp');
-    T:=P.Targets.AddImplicitUnit('AnonClassDefinitionsWebkit.pp');
+    T:=P.Targets.AddImplicitUnit('AnonClassDefinitionsQuartzcore.pas');
+    T:=P.Targets.AddImplicitUnit('AnonClassDefinitionsWebkit.pas');
 
 {$ifndef ALLPACKAGES}
     Run;

packages/fcl-db/fpmake.pp

@@ -3,6 +3,9 @@
 program fpmake;
 
 uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_fcl_db;
 
 const
   ParadoxOSes         = [beos,haiku,linux,freebsd,netbsd,openbsd,win32];
@@ -19,8 +22,6 @@ Var
 begin
   With Installer do
     begin
-{$endif ALLPACKAGES}
-
     P:=AddPackage('fcl-db');
 
     P.Author := '<various>';
@@ -734,11 +735,16 @@ begin
     // database.ini.txt
     // README.txt
 
-{$ifndef ALLPACKAGES}
-    Run;
     end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_fcl_db;
+  Installer.Run;
 end.
 {$endif ALLPACKAGES}
 
 
 
+

packages/fcl-fpcunit/fpmake.pp

@@ -105,9 +105,9 @@ begin
           AddUnit('fpcunit');
           AddUnit('fpcunitreport');
           AddUnit('testutils');
-          AddUnit('xmltestreport.pp');
-          AddUnit('latextestreport.pp');
-          AddUnit('plaintestreport.pp');
+          AddUnit('xmltestreport');
+          AddUnit('latextestreport');
+          AddUnit('plaintestreport');
         end;
 
 {$ifndef ALLPACKAGES}

packages/fcl-image/fpmake.pp

@@ -221,14 +221,14 @@ begin
         begin
           AddUnit('fpimage');
         end;
-    T:=P.Targets.AddUnit('freetypeh.pp',[solaris,iphonesim,darwin,freebsd,linux,haiku,beos,win32,win64]);
-    T:=P.Targets.AddUnit('freetype.pp',[solaris,iphonesim,darwin,freebsd,linux,haiku,beos,win32,win64]);
+    T:=P.Targets.AddUnit('freetypeh.pp',[solaris,iphonesim,darwin,freebsd,openbsd,linux,haiku,beos,win32,win64]);
+    T:=P.Targets.AddUnit('freetype.pp',[solaris,iphonesim,darwin,freebsd,openbsd,linux,haiku,beos,win32,win64]);
       with T.Dependencies do
         begin
           AddUnit('freetypeh');
           AddUnit('fpimgcmn');
         end;
-    T:=P.Targets.AddUnit('ftfont.pp',[solaris,iphonesim,darwin,freebsd,linux,haiku,beos,win32,win64]);
+    T:=P.Targets.AddUnit('ftfont.pp',[solaris,iphonesim,darwin,freebsd,openbsd,linux,haiku,beos,win32,win64]);
       with T.Dependencies do
         begin
           AddUnit('fpcanvas');

packages/fcl-xml/fpmake.pp

@@ -144,7 +144,6 @@ begin
         begin
           AddUnit('xmlread');
         end;
-    T.ResourceStrings:=True;
     T:=P.Targets.AddUnit('dtdmodel.pp');
       with T.Dependencies do
         begin

packages/fpmake_add.inc

@@ -28,6 +28,7 @@
   add_fftw;
   add_fpgtk;
   add_fpmkunit;
+  add_fppkg;
   add_fv;
   add_gdbint;
   add_gdbm;

packages/fpmake_proc.inc

@@ -82,11 +82,7 @@ begin
 {$include fcl-base/fpmake.pp}
 end;
 
-procedure add_fcl_db;
-begin
-  with Installer do
 {$include fcl-db/fpmake.pp}
-end;
 
 procedure add_fcl_extra;
 begin
@@ -178,6 +174,8 @@ begin
 {$include fpmkunit/fpmake.pp}
 end;
 
+{$include fppkg/fpmake.pp}
+
 procedure add_fv;
 begin
   with Installer do

packages/fppkg/fpmake.pp

@@ -0,0 +1,97 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit, sysutils;
+{$endif ALLPACKAGES}
+
+procedure add_fppkg;
+
+const
+  TargetsWithWGet = [linux,beos,haiku,freebsd,netbsd,openbsd,darwin,iphonesim,solaris,win32,win64,wince];
+  TargetsWithfpWeb = TargetsWithWGet;
+
+Var
+  T : TTarget;
+  P : TPackage;
+  Data2Inc : string;
+  HostOS: TOS;
+begin
+  AddCustomFpmakeCommandlineOption('data2inc', 'Use indicated data2inc executable.');
+  AddCustomFpmakeCommandlineOption('genfpmkunit', 'Regenerate the fpmkunitsrc.inc file (fppkg).');
+
+  With Installer do
+    begin
+
+    P:=AddPackage('fppkg');
+{$ifdef ALLPACKAGES}
+    P.Directory:='fppkg';
+{$endif ALLPACKAGES}
+
+    P.Version:='2.7.1';
+    P.Dependencies.Add('fcl-base');
+    P.Dependencies.Add('fcl-xml');
+    P.Dependencies.Add('fcl-process');
+    P.Dependencies.Add('paszlib');
+    P.Dependencies.Add('httpd22');
+
+    P.Dependencies.Add('univint',[MacOSX,iphonesim]);
+    P.Dependencies.Add('fcl-net', TargetsWithfpWeb);
+    P.Dependencies.Add('fcl-web', TargetsWithfpWeb);
+
+    P.Author := 'FreePascal development team';
+    P.License := 'LGPL with modification, ';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'Libraries to create fppkg package managers.';
+    P.NeedLibC:= false;
+
+    P.SourcePath.Add('src');
+
+    T:=P.Targets.AddUnit('fprepos.pp');
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('fpxmlrep.pp');
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('pkgrepos.pp');
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('pkgmessages.pp');
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('pkgoptions.pp');
+    T:=P.Targets.AddUnit('pkgglobals.pp');
+    T:=P.Targets.AddUnit('pkghandler.pp');
+    T:=P.Targets.AddUnit('pkgmkconv.pp');
+    T:=P.Targets.AddUnit('pkgdownload.pp');
+    T:=P.Targets.AddUnit('pkgfpmake.pp');
+    T:=P.Targets.AddUnit('pkgcommands.pp');
+
+    T:=P.Targets.AddUnit('pkgwget.pp', TargetsWithWGet);
+    T:=P.Targets.AddUnit('pkgfphttp.pp', TargetsWithfpWeb);
+
+    // Do not re-generate fpmkunitsrc.inc by default so it is possible to control
+    // when we want to update the internal fpmkunitsrc
+    if GetCustomFpmakeCommandlineOptionValue('genfpmkunit') <> '' then
+      begin
+      Data2Inc := GetCustomFpmakeCommandlineOptionValue('data2inc');
+      if Data2Inc<>'' then
+        Data2Inc:= ExpandFileName(Data2Inc);
+      if Data2Inc='' then
+        begin
+        HostOS:=StringToOS({$I %FPCTARGETOS%});
+        data2inc := ExeSearch(AddProgramExtension('data2inc', HostOS));
+        end;
+      if Data2Inc <> '' then
+        P.Commands.AddCommand(Data2Inc,'-b -s $(SOURCE) $(DEST) fpmkunitsrc','src/fpmkunitsrc.inc','../fpmkunit/src/fpmkunit.pp');
+      end;
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_fppkg;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}

packages/fv/fpmake.pp

@@ -51,6 +51,7 @@ begin
           AddUnit('app');
         end;
     T:=P.Targets.AddUnit('buildfv.pas');
+    T.Install := false; // Build-unit
       with T.Dependencies do
         begin
           AddUnit('fvcommon');

packages/gdbint/fpmake.pp

@@ -133,6 +133,8 @@ begin
     P.Description := 'Interface to libgdb, the GDB debugger in library format';
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
 
+    P.OSes:=[beos,haiku,freebsd,netbsd,openbsd,linux,win32,win64,go32v2];
+
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 

packages/graph/fpmake.pp

@@ -29,6 +29,7 @@ begin
 
     P.Dependencies.Add('sdl',[i386,powerpc],[win32,linux,freebsd,darwin]);
     P.Dependencies.Add('ptc',[win32,win64,linux]);
+
     // Dependencies for ptc, due to fpcmake bug:
     P.Dependencies.Add('fcl-base',[win32,win64,linux]);
     P.Dependencies.Add('x11',[win32,win64,linux]);
@@ -59,7 +60,22 @@ begin
           AddInclude('fills.inc');
           AddInclude('gtext.inc');
         end;
-    T:=P.Targets.AddUnit('graph.pp');
+    // Graph unit Linux/i386
+    T:=P.Targets.AddUnit('graph.pp',[i386],[linux]);
+      with T.Dependencies do
+        begin
+          AddInclude('graphh.inc');
+          AddInclude('graph.inc');
+          AddInclude('fontdata.inc');
+          AddInclude('clip.inc');
+          AddInclude('palette.inc');
+          AddInclude('modes.inc');
+          AddInclude('fills.inc');
+          AddInclude('gtext.inc');
+          AddInclude('graph16.inc',[freebsd,linux]);
+        end;
+    // Graph unit other targets
+    T:=P.Targets.AddUnit('graph.pp',[go32v2,amiga,win32,win64,freebsd]);
       with T.Dependencies do
         begin
           AddInclude('graphh.inc');
@@ -72,6 +88,7 @@ begin
           AddInclude('gtext.inc');
           AddInclude('graph16.inc',[freebsd,linux]);
         end;
+
     T:=P.Targets.AddUnit('src/sdlgraph/sdlgraph.pp',[i386,powerpc],[win32,linux,freebsd,darwin]);
       with T.Dependencies do
         begin
@@ -84,12 +101,12 @@ begin
           AddInclude('fills.inc');
           AddInclude('gtext.inc');
         end;
-    T:=P.Targets.AddUnit('wincrt.pp',[win32]);
+    T:=P.Targets.AddUnit('wincrt.pp',[win32, win64]);
       with T.Dependencies do
         begin
           AddUnit('graph');
         end;
-    T:=P.Targets.AddUnit('winmouse.pp',[win32]);
+    T:=P.Targets.AddUnit('winmouse.pp',[win32, win64]);
       with T.Dependencies do
         begin
           AddUnit('graph');

packages/libgbafpc/fpmake.pp

@@ -14,14 +14,62 @@ begin
 
     P:=AddPackage('libgbafpc');
     P.OSes:=[gba];
+    P.CPUs:=[arm];
 {$ifdef ALLPACKAGES}
     P.Directory:='libgbafpc';
 {$endif ALLPACKAGES}
     P.Version:='2.6.3';
+    P.Author := 'Library: libgba and maxmod from devkitARM; headers: Francesco Lombardi';
+    P.License := 'LGPL';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'Some libraries for Nintendo Gameboy Advance.';
+    P.NeedLibC:= false;
+
     P.SourcePath.Add('src');
-//    P.Dependencies.Add('x11');
+    T:=P.Targets.AddUnit('gba.pp');
+     T.IncludePath.Add('src/gba');
+     with T.Dependencies do
+     begin
+       AddInclude('BoyScout.inc');
+       AddInclude('core_asm.as');
+       AddInclude('disc.inc');
+       AddInclude('disc_io.inc');
+       AddInclude('dldi.inc');
+       AddInclude('fade.inc');
+       AddInclude('gba.inc');
+       AddInclude('gba_affine.inc');
+       AddInclude('gba_base.inc');
+       AddInclude('gba_compression.inc');
+       AddInclude('gba_console.inc');
+       AddInclude('gba_dma.inc');
+       AddInclude('gba_helper.inc');
+       AddInclude('gba_input.inc');
+       AddInclude('gba_interrupt.inc');
+       AddInclude('gba_multiboot.inc');
+       AddInclude('gba_sio.inc');
+       AddInclude('gba_sound.inc');
+       AddInclude('gba_sprites.inc');
+       AddInclude('gba_systemcalls.inc');
+       AddInclude('gba_timers.inc');
+       AddInclude('gba_types.inc');
+       AddInclude('gba_video.inc');
+       AddInclude('helper.inc');
+       AddInclude('mappy.inc');
+       AddInclude('mbv2.inc');
+       AddInclude('pcx.inc');
+     end;
+
+
+    P.SourcePath.Add('src/maxmod');
+    T:=P.Targets.AddUnit('maxmod.pp');
+     T.IncludePath.Add('src/maxmod/inc');
+     with T.Dependencies do
+     begin
+       AddInclude('maxmod.inc');
+       AddInclude('mm_types.inc');
+     end;
 
-    // not linux compilable, skip
 
 {$ifndef ALLPACKAGES}
     Run;

packages/libndsfpc/fpmake.pp

@@ -14,14 +14,133 @@ begin
 
     P:=AddPackage('libndsfpc');
     P.OSes:=[nds];
+    P.CPUs:=[arm];
 {$ifdef ALLPACKAGES}
     P.Directory:='libndsfpc';
 {$endif ALLPACKAGES}
     P.Version:='2.6.3';
+    P.Author := 'Library: libnds, dswifi, maxmod and gl2d from devkitARM; headers: Francesco Lombardi';
+    P.License := 'LGPL';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'Some libraries for Nintendo DS.';
+    P.NeedLibC:= false;
+
     P.SourcePath.Add('src');
-//    P.Dependencies.Add('x11');
+    
+    T:=P.Targets.AddUnit('nds9.pp');
+    T:=P.Targets.AddUnit('nds7.pp');
+     T.IncludePath.Add('src/nds');
+     with T.Dependencies do
+     begin
+       AddInclude('bios.inc');
+       AddInclude('card.inc');
+       AddInclude('debug.inc');
+       AddInclude('disc_io.inc');
+       AddInclude('dma.inc');
+       AddInclude('fifocommon.inc');
+       AddInclude('fifomessages.inc');
+       AddInclude('helper.inc');
+       AddInclude('input.inc');
+       AddInclude('interrupts.inc');
+       AddInclude('ipc.inc');
+       AddInclude('jtypes.inc');
+       AddInclude('memory.inc');
+       AddInclude('nds.inc');
+       AddInclude('ndsinclude.inc');
+       AddInclude('ndstypes.inc');
+       AddInclude('registers_alt.inc');
+       AddInclude('system.inc');
+       AddInclude('timers.inc');
+       AddInclude('touch.inc');
+     end;    
+     T.IncludePath.Add('src/nds/arm7');
+     with T.Dependencies do
+     begin
+       AddInclude('audio.inc');
+       AddInclude('clock.inc');
+       AddInclude('i2c.inc');
+       AddInclude('input.inc');
+       AddInclude('sdmmc.inc');
+       AddInclude('serial.inc');
+       AddInclude('touch.inc');
+     end;    
+     T.IncludePath.Add('src/nds/arm9');
+     with T.Dependencies do
+     begin
+       AddInclude('background.inc');
+       AddInclude('boxtest.inc');
+       AddInclude('cache.inc');
+       AddInclude('console.inc');
+       AddInclude('decompress.inc');
+       AddInclude('dldi.inc');
+       AddInclude('dynamicArray.inc');
+       AddInclude('exceptions.inc');
+       AddInclude('guitarGrip.inc');
+       AddInclude('image.inc');
+       AddInclude('input.inc');
+       AddInclude('keyboard.inc');
+       AddInclude('linkedlist.inc');
+       AddInclude('math.inc');
+       AddInclude('ndsmotion.inc');
+       AddInclude('paddle.inc');
+       AddInclude('pcx.inc');
+       AddInclude('piano.inc');
+       AddInclude('postest.inc');
+       AddInclude('rumble.inc');
+       AddInclude('sassert.inc');
+       AddInclude('sound.inc');
+       AddInclude('sprite.inc');
+       AddInclude('trig_lut.inc');
+       AddInclude('video.inc');
+       AddInclude('videoGL.inc');
+     end;    
+
+    // dswifi
+    P.SourcePath.Add('src/dswifi');
+    T:=P.Targets.AddUnit('dswifi9.pp');
+    T:=P.Targets.AddUnit('dswifi7.pp');
+     T.IncludePath.Add('src/dswifi/inc');
+     with T.Dependencies do
+     begin
+       AddInclude('dswifi_version.inc');
+       AddInclude('dswifi9.inc');
+       AddInclude('dswifi7.inc');
+       AddInclude('netdb.inc');
+       AddInclude('sgIp_errno.inc');
+     end;
+     T.IncludePath.Add('src/dswifi/inc/netinet');
+       T.Dependencies.AddInclude('in.inc');
+     T.IncludePath.Add('src/dswifi/inc/sys');
+       T.Dependencies.AddInclude('socket.inc');
+
+    // fat
+    P.SourcePath.Add('src/fat');
+    T:=P.Targets.AddUnit('fat.pp');
+     T.IncludePath.Add('src/fat');
+     T.Dependencies.AddInclude('fat.inc');
+    T:=P.Targets.AddUnit('filesystem.pp');
+     T.IncludePath.Add('src/fat');
+     T.Dependencies.AddInclude('filesystem.inc');
+
+    // gl2d
+    P.SourcePath.Add('src/gl2d');
+    T:=P.Targets.AddUnit('gl2d.pp');
 
-    // not linux compilable, skip
+    // maxmod
+    P.SourcePath.Add('src/maxmod');
+    T:=P.Targets.AddUnit('maxmod9.pp');
+    T:=P.Targets.AddUnit('maxmod7.pp');
+     T.IncludePath.Add('src/maxmod/inc');
+     with T.Dependencies do
+     begin
+       AddInclude('maxmod.inc');
+       AddInclude('maxmod7.inc');
+       AddInclude('maxmod9.inc');
+       AddInclude('mm_mas.inc');
+       AddInclude('mm_msl.inc');
+       AddInclude('mm_types.inc');
+     end;
 
 {$ifndef ALLPACKAGES}
     Run;

packages/pxlib/fpmake.pp

@@ -15,12 +15,10 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='pxlib';
 {$endif ALLPACKAGES}
-    P.OSes:=[Linux,beos,win32,darwin,freebsd,openbsd,netbsd];
+    P.OSes:=[Linux,beos,win32,darwin,iphonesim,freebsd,openbsd,netbsd];
     P.Version:='2.6.3';
     T:=P.Targets.AddUnit('src/pxlib.pp');
-      T.OSes:=[Linux,beos,win32,darwin,freebsd,openbsd,netbsd];
     T:=P.Targets.AddExampleunit('examples/ppxview.pp');
-      T.OSes:=[Linux,beos,win32,darwin,freebsd,openbsd,netbsd];
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/sdl/fpmake.pp

@@ -19,8 +19,8 @@ begin
     P.Version:='2.6.3';
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
-    P.Dependencies.Add('x11');
-    P.Dependencies.Add('pthreads');
+    P.Dependencies.Add('x11',AllUnixOSes);
+    P.Dependencies.Add('pthreads',AllUnixOSes);
 
     T:=P.Targets.AddUnit('logger.pas');
       with T.Dependencies do
@@ -69,7 +69,7 @@ begin
           AddInclude('jedi-sdl.inc');
           AddUnit('sdl');
         end;
-    T:=P.Targets.AddUnit('sdlutils.pas',[i386,powerpc],[linux,freebsd,win32,darwin]);
+    T:=P.Targets.AddUnit('sdlutils.pas',[i386,powerpc],[linux,freebsd,win32,darwin,iphonesim]);
       with T.Dependencies do
         begin
           AddInclude('jedi-sdl.inc');

packages/univint/fpmake.pp

@@ -20,6 +20,8 @@ begin
     P.SourcePath.Add('src');
     P.OSes:=[darwin,iphonesim];
     P.Options.Add('-Mmacpas');
+
+    P.SupportBuildModes:=[bmOneByOne];
   T:=P.Targets.AddImplicitUnit('ABActions.pas');
     with T.Dependencies do
       begin
@@ -53,7 +55,6 @@ begin
         AddUnit('cfarray');
         AddUnit('cggeometry');
         AddUnit('drag');
-        AddUnit('hiobjectcore');
         AddUnit('higeometry');
       end;
   T:=P.Targets.AddImplicitUnit('ABTypedefs.pas');
@@ -784,7 +785,6 @@ begin
         AddUnit('mactypes');
         AddUnit('cfbase');
         AddUnit('cfstring');
-        AddUnit('cmtypes');
         AddUnit('cgbase');
         AddUnit('cgdataprovider');
       end;
@@ -1136,8 +1136,6 @@ begin
     with T.Dependencies do
       begin
         AddUnit('mactypes');
-        AddUnit('cmtypes');
-        AddUnit('cmapplication');
         AddUnit('events');
       end;
   T:=P.Targets.AddImplicitUnit('CarbonEvents.pas');
@@ -1150,7 +1148,6 @@ begin
         AddUnit('axuielement');
         AddUnit('drag');
         AddUnit('cfarray');
-        AddUnit('hiobjectcore');
         AddUnit('events');
         AddUnit('menus');
         AddUnit('controls');
@@ -1184,11 +1181,8 @@ begin
     with T.Dependencies do
       begin
         AddUnit('mactypes');
-        AddUnit('cmtypes');
-        AddUnit('cmiccprofile');
         AddUnit('mixedmode');
         AddUnit('quickdraw');
-        AddUnit('cmapplication');
         AddUnit('events');
       end;
   T:=P.Targets.AddImplicitUnit('Components.pas');
@@ -1381,11 +1375,9 @@ begin
       begin
         AddUnit('mactypes');
         AddUnit('quickdraw');
-        AddUnit('cmtypes');
         AddUnit('aedatamodel');
         AddUnit('conditionalmacros');
         AddUnit('components');
-        AddUnit('cmapplication');
         AddUnit('appleevents');
         AddUnit('events');
         AddUnit('processes');
@@ -1558,7 +1550,6 @@ begin
         AddUnit('cfbundle');
         AddUnit('events');
         AddUnit('carbonevents');
-        AddUnit('hiobjectcore');
         AddUnit('axuielement');
         AddUnit('cfdictionary');
         AddUnit('carboneventscore');
@@ -1605,7 +1596,6 @@ begin
         AddUnit('cgimage');
         AddUnit('icons');
         AddUnit('menus');
-        AddUnit('hiobjectcore');
         AddUnit('quickdraw');
       end;
   T:=P.Targets.AddImplicitUnit('HIToolbox.pas');
@@ -1738,7 +1728,6 @@ begin
         AddUnit('dialogs');
         AddUnit('quickdraw');
         AddUnit('components');
-        AddUnit('gxtypes');
         AddUnit('imagecompression');
         AddUnit('movies');
       end;
@@ -1836,7 +1825,6 @@ begin
         AddUnit('menus');
         AddUnit('cgcontext');
         AddUnit('quickdraw');
-        AddUnit('hiobjectcore');
         AddUnit('textcommon');
         AddUnit('cfbase');
         AddUnit('cfdictionary');
@@ -1874,319 +1862,6 @@ begin
       end;
   T:=P.Targets.AddUnit('MacOS.pas');
     T.Install:=false;
-    with T.Dependencies do
-      begin
-        AddUnit('abactions');
-        AddUnit('abaddressbook');
-        AddUnit('abglobals');
-        AddUnit('abpeoplepicker');
-        AddUnit('abtypedefs');
-        AddUnit('aedatamodel');
-        AddUnit('aehelpers');
-        AddUnit('aeinteraction');
-        AddUnit('aemach');
-        AddUnit('aeobjects');
-        AddUnit('aepackobject');
-        AddUnit('aeregistry');
-        AddUnit('aeusertermtypes');
-        AddUnit('aiff');
-        AddUnit('asdebugging');
-        AddUnit('asregistry');
-        AddUnit('atsfont');
-        AddUnit('atslayouttypes');
-        AddUnit('atstypes');
-        AddUnit('atsunicodedirectaccess');
-        AddUnit('atsunicodedrawing');
-        AddUnit('atsunicodeflattening');
-        AddUnit('atsunicodefonts');
-        AddUnit('atsunicodeglyphs');
-        AddUnit('atsunicodeobjects');
-        AddUnit('atsunicodetypes');
-        AddUnit('avltree');
-        AddUnit('axactionconstants');
-        AddUnit('axattributeconstants');
-        AddUnit('axerrors');
-        AddUnit('axnotificationconstants');
-        AddUnit('axroleconstants');
-        AddUnit('axtextattributedstring');
-        AddUnit('axuielement');
-        AddUnit('axvalue');
-        AddUnit('axvalueconstants');
-        AddUnit('aliases');
-        AddUnit('appearance');
-        AddUnit('applediskpartitions');
-        AddUnit('appleevents');
-        AddUnit('applehelp');
-        AddUnit('applescript');
-        AddUnit('audiohardware');
-        AddUnit('authsession');
-        AddUnit('authorization');
-        AddUnit('authorizationdb');
-        AddUnit('authorizationtags');
-        AddUnit('cfarray');
-        AddUnit('cfattributedstring');
-        AddUnit('cfbag');
-        AddUnit('cfbase');
-        AddUnit('cfbinaryheap');
-        AddUnit('cfbitvector');
-        AddUnit('cfbundle');
-        AddUnit('cfbyteorders');
-        AddUnit('cfcalendar');
-        AddUnit('cfcharacterset');
-        AddUnit('cfdata');
-        AddUnit('cfdate');
-        AddUnit('cfdateformatter');
-        AddUnit('cfdictionary');
-        AddUnit('cfftpstream');
-        AddUnit('cfhttpmessage');
-        AddUnit('cfhttpstream');
-        AddUnit('cfhost');
-        AddUnit('cflocale');
-        AddUnit('cfmachport');
-        AddUnit('cfmessageport');
-        AddUnit('cfnetservices');
-        AddUnit('cfnotificationcenter');
-        AddUnit('cfnumber');
-        AddUnit('cfnumberformatter');
-        AddUnit('cfplugin');
-        AddUnit('cfplugincom');
-        AddUnit('cfpreferences');
-        AddUnit('cfpropertylist');
-        AddUnit('cfrunloop');
-        AddUnit('cfset');
-        AddUnit('cfsocket');
-        AddUnit('cfsocketstream');
-        AddUnit('cfstream');
-        AddUnit('cfstring');
-        AddUnit('cfstringencodingext');
-        AddUnit('cftimezone');
-        AddUnit('cftree');
-        AddUnit('cfurl');
-        AddUnit('cfurlaccess');
-        AddUnit('cfuuid');
-        AddUnit('cfusernotification');
-        AddUnit('cfxmlnode');
-        AddUnit('cfxmlparser');
-        AddUnit('cgaffinetransforms');
-        AddUnit('cgbase');
-        AddUnit('cgbitmapcontext');
-        AddUnit('cgcolor');
-        AddUnit('cgcolorspace');
-        AddUnit('cgcontext');
-        AddUnit('cgdataconsumer');
-        AddUnit('cgdataprovider');
-        AddUnit('cgdirectdisplay');
-        AddUnit('cgdirectpalette');
-        AddUnit('cgdisplayconfiguration');
-        AddUnit('cgdisplayfades');
-        AddUnit('cgerrors');
-        AddUnit('cgevent');
-        AddUnit('cgeventsource');
-        AddUnit('cgeventtypes');
-        AddUnit('cgfont');
-        AddUnit('cgfunction');
-        AddUnit('cgglcontext');
-        AddUnit('cggeometry');
-        AddUnit('cgimage');
-        AddUnit('cgimagedestination');
-        AddUnit('cgimageproperties');
-        AddUnit('cgimagesource');
-        AddUnit('cglayer');
-        AddUnit('cgpdfarray');
-        AddUnit('cgpdfcontentstream');
-        AddUnit('cgpdfcontext');
-        AddUnit('cgpdfdictionary');
-        AddUnit('cgpdfdocument');
-        AddUnit('cgpdfobject');
-        AddUnit('cgpdfoperatortable');
-        AddUnit('cgpdfpage');
-        AddUnit('cgpdfscanner');
-        AddUnit('cgpdfstream');
-        AddUnit('cgpdfstring');
-        AddUnit('cgpsconverter');
-        AddUnit('cgpath');
-        AddUnit('cgpattern');
-        AddUnit('cgremoteoperation');
-        AddUnit('cgsession');
-        AddUnit('cgshading');
-        AddUnit('cgwindowlevels');
-        AddUnit('cmapplication');
-        AddUnit('cmcalibrator');
-        AddUnit('cmdeviceintegration');
-        AddUnit('cmiccprofile');
-        AddUnit('cmmcomponent');
-        AddUnit('cmprcomponent');
-        AddUnit('cmscriptingplugin');
-        AddUnit('cmtypes');
-        AddUnit('carbonevents');
-        AddUnit('carboneventscore');
-        AddUnit('codefragments');
-        AddUnit('collections');
-        AddUnit('colorpicker');
-        AddUnit('components');
-        AddUnit('conditionalmacros');
-        AddUnit('controldefinitions');
-        AddUnit('controls');
-        AddUnit('coreaudiotypes');
-        AddUnit('corefoundation');
-        AddUnit('coregraphics');
-        AddUnit('dhcpclientpreferences');
-        AddUnit('datetimeutils');
-        AddUnit('debugging');
-        AddUnit('devices');
-        AddUnit('dialogs');
-        AddUnit('dictionary');
-        AddUnit('displays');
-        AddUnit('drag');
-        AddUnit('drawsprocket');
-        AddUnit('driverfamilymatching');
-        AddUnit('drivergestalt');
-        AddUnit('driversynchronization');
-        AddUnit('endian');
-        AddUnit('events');
-        AddUnit('filetypesandcreators');
-        AddUnit('files');
-        AddUnit('findbycontent');
-        AddUnit('finder');
-        AddUnit('finderregistry');
-        AddUnit('fixmath');
-        AddUnit('folders');
-        AddUnit('fontpanel');
-        AddUnit('fontsync');
-        AddUnit('fonts');
-        AddUnit('gxtypes');
-        AddUnit('gestaltequ');
-        AddUnit('hfsvolumes');
-        AddUnit('hiarchive');
-        AddUnit('higeometry');
-        AddUnit('himovieview');
-        AddUnit('hiobject');
-        AddUnit('hiobjectcore');
-        AddUnit('hishape');
-        AddUnit('hitextutils');
-        AddUnit('hitheme');
-        AddUnit('hitoolbar');
-        AddUnit('hitoolbox');
-        AddUnit('hiview');
-        AddUnit('htmlrendering');
-        AddUnit('hosttime');
-        AddUnit('ibcarbonruntime');
-        AddUnit('icaapplication');
-        AddUnit('icacamera');
-        AddUnit('icadevice');
-        AddUnit('icons');
-        AddUnit('imagecodec');
-        AddUnit('imagecompression');
-        AddUnit('internetconfig');
-        AddUnit('intlresources');
-        AddUnit('keyboards');
-        AddUnit('keychaincore');
-        AddUnit('keychainhi');
-        AddUnit('languageanalysis');
-        AddUnit('launchservices');
-        AddUnit('lists');
-        AddUnit('lowmem');
-        AddUnit('macapplication');
-        AddUnit('macerrors');
-        AddUnit('machelp');
-        AddUnit('maclocales');
-        AddUnit('macmemory');
-        AddUnit('macosxposix');
-        AddUnit('mactexteditor');
-        AddUnit('mactypes');
-        AddUnit('macwindows');
-        AddUnit('machineexceptions');
-        AddUnit('math64');
-        AddUnit('mediahandlers');
-        AddUnit('menus');
-        AddUnit('mixedmode');
-        AddUnit('movies');
-        AddUnit('moviesformat');
-        AddUnit('multiprocessing');
-        AddUnit('nsl');
-        AddUnit('nslcore');
-        AddUnit('navigation');
-        AddUnit('notification');
-        AddUnit('numberformatting');
-        AddUnit('osa');
-        AddUnit('osacomp');
-        AddUnit('osageneric');
-        AddUnit('osutils');
-        AddUnit('opentransport');
-        AddUnit('opentransportprotocol');
-        AddUnit('opentransportproviders');
-        AddUnit('pefbinaryformat');
-        AddUnit('plstringfuncs');
-        AddUnit('pmapplication');
-        AddUnit('pmcore');
-        AddUnit('pmdefinitions');
-        AddUnit('palettes');
-        AddUnit('pasteboard');
-        AddUnit('pictutils');
-        AddUnit('power');
-        AddUnit('printing');
-        AddUnit('processes');
-        AddUnit('qdoffscreen');
-        AddUnit('qdpicttocgcontext');
-        AddUnit('qtml');
-        AddUnit('qtsmovie');
-        AddUnit('qtstreamingcomponents');
-        AddUnit('quicktimecomponents');
-        AddUnit('quicktimemusic');
-        AddUnit('quicktimestreaming');
-        AddUnit('quicktimevr');
-        AddUnit('quicktimevrformat');
-        AddUnit('quickdraw');
-        AddUnit('quickdrawtext');
-        AddUnit('resources');
-        AddUnit('scdynamicstore');
-        AddUnit('scdynamicstorecopydhcpinfos');
-        AddUnit('scdynamicstorecopyspecific');
-        AddUnit('scdynamicstorekey');
-        AddUnit('scnetwork');
-        AddUnit('scnetworkconnection');
-        AddUnit('scnetworkreachability');
-        AddUnit('scpreferences');
-        AddUnit('scpreferencespath');
-        AddUnit('scpreferencessetspecific');
-        AddUnit('scsi');
-        AddUnit('scschemadefinitions');
-        AddUnit('sfntlayouttypes');
-        AddUnit('sfnttypes');
-        AddUnit('scrap');
-        AddUnit('script');
-        AddUnit('sound');
-        AddUnit('speechrecognition');
-        AddUnit('speechsynthesis');
-        AddUnit('stringcompare');
-        AddUnit('systemconfiguration');
-        AddUnit('systemsound');
-        AddUnit('tsmte');
-        AddUnit('textcommon');
-        AddUnit('textedit');
-        AddUnit('textencodingconverter');
-        AddUnit('textencodingplugin');
-        AddUnit('textservices');
-        AddUnit('textutils');
-        AddUnit('timer');
-        AddUnit('toolutils');
-        AddUnit('translation');
-        AddUnit('translationextensions');
-        AddUnit('translationservices');
-        AddUnit('typeselect');
-        AddUnit('urlaccess');
-        AddUnit('usb');
-        AddUnit('utcutils');
-        AddUnit('utcoretypes');
-        AddUnit('uttype');
-        AddUnit('unicodeconverter');
-        AddUnit('unicodeutilities');
-        AddUnit('universalaccess');
-        AddUnit('fenv');
-        AddUnit('vblas');
-        AddUnit('vdsp');
-        AddUnit('xattr');
-      end;
   T:=P.Targets.AddImplicitUnit('MacOSXPosix.pas');
     with T.Dependencies do
       begin
@@ -2216,7 +1891,6 @@ begin
         AddUnit('events');
         AddUnit('macerrors');
         AddUnit('carbonevents');
-        AddUnit('hiobjectcore');
         AddUnit('hiview');
         AddUnit('higeometry');
       end;
@@ -2464,7 +2138,6 @@ begin
         AddUnit('cfstring');
         AddUnit('cfurl');
         AddUnit('quickdraw');
-        AddUnit('cmapplication');
         AddUnit('pmdefinitions');
       end;
   T:=P.Targets.AddImplicitUnit('PMDefinitions.pas');
@@ -2627,7 +2300,6 @@ begin
     with T.Dependencies do
       begin
         AddUnit('mactypes');
-        AddUnit('cmtypes');
         AddUnit('cgdirectdisplay');
         AddUnit('components');
         AddUnit('mixedmode');