--- Merging r19264 into '.':

U    utils/instantfpc/instantfptools.pas
U    utils/instantfpc/instantfpc.pas
U    utils/instantfpc/instantfpc.lpi
--- Merging r19319 into '.':
U    rtl/os2/sysutils.pp
--- Merging r19321 into '.':
U    rtl/os2/Makefile.fpc
--- Merging r19322 into '.':
U    rtl/os2/Makefile
--- Merging r19323 into '.':
G    rtl/os2/sysutils.pp
--- Merging r19324 into '.':
U    rtl/os2/dos.pas
--- Merging r19327 into '.':
U    packages/fcl-process/src/unix/process.inc
U    packages/fcl-process/src/wince/process.inc
U    packages/fcl-process/src/process.pp
U    packages/fcl-process/src/win/process.inc
--- Merging r19340 into '.':
G    packages/fcl-process/src/process.pp
--- Merging r19367 into '.':
G    packages/fcl-process/src/process.pp
--- Merging r19368 into '.':
G    rtl/os2/sysutils.pp
--- Merging r19378 into '.':
U    packages/fcl-process/src/dummy/process.inc
--- Merging r19380 into '.':
U    rtl/objpas/sysutils/sysutils.inc
--- Merging r19397 into '.':
U    rtl/os2/doscalls.pas
--- Merging r19398 into '.':
G    rtl/os2/dos.pas
--- Merging r19455 into '.':
U    packages/fcl-net/src/netdb.pp
--- Merging r19456 into '.':
U    packages/Makefile
U    packages/Makefile.fpc
U    packages/fppkg/Makefile.fpc
U    packages/fppkg/Makefile
--- Merging r19474 into '.':
U    installer/install.dat
--- Merging r19485 into '.':
U    packages/fpmkunit/src/fpmkunit.pp
U    packages/fppkg/src/pkgrepos.pp
U    packages/fppkg/src/pkgoptions.pp
U    packages/fppkg/src/fpmkunitsrc.inc
--- Merging r19486 into '.':
U    compiler/systems/i_win.pas
--- Merging r19493 into '.':
U    packages/fcl-db/src/dbase/readme.txt
U    packages/fcl-db/src/dbase/dbf.pas
--- Merging r19497 into '.':
G    utils/instantfpc/instantfptools.pas
--- Merging r19520 into '.':
G    utils/instantfpc/instantfptools.pas
--- Merging r19521 into '.':
G    utils/instantfpc/instantfptools.pas

# revisions: 19264,19319,19321,19322,19323,19324,19327,19340,19367,19368,19378,19380,19397,19398,19455,19456,19474,19485,19486,19493,19497,19520,19521
------------------------------------------------------------------------
r19264 | mattias | 2011-09-28 16:32:34 +0200 (Wed, 28 Sep 2011) | 1 line
Changed paths:
   M /trunk/utils/instantfpc/instantfpc.lpi
   M /trunk/utils/instantfpc/instantfpc.pas
   M /trunk/utils/instantfpc/instantfptools.pas

instantfpc: compiler output: replace cache file name with source file name
------------------------------------------------------------------------
------------------------------------------------------------------------
r19319 | hajny | 2011-10-02 01:10:22 +0200 (Sun, 02 Oct 2011) | 1 line
Changed paths:
   M /trunk/rtl/os2/sysutils.pp

  * fix for ExecuteProcess - starting of different executable types works properly now; dependency on unit Dos removed; redefinitions of imports from DosCalls removed also - unit DosCalls used directly now
------------------------------------------------------------------------
------------------------------------------------------------------------
r19321 | hajny | 2011-10-02 03:33:19 +0200 (Sun, 02 Oct 2011) | 1 line
Changed paths:
   M /trunk/rtl/os2/Makefile.fpc

  * SysUtils do not depend on Dos any longer
------------------------------------------------------------------------
------------------------------------------------------------------------
r19322 | hajny | 2011-10-02 03:33:26 +0200 (Sun, 02 Oct 2011) | 1 line
Changed paths:
   M /trunk/rtl/os2/Makefile

  * SysUtils do not depend on Dos any longer
------------------------------------------------------------------------
------------------------------------------------------------------------
r19323 | hajny | 2011-10-02 03:41:56 +0200 (Sun, 02 Oct 2011) | 1 line
Changed paths:
   M /trunk/rtl/os2/sysutils.pp

  * additional fixes for ExecuteProcess - running of DOS programs in current directory and proper closing of the created queue
------------------------------------------------------------------------
------------------------------------------------------------------------
r19324 | hajny | 2011-10-02 03:43:18 +0200 (Sun, 02 Oct 2011) | 1 line
Changed paths:
   M /trunk/rtl/os2/dos.pas

  * fixes for Exec - execution of different application types, fixed memory leak and avoided queue name collisions
------------------------------------------------------------------------
------------------------------------------------------------------------
r19327 | hajny | 2011-10-03 00:05:24 +0200 (Mon, 03 Oct 2011) | 1 line
Changed paths:
   M /trunk/packages/fcl-process/src/process.pp
   M /trunk/packages/fcl-process/src/unix/process.inc
   M /trunk/packages/fcl-process/src/win/process.inc
   M /trunk/packages/fcl-process/src/wince/process.inc

  * uses and resourcestrings moved to platform specific includes
------------------------------------------------------------------------
------------------------------------------------------------------------
r19340 | hajny | 2011-10-03 21:46:50 +0200 (Mon, 03 Oct 2011) | 1 line
Changed paths:
   M /trunk/packages/fcl-process/src/process.pp

  * fix for breakage under Unix platforms - see also bug #20400
------------------------------------------------------------------------
------------------------------------------------------------------------
r19367 | hajny | 2011-10-04 22:15:48 +0200 (Tue, 04 Oct 2011) | 1 line
Changed paths:
   M /trunk/packages/fcl-process/src/process.pp

  * correction of whitespace definition
------------------------------------------------------------------------
------------------------------------------------------------------------
r19368 | hajny | 2011-10-05 00:10:21 +0200 (Wed, 05 Oct 2011) | 1 line
Changed paths:
   M /trunk/rtl/os2/sysutils.pp

  * proper support for ExecInheritsHandles in Flags
------------------------------------------------------------------------
------------------------------------------------------------------------
r19378 | hajny | 2011-10-05 02:32:12 +0200 (Wed, 05 Oct 2011) | 1 line
Changed paths:
   M /trunk/packages/fcl-process/src/dummy/process.inc

  + working (although very limited) generic TProcess implementation based on SysUtils.CreteProcess for use with GO32v2, etc.
------------------------------------------------------------------------
------------------------------------------------------------------------
r19380 | michael | 2011-10-05 09:06:57 +0200 (Wed, 05 Oct 2011) | 1 line
Changed paths:
   M /trunk/rtl/objpas/sysutils/sysutils.inc

* Fixed bug in ExeSearch, noted by Tomas
------------------------------------------------------------------------
------------------------------------------------------------------------
r19397 | hajny | 2011-10-07 01:56:34 +0200 (Fri, 07 Oct 2011) | 1 line
Changed paths:
   M /trunk/rtl/os2/doscalls.pas

  * added some missing constants and TResultCodes fields alias names
------------------------------------------------------------------------
------------------------------------------------------------------------
r19398 | hajny | 2011-10-07 01:57:59 +0200 (Fri, 07 Oct 2011) | 1 line
Changed paths:
   M /trunk/rtl/os2/dos.pas

  * fix DosExitCode for sessions of other types, consider ExecFlags for other session types
------------------------------------------------------------------------
------------------------------------------------------------------------
r19455 | hajny | 2011-10-11 00:50:34 +0200 (Tue, 11 Oct 2011) | 1 line
Changed paths:
   M /trunk/packages/fcl-net/src/netdb.pp

  * /etc/ location hardcoded only for Unix targets, support for retrieval from the environment added for platforms using it
------------------------------------------------------------------------
------------------------------------------------------------------------
r19456 | hajny | 2011-10-11 01:06:10 +0200 (Tue, 11 Oct 2011) | 1 line
Changed paths:
   M /trunk/packages/Makefile
   M /trunk/packages/Makefile.fpc
   M /trunk/packages/fppkg/Makefile
   M /trunk/packages/fppkg/Makefile.fpc

  * fixed wrong dependency of fppkg on fcl-web for all targets
------------------------------------------------------------------------
------------------------------------------------------------------------
r19474 | hajny | 2011-10-12 08:15:48 +0200 (Wed, 12 Oct 2011) | 1 line
Changed paths:
   M /trunk/installer/install.dat

  * added support for ufppkg
------------------------------------------------------------------------
------------------------------------------------------------------------
r19485 | hajny | 2011-10-13 23:04:24 +0200 (Thu, 13 Oct 2011) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp
   M /trunk/packages/fppkg/src/fpmkunitsrc.inc
   M /trunk/packages/fppkg/src/pkgoptions.pp
   M /trunk/packages/fppkg/src/pkgrepos.pp

  * fpunits.conf -> fpunits.cfg
------------------------------------------------------------------------
------------------------------------------------------------------------
r19486 | jonas | 2011-10-14 18:11:46 +0200 (Fri, 14 Oct 2011) | 5 lines
Changed paths:
   M /trunk/compiler/systems/i_win.pas

  * r17629 changed the condition for generating safecall code on x64 and ARM
    platforms from testing for a Windows target into testing to the
    tf_safecall_exceptions target flag. However, this flag was not set for
    non-i386 Windows platforms (mantis #20385)

------------------------------------------------------------------------
------------------------------------------------------------------------
r19493 | jonas | 2011-10-15 17:00:54 +0200 (Sat, 15 Oct 2011) | 4 lines
Changed paths:
   M /trunk/packages/fcl-db/src/dbase/dbf.pas
   M /trunk/packages/fcl-db/src/dbase/readme.txt

  * mark dbf unit as deprecated because abandoned by maintainer, along with a 
    deprecation message that mentions the sourceforge forum where help may
    still be found

------------------------------------------------------------------------
------------------------------------------------------------------------
r19497 | florian | 2011-10-15 19:43:12 +0200 (Sat, 15 Oct 2011) | 1 line
Changed paths:
   M /trunk/utils/instantfpc/instantfptools.pas

* check environment variable LOCALAPPDATA on windows as a possible cache location for instantfpc
------------------------------------------------------------------------
------------------------------------------------------------------------
r19520 | hajny | 2011-10-21 01:30:31 +0200 (Fri, 21 Oct 2011) | 1 line
Changed paths:
   M /trunk/utils/instantfpc/instantfptools.pas

  * fixes for additional non-unix platforms
------------------------------------------------------------------------
------------------------------------------------------------------------
r19521 | hajny | 2011-10-21 01:32:33 +0200 (Fri, 21 Oct 2011) | 1 line
Changed paths:
   M /trunk/utils/instantfpc/instantfptools.pas

  * additional case insensitive platforms
------------------------------------------------------------------------

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

compiler/systems/i_win.pas

@@ -104,7 +104,8 @@ unit i_win;
                             tf_smartlink_sections,tf_smartlink_library,
                             tf_winlikewidestring,tf_no_pic_supported,
                             tf_dwarf_only_local_labels,
-                            tf_no_generic_stackcheck,tf_has_winlike_resources];
+                            tf_no_generic_stackcheck,tf_has_winlike_resources,
+                            tf_safecall_exceptions];
             cpu          : cpu_x86_64;
             unit_env     : 'WIN64UNITS';
             extradefines : 'MSWINDOWS;WINDOWS';
@@ -167,7 +168,8 @@ unit i_win;
             shortname    : 'WinCE';
             flags        : [tf_files_case_aware{,tf_winlikewidestring},
                             tf_smartlink_sections,tf_requires_proper_alignment,tf_no_pic_supported,
-                            tf_has_winlike_resources];
+                            tf_has_winlike_resources,
+                            tf_safecall_exceptions];
             cpu          : cpu_arm;
             unit_env     : '';
             extradefines : 'UNDER_CE;WINDOWS;UNICODE';
@@ -230,7 +232,8 @@ unit i_win;
             shortname    : 'WinCE';
             flags        : [tf_files_case_aware
                             {,tf_winlikewidestring},tf_smartlink_sections,tf_no_pic_supported,
-                            tf_has_winlike_resources];
+                            tf_has_winlike_resources,
+                            tf_safecall_exceptions];
             cpu          : cpu_i386;
             unit_env     : '';
             extradefines : 'UNDER_CE;WINDOWS;UNICODE';

installer/install.dat

@@ -91,6 +91,8 @@ package=ubzip2dos.zip[ubz2dos.zip],Units for bzip2 decompression
 package=ufcl-jsdos.zip[ufcjsdos.zip],Free Component Library (FCL)-Javascript support
 # Dos 32
 package=uhermesdos.zip[uhermdos.zip],Port of Hermes graphics library
+# Dos 33
+package=ufppkgdos.zip[ufppkdos.zip],Units for FPPkg packaging support
 
 #
 # Win32 packages
@@ -150,6 +152,8 @@ package=units-openal.i386-win32.zip,OpenAL interface units
 package=units-openssl.i386-win32.zip,OpenSSL interface units
 # Win32 23
 package=units-hermes.i386-win32.zip,Port of Hermes graphics library
+# Win32 24
+package=units-fppkg.i386-win32.zip,Units for FPPkg packaging support
 
 #
 # Win32 packages 2nd part
@@ -272,6 +276,8 @@ package=ufcl-xmlos2.zip[ufclxos2.zip],Free Component Library (FCL)-XML
 #package=ufcl-webos2.zip[ufclwos2.zip],Free Component Library (FCL)-Web
 # OS/2 21
 package=uhermesos2.zip[uhermos2.zip],Port of Hermes graphics library
+# OS/2 22
+package=ufppkgos2.zip[ufppkos2.zip],Units for FPPkg packaging support
 
 #
 # OS/2 packages 2nd part
@@ -386,6 +392,8 @@ package=ufcl-xmlemx.zip[ufclxemx.zip],Free Component Library (FCL)-XML
 #package=ufcl-webemx.zip[ufclwemx.zip],Free Component Library (FCL)-Web
 # EMX 21
 package=uhermesemx.zip[uhermemx.zip],Port of Hermes graphics library
+# EMX 22
+package=ufppkgemx.zip[ufppkemx.zip],Units for FPPkg packaging support
 
 #
 # EMX packages 2nd part
@@ -480,25 +488,27 @@ package=installer.source.zip[instsrc.zip],~I~nstaller sources
 # Source 7
 package=doc.source.zip[docsrc.zip],~D~ocumentation sources (LaTeX)
 # Source 8
-package=units-cdrom.source.zip[ucdrsrc.zip],CD-ROM interface units
+package=units-cdrom.source.zip[ucdrsrc.zip],CD-ROM interface sources
 # Source 9
-package=units-unzip.source.zip[uzipsrc.zip],Unzip units
+package=units-unzip.source.zip[uzipsrc.zip],Unzip units sources
 # Source 10
-package=units-regexpr.source.zip[uregsrc.zip],Regular expression units
+package=units-regexpr.source.zip[uregsrc.zip],Regular expression units sources
 # Source 11
-package=units-paszlib.source.zip[upzlsrc.zip],PasZLib units
+package=units-paszlib.source.zip[upzlsrc.zip],PasZLib units sources
 # Source 12
-package=units-rexx.source.zip[urexxsrc.zip],REXX SAA interface units
+package=units-rexx.source.zip[urexxsrc.zip],REXX SAA interface units sources
 # Source 13
-package=units-zlib.source.zip[uzlibsrc.zip],ZLib interface units
+package=units-zlib.source.zip[uzlibsrc.zip],ZLib interface units sources
 # Source 14
-package=units-gdbint.source.zip[ugdbsrc.zip],GDB interface units
+package=units-gdbint.source.zip[ugdbsrc.zip],GDB interface units sources
 # Source 15
-package=units-postgres.source.zip[upgrsrc.zip],PostGreSQL interface units
+package=units-postgres.source.zip[upgrsrc.zip],PostGreSQL interface sources
 # Source 16
-package=units-graph.source.zip[ugrphsrc.zip],Unit Graph
+package=units-graph.source.zip[ugrphsrc.zip],Unit Graph sources
 # Source 17
 package=units-hermes.source.zip[uhermsrc.zip],Port of Hermes graphics library
+# Source 18
+package=units-fppkg.source.zip[ufppkdos.zip],Units for FPPkg packaging support
 
 #
 # Source packages 2nd part
@@ -506,38 +516,38 @@ package=units-hermes.source.zip[uhermsrc.zip],Port of Hermes graphics library
 pack=So~u~rces 2
 filecheck=*.source.zip[*src.zip]
 # Source-2 1
-package=units-opengl.source.zip[uoglsrc.zip],OpenGL interface units
+package=units-opengl.source.zip[uoglsrc.zip],OpenGL interface units sources
 # Source-2 2
-package=units-gtk1.source.zip[ugtksrc.zip],GTK1 interface units
+package=units-gtk1.source.zip[ugtksrc.zip],GTK1 interface units sources
 # Source-2 3
-package=units-odbc.source.zip[uodbcsrc.zip],ODBC interface units
+package=units-odbc.source.zip[uodbcsrc.zip],ODBC interface units sources
 # Source-2 4
-package=units-ibase.source.zip[uibassrc.zip],Interbase interface units
+package=units-ibase.source.zip[uibassrc.zip],Interbase interface units sources
 # Source-2 5
-package=units-mysql.source.zip[umysqsrc.zip],MySQL interface units
+package=units-mysql.source.zip[umysqsrc.zip],MySQL interface units sources
 # Source-2 6
 #package=units-ftpapi.source.zip[uftpsrc.zip],OS/2 FTP API interface units
 # Source-2 7
 #package=units-hwvideo.source.zip[uhwvsrc.zip],OS/2 HWVideo interface units
 # Source-2 8
-#package=units-mmtk.source.zip[ummtksrc.zip],MMOS/2 interface units
+#package=units-mmtk.source.zip[ummtksrc.zip],MMOS/2 interface units sources
 # Source-2 9
 package=units-os2units.source.zip[uos2src.zip],Units interfacing libraries delivered with OS/2/eCS
 #package=units-clkdll.source.zip[uclksrc.zip],CLKDLL interface unit (eCS 1.1+)
 # Source-2 10
-#package=units-lvm.source.zip[ulvmsrc.zip],OS/2 LVM interface unit
+#package=units-lvm.source.zip[ulvmsrc.zip],OS/2 LVM interface unit sources
 # Source-2 11
-package=units-pasjpeg.source.zip[upjpsrc.zip],PasJPEG units
+package=units-pasjpeg.source.zip[upjpsrc.zip],PasJPEG units sources
 # Source-2 12
-package=units-fv.source.zip[ufvsrc.zip],Free ~V~ision (FV)
+package=units-fv.source.zip[ufvsrc.zip],Free ~V~ision (FV) sources
 # Source-2 13
-package=units-libpng.source.zip[ulpngsrc.zip],LibPNG interface units
+package=units-libpng.source.zip[ulpngsrc.zip],LibPNG interface units sources
 # Source-2 14
-package=units-imlib.source.zip[uimlbsrc.zip],ImLib interface units
+package=units-imlib.source.zip[uimlbsrc.zip],ImLib interface units sources
 # Source-2 15
-package=units-fpgtk.source.zip[ufpgtsrc.zip],fpGTK units
+package=units-fpgtk.source.zip[ufpgtsrc.zip],fpGTK units sources
 # Source-2 16
-package=units-sqlite.source.zip[usqltsrc.zip],SQLite interface units
+package=units-sqlite.source.zip[usqltsrc.zip],SQLite interface units sources
 # Source-2 17
 package=units-fpmkunit.source.zip[ufpmksrc.zip],Units required for building fpmake.exe
 # Source-2 18
@@ -568,13 +578,13 @@ filecheck=*.source.zip[*src.zip]
 # Source-3 1
 package=units-winunits.source.zip[uwinsrc.zip],Extended Windows API interface units
 # Source-3 2
-package=units-tcl.source.zip[utclsrc.zip],TCL interface units
+package=units-tcl.source.zip[utclsrc.zip],TCL interface units sources
 # Source-3 3
-package=units-oracle.source.zip[uorasrc.zip],Oracle interface units
+package=units-oracle.source.zip[uorasrc.zip],Oracle interface units sources
 # Source-3 4
-package=units-hash.source.zip[uhashsrc.zip],Hash calculation units
+package=units-hash.source.zip[uhashsrc.zip],Hash calculation units sources
 # Source-3 5
-package=units-fftw.source.zip[ufftwsrc.zip],FFTW interface unit
+package=units-fftw.source.zip[ufftwsrc.zip],FFTW interface unit sources
 # Source-3 6
 package=fcl-base.source.zip[ufclbsrc.zip],Free component library (FCL)-base part
 # Source-3 7
@@ -594,17 +604,17 @@ package=fcl-xml.source.zip[ufclxsrc.zip],Free component library (FCL)-XML files
 # Source-3 14
 package=fcl-web.source.zip[ufclwsrc.zip],Free component library (FCL)-Web
 # Source-3 15
-package=httpd-1.3.source.zip[uhd13src.zip],HTTPD 1.3 interface units
+package=httpd-1.3.source.zip[uhd13src.zip],HTTPD 1.3 interface units sources
 # Source-3 16
-package=httpd-2.0.source.zip[uhd20src.zip],HTTPD 2.0 interface units
+package=httpd-2.0.source.zip[uhd20src.zip],HTTPD 2.0 interface units sources
 # Source-3 17
-package=httpd-2.2.source.zip[uhd22src.zip],HTTPD 2.2 interface units
+package=httpd-2.2.source.zip[uhd22src.zip],HTTPD 2.2 interface units sources
 # Source-3 18
-package=oggvorbis.source.zip[uoggvsrc.zip],OGG Vorbis interface units
+package=oggvorbis.source.zip[uoggvsrc.zip],OGG Vorbis interface units sources
 # Source-3 19
-package=openal.source.zip[uoalsrc.zip],OpenAL interface units
+package=openal.source.zip[uoalsrc.zip],OpenAL interface units sources
 # Source-3 20
-package=openssl.source.zip[uosslsrc.zip],OpenSSL interface units
+package=openssl.source.zip[uosslsrc.zip],OpenSSL interface units sources
 
 defaultcfg=
 #

packages/Makefile

@@ -9826,10 +9826,3 @@ opencl_debug:  opengl_debug
 opencl_smart:  opengl_smart
 opencl_release:  opengl_release
 opencl_shared:  opengl_shared
-ifeq ($(findstring $(OS_TARGET),go32v2),)
-fppkg_all:  fcl-web_all
-fppkg_debug:  fcl-web_debug
-fppkg_smart:  fcl-web_smart
-fppkg_release:  fcl-web_release
-fppkg_shared:  fcl-web_shared
-endif

packages/Makefile.fpc

@@ -414,11 +414,3 @@ opencl_debug:  opengl_debug
 opencl_smart:  opengl_smart
 opencl_release:  opengl_release
 opencl_shared:  opengl_shared
-
-ifeq ($(findstring $(OS_TARGET),go32v2),)
-fppkg_all:  fcl-web_all
-fppkg_debug:  fcl-web_debug
-fppkg_smart:  fcl-web_smart
-fppkg_release:  fcl-web_release
-fppkg_shared:  fcl-web_shared
-endif

packages/fcl-db/src/dbase/dbf.pas

@@ -1,4 +1,4 @@
-unit dbf;
+unit dbf deprecated 'Abandoned by maintainer, no longer supported by FPC team. Help may be available at http://tdbf.sourceforge.net and http://sourceforge.net/projects/tdbf/forums/forum/107245';
 
 { design info in dbf_reg.pas }
 

packages/fcl-db/src/dbase/readme.txt

@@ -1,3 +1,11 @@
+The maintainers of this package have abandoned it, so it has been deprecated.
+It will no longer be supported by the FPC team in the future, unless someone
+else volunteers to do so.
+
+Support from other tdbf users may be available on the tdbf forum on
+SourceForge: http://sourceforge.net/projects/tdbf/forums/forum/107245
+
+
 TDbf readme:
 
 See history.txt for changelog.

packages/fcl-net/src/netdb.pp

@@ -29,6 +29,26 @@ Interface
 
 Uses Sockets;
 
+{$IFDEF OS2}
+(* ETC directory location determined by environment variable ETC *)
+ {$DEFINE ETC_BY_ENV}
+(* Use names supported also on non-LFN drives like plain FAT-16. *)
+ {$DEFINE SFN_VERSION}
+{$ENDIF OS2}
+{$IFDEF GO32V2}
+ {$DEFINE ETC_BY_ENV}
+ {$DEFINE SFN_VERSION}
+{$ENDIF GO32V2}
+{$IFDEF WATCOM}
+ {$DEFINE ETC_BY_ENV}
+ {$DEFINE SFN_VERSION}
+{$ENDIF WATCOM}
+
+{$IFDEF UNIX}
+(* ETC directory location hardcoded to /etc/ *)
+ {$DEFINE UNIX_ETC}
+{$ENDIF UNIX}
+
 Type
   THostAddr = in_addr;		// historical aliases for these.
   THostAddr6= Tin6_addr;
@@ -37,15 +57,28 @@ Type
 Const
   DNSPort        = 53;
   MaxResolveAddr = 10;
-  SResolveFile   = '/etc/resolv.conf';
-  SServicesFile  = '/etc/services'; 
-  SHostsFile     = '/etc/hosts';
-  SNetworksFile  = '/etc/networks';
-  SProtocolFile  = '/etc/protocols';
+  SServicesFile  = 'services'; 
+  SHostsFile     = 'hosts';
+  SNetworksFile  = 'networks';
+{$IFDEF SFN_VERSION}
+  SProtocolFile  = 'protocol';
+  SResolveFile   = 'resolv';
+ {$IFDEF OS2}
+(* Peculiarity of OS/2 - depending on the used TCP/IP version, *)
+(* the file differs slightly in name and partly also content.  *)
+   SResolveFile2  = 'resolv2';
+ {$ENDIF OS2}
+{$ELSE SFN_VERSION}
+  SProtocolFile  = 'protocols';
+  SResolveFile   = 'resolv.conf';
+{$ENDIF SFN_VERSION}
 
   MaxRecursion = 10;
   MaxIP4Mapped = 10;
-  
+
+var
+  EtcPath: string;
+
 Type
   TDNSServerArray = Array of THostAddr;
   TServiceEntry = record
@@ -387,12 +420,12 @@ Var
 begin
   If CheckHostsFileAge then
     begin
-    F:=FileAge(SHostsFile);
+    F:=FileAge (EtcPath + SHostsFile);
     If HostsFileAge<F then
       begin
       // Rescan.
       FreeHostsList(HostsList);
-      HostsList:=ProcessHosts(SHostsFile);
+      HostsList:=ProcessHosts (EtcPath + SHostsFile);
       HostsFileAge:=F;
       end;
     end;  
@@ -1164,9 +1197,9 @@ Var
   
 begin
   Result:=False;
-  If FileExists(SProtocolFile) then
+  If FileExists (EtcPath + SProtocolFile) then
     begin
-    Assign(F,SProtocolFile);
+    Assign (F, EtcPath + SProtocolFile);
     {$i-}
     Reset(F);
     {$i+}
@@ -1266,9 +1299,9 @@ Var
   
 begin
   Result:=False;
-  If FileExists(SNetworksFile) then
+  If FileExists (EtcPath + SNetworksFile) then
     begin
-    Assign(F,SNetworksFile);
+    Assign (F, EtcPath + SNetworksFile);
     {$i-}
     Reset(F);
     {$i+}
@@ -1359,9 +1392,9 @@ Var
   
 begin
   Result:=False;
-  If FileExists(SServicesFile) then
+  If FileExists (EtcPath + SServicesFile) then
     begin
-    Assign(F,SServicesFile);
+    Assign (F, EtcPath + SServicesFile);
     {$i-}
     Reset(F);
     {$i+}
@@ -1413,11 +1446,28 @@ begin
   TimeOutS :=5;
   TimeOutMS:=0;
   CheckHostsFileAge:=False;
-  If FileExists(SHostsFile) then
-    HostsList:=ProcessHosts(SHostsFile);
+{$IFDEF UNIX_ETC}
+  EtcPath := '/etc/';
+{$ELSE UNIX_ETC}
+ {$IFDEF ETC_BY_ENV}
+  EtcPath := GetEnvironmentVariable ('ETC');
+  if (EtcPath <> '') and (EtcPath [Length (EtcPath)] <> DirectorySeparator) then
+   EtcPath := EtcPath + DirectorySeparator;
+ {$ELSE ETC_BY_ENV}
+{$WARNING Support for finding /etc/ directory not implemented for this platform!}
+
+ {$ENDIF ETC_BY_ENV}
+{$ENDIF UNIX_ETC}
+  If FileExists (EtcPath + SHostsFile) then
+    HostsList := ProcessHosts (EtcPath + SHostsFile);
   CheckResolveFileAge:=False;
-  If FileExists(SResolveFile) then
-    GetDNsservers(SResolveFile);
+  If FileExists(EtcPath + SResolveFile) then
+    GetDNsservers(EtcPath + SResolveFile)
+{$IFDEF OS2}
+  else if FileExists(EtcPath + SResolveFile2) then
+    GetDNsservers(EtcPath + SResolveFile2)
+{$ENDIF OS2}
+                                         ;
 end;
 
 Procedure DoneResolver;

packages/fcl-process/src/dummy/process.inc

@@ -1,21 +1,13 @@
 {
-  Dummy process.inc
+  Dummy process.inc - the simplest version based on SysUtils.ExecuteProcess
 }
 
-{
-  prevent compilation error for the versions mentioned below
-}
-{$if defined (go32v2) and defined(VER2_7_1)}
-  {$define WARN_ONLY}
-{$endif}
-{$if defined(VER2_4) or defined(VER2_5_1)}
-  {$define WARN_ONLY}
-{$endif}
-{$ifdef WARN_ONLY}
-{$warning Temporary workaround - unit does nothing}
-{$else}
-{$fatal Proper implementation of TProcess for version of this target needed}
-{$endif}
+
+Resourcestring
+  SNoCommandLine        = 'Cannot execute empty command-line';
+  SErrCannotExecute     = 'Failed to execute %s : %d';
+  SErrNoSuchProgram     = 'Executable not found: "%s"';
+
 
 procedure TProcess.CloseProcessHandles;
 begin
@@ -23,15 +15,115 @@ end;
 
 Function TProcess.PeekExitStatus : Boolean;
 begin
+  Result := true; (* Dummy version assumes always synchronous execution *)
+end;
+
+function GetNextWordPos (const S: string): integer;
+const
+  WhiteSpace = [' ', #9, #10, #13];
+  Literals = ['"', ''''];
+var
+  WStart: integer;
+  InLiteral: boolean;
+  LastLiteral: char;
+begin
+  WStart := 1;
+(* Skip whitespaces at the beginning *)
+  while (WStart <= Length (S)) and (S [WStart] in WhiteSpace) do
+   Inc (WStart);
+  InLiteral := false;
+  LastLiteral := #0;
+  while (WStart <= Length (S)) and
+                               (not (S [WStart] in WhiteSpace) or InLiteral) do
+   begin
+    if S [WStart] in Literals then
+     if InLiteral then
+      InLiteral := not (S [WStart] = LastLiteral)
+     else
+      begin
+       InLiteral := true;
+       LastLiteral := S [WStart];
+      end;
+     Inc (WStart);
+    end;
+(* Skip whitespaces at the end *)
+  while (WStart <= Length (S)) and (S [WStart] in WhiteSpace) do
+   Inc (WStart);
+  Result := WStart;
+end;
+
+function MaybeQuote (const S: string): string;
+begin
+  if (Pos (' ', S) <> 0) then
+   Result := '"' + S + '"'
+  else
+   Result := S;
 end;
 
 Procedure TProcess.Execute;
+var
+  I: integer;
+  ExecName, FoundName: string;
+  E2: EProcess;
+  OrigDir: string;
+  Params: string;
 begin
+  if (ApplicationName = '') and (CommandLine = '') and (Executable = '') then
+   raise EProcess.Create (SNoCommandline);
+  if (FApplicationName <> '') then
+   ExecName := FApplicationName;
+  if (FCommandLine <> '') then
+   begin
+    Params := FCommandLine;
+    if ExecName = '' then
+     begin
+      I := GetNextWordPos (Params);
+      ExecName := Copy (Params, 1, Pred (I));
+      Trim (ExecName);
+      Delete (Params, 1, Pred (I));
+     end
+    else if Copy (FCommandLine, 1, Length (ExecName)) = ExecName then
+     Delete (Params, 1, Succ (Length (ExecName)))
+    else
+     Delete (Params, 1, Pred (GetNextWordPos (Params)));
+    Trim (Params);
+   end
+  else
+   for I := 1 to Pred (Parameters.Count) do
+    Params := Params + ' ' + MaybeQuote (Parameters [I]);
+  if (FExecutable <> '') and (ExecName = '') then
+   ExecName := Executable;
+  if not FileExists (ExecName) then
+   begin
+    FoundName := ExeSearch (ExecName, '');
+    if FoundName <> '' then
+     ExecName := FoundName
+    else
+     raise EProcess.CreateFmt (SErrNoSuchProgram, [ExecName]);
+   end;
+  if (FCurrentDirectory <> '') then
+   begin
+    GetDir (0, OrigDir);
+    ChDir (FCurrentDirectory);
+   end;
+  try
+   FExitCode := ExecuteProcess (ExecName, Params);
+  except
+(* Normalize the raised exception so that it is aligned to other platforms. *)
+    On E: EOSError do
+     begin
+      raise EProcess.CreateFmt (SErrCannotExecute, [FCommandLine, E.ErrorCode]);
+      if (FCurrentDirectory <> '') then
+       ChDir (OrigDir);
+      end;
+  end;
+  if (FCurrentDirectory <> '') then
+   ChDir (OrigDir);
 end;
 
 Function TProcess.WaitOnExit : Boolean;
 begin
-  Result:=False;
+  Result:=True;
 end;
 
 Function TProcess.Suspend : Longint;
@@ -40,7 +132,6 @@ begin
 end;
 
 Function TProcess.Resume : LongInt;
-
 begin
   Result:=0;
 end;

packages/fcl-process/src/process.pp

@@ -160,6 +160,8 @@ Type
 
   EProcess = Class(Exception);
 
+Procedure CommandToList(S : String; List : TStrings);
+
 {$ifdef unix}
 Var
   TryTerminals : Array of string;
@@ -169,29 +171,14 @@ Var
 
 implementation
 
-{$ifdef WINDOWS}
-Uses
-  Windows;
-{$endif WINDOWS}
-{$ifdef UNIX}
-uses
-   ctypes,
-   UnixType,
-   Unix,
-   Baseunix;
-{$endif UNIX}
-
-Resourcestring
-  SNoCommandLine        = 'Cannot execute empty command-line';
-  SErrNoSuchProgram     = 'Executable not found: "%s"';
-  SErrNoTerminalProgram = 'Could not detect X-Terminal program';
+{$i process.inc}
 
 Procedure CommandToList(S : String; List : TStrings);
 
   Function GetNextWord : String;
 
   Const
-    WhiteSpace = [' ',#8,#10];
+    WhiteSpace = [' ',#9,#10,#13];
     Literals = ['"',''''];
 
   Var
@@ -244,8 +231,6 @@ begin
     end;
 end;
 
-{$i process.inc}
-
 Constructor TProcess.Create (AOwner : TComponent);
 begin
   Inherited;

packages/fcl-process/src/unix/process.inc

@@ -10,6 +10,19 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+uses
+   ctypes,
+   UnixType,
+   Unix,
+   Baseunix;
+
+Resourcestring
+  SNoCommandLine        = 'Cannot execute empty command-line';
+  SErrNoSuchProgram     = 'Executable not found: "%s"';
+  SErrNoTerminalProgram = 'Could not detect X-Terminal program';
+  SErrCannotFork        = 'Failed to Fork process';
+  SErrCannotCreatePipes = 'Failed to create pipes';
+
 Const
   PriorityConstants : Array [TProcessPriority] of Integer =
                       (20,20,0,-20);
@@ -242,7 +255,7 @@ Procedure CreatePipes(Var HI,HO,HE : TPipePair; CE : Boolean);
 
    begin
     If not CreatePipeHandles(P[peRead],P[peWrite]) then
-      Raise EProcess.Create('Failed to create pipes');
+      Raise EProcess.Create(SErrCannotCreatePipes);
    end;
 
   Procedure ClosePair(Var P : TPipePair);
@@ -335,7 +348,7 @@ begin
         Pid:=fpfork;
 {$endif}
         if Pid<0 then
-          Raise EProcess.Create('Failed to Fork process');
+          Raise EProcess.Create(SErrCannotFork);
         if (PID>0) then
           begin
             // Parent process. Copy process information.

packages/fcl-process/src/win/process.inc

@@ -11,6 +11,17 @@
 
  **********************************************************************}
 
+Uses
+  Windows;
+
+
+Resourcestring
+  SNoCommandLine        = 'Cannot execute empty command-line';
+  SErrCannotExecute     = 'Failed to execute %s : %d';
+{  SErrNoSuchProgram     = 'Executable not found: "%s"';
+  SErrNoTerminalProgram = 'Could not detect X-Terminal program';
+}
+
 Const
   PriorityConstants : Array [TProcessPriority] of Cardinal =
                       (HIGH_PRIORITY_CLASS,IDLE_PRIORITY_CLASS,
@@ -248,7 +259,7 @@ begin
       If Not CreateProcess (PName,PCommandLine,@FProcessAttributes,@FThreadAttributes,
                    FInheritHandles,FCreationFlags,FEnv,PDir,FStartupInfo,
                    fProcessInformation) then
-        Raise EProcess.CreateFmt('Failed to execute %s : %d',[FCommandLine,GetLastError]);
+        Raise EProcess.CreateFmt(SErrCannotExecute,[FCommandLine,GetLastError]);
       FProcessHandle:=FProcessInformation.hProcess;
       FThreadHandle:=FProcessInformation.hThread;
       FProcessID:=FProcessINformation.dwProcessID;

packages/fcl-process/src/wince/process.inc

@@ -11,6 +11,17 @@
 
  **********************************************************************}
 
+Uses
+  Windows;
+
+
+Resourcestring
+  SNoCommandLine        = 'Cannot execute empty command-line';
+  SErrCannotExecute     = 'Failed to execute %s : %d';
+{  SErrNoSuchProgram     = 'Executable not found: "%s"';
+  SErrNoTerminalProgram = 'Could not detect X-Terminal program';
+}
+
 Const
   PriorityConstants : Array [TProcessPriority] of Cardinal =
                       (HIGH_PRIORITY_CLASS,IDLE_PRIORITY_CLASS,
@@ -207,7 +218,7 @@ begin
       If Not CreateProcess (PName,PCommandLine,@FProcessAttributes,@FThreadAttributes,
                    FInheritHandles,FCreationFlags,FEnv,PDir,@FStartupInfo,
                    fProcessInformation) then
-        Raise EProcess.CreateFmt('Failed to execute %s : %d',[FCommandLine,GetLastError]);
+        Raise EProcess.CreateFmt(SErrCannotExecute,[FCommandLine,GetLastError]);
       FProcessHandle:=FProcessInformation.hProcess;
       FThreadHandle:=FProcessInformation.hThread;
       FProcessID:=FProcessINformation.dwProcessID;

packages/fpmkunit/src/fpmkunit.pp

@@ -172,7 +172,7 @@ Const
 
   FPMakePPFile = 'fpmake.pp';
   ManifestFile = 'manifest.xml';
-  UnitConfigFile = 'fpunits.conf';
+  UnitConfigFile = 'fpunits.cfg';
 
   DirNotFound = '<dirnotfound>';
 

packages/fppkg/Makefile

@@ -1853,7 +1853,7 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fcl-process fcl-net paszlib fcl-web
+override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fcl-process fcl-net paszlib
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-BASE=1
@@ -1879,7 +1879,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
@@ -1905,7 +1904,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 REQUIRE_PACKAGES_RTL=1
@@ -1986,7 +1984,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
@@ -1999,7 +1996,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2025,7 +2021,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2053,7 +2048,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 REQUIRE_PACKAGES_RTL=1
@@ -2066,7 +2060,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
@@ -2079,7 +2072,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
@@ -2105,7 +2097,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 REQUIRE_PACKAGES_RTL=1
@@ -2118,7 +2109,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
 REQUIRE_PACKAGES_RTL=1
@@ -2131,7 +2121,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
 REQUIRE_PACKAGES_RTL=1
@@ -2200,7 +2189,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 REQUIRE_PACKAGES_RTL=1
@@ -2213,7 +2201,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 REQUIRE_PACKAGES_RTL=1
@@ -2239,7 +2226,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2252,7 +2238,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2292,7 +2277,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
@@ -2305,7 +2289,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2333,7 +2316,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2346,7 +2328,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
 REQUIRE_PACKAGES_RTL=1
@@ -2359,7 +2340,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2412,7 +2392,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2494,7 +2473,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2521,7 +2499,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
 REQUIRE_PACKAGES_RTL=1
@@ -2562,7 +2539,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 REQUIRE_PACKAGES_RTL=1
@@ -2575,7 +2551,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2588,7 +2563,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 REQUIRE_PACKAGES_RTL=1
@@ -2601,7 +2575,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2643,7 +2616,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
@@ -2656,7 +2628,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
 REQUIRE_PACKAGES_RTL=1
@@ -2683,7 +2654,6 @@ REQUIRE_PACKAGES_FCL-NET=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FPMKUNIT=1
-REQUIRE_PACKAGES_FCL-WEB=1
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 REQUIRE_PACKAGES_RTL=1

packages/fppkg/Makefile.fpc

@@ -35,10 +35,20 @@ fpcpackage=y
 fpcdir=../..
 
 [require]
-packages=fcl-base fcl-xml fcl-process fcl-net paszlib fcl-web
+packages=fcl-base fcl-xml fcl-process fcl-net paszlib
 tools=data2inc
-packages_darwin=univint
-packages_iphonesim=univint
+packages_darwin=univint fcl-web
+packages_iphonesim=univint fcl-web
+packages_linux=fcl-web
+packages_beos=fcl-web
+packages_haiku=fcl-web
+packages_freebsd=fcl-web
+packages_netbsd=fcl-web
+packages_openbsd=fcl-web
+packages_solaris=fcl-web
+packages_win32=fcl-web
+packages_win64=fcl-web
+packages_wince=fcl-web
 
 [rules]
 .NOTPARALLEL:

packages/fppkg/src/fpmkunitsrc.inc

@@ -1,5857 +1,7112 @@
 {$ifdef Delphi}
-const fpmkunitsrc : array[0..638] of string[240]=(
+const fpmkunitsrc : array[0..809] of string[240]=(
 {$else Delphi}
-const fpmkunitsrc : array[0..638,1..240] of char=(
+const fpmkunitsrc : array[0..809,1..240] of char=(
 {$endif Delphi}
-  '{'#010+
-  '    This file is part of the Free Pascal Makefile Package'#010+
-  #010+
-  '    Implementation of fpmake classes and functions'#010+
-  #010+
-  '    Copyright (c) 2007 by the freepascal team'#010+
-  #010+
-  '    See the file COPYING.FPC, included in this distribution,'#010+
-  '    for details abo','ut the copyright.'#010+
-  #010+
-  '    This program is distributed in the hope that it will be useful,'#010+
-  '    but WITHOUT ANY WARRANTY; without even the implied warranty of'#010+
-  '    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.'#010+
-  #010+
-  ' ***************************','****************************************'+
-  '***}'#010+
-  #010+
-  'unit fpmkunit;'#010+
-  #010+
-  '{$Mode objfpc}'#010+
-  '{$H+}'#010+
-  '{$inline on}'#010+
-  #010+
+  '{'#013#010+
+  '    This file is part of the Free Pascal Makefile Package'#013#010+
+  #013#010+
+  '    Implementation of fpmake classes and functions'#013#010+
+  #013#010+
+  '    Copyright (c) 2007 by the freepascal team'#013#010+
+  #013#010+
+  '    See the file COPYING.FPC, included in this distribution,'#013#010+
+  '    for det','ails about the copyright.'#013#010+
+  #013#010+
+  '    This program is distributed in the hope that it will be useful,'#013+
+  #010+
+  '    but WITHOUT ANY WARRANTY; without even the implied warranty of'#013+
+  #010+
+  '    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.'#013#010+
+  #013#010+
+  ' *************','******************************************************'+
+  '***}'#013#010+
+  #013#010+
+  'unit fpmkunit;'#013#010+
+  #013#010+
+  '{$Mode objfpc}'#013#010+
+  '{$H+}'#013#010+
+  '{$inline on}'#013#010+
+  #013#010+
   '{ For target or cpu dependent dependencies add also an overload were y'+
-  'ou'#010+
-  '  can pass only a set of cpus. This is disabled for now because it cre',
-  'ates'#010+
-  '  an error in the compiler with overload choosing }'#010+
-  '{ define cpu_only_overloads}'#010+
-  #010+
-  'Interface'#010+
-  #010+
-  '{$ifndef NO_UNIT_PROCESS}'#010+
-  '  {$define HAS_UNIT_PROCESS}'#010+
-  '{$endif NO_UNIT_PROCESS}'#010+
-  #010+
-  '{$ifndef NO_UNIT_ZIPPER}'#010+
-  '  {$define HAS_UNIT_ZIPPER}'#010+
-  '{$endif ','NO_UNIT_ZIPPER}'#010+
-  #010+
-  'uses'#010+
-  '  SysUtils, Classes, StrUtils'#010+
-  '{$ifdef HAS_UNIT_PROCESS}'#010+
-  '  ,process'#010+
-  '{$endif HAS_UNIT_PROCESS}'#010+
-  '{$ifdef HAS_UNIT_ZIPPER}'#010+
-  '  ,zipper'#010+
-  '{$endif HAS_UNIT_ZIPPER}'#010+
-  '  ;'#010+
-  #010+
-  'Type'#010+
-  '  TFileType = (ftSource,ftUnit,ftObject,ftResource,ftEx','ecutable,ftSt'+
-  'aticLibrary,'#010+
-  '               ftSharedLibrary);'#010+
-  '  TFileTypes = set of TFileType;'#010+
-  #010+
-  '  // Please keep this order, see OSCPUSupported below'#010+
-  '  TCpu=(cpuNone,'#010+
-  '    i386,m68k,powerpc,sparc,x86_64,arm,powerpc64,avr,armeb'#010+
-  '  );'#010+
-  '  TCPUS = Se','t of TCPU;'#010+
-  #010+
-  '  // Please keep this order, see OSCPUSupported below'#010+
-  '  TOS=(osNone,'#010+
-  '    linux,go32v2,win32,os2,freebsd,beos,netbsd,'#010+
-  '    amiga,atari, solaris, qnx, netware, openbsd,wdosx,'#010+
-  '    palmos,macos,darwin,emx,watcom,morphos,netwlibc,'#010+
-  '   ',' win64,wince,gba,nds,embedded,symbian'#010+
-  '  );'#010+
-  '  TOSes = Set of TOS;'#010+
-  #010+
-  '  TCompilerMode = (cmFPC,cmTP,cmObjFPC,cmDelphi,cmMacPas);'#010+
-  '  TCompilerModes = Set of TCompilerMode;'#010+
-  #010+
+  'ou'#013#010+
+  '  can pass only a set of cpus. This is disabled',' for now because it c'+
+  'reates'#013#010+
+  '  an error in the compiler with overload choosing }'#013#010+
+  '{ define cpu_only_overloads}'#013#010+
+  #013#010+
+  'Interface'#013#010+
+  #013#010+
+  '{$IFDEF OS2}'#013#010+
+  ' {$DEFINE NO_UNIT_PROCESS}'#013#010+
+  '{$ENDIF OS2}'#013#010+
+  #013#010+
+  '{$IFDEF GO32V2}'#013#010+
+  ' {$DEFINE NO_UNIT_PROCESS}'#013#010+
+  '{$ENDIF GO','32V2}'#013#010+
+  #013#010+
+  '{$ifndef NO_UNIT_PROCESS}'#013#010+
+  '  {$define HAS_UNIT_PROCESS}'#013#010+
+  '{$endif NO_UNIT_PROCESS}'#013#010+
+  #013#010+
+  '{$ifndef NO_UNIT_ZIPPER}'#013#010+
+  '  {$define HAS_UNIT_ZIPPER}'#013#010+
+  '{$endif NO_UNIT_ZIPPER}'#013#010+
+  #013#010+
+  'uses'#013#010+
+  '  SysUtils, Classes, StrUtils'#013#010+
+  '{$ifdef HAS_UNIT_PROCESS}'#013#010,
+  '  ,process'#013#010+
+  '{$endif HAS_UNIT_PROCESS}'#013#010+
+  '{$ifdef HAS_UNIT_ZIPPER}'#013#010+
+  '  ,zipper'#013#010+
+  '{$endif HAS_UNIT_ZIPPER}'#013#010+
+  '  ;'#013#010+
+  #013#010+
+  'Type'#013#010+
+  '  TFileType = (ftSource,ftUnit,ftObject,ftResource,ftExecutable,ftStat'+
+  'icLibrary,'#013#010+
+  '               ftSharedLibrary);'#013#010+
+  '  TFileTy','pes = set of TFileType;'#013#010+
+  #013#010+
+  '  // Please keep this order, see OSCPUSupported below'#013#010+
+  '  TCpu=(cpuNone,'#013#010+
+  '    i386,m68k,powerpc,sparc,x86_64,arm,powerpc64,avr,armeb'#013#010+
+  '  );'#013#010+
+  '  TCPUS = Set of TCPU;'#013#010+
+  #013#010+
+  '  // Please keep this order, see OSCPUSupported ','below'#013#010+
+  '  TOS=(osNone,'#013#010+
+  '    linux,go32v2,win32,os2,freebsd,beos,netbsd,'#013#010+
+  '    amiga,atari, solaris, qnx, netware, openbsd,wdosx,'#013#010+
+  '    palmos,macos,darwin,emx,watcom,morphos,netwlibc,'#013#010+
+  '    win64,wince,gba,nds,embedded,symbian,haiku,iphonesim'#013#010,
+  '  );'#013#010+
+  '  TOSes = Set of TOS;'#013#010+
+  #013#010+
+  '  TCompilerMode = (cmFPC,cmTP,cmObjFPC,cmDelphi,cmMacPas);'#013#010+
+  '  TCompilerModes = Set of TCompilerMode;'#013#010+
+  #013#010+
   '  TTargetType = (ttProgram,ttUnit,ttImplicitUnit,ttCleanOnlyUnit,ttExa'+
-  'mpl','eUnit,ttExampleProgram);'#010+
-  '  TTargetTypes = set of TTargetType;'#010+
-  #010+
+  'mpleUnit,ttExampleProgram,ttFPDoc);',#013#010+
+  '  TTargetTypes = set of TTargetType;'#013#010+
+  #013#010+
+  '  TFPDocFormat = (ffHtml, ffHtm, ffXHtml, ffLaTex, ffXMLStruct, ffChm)'+
+  ';'#013#010+
+  '  TFPDocFormats = set of TFPDocFormat;'#013#010+
+  #013#010+
   '  TTargetState = (tsNeutral,tsConsidering,tsNoCompile,tsCompiled,tsIns'+
-  'talled,tsNotFound);'#010+
-  '  TTargetStates = Set of TTargetState;'#010+
-  #010+
-  '  TSourceType = (stDoc,stSrc,stExample,stTest);',#010+
-  '  TSourceTypes = set of TSourceType;'#010+
-  #010+
-  '  TVerboseLevel = (vlError,vlWarning,vlInfo,vldebug,vlCommand);'#010+
-  '  TVerboseLevels = Set of TVerboseLevel;'#010+
-  #010+
-  '  TCommandAt = (caBeforeCompile,caAfterCompile,'#010+
-  '                caBeforeInstall,caAfterInstall,',#010+
-  '                caBeforeArchive,caAfterArchive,'#010+
-  '                caBeforeClean,caAfterClean,'#010+
-  '                caBeforeDownload,caAfterDownload);'#010+
-  #010+
+  'talled,tsNotF','ound);'#013#010+
+  '  TTargetStates = Set of TTargetState;'#013#010+
+  #013#010+
+  '  TSourceType = (stDoc,stSrc,stExample,stTest);'#013#010+
+  '  TSourceTypes = set of TSourceType;'#013#010+
+  #013#010+
+  '  TVerboseLevel = (vlError,vlWarning,vlInfo,vldebug,vlCommand);'#013#010+
+  '  TVerboseLevels = Set of TVerboseLe','vel;'#013#010+
+  #013#010+
+  '  TCommandAt = (caBeforeCompile,caAfterCompile,'#013#010+
+  '                caBeforeInstall,caAfterInstall,'#013#010+
+  '                caBeforeArchive,caAfterArchive,'#013#010+
+  '                caBeforeClean,caAfterClean,'#013#010+
+  '                caBeforeDownload,caAfter','Download);'#013#010+
+  #013#010+
   '  TDependencyType = (depPackage,depImplicitPackage,depUnit,depInclude)'+
-  ';'#010+
-  '  TDependencyTypes = se','t of TDependencyType;'#010+
-  #010+
+  ';'#013#010+
+  '  TDependencyTypes = set of TDependencyType;'#013#010+
+  #013#010+
   '  TLogEvent = Procedure (Level : TVerboseLevel; Const Msg : String) of'+
-  ' Object;'#010+
-  #010+
-  '  TRunMode = (rmCompile,rmBuild,rmInstall,rmArchive,rmClean,rmManifest'+
-  ');'#010+
-  #010+
-  'Const'#010+
-  '  // Aliases'#010+
-  '  Amd64   = X86_64;'#010+
-  '  PPC = PowerPC;'#010+
-  '  PPC64',' = PowerPC64;'#010+
-  '  DOS = Go32v2;'#010+
-  '  MacOSX = Darwin;'#010+
-  #010+
-  '  AllOSes = [Low(TOS)..High(TOS)];'#010+
-  '  AllCPUs = [Low(TCPU)..High(TCPU)];'#010+
-  '  AllUnixOSes  = [Linux,FreeBSD,NetBSD,OpenBSD,Darwin,QNX,BeOS,Solaris'+
-  '];'#010+
-  '  AllBSDOSes      = [FreeBSD,NetBSD,OpenBSD,D','arwin];'#010+
-  '  AllWindowsOSes  = [Win32,Win64,WinCE];'#010+
-  #010+
+  ' Object;'#013#010+
+  '  TNotifyProcEvent = proc','edure(Sender: TObject);'#013#010+
+  #013#010+
+  '  TRunMode = (rmCompile,rmBuild,rmInstall,rmArchive,rmClean,rmDistClea'+
+  'n,rmManifest);'#013#010+
+  #013#010+
+  '  TBuildMode = (bmOneByOne, bmBuildUnit{, bmSkipImplicitUnits});'#013#010+
+  '  TBuildModes = set of TBuildMode;'#013#010+
+  #013#010+
+  'Const'#013#010+
+  '  // Aliases'#013#010,
+  '  Amd64   = X86_64;'#013#010+
+  '  PPC = PowerPC;'#013#010+
+  '  PPC64 = PowerPC64;'#013#010+
+  '  DOS = Go32v2;'#013#010+
+  '  MacOSX = Darwin;'#013#010+
+  #013#010+
+  '  AllOSes = [Low(TOS)..High(TOS)];'#013#010+
+  '  AllCPUs = [Low(TCPU)..High(TCPU)];'#013#010+
+  '  AllUnixOSes  = [Linux,FreeBSD,NetBSD,OpenBSD,Darwin,QNX,BeOS,Sol','ar'+
+  'is,Haiku,iphonesim];'#013#010+
+  '  AllBSDOSes      = [FreeBSD,NetBSD,OpenBSD,Darwin,iphonesim];'#013#010+
+  '  AllWindowsOSes  = [Win32,Win64,WinCE];'#013#010+
+  '  AllLimit83fsOses= [go32v2,os2,emx,watcom];'#013#010+
+  #013#010+
+  '  AllSmartLinkLibraryOSes = [Linux]; // OSes that use .a libra','ry fil'+
+  'es for smart-linking'#013#010+
+  #013#010+
   '  { This table is kept OS,Cpu because it is easier to maintain (PFV) }'+
-  #010+
-  '  OSCPUSupported : array[TOS,TCpu] of boolean = ('#010+
-  '    { os          none   i386    m68k  ppc    sparc  x86_64 arm    pp',
-  'c64  avr    armeb}'#010+
+  #013#010+
+  '  OSCPUSupported : array[TOS,TCpu] of boolean = ('#013#010+
+  '    { os          none   i386    m68k  ppc    sparc  x86_64 arm    ppc'+
+  '64  avr    armeb}',#013#010+
   '    { none }    ( false, false, false, false, false, false, false, fal'+
-  'se, false, false),'#010+
+  'se, false, false),'#013#010+
   '    { linux }   ( false, true,  true,  true,  true,  true,  true,  tru'+
-  'e,  false, true ),'#010+
-  '    { go32v2 }  ( false, true,  false, fals','e, false, false, false, f'+
-  'alse, false, false),'#010+
+  'e,  false, true ),'#013#010+
+  '    { go32v2 }  ( false, true,  false, false, false, false',', false, f'+
+  'alse, false, false),'#013#010+
   '    { win32 }   ( false, true,  false, false, false, false, false, fal'+
-  'se, false, false),'#010+
+  'se, false, false),'#013#010+
   '    { os2 }     ( false, true,  false, false, false, false, false, fal'+
-  'se, false, false),'#010+
-  '    { freebsd } ','( false, true,  true,  false, false, true,  false, f'+
-  'alse, false, false),'#010+
+  'se, false, false),'#013#010+
+  '    { freebsd } ( false, tru','e,  true,  false, false, true,  false, f'+
+  'alse, false, false),'#013#010+
   '    { beos }    ( false, true,  false, false, false, false, false, fal'+
-  'se, false, false),'#010+
+  'se, false, false),'#013#010+
   '    { netbsd }  ( false, true,  true,  true,  true,  false, false, fal'+
-  'se, fals','e, false),'#010+
+  'se, false, false),',#013#010+
   '    { amiga }   ( false, false, true,  true,  false, false, false, fal'+
-  'se, false, false),'#010+
+  'se, false, false),'#013#010+
   '    { atari }   ( false, false, true,  false, false, false, false, fal'+
-  'se, false, false),'#010+
-  '    { solaris } ( false, true,  false, false, true,','  false, false, f'+
-  'alse, false, false),'#010+
+  'se, false, false),'#013#010+
+  '    { solaris } ( false, true,  false, false, true,  false',', false, f'+
+  'alse, false, false),'#013#010+
   '    { qnx }     ( false, true,  false, false, false, false, false, fal'+
-  'se, false, false),'#010+
+  'se, false, false),'#013#010+
   '    { netware } ( false, true,  false, false, false, false, false, fal'+
-  'se, false, false),'#010+
-  '    { openbsd } ( false,',' true,  true,  false, false, false, false, f'+
-  'alse, false, false),'#010+
+  'se, false, false),'#013#010+
+  '    { openbsd } ( false, tru','e,  true,  false, false, false, false, f'+
+  'alse, false, false),'#013#010+
   '    { wdosx }   ( false, true,  false, false, false, false, false, fal'+
-  'se, false, false),'#010+
+  'se, false, false),'#013#010+
   '    { palmos }  ( false, false, true,  false, false, false, true,  fal'+
-  'se, false, false','),'#010+
+  'se, false, false),',#013#010+
   '    { macos }   ( false, false, false, true,  false, false, false, fal'+
-  'se, false, false),'#010+
+  'se, false, false),'#013#010+
   '    { darwin }  ( false, true,  false, true,  false, true,  true,  tru'+
-  'e,  false, false),'#010+
-  '    { emx }     ( false, true,  false, false, false, false,',' false, f'+
-  'alse, false, false),'#010+
+  'e,  false, false),'#013#010+
+  '    { emx }     ( false, true,  false, false, false, false',', false, f'+
+  'alse, false, false),'#013#010+
   '    { watcom }  ( false, true,  false, false, false ,false, false, fal'+
-  'se, false, false),'#010+
+  'se, false, false),'#013#010+
   '    { morphos } ( false, false, false, true,  false ,false, false, fal'+
-  'se, false, false),'#010+
-  '    { netwlibc }( false, true,  ','false, false, false, false, false, f'+
-  'alse, false, false),'#010+
+  'se, false, false),'#013#010+
+  '    { netwlibc }( false, tru','e,  false, false, false, false, false, f'+
+  'alse, false, false),'#013#010+
   '    { win64   } ( false, false, false, false, false, true,  false, fal'+
-  'se, false, false),'#010+
+  'se, false, false),'#013#010+
   '    { wince    }( false, true,  false, false, false, false, true,  fal'+
-  'se, false, false),'#010+
-  '    {',' gba    }  ( false, false, false, false, false, false, true,  f'+
-  'alse, false, false),'#010+
+  'se, false, false),',#013#010+
+  '    { gba    }  ( false, false, false, false, false, false, true,  fal'+
+  'se, false, false),'#013#010+
   '    { nds    }  ( false, false, false, false, false, false, true,  fal'+
-  'se, false, false),'#010+
-  '    { embedded }( false, true,  true,  true,  true,  true,  true,  ','t'+
-  'rue,  true,  true ),'#010+
+  'se, false, false),'#013#010+
+  '    { embedded }( false, true,  true,  true,  true,  true,','  true,  t'+
+  'rue,  true,  true ),'#013#010+
   '    { symbian } ( false, true,  false, false, false, false, true,  fal'+
-  'se, false, false)'#010+
-  '  );'#010+
-  #010+
-  '  // Useful'#010+
-  '  UnitExt = '#039'.ppu'#039';'#010+
-  '  PPUExt  = UnitExt;'#010+
-  '  PasExt  = '#039'.pas'#039';'#010+
-  '  PPExt   = '#039'.pp'#039';'#010+
-  '  IncExt  = '#039'.inc'#039';'#010+
-  '  ObjExt  = ',#039'.o'#039';'#010+
-  '  RstExt  = '#039'.rst'#039';'#010+
-  '  LibExt  = '#039'.a'#039';'#010+
-  '  SharedLibExt = '#039'.so'#039';'#010+
-  '  DLLExt  = '#039'.dll'#039';'#010+
-  '  ExeExt  = '#039'.exe'#039';'#010+
-  '  ZipExt  = '#039'.zip'#039';'#010+
-  #010+
-  '  FPMakePPFile = '#039'fpmake.pp'#039';'#010+
-  '  ManifestFile = '#039'manifest.xml'#039';'#010+
-  '  UnitConfigFile = '#039'fpunits.conf'#039';'#010+
-  #010+
-  '  DirNotFoun','d = '#039'<dirnotfound>'#039';'#010+
-  #010+
-  '  UnitTargets = [ttUnit,ttImplicitUnit,ttCleanOnlyUnit,ttExampleUnit];'+
-  #010+
-  '  ProgramTargets = [ttProgram,ttExampleProgram];'#010+
-  #010+
-  '  DefaultMessages = [vlError,vlWarning,vlCommand];'#010+
-  '  AllMessages = [vlError,vlWarning,vlCommand,v','lInfo];'#010+
-  #010+
-  #010+
-  'Type'#010+
-  '  { TNamedItem }'#010+
-  #010+
-  '  TNamedItem = Class(TCollectionItem)'#010+
-  '  private'#010+
-  '    FName: String;'#010+
-  '    procedure SetName(const AValue: String);virtual;'#010+
-  '  Public'#010+
-  '    property Name : String Read FName Write SetName;'#010+
-  '  end;'#010+
-  #010+
-  '  { TNamedCollect','ion }'#010+
-  #010+
-  '  TNamedCollection = Class(TCollection)'#010+
-  '  private'#010+
-  '    FUniqueNames: Boolean;'#010+
-  '  Public'#010+
-  '    Function IndexOfName(const AName : String) : Integer;'#010+
-  '    Function ItemByName(const AName : String) : TNamedItem;'#010+
-  '    Property UniqueNames : Bo','olean Read FUniqueNames;'#010+
-  '  end;'#010+
-  #010+
-  '  { TNamedItemList }'#010+
-  #010+
-  '  TNamedItemList = Class(TFPList)'#010+
-  '  private'#010+
-  '    function GetNamedItem(Index : Integer): TNamedItem;'#010+
+  'se, false, false),'#013#010+
+  '    { haiku }   ( false, true,  false, false, false, false, false, fal'+
+  'se, false, false),'#013#010+
+  '    { iphonesim}( false, tru','e,  false, false, false, false, false, f'+
+  'alse, false, false)'#013#010+
+  '  );'#013#010+
+  #013#010+
+  '  // Useful'#013#010+
+  '  UnitExt = '#039'.ppu'#039';'#013#010+
+  '  PPUExt  = UnitExt;'#013#010+
+  '  PasExt  = '#039'.pas'#039';'#013#010+
+  '  PPExt   = '#039'.pp'#039';'#013#010+
+  '  IncExt  = '#039'.inc'#039';'#013#010+
+  '  ObjExt  = '#039'.o'#039';'#013#010+
+  '  RstExt  = '#039'.rst'#039';'#013#010+
+  '  LibExt  = '#039,'.a'#039';'#013#010+
+  '  SharedLibExt = '#039'.so'#039';'#013#010+
+  '  DLLExt  = '#039'.dll'#039';'#013#010+
+  '  ExeExt  = '#039'.exe'#039';'#013#010+
+  '  ZipExt  = '#039'.zip'#039';'#013#010+
+  #013#010+
+  '  FPMakePPFile = '#039'fpmake.pp'#039';'#013#010+
+  '  ManifestFile = '#039'manifest.xml'#039';'#013#010+
+  '  UnitConfigFile = '#039'fpunits.cfg'#039';'#013#010+
+  #013#010+
+  '  DirNotFound = '#039'<dirnotfound>'#039';'#013#010+
+  #013#010+
+  '  Unit','Targets = [ttUnit,ttImplicitUnit,ttCleanOnlyUnit,ttExampleUnit'+
+  '];'#013#010+
+  '  ProgramTargets = [ttProgram,ttExampleProgram];'#013#010+
+  #013#010+
+  '  DefaultMessages = [vlError,vlWarning,vlCommand];'#013#010+
+  '  AllMessages = [vlError,vlWarning,vlCommand,vlInfo];'#013#010+
+  #013#010+
+  'Type'#013#010+
+  '  { TNa','medItem }'#013#010+
+  #013#010+
+  '  TNamedItem = Class(TCollectionItem)'#013#010+
+  '  private'#013#010+
+  '    FName: String;'#013#010+
+  '    procedure SetName(const AValue: String);virtual;'#013#010+
+  '  Public'#013#010+
+  '    property Name : String Read FName Write SetName;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TNamedCollection }'#013#010+
+  #013#010+
+  '  T','NamedCollection = Class(TCollection)'#013#010+
+  '  private'#013#010+
+  '    FUniqueNames: Boolean;'#013#010+
+  '  Public'#013#010+
+  '    Function IndexOfName(const AName : String) : Integer;'#013#010+
+  '    Function ItemByName(const AName : String) : TNamedItem;'#013#010+
+  '    Property UniqueNames : Boolea','n Read FUniqueNames;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TNamedItemList }'#013#010+
+  #013#010+
+  '  TNamedItemList = Class(TFPList)'#013#010+
+  '  private'#013#010+
+  '    function GetNamedItem(Index : Integer): TNamedItem;'#013#010+
   '    procedure SetNamedItem(Index : Integer; const AValue: TNamedItem);'+
-  #010+
-  '  public'#010+
-  '    F','unction IndexOfName(const AName : String) : Integer;'#010+
-  '    Function ItemByName(const ANAme : String) : TNamedItem;'#010+
+  #013#010+
+  '  public'#013,#010+
+  '    Function IndexOfName(const AName : String) : Integer;'#013#010+
+  '    Function ItemByName(const ANAme : String) : TNamedItem;'#013#010+
   '    Property NamedItems[Index : Integer] : TNamedItem Read GetNamedIte'+
-  'm Write SetNamedItem; default;'#010+
-  '  end;'#010+
-  #010+
-  '  { TCommand }'#010+
-  '  T','Command = Class(TNamedItem)'#010+
-  '  private'#010+
-  '    FAfterCommand: TNotifyEvent;'#010+
-  '    FBeforeCommand: TNotifyEvent;'#010+
-  '    FCommand: String;'#010+
-  '    FCommandAt: TCommandAt;'#010+
-  '    FDestFile: String;'#010+
-  '    FIgnoreResult: Boolean;'#010+
-  '    FOptions: TStrings;'#010+
-  '    FSourc','eFile: String;'#010+
-  '    Function GetOptions : TStrings;'#010+
-  '    Procedure SetOptions(Const Value : TStrings);'#010+
-  '  Public'#010+
-  '    Destructor Destroy; override;'#010+
-  '    Function HaveOptions : Boolean;'#010+
-  '    Function CmdLineOptions : String;'#010+
-  '    Procedure ParseOpt','ions(S : String);'#010+
-  '    Property SourceFile : String Read FSourceFile Write FSourceFile;'#010+
-  '    Property DestFile : String Read FDestFile Write FDestFile;'#010+
-  '    Property Command : String Read FCommand Write FCommand;'#010+
-  '    Property Options : TString','s Read GetOptions Write SetOptions;'#010+
-  '    Property At : TCommandAt Read FCommandAt Write FCommandAt;'#010+
+  'm Write SetNamedItem; default;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TCo','mmand }'#013#010+
+  '  TCommand = Class(TNamedItem)'#013#010+
+  '  private'#013#010+
+  '    FAfterCommand: TNotifyEvent;'#013#010+
+  '    FBeforeCommand: TNotifyEvent;'#013#010+
+  '    FCommand: String;'#013#010+
+  '    FCommandAt: TCommandAt;'#013#010+
+  '    FDestFile: String;'#013#010+
+  '    FIgnoreResult: Boolean;'#013#010+
+  '    FOptions: ','TStrings;'#013#010+
+  '    FSourceFile: String;'#013#010+
+  '    Function GetOptions : TStrings;'#013#010+
+  '    Procedure SetOptions(Const Value : TStrings);'#013#010+
+  '  Public'#013#010+
+  '    Destructor Destroy; override;'#013#010+
+  '    Function HaveOptions : Boolean;'#013#010+
+  '    Function CmdLineOptions : Str','ing;'#013#010+
+  '    Procedure ParseOptions(S : String);'#013#010+
+  '    Property SourceFile : String Read FSourceFile Write FSourceFile;'#013+
+  #010+
+  '    Property DestFile : String Read FDestFile Write FDestFile;'#013#010+
+  '    Property Command : String Read FCommand Write FCommand;',#013#010+
+  '    Property Options : TStrings Read GetOptions Write SetOptions;'#013#010+
+  '    Property At : TCommandAt Read FCommandAt Write FCommandAt;'#013#010+
   '    Property IgnoreResult : Boolean Read FIgnoreResult Write FIgnoreRe'+
-  'sult;'#010+
-  '    Property BeforeCommand : TNotifyEvent Read FBeforeCommand Wri','te '+
-  'FBeforeCommand;'#010+
+  'sult;'#013#010+
+  '    Property BeforeCommand : T','NotifyEvent Read FBeforeCommand Write '+
+  'FBeforeCommand;'#013#010+
   '    Property AfterCommand : TNotifyEvent Read FAfterCommand Write FAft'+
-  'erCommand;'#010+
-  '  end;'#010+
-  #010+
-  '  { TCommands }'#010+
-  #010+
-  '  TCommands = Class(TNamedCollection)'#010+
-  '  private'#010+
-  '    FDefaultAt: TCommandAt;'#010+
-  '    function GetCommand(const Dest : St','ring): TCommand;'#010+
-  '    function GetCommandItem(Index : Integer): TCommand;'#010+
+  'erCommand;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TCommands }'#013#010+
+  #013#010+
+  '  TCommands = Class(TNamedCollection)'#013#010+
+  '  private'#013#010+
+  '    FDefaultAt: TCommand','At;'#013#010+
+  '    function GetCommand(const Dest : String): TCommand;'#013#010+
+  '    function GetCommandItem(Index : Integer): TCommand;'#013#010+
   '    procedure SetCommandItem(Index : Integer; const AValue: TCommand);'+
-  #010+
-  '  Public'#010+
-  '    Function AddCommand(Const Cmd : String) : TCommand;'#010+
-  '    Function AddCommand(Const C','md,Options : String) : TCommand;'#010+
+  #013#010+
+  '  Public'#013#010+
+  '    Function AddCommand(Const Cmd : Str','ing) : TCommand;'#013#010+
+  '    Function AddCommand(Const Cmd,Options : String) : TCommand;'#013#010+
   '    Function AddCommand(Const Cmd,Options,Dest,Source : String) : TCom'+
-  'mand;'#010+
+  'mand;'#013#010+
   '    Function AddCommand(At : TCommandAt; Const Cmd : String) : TComman'+
-  'd;'#010+
-  '    Function AddCommand(At : TCommandAt; Const Cmd,Options',' : String)'+
-  ' : TCommand;'#010+
+  'd;'#013#010+
+  '    Fu','nction AddCommand(At : TCommandAt; Const Cmd,Options : String)'+
+  ' : TCommand;'#013#010+
   '    Function AddCommand(At : TCommandAt; Const Cmd,Options, Dest,Sourc'+
-  'e : String) : TCommand;'#010+
-  '    Property CommandItems[Index : Integer] : TCommand Read GetCommandI'+
-  'tem Write SetCommandItem;'#010+
-  '    Property Commands[Dest ',': String] : TCommand Read GetCommand; def'+
-  'ault;'#010+
-  '    Property DefaultAt : TCommandAt Read FDefaultAt Write FDefaultAt;'#010+
-  '  end;'#010+
-  #010+
-  '  { TFPVersion }'#010+
-  #010+
-  '  TFPVersion = Class(TPersistent)'#010+
-  '  private'#010+
-  '    FMajor,'#010+
-  '    FMinor,'#010+
-  '    FMicro,'#010+
-  '    FBuild    : W','ord;'#010+
-  '    function GetAsString: String;'#010+
-  '    function GetEmpty: Boolean;'#010+
-  '    procedure SetAsString(const AValue: String);'#010+
-  '  Public'#010+
-  '   Procedure Clear;'#010+
-  '   Procedure Assign(Source : TPersistent); override;'#010+
-  '   Function CompareVersion(AVersion : ','TFPVersion) : Integer;'#010+
-  '   Function SameVersion(AVersion : TFPVersion) : Boolean;'#010+
-  '   Property AsString : String Read GetAsString Write SetAsString;'#010+
-  '   Property Empty : Boolean Read GetEmpty;'#010+
-  '  Published'#010+
-  '   Property Major : Word Read FMajor W','rite FMajor;'#010+
-  '   Property Minor : Word Read FMinor Write FMinor;'#010+
-  '   Property Micro : Word Read FMicro Write FMicro;'#010+
-  '   Property Build : Word Read FBuild Write FBuild;'#010+
-  '  end;'#010+
-  #010+
-  '  { TConditionalString }'#010+
-  '  TConditionalString = Class'#010+
-  '  private'#010+
-  '  ','  FOSes   : TOSes;'#010+
-  '    FCPUs   : TCPUs;'#010+
-  '    FValue  : String;'#010+
-  '  Public'#010+
-  '    Constructor Create;virtual;'#010+
-  '    Property Value : String Read FValue Write FValue;'#010+
-  '    Property OSes  : TOSes Read FOSes Write FOSes;'#010+
-  '    Property CPUs : TCPUs Read F','CPUS Write FCPUs;'#010+
-  '  end;'#010+
-  #010+
-  '  TConditionalStringClass = class of TConditionalString;'#010+
-  #010+
-  '  { TConditionalStrings }'#010+
-  #010+
-  '  TConditionalStrings = Class(TFPList)'#010+
-  '  private'#010+
-  '    FCSClass : TConditionalStringClass;'#010+
-  '    function GetConditionalString(Index ',': Integer): TConditionalStri'+
-  'ng;'#010+
+  'e : String) : TCommand;'#013#010+
+  '    Property CommandItems[Index : Integer] : TCommand Read GetCommand',
+  'Item Write SetCommandItem;'#013#010+
+  '    Property Commands[Dest : String] : TCommand Read GetCommand; defau'+
+  'lt;'#013#010+
+  '    Property DefaultAt : TCommandAt Read FDefaultAt Write FDefaultAt;'#013+
+  #010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TFPVersion }'#013#010+
+  #013#010+
+  '  TFPVersion = Class(TPersistent)'#013#010+
+  ' ',' private'#013#010+
+  '    FMajor,'#013#010+
+  '    FMinor,'#013#010+
+  '    FMicro,'#013#010+
+  '    FBuild    : Integer;'#013#010+
+  '    function GetAsString: String;'#013#010+
+  '    function GetEmpty: Boolean;'#013#010+
+  '    procedure SetAsString(const AValue: String);'#013#010+
+  '  Public'#013#010+
+  '   Procedure Clear;'#013#010+
+  '   Procedure Ass','ign(Source : TPersistent); override;'#013#010+
+  '   Function CompareVersion(AVersion : TFPVersion) : Integer;'#013#010+
+  '   Function SameVersion(AVersion : TFPVersion) : Boolean;'#013#010+
+  '   Property AsString : String Read GetAsString Write SetAsString;'#013#010+
+  '   Property Em','pty : Boolean Read GetEmpty;'#013#010+
+  '  Published'#013#010+
+  '   Property Major : Integer Read FMajor Write FMajor;'#013#010+
+  '   Property Minor : Integer Read FMinor Write FMinor;'#013#010+
+  '   Property Micro : Integer Read FMicro Write FMicro;'#013#010+
+  '   Property Build : Integer Read',' FBuild Write FBuild;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TConditionalString }'#013#010+
+  '  TConditionalString = Class'#013#010+
+  '  private'#013#010+
+  '    FOSes   : TOSes;'#013#010+
+  '    FCPUs   : TCPUs;'#013#010+
+  '    FValue  : String;'#013#010+
+  '  Public'#013#010+
+  '    Constructor Create;virtual;'#013#010+
+  '    Property Value : String Re','ad FValue Write FValue;'#013#010+
+  '    Property OSes  : TOSes Read FOSes Write FOSes;'#013#010+
+  '    Property CPUs : TCPUs Read FCPUS Write FCPUs;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  TConditionalStringClass = class of TConditionalString;'#013#010+
+  #013#010+
+  '  { TConditionalStrings }'#013#010+
+  #013#010+
+  '  TConditiona','lStrings = Class(TFPList)'#013#010+
+  '  private'#013#010+
+  '    FCSClass : TConditionalStringClass;'#013#010+
+  '    function GetConditionalString(Index : Integer): TConditionalString'+
+  ';'#013#010+
   '    procedure SetConditionalString(Index : Integer; const AValue: TCon'+
-  'ditionalString);'#010+
-  '  Public'#010+
-  '    Constructor Create(AClass:TConditionalStringClass);'#010+
-  '    Function Add(Const Value : String) : TConditionalStr','ing;inline;'#010+
+  'ditionalString);'#013#010,
+  '  Public'#013#010+
+  '    Constructor Create(AClass:TConditionalStringClass);'#013#010+
+  '    Function Add(Const Value : String) : TConditionalString;inline;'#013+
+  #010+
   '    Function Add(Const Value : String;const OSes:TOSes) : TConditional'+
-  'String;inline;'#010+
-  '{$ifdef cpu_only_overloads}'#010+
+  'String;inline;'#013#010+
+  '{$ifdef cpu_only_o','verloads}'#013#010+
   '    Function Add(Const Value : String;const CPUs:TCPUs) : TConditional'+
-  'String;inline;'#010+
-  '{$endif cpu_only_overloads}'#010+
-  '  ','  Function Add(Const Value : String;const CPUs:TCPUs;const OSes:TO'+
-  'Ses) : TConditionalString;'#010+
-  '    Property ConditionalStrings[Index : Integer] : TConditionalString '+
-  'Read GetConditionalString Write SetConditionalString; default;'#010+
-  '  end;'#010+
-  #010+
-  '  { TD','ependency }'#010+
-  '  TDependency = Class(TConditionalString)'#010+
-  '  private'#010+
-  '    FDependencyType : TDependencyType;'#010+
-  '    // Package, Unit'#010+
-  '    FTarget : TObject;'#010+
-  '    FVersion : TFPVersion;'#010+
-  '    FRequireChecksum : Cardinal;'#010+
-  '    // Filenames, Includes'#010+
-  '    FT','argetFileName : String;'#010+
-  '    Function GetVersion : string;'#010+
-  '    Procedure SetVersion(const V : string);'#010+
-  '  Public'#010+
-  '    Constructor Create;override;'#010+
-  '    Destructor Destroy;override;'#010+
-  '    Property Target : TObject Read FTarget Write FTarget;'#010+
-  '    P','roperty DependencyType : TDependencyType Read FDependencyType;'#010+
-  '    Property TargetFileName : String Read FTargetFileName Write FTarge'+
-  'tFileName;'#010+
-  '    Property Version : String Read GetVersion Write SetVersion;'#010+
-  '    Property RequireChecksum : C','ardinal Read FRequireChecksum Write '+
-  'FRequireChecksum;'#010+
-  '  end;'#010+
-  #010+
-  '  TDependencies = Class(TConditionalStrings)'#010+
-  '    function GetDependency(Index : Integer): TDependency;'#010+
-  '    procedure SetDependency(Index : Integer; const AValue: TDependency'+
-  ');'#010+
-  '  ','Public'#010+
-  '    Function Add(Const Value : String) : TDependency;inline;'#010+
-  '    Function Add(Const Value : String;const OSes:TOSes) : TDependency;'+
-  'inline;'#010+
-  '{$ifdef cpu_only_overloads}'#010+
-  '    Function Add(Const Value : String;const CPUs:TCPUs) : TDepende','nc'+
-  'y;inline;'#010+
-  '{$endif cpu_only_overloads}'#010+
+  'String;inline;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
   '    Function Add(Const Value : String;const CPUs:TCPUs;const OSes:TOSe'+
-  's) : TDependency;'#010+
-  '    Function AddUnit(Const Value : String) : TDependency;inline;'#010+
-  '    Function AddUnit(Const Value : String;const',' OSes:TOSes) : TDepen'+
-  'dency;inline;'#010+
-  '{$ifdef cpu_only_overloads}'#010+
-  '    Function AddUnit(Const Value : String;const CPUs:TCPUs) : TDepende'+
-  'ncy;inline;'#010+
-  '{$endif cpu_only_overloads}'#010+
-  '    Function AddUnit(Const Value : String;const CPUs:TCPUs;const OS','e'+
-  's:TOSes) : TDependency;'#010+
-  '    Function AddInclude(Const Value : String) : TDependency;inline;'#010+
+  's) : TConditionalString;'#013#010+
+  '    Property Condi','tionalStrings[Index : Integer] : TConditionalStrin'+
+  'g Read GetConditionalString Write SetConditionalString; default;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TDependency }'#013#010+
+  '  TDependency = Class(TConditionalString)'#013#010+
+  '  private'#013#010+
+  '    FDependencyType : TDependencyType;'#013#010+
+  ' ','   // Package, Unit'#013#010+
+  '    FTarget : TObject;'#013#010+
+  '    FVersion : TFPVersion;'#013#010+
+  '    FRequireChecksum : Cardinal;'#013#010+
+  '    // Filenames, Includes'#013#010+
+  '    FTargetFileName : String;'#013#010+
+  '    Function GetVersion : string;'#013#010+
+  '    Procedure SetVersion(const V : stri','ng);'#013#010+
+  '  Public'#013#010+
+  '    Constructor Create;override;'#013#010+
+  '    Destructor Destroy;override;'#013#010+
+  '    Property Target : TObject Read FTarget Write FTarget;'#013#010+
+  '    Property DependencyType : TDependencyType Read FDependencyType;'#013+
+  #010+
+  '    Property TargetFileName ',': String Read FTargetFileName Write FTar'+
+  'getFileName;'#013#010+
+  '    Property Version : String Read GetVersion Write SetVersion;'#013#010+
+  '    Property RequireChecksum : Cardinal Read FRequireChecksum Write FR'+
+  'equireChecksum;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  TDependencies = Class(','TConditionalStrings)'#013#010+
+  '    function GetDependency(Index : Integer): TDependency;'#013#010+
+  '    procedure SetDependency(Index : Integer; const AValue: TDependency'+
+  ');'#013#010+
+  '  Public'#013#010+
+  '    Function Add(Const Value : String) : TDependency;inline;'#013#010+
+  '    Function ','Add(Const Value : String;const OSes:TOSes) : TDependenc'+
+  'y;inline;'#013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
+  '    Function Add(Const Value : String;const CPUs:TCPUs) : TDependency;'+
+  'inline;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  '    Function Add(Const Value : String',';const CPUs:TCPUs;const OSes:TO'+
+  'Ses) : TDependency;'#013#010+
+  '    Function AddUnit(Const Value : String) : TDependency;inline;'#013#010+
+  '    Function AddUnit(Const Value : String;const OSes:TOSes) : TDepende'+
+  'ncy;inline;'#013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
+  '    Functi','on AddUnit(Const Value : String;const CPUs:TCPUs) : TDepen'+
+  'dency;inline;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  '    Function AddUnit(Const Value : String;const CPUs:TCPUs;const OSes:'+
+  'TOSes) : TDependency;'#013#010+
+  '    Function AddInclude(Const Value : String)',' : TDependency;inline;'#013+
+  #010+
   '    Function AddInclude(Const Value : String;const OSes:TOSes) : TDepe'+
-  'ndency;inline;'#010+
-  '{$ifdef cpu_only_overloads}'#010+
-  '    Function AddInclude(Const Valu','e : String;const CPUs:TCPUs) : TDe'+
-  'pendency;inline;'#010+
-  '{$endif cpu_only_overloads}'#010+
+  'ndency;inline;'#013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
+  '    Function AddInclude(Const Value : String;const CPUs:TCPUs) : TDepe'+
+  'ndency;inline;'#013#010+
+  '{$endif cpu_onl','y_overloads}'#013#010+
   '    Function AddInclude(Const Value : String;const CPUs:TCPUs;const OS'+
-  'es:TOSes) : TDependency;'#010+
-  '    Property Dependencies[Index : Integer] : TDependency Read GetD','ep'+
-  'endency Write SetDependency; default;'#010+
-  '  end;'#010+
-  #010+
-  '  { TTarget }'#010+
-  #010+
-  '  TTarget = Class(TNamedItem)'#010+
-  '  private'#010+
-  '    FInstall : Boolean;'#010+
-  '    FAfterClean: TNotifyEvent;'#010+
-  '    FAfterCompile: TNotifyEvent;'#010+
-  '    FBeforeClean: TNotifyEvent;'#010+
-  '    FBeforeCompil','e: TNotifyEvent;'#010+
-  '    FCPUs: TCPUs;'#010+
-  '    FOSes: TOSes;'#010+
-  '    FMode: TCompilerMode;'#010+
-  '    FResourceStrings: Boolean;'#010+
-  '    FObjectPath,'#010+
-  '    FUnitPath,'#010+
-  '    FIncludePath : TConditionalStrings;'#010+
-  '    FDependencies : TDependencies;'#010+
-  '    FCommands : TComman','ds;'#010+
-  '    FDirectory: String;'#010+
-  '    FExtension: String;'#010+
-  '    FTargetSourceFileName : String;'#010+
-  '    FFileType: TFileType;'#010+
-  '    FOptions: TStrings;'#010+
-  '    FFPCTarget: String;'#010+
-  '    FTargetState: TTargetState;'#010+
-  '    FTargetType: TTargetType;'#010+
-  '    function Get','Options: TStrings;'#010+
-  '    procedure SetOptions(const AValue: TStrings);'#010+
-  '  Protected'#010+
-  '    Function GetSourceFileName : String; virtual;'#010+
-  '    Function GetUnitFileName : String; virtual;'#010+
-  '    Function GetObjectFileName : String; virtual;'#010+
-  '    Functio','n GetRSTFileName : String; Virtual;'#010+
-  '    Function GetProgramFileName(AOS : TOS) : String; Virtual;'#010+
-  '  Public'#010+
-  '    Constructor Create(ACollection : TCollection); override;'#010+
-  '    Destructor Destroy; override;'#010+
-  '    Function  GetOutputFileName (AOs :',' TOS) : String; Virtual;'#010+
-  '    Function HaveOptions : Boolean;'#010+
-  '    procedure SetName(const AValue: String);override;'#010+
-  '    Procedure GetCleanFiles(List : TStrings; const APrefixU, APrefixB '+
-  ': String; ACPU:TCPU; AOS : TOS); virtual;'#010+
-  '    Procedure',' GetInstallFiles(List : TStrings; const APrefixU, APref'+
-  'ixB: String; ACPU:TCPU; AOS : TOS); virtual;'#010+
-  '    Procedure GetArchiveFiles(List : TStrings; ACPU:TCPU; AOS : TOS); '+
-  'virtual;'#010+
-  '    Property Dependencies : TDependencies Read FDependencies;',#010+
-  '    Property Commands : TCommands Read FCommands;'#010+
-  '    Property State : TTargetState Read FTargetState;'#010+
-  '    Property TargetType : TTargetType Read FTargetType Write FTargetTy'+
-  'pe;'#010+
-  '    Property OSes : TOSes Read FOSes Write FOSes;'#010+
-  '    Property',' CPUs : TCPUs Read FCPUs Write FCPUs;'#010+
-  '    Property Mode : TCompilerMode Read FMode Write FMode;'#010+
-  '    Property Options : TStrings Read GetOptions Write SetOptions;'#010+
-  '    Property SourceFileName: String Read GetSourceFileName ;'#010+
-  '    Property Unit','FileName : String Read GetUnitFileName;'#010+
-  '    Property ObjectFileName : String Read GetObjectFileName;'#010+
-  '    Property RSTFileName : String Read GetRSTFileName;'#010+
-  '    Property FPCTarget : String Read FFPCTarget Write FFPCTarget;'#010+
-  '    Property Exten','sion : String Read FExtension Write FExtension;'#010+
-  '    Property FileType : TFileType Read FFileType Write FFileType;'#010+
-  '    Property Directory : String Read FDirectory Write FDirectory;'#010+
-  '    Property ResourceStrings : Boolean Read FResourceStrings',' Write F'+
-  'ResourceStrings;'#010+
-  '    Property Install : Boolean Read FInstall Write FInstall;'#010+
-  '    Property TargetSourceFileName: String Read FTargetSourceFileName;'#010+
-  '    Property ObjectPath : TConditionalStrings Read FObjectPath;'#010+
-  '    Property UnitPat','h : TConditionalStrings Read FUnitPath;'#010+
-  '    Property IncludePath : TConditionalStrings Read FIncludePath;'#010+
-  '    // Events.'#010+
+  'es:TOSes) : TDependency;'#013#010+
+  '    Property Dependencies[Index : Integer] : TDependency Read GetDepen'+
+  'dency Write SetDependency; default;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TTarget }',#013#010+
+  #013#010+
+  '  TTarget = Class(TNamedItem)'#013#010+
+  '  private'#013#010+
+  '    FInstall : Boolean;'#013#010+
+  '    FAfterClean: TNotifyEvent;'#013#010+
+  '    FAfterCompile: TNotifyEvent;'#013#010+
+  '    FBeforeClean: TNotifyEvent;'#013#010+
+  '    FBeforeCompile: TNotifyEvent;'#013#010+
+  '    FCPUs: TCPUs;'#013#010+
+  '    FOSes: TOSes',';'#013#010+
+  '    FMode: TCompilerMode;'#013#010+
+  '    FResourceStrings: Boolean;'#013#010+
+  '    FObjectPath,'#013#010+
+  '    FUnitPath,'#013#010+
+  '    FIncludePath : TConditionalStrings;'#013#010+
+  '    FDependencies : TDependencies;'#013#010+
+  '    FCommands : TCommands;'#013#010+
+  '    FDirectory: String;'#013#010+
+  '    FExtension',': String;'#013#010+
+  '    FTargetSourceFileName : String;'#013#010+
+  '    FFileType: TFileType;'#013#010+
+  '    FOptions: TStrings;'#013#010+
+  '    FFPCTarget: String;'#013#010+
+  '    FTargetState: TTargetState;'#013#010+
+  '    FTargetType: TTargetType;'#013#010+
+  '    FXML: string;'#013#010+
+  '    function GetOptions: TString','s;'#013#010+
+  '    procedure SetOptions(const AValue: TStrings);'#013#010+
+  '  Protected'#013#010+
+  '    Function GetSourceFileName : String; virtual;'#013#010+
+  '    Function GetUnitFileName : String; virtual;'#013#010+
+  '    function GetUnitLibFileName: String; virtual;'#013#010+
+  '    Function GetObjec','tFileName : String; virtual;'#013#010+
+  '    Function GetRSTFileName : String; Virtual;'#013#010+
+  '    Function GetProgramFileName(AOS : TOS) : String; Virtual;'#013#010+
+  '  Public'#013#010+
+  '    Constructor Create(ACollection : TCollection); override;'#013#010+
+  '    Destructor Destroy; ove','rride;'#013#010+
+  '    Function  GetOutputFileName (AOs : TOS) : String; Virtual;'#013#010+
+  '    Function HaveOptions : Boolean;'#013#010+
+  '    procedure SetName(const AValue: String);override;'#013#010+
+  '    procedure SetXML(const AValue: string);'#013#010+
+  '    Procedure GetCleanFiles(Lis','t : TStrings; const APrefixU, APrefix'+
+  'B : String; ACPU:TCPU; AOS : TOS); virtual;'#013#010+
+  '    Procedure GetInstallFiles(List : TStrings; const APrefixU, APrefix'+
+  'B: String; ACPU:TCPU; AOS : TOS); virtual;'#013#010+
+  '    Procedure GetArchiveFiles(List : TString','s; ACPU:TCPU; AOS : TOS)'+
+  '; virtual;'#013#010+
+  '    Property Dependencies : TDependencies Read FDependencies;'#013#010+
+  '    Property Commands : TCommands Read FCommands;'#013#010+
+  '    Property State : TTargetState Read FTargetState;'#013#010+
+  '    Property TargetType : TTargetTyp','e Read FTargetType Write FTarget'+
+  'Type;'#013#010+
+  '    Property OSes : TOSes Read FOSes Write FOSes;'#013#010+
+  '    Property CPUs : TCPUs Read FCPUs Write FCPUs;'#013#010+
+  '    Property Mode : TCompilerMode Read FMode Write FMode;'#013#010+
+  '    Property Options : TStrings Read Get','Options Write SetOptions;'#013+
+  #010+
+  '    Property SourceFileName: String Read GetSourceFileName ;'#013#010+
+  '    Property UnitFileName : String Read GetUnitFileName;'#013#010+
+  '    Property UnitLibFileName : String Read GetUnitLibFileName;'#013#010+
+  '    Property ObjectFileName :',' String Read GetObjectFileName;'#013#010+
+  '    Property RSTFileName : String Read GetRSTFileName;'#013#010+
+  '    Property FPCTarget : String Read FFPCTarget Write FFPCTarget;'#013#010+
+  '    Property Extension : String Read FExtension Write FExtension;'#013#010+
+  '    Property File','Type : TFileType Read FFileType Write FFileType;'#013+
+  #010+
+  '    Property Directory : String Read FDirectory Write FDirectory;'#013#010+
+  '    Property ResourceStrings : Boolean Read FResourceStrings Write FRe'+
+  'sourceStrings;'#013#010+
+  '    Property Install : Boolean Read F','Install Write FInstall;'#013#010+
+  '    Property TargetSourceFileName: String Read FTargetSourceFileName;'#013+
+  #010+
+  '    Property ObjectPath : TConditionalStrings Read FObjectPath;'#013#010+
+  '    Property UnitPath : TConditionalStrings Read FUnitPath;'#013#010+
+  '    Property Inclu','dePath : TConditionalStrings Read FIncludePath;'#013+
+  #010+
+  '    Property XML: string Read FXML Write SetXML;'#013#010+
+  '    // Events.'#013#010+
   '    Property BeforeCompile : TNotifyEvent Read FBeforeCompile Write FB'+
-  'eforeCompile;'#010+
-  '    Property AfterCompile : TNotify','Event Read FAfterCompile Write FA'+
-  'fterCompile;'#010+
+  'eforeCompile;'#013#010+
+  '    Property AfterCompile : TNotifyEvent',' Read FAfterCompile Write FA'+
+  'fterCompile;'#013#010+
   '    Property BeforeClean : TNotifyEvent Read FBeforeClean Write FBefor'+
-  'eClean;'#010+
+  'eClean;'#013#010+
   '    Property AfterClean : TNotifyEvent Read FAfterClean Write FAfterCl'+
-  'ean;'#010+
-  '  end;'#010+
-  #010+
-  '  { TTargets }'#010+
-  #010+
-  '  TTargets = Clas','s(TNamedCollection)'#010+
-  '  private'#010+
-  '    function GetTargetItem(Index : Integer): TTarget;'#010+
-  '    function GetTarget(const AName : String): TTarget;'#010+
-  '    procedure SetTargetItem(Index : Integer; const AValue: TTarget);'#010+
-  '  Public'#010+
-  '    Function AddUnit(Co','nst AUnitName : String) : TTarget;inline;'#010+
+  'ean;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TTargets }'#013#010+
+  #013#010+
+  '  TTargets = Cl','ass(TNamedCollection)'#013#010+
+  '  private'#013#010+
+  '    function GetTargetItem(Index : Integer): TTarget;'#013#010+
+  '    function GetTarget(const AName : String): TTarget;'#013#010+
+  '    procedure SetTargetItem(Index : Integer; const AValue: TTarget);'#013+
+  #010+
+  '  Public'#013#010+
+  '    Function Ad','dFPDoc(Const AUnitName, AXMLName : String) : TTarget;'+
+  'inline;'#013#010+
+  '    Function AddUnit(Const AUnitName : String) : TTarget;inline;'#013#010+
   '    Function AddUnit(Const AUnitName : String;const OSes:TOSes) : TTar'+
-  'get;inline;'#010+
-  '{$ifdef cpu_only_overloads}'#010+
+  'get;inline;'#013#010+
+  '{$ifdef cpu_only_overloads}'#013#010,
   '    Function AddUnit(Const AUnitName : String;const CPUs:TCPUs) : TTar'+
-  'get;inline;'#010+
-  '{$endi','f cpu_only_overloads}'#010+
+  'get;inline;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
   '    Function AddUnit(Const AUnitName : String;const CPUs:TCPUs;const O'+
-  'Ses:TOSes) : TTarget;'#010+
-  '    Function AddImplicitUnit(Const AUnitName : String;InstallUnit:bool'+
-  'ean=true) : TTarget;inline;'#010+
-  '    Function AddImplicitUnit','(Const AUnitName : String;const OSes:TOS'+
-  'es;InstallUnit:boolean=true) : TTarget;inline;'#010+
+  'Ses:TOSes) : TTarget;'#013#010+
+  '    Function AddImplicitUnit(Const ','AUnitName : String;InstallUnit:bo'+
+  'olean=true) : TTarget;inline;'#013#010+
+  '    Function AddImplicitUnit(Const AUnitName : String;const OSes:TOSes'+
+  ';InstallUnit:boolean=true) : TTarget;inline;'#013#010+
+  '    Function AddImplicitUnit(Const AUnitName : String;const ','CPUs:TCP'+
+  'Us;InstallUnit:boolean=true) : TTarget;inline;'#013#010+
   '    Function AddImplicitUnit(Const AUnitName : String;const CPUs:TCPUs'+
-  ';InstallUnit:boolean=true) : TTarget;inline;'#010+
-  '    Function AddImplicitUnit(Const AUn','itName : String;const CPUs:TCP'+
-  'Us;const OSes:TOSes;InstallUnit:boolean=true) : TTarget;'#010+
-  '    Function AddProgram(Const AProgramName : String) : TTarget;inline;'+
-  #010+
+  ';const OSes:TOSes;InstallUnit:boolean=true) : TTarget;'#013#010+
+  '    Function AddProgram(Const AProgramName : String) : TTa','rget;inlin'+
+  'e;'#013#010+
   '    Function AddProgram(Const AProgramName : String;const OSes:TOSes) '+
-  ': TTarget;in','line;'#010+
-  '{$ifdef cpu_only_overloads}'#010+
+  ': TTarget;inline;'#013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
   '    Function AddProgram(Const AProgramName : String;const CPUs:TCPUs) '+
-  ': TTarget;inline;'#010+
-  '{$endif cpu_only_overloads}'#010+
+  ': TTarget;inline;'#013#010+
+  '{$endif cpu_only_ov','erloads}'#013#010+
   '    Function AddProgram(Const AProgramName : String;const CPUs:TCPUs;c'+
-  'onst OSes:TOSes) : T','Target;'#010+
+  'onst OSes:TOSes) : TTarget;'#013#010+
   '    Function AddExampleUnit(Const AUnitName : String) : TTarget;inline'+
-  ';'#010+
-  '    Function AddExampleUnit(Const AUnitName : String;const OSes:TOSes)'+
-  ' : TTarget;inline;'#010+
-  '{$ifdef cpu_only_overloads}'#010+
-  '    Function AddExampleUnit(Const AUnitName',' : String;const CPUs:TCPU'+
-  's) : TTarget;inline;'#010+
-  '{$endif cpu_only_overloads}'#010+
-  '    Function AddExampleUnit(Const AUnitName : String;const CPUs:TCPUs;'+
-  'const OSes:TOSes) : TTarget;'#010+
-  '    Function AddExampleProgram(Const AProgramName : String) : TTarg','e'+
-  't;inline;'#010+
+  ';'#013#010+
+  '    Function AddExampleUnit(Const AUnitName : String;const',' OSes:TOSe'+
+  's) : TTarget;inline;'#013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
+  '    Function AddExampleUnit(Const AUnitName : String;const CPUs:TCPUs)'+
+  ' : TTarget;inline;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  '    Function AddExampleUnit(Const AUnitName : String;const C','PUs:TCPU'+
+  's;const OSes:TOSes) : TTarget;'#013#010+
+  '    Function AddExampleProgram(Const AProgramName : String) : TTarget;'+
+  'inline;'#013#010+
   '    Function AddExampleProgram(Const AProgramName : String;const OSes:'+
-  'TOSes) : TTarget;inline;'#010+
-  '{$ifdef cpu_only_overloads}'#010+
+  'TOSes) : TTarget;inline;'#013#010+
+  '{$ifdef cpu_only_overload','s}'#013#010+
   '    Function AddExampleProgram(Const AProgramName : String;const CPUs:'+
-  'TCPUs) : TTarget;inline;'#010+
-  '{$endif cpu','_only_overloads}'#010+
+  'TCPUs) : TTarget;inline;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
   '    Function AddExampleProgram(Const AProgramName : String;const CPUs:'+
-  'TCPUs;const OSes:TOSes) : TTarget;'#010+
-  '    Property Targets[AName : String] : TTarget Read GetTarget; default'+
-  ';'#010+
-  '    Property TargetItems[Index : Integer] : TT','arget Read GetTargetIt'+
-  'em Write SetTargetItem;'#010+
-  '  end;'#010+
-  #010+
-  '  { TSource }'#010+
-  #010+
-  '  TSource = Class(TNamedItem)'#010+
-  '  private'#010+
-  '    FSourceType : TSourceType;'#010+
-  '    FInstallSourcePath : string;'#010+
-  '    function GetInstallSourcePath: string;'#010+
-  '  Public'#010+
-  '    Constructor',' Create(ACollection : TCollection); override;'#010+
-  '    Destructor Destroy; override;'#010+
-  '    Procedure GetInstallFiles(List : TStrings); virtual;'#010+
-  '    property SourceType : TSourceType read FSourceType;'#010+
-  '    property InstallSourcePath : string read Ge','tInstallSourcePath;'#010+
-  '  end;'#010+
-  #010+
-  '  { TSources }'#010+
-  #010+
-  '  TSources = Class(TNamedCollection)'#010+
-  '  private'#010+
-  '    function GetSourceItem(Index : Integer): TSource;'#010+
-  '    procedure SetSourceItem(Index : Integer; const AValue: TSource);'#010+
-  '  public'#010+
-  '    Function AddD','oc(const AFiles : String) : TSource;'#010+
-  '    Function AddDoc(const AFiles : String; AInstallSourcePath : String'+
-  ') : TSource;'#010+
-  '    Function AddSrc(const AFiles : String) : TSource;'#010+
-  '    Function AddExample(const AFiles : String) : TSource;'#010+
-  '    Func','tion AddExample(const AFiles : String; AInstallSourcePath : '+
-  'String) : TSource;'#010+
-  '    Function AddTest(const AFiles : String) : TSource;'#010+
+  'TCPUs;const OSes:TOSes) : TTarget;'#013#010+
+  '    P','roperty Targets[AName : String] : TTarget Read GetTarget; defau'+
+  'lt;'#013#010+
+  '    Property TargetItems[Index : Integer] : TTarget Read GetTargetItem'+
+  ' Write SetTargetItem;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TSource }'#013#010+
+  #013#010+
+  '  TSource = Class(TNamedItem)'#013#010+
+  '  private'#013#010+
+  '    FSourc','eType : TSourceType;'#013#010+
+  '    FInstallSourcePath : string;'#013#010+
+  '    function GetInstallSourcePath: string;'#013#010+
+  '  Public'#013#010+
+  '    Constructor Create(ACollection : TCollection); override;'#013#010+
+  '    Destructor Destroy; override;'#013#010+
+  '    Procedure GetInstallFiles(Lis','t : TStrings); virtual;'#013#010+
+  '    property SourceType : TSourceType read FSourceType;'#013#010+
+  '    property InstallSourcePath : string read GetInstallSourcePath;'#013+
+  #010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TSources }'#013#010+
+  #013#010+
+  '  TSources = Class(TNamedCollection)'#013#010+
+  '  private'#013#010+
+  '    function ','GetSourceItem(Index : Integer): TSource;'#013#010+
+  '    procedure SetSourceItem(Index : Integer; const AValue: TSource);'#013+
+  #010+
+  '  public'#013#010+
+  '    Function AddDoc(const AFiles : String) : TSource;'#013#010+
+  '    Function AddDoc(const AFiles : String; AInstallSourcePath :',' Stri'+
+  'ng) : TSource;'#013#010+
+  '    Function AddSrc(const AFiles : String) : TSource;'#013#010+
+  '    Function AddExample(const AFiles : String) : TSource;'#013#010+
+  '    Function AddExample(const AFiles : String; AInstallSourcePath : St'+
+  'ring) : TSource;'#013#010+
+  '    Function AddT','est(const AFiles : String) : TSource;'#013#010+
   '    procedure AddDocFiles(const AFileMask: string; Recursive: boolean '+
-  '= False; AInstallSourcePath : String',' = '#039#039');'#010+
+  '= False; AInstallSourcePath : String = '#039#039');'#013#010+
   '    procedure AddSrcFiles(const AFileMask: string; Recursive: boolean '+
-  '= False);'#010+
-  '    procedure AddExampleFiles(const AFileMask: string; Recursive: bool'+
-  'ean = False; AInstallSourcePath : String = '#039#039');'#010+
-  '    procedure AddTestFiles(const A','FileMask: string; Recursive: boole'+
-  'an = False);'#010+
-  '    Property SourceItems[Index : Integer] : TSource Read GetSourceItem'+
-  ' Write SetSourceItem;default;'#010+
-  '  end;'#010+
-  #010+
-  '  { TPackage }'#010+
-  #010+
-  '  TPackage = Class(TNamedItem)'#010+
-  '  private'#010+
-  '    FAfterArchive: TNotifyEv','ent;'#010+
-  '    FAfterClean: TNotifyEvent;'#010+
-  '    FAfterCompile: TNotifyEvent;'#010+
-  '    FAfterInstall: TNotifyEvent;'#010+
-  '    FAfterManifest: TNotifyEvent;'#010+
-  '    FBeforeArchive: TNotifyEvent;'#010+
-  '    FBeforeClean: TNotifyEvent;'#010+
-  '    FBeforeCompile: TNotifyEvent;'#010+
-  '    ','FBeforeInstall: TNotifyEvent;'#010+
-  '    FBeforeManifest: TNotifyEvent;'#010+
-  '    FUnitPath,'#010+
-  '    FObjectPath,'#010+
-  '    FIncludePath,'#010+
-  '    FSourcePath,'#010+
-  '    FExamplePath,'#010+
-  '    FTestPath,'#010+
-  '    FCleanFiles,'#010+
-  '    FInstallFiles : TConditionalStrings;'#010+
-  '    FDependencies',' : TDependencies;'#010+
-  '    FCPUs: TCPUs;'#010+
-  '    FOSes: TOSes;'#010+
-  '    FTargetState: TTargetState;'#010+
-  '    FTargets: TTargets;'#010+
-  '    FSources: TSources;'#010+
-  '    FDirectory: String;'#010+
-  '    FOptions: TStrings;'#010+
-  '    FFileName: String;'#010+
-  '    FAuthor: String;'#010+
-  '    FLicense: ','String;'#010+
-  '    FHomepageURL: String;'#010+
-  '    FDownloadURL: String;'#010+
-  '    FVersion: TFPVersion;'#010+
-  '    FEmail : String;'#010+
-  '    FNeedLibC : Boolean;'#010+
-  '    FCommands : TCommands;'#010+
-  '    FDescriptionFile : String;'#010+
-  '    FDescription : String;'#010+
-  '    FInstalledChecksum ',': Cardinal;'#010+
-  '    // Cached directory of installed packages'#010+
-  '    FUnitDir : String;'#010+
-  '    Function GetDescription : string;'#010+
-  '    Function GetFileName : string;'#010+
-  '    function GetOptions: TStrings;'#010+
-  '    Function GetVersion : string;'#010+
-  '    procedure Set','Options(const AValue: TStrings);'#010+
-  '    Procedure SetVersion(const V : string);'#010+
-  '  Protected'#010+
-  '    procedure SetName(const AValue: String);override;'#010+
-  '    procedure LoadUnitConfigFromFile(Const AFileName: String);'#010+
-  '    procedure SaveUnitConfigToFile','(Const AFileName: String;ACPU:TCPU'+
-  ';AOS:TOS);'#010+
-  '  Public'#010+
-  '    constructor Create(ACollection: TCollection); override;'#010+
-  '    destructor destroy; override;'#010+
-  '    Function HaveOptions : Boolean;'#010+
-  '    Function  GetUnitsOutputDir(ACPU:TCPU; AOS : TOS):St','ring;'#010+
-  '    Function  GetBinOutputDir(ACPU:TCPU; AOS : TOS) : String;'#010+
+  '= False);'#013#010+
+  '    p','rocedure AddExampleFiles(const AFileMask: string; Recursive: bo'+
+  'olean = False; AInstallSourcePath : String = '#039#039');'#013#010+
+  '    procedure AddTestFiles(const AFileMask: string; Recursive: boolean'+
+  ' = False);'#013#010+
+  '    Property SourceItems[Index : Integer] : ','TSource Read GetSourceIt'+
+  'em Write SetSourceItem;default;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TPackage }'#013#010+
+  #013#010+
+  '  TPackage = Class(TNamedItem)'#013#010+
+  '  private'#013#010+
+  '    FAfterArchive: TNotifyEvent;'#013#010+
+  '    FAfterArchiveProc: TNotifyProcEvent;'#013#010+
+  '    FAfterClean: TNotifyEvent;'#013#010+
+  '    ','FAfterCleanProc: TNotifyProcEvent;'#013#010+
+  '    FAfterCompile: TNotifyEvent;'#013#010+
+  '    FAfterCompileProc: TNotifyProcEvent;'#013#010+
+  '    FAfterInstall: TNotifyEvent;'#013#010+
+  '    FAfterInstallProc: TNotifyProcEvent;'#013#010+
+  '    FAfterManifest: TNotifyEvent;'#013#010+
+  '    FAfterManifes','tProc: TNotifyProcEvent;'#013#010+
+  '    FBeforeArchive: TNotifyEvent;'#013#010+
+  '    FBeforeArchiveProc: TNotifyProcEvent;'#013#010+
+  '    FBeforeClean: TNotifyEvent;'#013#010+
+  '    FBeforeCleanProc: TNotifyProcEvent;'#013#010+
+  '    FBeforeCompile: TNotifyEvent;'#013#010+
+  '    FBeforeCompileProc: TNo','tifyProcEvent;'#013#010+
+  '    FBeforeInstall: TNotifyEvent;'#013#010+
+  '    FBeforeInstallProc: TNotifyProcEvent;'#013#010+
+  '    FBeforeManifest: TNotifyEvent;'#013#010+
+  '    FBeforeManifestProc: TNotifyProcEvent;'#013#010+
+  '    FBuildMode: TBuildMode;'#013#010+
+  '    FFPDocFormat: TFPDocFormats;'#013#010+
+  '   ',' FIsFPMakeAddIn: boolean;'#013#010+
+  '    FSupportBuildModes: TBuildModes;'#013#010+
+  '    FUnitPath,'#013#010+
+  '    FObjectPath,'#013#010+
+  '    FIncludePath,'#013#010+
+  '    FSourcePath,'#013#010+
+  '    FExamplePath,'#013#010+
+  '    FTestPath,'#013#010+
+  '    FCleanFiles,'#013#010+
+  '    FInstallFiles : TConditionalStrings;'#013#010+
+  '    FDepe','ndencies : TDependencies;'#013#010+
+  '    FCPUs: TCPUs;'#013#010+
+  '    FOSes: TOSes;'#013#010+
+  '    FTargetState: TTargetState;'#013#010+
+  '    FTargets: TTargets;'#013#010+
+  '    FSources: TSources;'#013#010+
+  '    FDirectory: String;'#013#010+
+  '    FOptions: TStrings;'#013#010+
+  '    FFileName: String;'#013#010+
+  '    FAuthor: Strin','g;'#013#010+
+  '    FLicense: String;'#013#010+
+  '    FHomepageURL: String;'#013#010+
+  '    FDownloadURL: String;'#013#010+
+  '    FVersion: TFPVersion;'#013#010+
+  '    FEmail : String;'#013#010+
+  '    FNeedLibC : Boolean;'#013#010+
+  '    FCommands : TCommands;'#013#010+
+  '    FDescriptionFile : String;'#013#010+
+  '    FDescription : Strin','g;'#013#010+
+  '    FInstalledChecksum : Cardinal;'#013#010+
+  '    // Cached directory of installed packages'#013#010+
+  '    FUnitDir : String;'#013#010+
+  '    FBUTargets: TTargets;'#013#010+
+  '    FBUTarget: TTarget;'#013#010+
+  '    Function GetDescription : string;'#013#010+
+  '    Function GetFileName : string;'#013#010+
+  '  ','  function GetOptions: TStrings;'#013#010+
+  '    Function GetVersion : string;'#013#010+
+  '    procedure SetOptions(const AValue: TStrings);'#013#010+
+  '    Procedure SetVersion(const V : string);'#013#010+
+  '  Protected'#013#010+
+  '    procedure SetName(const AValue: String);override;'#013#010+
+  '    pro','cedure LoadUnitConfigFromFile(Const AFileName: String);'#013#010+
+  '    procedure SaveUnitConfigToStringList(Const AStringList: TStrings;A'+
+  'CPU:TCPU;AOS:TOS); virtual;'#013#010+
+  '    procedure SaveUnitConfigToFile(Const AFileName: String;ACPU:TCPU;A'+
+  'OS:TOS);'#013#010+
+  '  Pu','blic'#013#010+
+  '    constructor Create(ACollection: TCollection); override;'#013#010+
+  '    destructor destroy; override;'#013#010+
+  '    Function HaveOptions : Boolean;'#013#010+
+  '    Function  GetUnitsOutputDir(ACPU:TCPU; AOS : TOS):String;'#013#010+
+  '    Function  GetBinOutputDir(ACPU:TCP','U; AOS : TOS) : String;'#013#010+
   '    Procedure GetCleanFiles(List : TStrings; ACPU:TCPU; AOS : TOS); vi'+
-  'rtual;'#010+
+  'rtual;'#013#010+
   '    procedure GetInstallFiles(List: TStrings;Types : TTargetTypes;ACPU'+
-  ':TCPU; AOS : TOS);'#010+
-  '    pr','ocedure GetInstallSourceFiles(List: TStrings;Types : TSourceTy'+
-  'pes);'#010+
+  ':TCPU; AOS : TOS); virtual;'#013#010+
+  '    procedure GetInstallSourceFiles(Li','st: TStrings; SourceTypes : TS'+
+  'ourceTypes; TargetTypes : TTargetTypes); virtual;'#013#010+
   '    Procedure GetArchiveFiles(List : TStrings; ACPU:TCPU; AOS : TOS); '+
-  'virtual;'#010+
-  '    Procedure GetManifest(Manifest : TStrings);'#010+
-  '    Property Version : String Read GetVersion',' Write SetVersion;'#010+
-  '    Property FileName : String Read GetFileName Write FFileName;'#010+
+  'virtual;'#013#010+
+  '    Procedure GetArchiveSourceFiles(List : TStrings); virtual;'#013#010+
+  '    Procedure G','etManifest(Manifest : TStrings);'#013#010+
+  '    Property Version : String Read GetVersion Write SetVersion;'#013#010+
+  '    Property FileName : String Read GetFileName Write FFileName;'#013#010+
   '    Property HomepageURL : String Read FHomepageURL Write FHomepageURL'+
-  ';'#010+
-  '    Property DownloadURL : String Read FDownloadURL Write FDownloadURL'+
-  ';'#010+
-  '    Property',' Email : String Read FEmail Write FEmail;'#010+
-  '    Property Author : String Read FAuthor Write FAuthor;'#010+
-  '    Property License : String Read FLicense Write FLicense;'#010+
-  '    Property Directory : String Read FDirectory Write FDirectory;'#010+
-  '    Property De','scription : String Read GetDescription Write FDescrip'+
-  'tion;'#010+
+  ';'#013#010+
+  '  ','  Property DownloadURL : String Read FDownloadURL Write FDownloadU'+
+  'RL;'#013#010+
+  '    Property Email : String Read FEmail Write FEmail;'#013#010+
+  '    Property Author : String Read FAuthor Write FAuthor;'#013#010+
+  '    Property License : String Read FLicense Write FLicen','se;'#013#010+
+  '    Property Directory : String Read FDirectory Write FDirectory;'#013#010+
+  '    Property Description : String Read GetDescription Write FDescripti'+
+  'on;'#013#010+
   '    Property DescriptionFile : String Read FDescriptionFile Write FDes'+
-  'criptionFile;'#010+
-  '    Property InstalledChecksum : Cardinal Read FInstalledChecksum Writ'+
-  'e FInstalledChecksum;'#010+
-  '    /','/ Compiler options.'#010+
-  '    Property OSes : TOSes Read FOSes Write FOSes;'#010+
-  '    Property CPUs : TCPUs Read FCPUs Write FCPUs;'#010+
-  '    Property NeedLibC : Boolean Read FNeedLibC Write FNeedLibC;'#010+
-  '    Property Options: TStrings Read GetOptions Write Set','Options;'#010+
-  '    Property UnitPath : TConditionalStrings Read FUnitPath;'#010+
-  '    Property ObjectPath : TConditionalStrings Read FObjectPath;'#010+
-  '    Property IncludePath : TConditionalStrings Read FIncludePath;'#010+
-  '    Property SourcePath : TConditionalStr','ings Read FSourcePath;'#010+
-  '    Property ExamplePath : TConditionalStrings Read FExamplePath;'#010+
-  '    Property TestPath : TConditionalStrings Read FTestPath;'#010+
-  '    // Targets and dependencies'#010+
-  '    Property InstallFiles : TConditionalStrings Read FInsta','llFiles;'#010+
-  '    Property CleanFiles : TConditionalStrings Read FCleanFiles;'#010+
-  '    Property Dependencies : TDependencies Read FDependencies;'#010+
-  '    Property Commands : TCommands Read FCommands;'#010+
-  '    Property State : TTargetState Read FTargetState;'#010+
-  '  ','  Property Targets : TTargets Read FTargets;'#010+
-  '    Property Sources : TSources Read FSources;'#010+
-  '    Property UnitDir : String Read FUnitDir Write FUnitDir;'#010+
-  '    // events'#010+
+  'criptionFile;'#013#010+
+  '    Prop','erty InstalledChecksum : Cardinal Read FInstalledChecksum Wr'+
+  'ite FInstalledChecksum;'#013#010+
+  '    Property IsFPMakeAddIn: boolean read FIsFPMakeAddIn write FIsFPMak'+
+  'eAddIn;'#013#010+
+  '    Property SupportBuildModes: TBuildModes read FSupportBuildModes wr'+
+  'ite FS','upportBuildModes;'#013#010+
+  '    Property BuildMode: TBuildMode read FBuildMode;'#013#010+
+  '    // Compiler options.'#013#010+
+  '    Property OSes : TOSes Read FOSes Write FOSes;'#013#010+
+  '    Property CPUs : TCPUs Read FCPUs Write FCPUs;'#013#010+
+  '    Property NeedLibC : Boolean Read FNe','edLibC Write FNeedLibC;'#013#010+
+  '    Property Options: TStrings Read GetOptions Write SetOptions;'#013#010+
+  '    Property UnitPath : TConditionalStrings Read FUnitPath;'#013#010+
+  '    Property ObjectPath : TConditionalStrings Read FObjectPath;'#013#010+
+  '    Property IncludePat','h : TConditionalStrings Read FIncludePath;'#013+
+  #010+
+  '    Property SourcePath : TConditionalStrings Read FSourcePath;'#013#010+
+  '    Property ExamplePath : TConditionalStrings Read FExamplePath;'#013#010+
+  '    Property TestPath : TConditionalStrings Read FTestPath;'#013#010+
+  '   ',' Property FPDocFormat: TFPDocFormats read FFPDocFormat write FFPD'+
+  'ocFormat;'#013#010+
+  '    // Targets and dependencies'#013#010+
+  '    Property InstallFiles : TConditionalStrings Read FInstallFiles;'#013+
+  #010+
+  '    Property CleanFiles : TConditionalStrings Read FCleanFiles',';'#013#010+
+  '    Property Dependencies : TDependencies Read FDependencies;'#013#010+
+  '    Property Commands : TCommands Read FCommands;'#013#010+
+  '    Property State : TTargetState Read FTargetState;'#013#010+
+  '    Property Targets : TTargets Read FTargets;'#013#010+
+  '    Property Sources ',': TSources Read FSources;'#013#010+
+  '    Property UnitDir : String Read FUnitDir Write FUnitDir;'#013#010+
+  '    // events'#013#010+
   '    Property BeforeCompile : TNotifyEvent Read FBeforeCompile Write FB'+
-  'efor','eCompile;'#010+
+  'eforeCompile;'#013#010+
+  '    Property BeforeCompileProc : TNotifyProcEvent Re','ad FBeforeCompil'+
+  'eProc write FBeforeCompileProc;'#013#010+
   '    Property AfterCompile : TNotifyEvent Read FAfterCompile Write FAft'+
-  'erCompile;'#010+
-  '    Property BeforeInstall : TNotifyEvent Read FBeforeInstall Write FB'+
-  'eforeInstall;'#010+
+  'erCompile;'#013#010+
+  '    Property AfterCompileProc : TNotifyProcEvent Read FAfterCompilePro'+
+  'c Write FAfterCompileProc;'#013#010+
+  '    Propert','y BeforeInstall : TNotifyEvent Read FBeforeInstall Write '+
+  'FBeforeInstall;'#013#010+
+  '    Property BeforeInstallProc : TNotifyProcEvent Read FBeforeInstallP'+
+  'roc Write FBeforeInstallProc;'#013#010+
   '    Property AfterInstall : TNotifyEvent Read FAfterInstall Write',' FA'+
-  'fterInstall;'#010+
+  'fterInstall;'#013#010+
+  '    Property AfterInstallProc : TNotifyProcEvent Read FAfterInstallPro'+
+  'c Write FAfterInstallProc;'#013#010+
   '    Property BeforeClean : TNotifyEvent Read FBeforeClean Write FBefor'+
-  'eClean;'#010+
+  'eClean;'#013#010+
+  '    Property BeforeCleanProc : TNotifyProcEven','t Read FBeforeCleanPro'+
+  'c Write FBeforeCleanProc;'#013#010+
   '    Property AfterClean : TNotifyEvent Read FAfterClean Write FAfterCl'+
-  'ean;'#010+
-  '    Property BeforeArchive : TNotifyEvent Read FBeforeArchive Write FB'+
-  'e','foreArchive;'#010+
+  'ean;'#013#010+
+  '    Property AfterCleanProc : TNotifyProcEvent Read FAfterCleanProc Wr'+
+  'ite FAfterCleanProc;'#013#010+
+  '    Property BeforeArch','ive : TNotifyEvent Read FBeforeArchive Write '+
+  'FBeforeArchive;'#013#010+
+  '    Property BeforeArchiveProc : TNotifyProcEvent Read FBeforeArchiveP'+
+  'roc Write FBeforeArchiveProc;'#013#010+
   '    Property AfterArchive : TNotifyEvent Read FAfterArchive Write FAft'+
-  'erArchive;'#010+
+  'erArchi','ve;'#013#010+
+  '    Property AfterArchiveProc : TNotifyProcEvent Read FAfterArchivePro'+
+  'c Write FAfterArchiveProc;'#013#010+
   '    Property BeforeManifest : TNotifyEvent Read FBeforeManifest Write '+
-  'FBeforeManifest;'#010+
-  '    Property AfterManifest : TNotifyEvent Read FAfterManife','st Write '+
-  'FAfterManifest;'#010+
-  '  end;'#010+
-  #010+
-  '  { TPackages }'#010+
-  #010+
-  '  TPackages = Class(TNamedCollection)'#010+
-  '  private'#010+
-  '    function GetPackage(const AName : String): TPackage;'#010+
-  '    function GetPackageItem(AIndex : Integer): TPackage;'#010+
-  '    procedure SetPackageItem','(AIndex : Integer; const AValue: TPackag'+
-  'e);'#010+
-  '  Public'#010+
-  '    Function AddPackage(Const AName : String) : TPackage;'#010+
+  'FBeforeManifest;'#013#010+
+  '    Property BeforeManifestProc : TNotifyProcEven','t Read FBeforeManif'+
+  'estProc Write FBeforeManifestProc;'#013#010+
+  '    Property AfterManifest : TNotifyEvent Read FAfterManifest Write FA'+
+  'fterManifest;'#013#010+
+  '    Property AfterManifestProc : TNotifyProcEvent Read FAfterManifestP'+
+  'roc Write FAfterManifestProc;'#013,#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TPackages }'#013#010+
+  #013#010+
+  '  TPackages = Class(TNamedCollection)'#013#010+
+  '  private'#013#010+
+  '    function GetPackage(const AName : String): TPackage;'#013#010+
+  '    function GetPackageItem(AIndex : Integer): TPackage;'#013#010+
+  '    procedure SetPackageItem(AIndex : Intege','r; const AValue: TPackag'+
+  'e);'#013#010+
+  '  Public'#013#010+
+  '    Function AddPackage(Const AName : String) : TPackage;'#013#010+
   '    Property Packages[AName : String] : TPackage Read GetPackage ; Def'+
-  'ault;'#010+
-  '    Property PackageItems[AIndex : Integer] : TPackag','e Read GetPacka'+
-  'geItem Write SetPackageItem;'#010+
-  '  end;'#010+
-  #010+
-  '  { TCustomDefaults }'#010+
-  #010+
-  '  TCustomDefaults = Class(TPersistent)'#010+
-  '  Private'#010+
-  '    FArchive: String;'#010+
-  '    FCompiler: String;'#010+
-  '    FCopy: String;'#010+
-  '    FMkDir: String;'#010+
-  '    FMove: String;'#010+
-  '    FOptions:',' TStrings;'#010+
-  '    FCPU: TCPU;'#010+
-  '    FOS: TOS;'#010+
-  '    FMode : TCompilerMode;'#010+
-  '    FCompilerVersion : String;'#010+
-  '    FPrefix: String;'#010+
-  '    FLocalUnitDir,'#010+
-  '    FGlobalUnitDir,'#010+
-  '    FBaseInstallDir,'#010+
-  '    FUnitInstallDir,'#010+
-  '    FBinInstallDir,'#010+
-  '    FDocInstallDir,',#010+
-  '    FExamplesInstallDir : String;'#010+
-  '    FRemove: String;'#010+
-  '    FTarget: String;'#010+
-  '    FUnixPaths: Boolean;'#010+
-  '    FNoFPCCfg: Boolean;'#010+
-  '    function GetLocalUnitDir: String;'#010+
-  '    function GetGlobalUnitDir: String;'#010+
-  '    function GetBaseInstallDir: Strin','g;'#010+
-  '    function GetBinInstallDir: String;'#010+
-  '    function GetCompiler: String;'#010+
-  '    function GetDocInstallDir: String;'#010+
-  '    function GetExamplesInstallDir: String;'#010+
-  '    function GetOptions: TStrings;'#010+
-  '    function GetUnitInstallDir: String;'#010+
-  '    pr','ocedure SetLocalUnitDir(const AValue: String);'#010+
-  '    procedure SetGlobalUnitDir(const AValue: String);'#010+
-  '    procedure SetBaseInstallDir(const AValue: String);'#010+
-  '    procedure SetCPU(const AValue: TCPU);'#010+
-  '    procedure SetOptions(const AValue: TSt','rings);'#010+
-  '    procedure SetOS(const AValue: TOS);'#010+
-  '    procedure SetPrefix(const AValue: String);'#010+
-  '    procedure SetTarget(const AValue: String);'#010+
-  '  Protected'#010+
-  '    procedure RecalcTarget;'#010+
-  '    Function CmdLineOptions : String;'#010+
-  '  Public'#010+
-  '    Constru','ctor Create;'#010+
-  '    Procedure InitDefaults;'#010+
-  '    Function HaveOptions: Boolean;'#010+
-  '    procedure CompilerDefaults; virtual;'#010+
-  '    Procedure LocalInit(Const AFileName : String);'#010+
-  '    Procedure LoadFromFile(Const AFileName : String);'#010+
-  '    Procedure Save','ToFile(Const AFileName : String);'#010+
-  '    procedure SaveToStream(S : TStream);virtual;'#010+
-  '    procedure LoadFromStream(S : TStream);virtual;'#010+
-  '    // Compile Information'#010+
-  '    Property Target : String Read FTarget Write SetTarget;'#010+
-  '    Property OS : TO','S Read FOS Write SetOS;'#010+
-  '    Property CPU : TCPU Read FCPU Write SetCPU;'#010+
-  '    Property Mode : TCompilerMode Read FMode Write FMode;'#010+
-  '    Property UnixPaths : Boolean Read FUnixPaths Write FUnixPaths;'#010+
-  '    Property Options : TStrings Read GetOpt','ions Write SetOptions;   '+
-  ' // Default compiler options.'#010+
-  '    Property NoFPCCfg : Boolean Read FNoFPCCfg Write FNoFPCCfg;'#010+
-  '    // paths etc.'#010+
+  'ault;'#013#010+
+  '    Property PackageItems[AIndex : Integer] : TPackage Read GetPa','cka'+
+  'geItem Write SetPackageItem;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TCustomDefaults }'#013#010+
+  #013#010+
+  '  TCustomDefaults = Class(TPersistent)'#013#010+
+  '  Private'#013#010+
+  '    FArchive: String;'#013#010+
+  '    FBuildMode: TBuildMode;'#013#010+
+  '    FCompiler: String;'#013#010+
+  '    FCopy: String;'#013#010+
+  '    FFPDocOutputDir: Stri','ng;'#013#010+
+  '    FIgnoreInvalidOptions: Boolean;'#013#010+
+  '    FInstallExamples: Boolean;'#013#010+
+  '    FMkDir: String;'#013#010+
+  '    FMove: String;'#013#010+
+  '    FOptions: TStrings;'#013#010+
+  '    FCPU: TCPU;'#013#010+
+  '    FOS: TOS;'#013#010+
+  '    FMode : TCompilerMode;'#013#010+
+  '    FCompilerVersion : String;'#013#010+
+  '    FPre','fix: String;'#013#010+
+  '    FLocalUnitDir,'#013#010+
+  '    FGlobalUnitDir,'#013#010+
+  '    FBaseInstallDir,'#013#010+
+  '    FUnitInstallDir,'#013#010+
+  '    FBinInstallDir,'#013#010+
+  '    FDocInstallDir,'#013#010+
+  '    FExamplesInstallDir : String;'#013#010+
+  '    FRemoveTree: String;'#013#010+
+  '    FRemoveDir: String;'#013#010+
+  '    FRemove: ','String;'#013#010+
+  '    FTarget: String;'#013#010+
+  '    FUnixPaths: Boolean;'#013#010+
+  '    FNoFPCCfg: Boolean;'#013#010+
+  '    FUseEnvironment: Boolean;'#013#010+
+  '    function GetFPDocOutputDir: String;'#013#010+
+  '    function GetLocalUnitDir: String;'#013#010+
+  '    function GetGlobalUnitDir: String;'#013#010+
+  '    fun','ction GetBaseInstallDir: String;'#013#010+
+  '    function GetBinInstallDir: String;'#013#010+
+  '    function GetCompiler: String;'#013#010+
+  '    function GetDocInstallDir: String;'#013#010+
+  '    function GetExamplesInstallDir: String;'#013#010+
+  '    function GetOptions: TStrings;'#013#010+
+  '    functi','on GetUnitInstallDir: String;'#013#010+
+  '    procedure SetLocalUnitDir(const AValue: String);'#013#010+
+  '    procedure SetGlobalUnitDir(const AValue: String);'#013#010+
+  '    procedure SetBaseInstallDir(const AValue: String);'#013#010+
+  '    procedure SetCPU(const AValue: TCPU);'#013#010+
+  ' ','   procedure SetOptions(const AValue: TStrings);'#013#010+
+  '    procedure SetOS(const AValue: TOS);'#013#010+
+  '    procedure SetPrefix(const AValue: String);'#013#010+
+  '    procedure SetTarget(const AValue: String);'#013#010+
+  '    procedure SetUnitInstallDir(const AValue: String)',';'#013#010+
+  '  Protected'#013#010+
+  '    procedure RecalcTarget;'#013#010+
+  '    Function CmdLineOptions : String;'#013#010+
+  '  Public'#013#010+
+  '    Constructor Create;'#013#010+
+  '    Procedure InitDefaults;'#013#010+
+  '    Function HaveOptions: Boolean;'#013#010+
+  '    procedure CompilerDefaults; virtual;'#013#010+
+  '    Procedure ','LocalInit(Const AFileName : String);'#013#010+
+  '    Procedure LoadFromFile(Const AFileName : String);'#013#010+
+  '    Procedure SaveToFile(Const AFileName : String);'#013#010+
+  '    procedure SaveToStream(S : TStream);virtual;'#013#010+
+  '    procedure LoadFromStream(S : TStream);vi','rtual;'#013#010+
+  '    // Compile Information'#013#010+
+  '    Property Target : String Read FTarget Write SetTarget;'#013#010+
+  '    Property OS : TOS Read FOS Write SetOS;'#013#010+
+  '    Property CPU : TCPU Read FCPU Write SetCPU;'#013#010+
+  '    Property Mode : TCompilerMode Read FMode Write',' FMode;'#013#010+
+  '    Property UnixPaths : Boolean Read FUnixPaths Write FUnixPaths;'#013+
+  #010+
+  '    Property Options : TStrings Read GetOptions Write SetOptions;    /'+
+  '/ Default compiler options.'#013#010+
+  '    Property NoFPCCfg : Boolean Read FNoFPCCfg Write FNoFPCCfg;'#013,#010+
+  '    // paths etc.'#013#010+
   '    Property LocalUnitDir : String Read GetLocalUnitDir Write SetLocal'+
-  'UnitDir;'#010+
-  '    Property GlobalUnitD','ir : String Read GetGlobalUnitDir Write SetG'+
-  'lobalUnitDir;'#010+
-  '    Property Prefix : String Read FPrefix Write SetPrefix;'#010+
+  'UnitDir;'#013#010+
+  '    Property GlobalUnitDir : String Read GetGlobalUnitDir Write SetGlo'+
+  'balUnitDir;'#013#010+
+  '    Property Prefix : String Read FPrefix Write SetPrefix',';'#013#010+
   '    Property BaseInstallDir : String Read GetBaseInstallDir Write SetB'+
-  'aseInstallDir;'#010+
-  '    Property UnitInstallDir : String R','ead GetUnitInstallDir Write FU'+
-  'nitInstallDir;'#010+
-  '    Property BinInstallDir : String Read GetBinInstallDir Write FBinIn'+
-  'stallDir;'#010+
+  'aseInstallDir;'#013#010+
+  '    Property UnitInstallDir : String Read GetUnitInstallDir Write SetU'+
+  'nitInstallDir;'#013#010+
+  '    Property BinInstallDir : String Read GetBinInstallDir Write F','Bin'+
+  'InstallDir;'#013#010+
   '    Property DocInstallDir : String Read GetDocInstallDir Write FDocIn'+
-  'stallDir;'#010+
-  '    Property ExamplesInstallDir : S','tring Read GetExamplesInstallDir '+
-  'Write FExamplesInstallDir;'#010+
-  '    // Command tools. If not set, internal commands  will be used.'#010+
+  'stallDir;'#013#010+
+  '    Property ExamplesInstallDir : String Read GetExamplesInstallDir Wr'+
+  'ite FExamplesInstallDir;'#013#010+
+  '    Property FPDocOutputDir : String Read GetFP','DocOutputDir Write FF'+
+  'PDocOutputDir;'#013#010+
+  '    // Command tools. If not set, internal commands  will be used.'#013+
+  #010+
   '    Property Compiler : String Read GetCompiler Write FCompiler; // Co'+
-  'mpiler. Defaults to fpc'#010+
-  '    Property Copy :',' String Read FCopy Write FCopy;             // co'+
-  'py $(FILES) to $(DEST)'#010+
+  'mpiler. Defaults to fpc'#013#010+
+  '    Property Copy : String Read FCopy Wr','ite FCopy;             // co'+
+  'py $(FILES) to $(DEST)'#013#010+
   '    Property Move : String Read FMove Write FMove;             // Move'+
-  ' $(FILES) to $(DEST)'#010+
+  ' $(FILES) to $(DEST)'#013#010+
   '    Property Remove : String Read FRemove Write FRemove;       // Dele'+
-  'te $(FI','LES)'#010+
-  '    Property MkDir : String Read FMkDir write FMkDir;          // Make'+
-  ' $(DIRECTORY)'#010+
+  'te $(FILES)'#013#010+
+  '    Property ','RemoveDir : String Read FRemoveDir Write FRemoveDir;   '+
+  '    // Delete $(FILES)'#013#010+
+  '    Property RemoveTree : String Read FRemoveTree Write FRemoveTree;  '+
+  '     // removes $(DIRECTORY)'#013#010+
+  '    Property MkDir : String Read FMkDir write FMkDir;        ','  // Ma'+
+  'ke $(DIRECTORY)'#013#010+
   '    Property Archive : String Read FArchive Write FArchive;    // zip '+
-  '$(ARCHIVE) $(FILESORDIRS)'#010+
-  '  end;'#010+
-  #010+
-  '  { TBasicDefaults }'#010+
-  #010+
-  '  TBasicDefaults = Class(','TCustomDefaults)'#010+
-  '  end;'#010+
-  #010+
-  '  { TFPCDefaults }'#010+
-  #010+
-  '  TFPCDefaults = Class(TCustomDefaults)'#010+
-  '  public'#010+
-  '    procedure CompilerDefaults; override;'#010+
-  '  end;'#010+
-  #010+
-  '  { TBuildEngine }'#010+
-  #010+
-  '  TBuildEngine = Class(TComponent)'#010+
-  '  private'#010+
-  '    // general variables'#010+
-  '    FC','ompiler : String;'#010+
-  '    FStartDir : String;'#010+
-  '    FForceCompile : Boolean;'#010+
-  '    FListMode : Boolean;'#010+
-  '{$ifdef HAS_UNIT_ZIPPER}'#010+
-  '    FZipFile: TZipper;'#010+
-  '{$endif HAS_UNIT_ZIPPER}'#010+
-  '    FExternalPackages : TPackages;'#010+
-  '    // Logging'#010+
-  '    FLogPrefix : Stri','ng;'#010+
-  '    // Events'#010+
-  '    FOnLog: TLogEvent;'#010+
-  '    FAfterArchive: TNotifyEvent;'#010+
-  '    FAfterClean: TNotifyEvent;'#010+
-  '    FAfterCompile: TNotifyEvent;'#010+
-  '    FAfterInstall: TNotifyEvent;'#010+
-  '    FAfterManifest: TNotifyEvent;'#010+
-  '    FBeforeArchive: TNotifyEvent;'#010+
-  ' ','   FBeforeClean: TNotifyEvent;'#010+
-  '    FBeforeCompile: TNotifyEvent;'#010+
-  '    FBeforeInstall: TNotifyEvent;'#010+
-  '    FBeforeManifest: TNotifyEvent;'#010+
-  '  Protected'#010+
-  '    Procedure Error(const Msg : String);'#010+
-  '    Procedure Error(const Fmt : String; const Args : ','Array of const)'+
-  ';'#010+
-  '    // Internal copy/delete/move/archive/mkdir files'#010+
-  '    Function  SysDirectoryExists(const ADir:string):Boolean;'#010+
-  '    Function  SysFileExists(const AFileName:string):Boolean;'#010+
-  '    Procedure SysCopyFile(Const Src,Dest : Strin','g); virtual;'#010+
-  '    Procedure SysMoveFile(Const Src,Dest : String); virtual;'#010+
-  '    Procedure SysDeleteFile(Const AFileName : String); virtual;'#010+
+  '$(ARCHIVE) $(FILESORDIRS)'#013#010+
+  '    // Misc'#013#010+
+  '    Property UseEnvironment : Boolean read FUseEnvironment write FUseE'+
+  'nvironment;'#013#010+
+  '    Property IgnoreInva','lidOptions: Boolean read FIgnoreInvalidOption'+
+  's write FIgnoreInvalidOptions;'#013#010+
+  '    Property BuildMode: TBuildMode read FBuildMode write FBuildMode;'#013+
+  #010+
+  '    // Installation optioms'#013#010+
+  '    Property InstallExamples: Boolean read FInstallExamples writ','e FI'+
+  'nstallExamples;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TBasicDefaults }'#013#010+
+  #013#010+
+  '  TBasicDefaults = Class(TCustomDefaults)'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TFPCDefaults }'#013#010+
+  #013#010+
+  '  TFPCDefaults = Class(TCustomDefaults)'#013#010+
+  '  public'#013#010+
+  '    procedure CompilerDefaults; override;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TB','uildEngine }'#013#010+
+  #013#010+
+  '  TBuildEngine = Class(TComponent)'#013#010+
+  '  private'#013#010+
+  '    // general variables'#013#010+
+  '    FCompiler : String;'#013#010+
+  '    FStartDir : String;'#013#010+
+  '    FForceCompile : Boolean;'#013#010+
+  '    FListMode : Boolean;'#013#010+
+  '    FVerbose : boolean;'#013#010+
+  '    FProgressMax : i','nteger;'#013#010+
+  '    FProgressCount : integer;'#013#010+
+  '{$ifdef HAS_UNIT_ZIPPER}'#013#010+
+  '    FZipFile: TZipper;'#013#010+
+  '{$endif HAS_UNIT_ZIPPER}'#013#010+
+  '    FExternalPackages : TPackages;'#013#010+
+  '    // Logging'#013#010+
+  '    FLogPrefix : String;'#013#010+
+  '    // Events'#013#010+
+  '    FOnLog: TLogEvent;'#013#010+
+  '    FAf','terArchive: TNotifyEvent;'#013#010+
+  '    FAfterClean: TNotifyEvent;'#013#010+
+  '    FAfterCompile: TNotifyEvent;'#013#010+
+  '    FAfterInstall: TNotifyEvent;'#013#010+
+  '    FAfterManifest: TNotifyEvent;'#013#010+
+  '    FBeforeArchive: TNotifyEvent;'#013#010+
+  '    FBeforeClean: TNotifyEvent;'#013#010+
+  '    FBefor','eCompile: TNotifyEvent;'#013#010+
+  '    FBeforeInstall: TNotifyEvent;'#013#010+
+  '    FBeforeManifest: TNotifyEvent;'#013#010+
+  '  Protected'#013#010+
+  '    Procedure Error(const Msg : String);'#013#010+
+  '    Procedure Error(const Fmt : String; const Args : Array of const);'#013+
+  #010+
+  '    // Internal co','py/delete/move/archive/mkdir files'#013#010+
+  '    Function  SysDirectoryExists(const ADir:string):Boolean;'#013#010+
+  '    Function  SysFileExists(const AFileName:string):Boolean;'#013#010+
+  '    Procedure SysCopyFile(Const Src,Dest : String); virtual;'#013#010+
+  '    Procedure SysM','oveFile(Const Src,Dest : String); virtual;'#013#010+
+  '    Procedure SysDeleteFile(Const AFileName : String); virtual;'#013#010+
+  '    Procedure SysDeleteDirectory(Const ADirectoryName : String); virtu'+
+  'al;'#013#010+
+  '    Procedure SysDeleteTree(Const ADirectoryName : Strin','g); virtual;'+
+  #013#010+
   '    Procedure SysArchiveFiles(List : TStrings; Const AFileName : Strin'+
-  'g); virtual;'#010+
-  '    procedure LogIn','dent;'#010+
-  '    procedure LogUnIndent;'#010+
-  '    Procedure Log(Level : TVerboseLevel; Const Msg : String);'#010+
-  '    Procedure Log(Level : TVerboseLevel; Const Fmt : String; const Arg'+
-  's : Array Of Const);'#010+
-  '    Procedure EnterDir(ADir : String);'#010+
-  '    Function Ge','tCompiler : String;'#010+
-  '    Function InstallPackageFiles(APAckage : TPackage; tt : TTargetType'+
-  '; Const Dest : String):Boolean;'#010+
-  '    Function InstallPackageSourceFiles(APAckage : TPackage; tt : TSour'+
-  'ceType; Const Dest : String):Boolean;'#010+
-  '    Functi','on FileNewer(const Src,Dest : String) : Boolean;'#010+
+  'g); virtual;'#013#010+
+  '    procedure LogIndent;'#013#010+
+  '    procedure LogUnIndent;'#013#010+
+  '    Procedure EnterDir(ADir : String);'#013#010+
+  '    Function GetCompiler : String;'#013#010+
+  '    Function',' InstallPackageFiles(APAckage : TPackage; tt : TTargetTy'+
+  'pe; Const Dest : String):Boolean;'#013#010+
+  '    Procedure InstallUnitConfigFile(APAckage : TPackage; Const Dest : '+
+  'String);'#013#010+
+  '    Function InstallPackageSourceFiles(APAckage : TPackage; stt : TSo',
+  'urceTypes; ttt : TTargetTypes; Const Dest : String):Boolean;'#013#010+
+  '    Function FileNewer(const Src,Dest : String) : Boolean;'#013#010+
   '    Procedure LogSearchPath(const ASearchPathName:string;Path:TConditi'+
-  'onalStrings; ACPU:TCPU;AOS:TOS);'#010+
-  '    Function FindFileInPath(Path:TConditionalStrings; AFileName:String'+
-  '; var FoundPath:St','ring;ACPU:TCPU;AOS:TOS):Boolean;'#010+
-  #010+
-  '    //package commands'#010+
+  'onalStrings; ACPU:TCPU;AOS:TOS);'#013#010+
+  '    Function F','indFileInPath(Path:TConditionalStrings; AFileName:Stri'+
+  'ng; var FoundPath:String;ACPU:TCPU;AOS:TOS):Boolean;'#013#010+
+  #013#010+
+  '    procedure GetDirectoriesFromFilelist(const AFileList, ADirectoryLi'+
+  'st: TStringList);'#013#010+
+  '    //package commands'#013#010+
+  '    function  Get','UnitDir(APackage:TPackage):String;'#013#010+
+  '    procedure AddDependencyPaths(L: TStrings; DependencyType: TDepende'+
+  'ncyType; ATarget: TTarget);'#013#010+
+  '    procedure AddDependencyUnitPaths(L:TStrings;APackage: TPackage);'#013+
+  #010+
+  '  Public'#013#010+
+  '    Constructor Create(AO','wner : TComponent); override;'#013#010+
+  '    destructor Destroy;override;'#013#010+
+  #013#010+
+  '    property Verbose : boolean read FVerbose write FVerbose;'#013#010+
   '    Procedure ResolveFileNames(APackage : TPackage; ACPU:TCPU;AOS:TOS;'+
-  'DoChangeDir:boolean=true);'#010+
-  '    function  GetUnitDir(APackage:TPackage):String;'#010+
-  '    procedure AddDependencyInclude','Paths(L:TStrings;ATarget: TTarget)'+
-  ';'#010+
-  '    procedure AddDependencyUnitPaths(L:TStrings;APackage: TPackage);'#010+
-  '  Public'#010+
-  '    Constructor Create(AOwner : TComponent); override;'#010+
-  '    destructor Destroy;override;'#010+
-  '    // Public Copy/delete/Move/Archive','/Mkdir Commands.'#010+
-  '    Procedure ExecuteCommand(const Cmd,Args : String; IgnoreError : Bo'+
-  'olean = False); virtual;'#010+
-  '    Procedure CmdCopyFiles(List : TStrings; Const DestDir : String);'#010+
-  '    Procedure CmdCreateDir(const DestDir : String);'#010+
-  '    Pro','cedure CmdMoveFiles(List : TStrings; Const DestDir : String);'+
+  'DoChangeDir:boolean=true);'#013#010+
+  #013#010+
+  '    // Publ','ic Copy/delete/Move/Archive/Mkdir Commands.'#013#010+
+  '    Procedure ExecuteCommand(const Cmd,Args : String; const Env: TStri'+
+  'ngs = nil; IgnoreError : Boolean = False); virtual;'#013#010+
+  '    Procedure CmdCopyFiles(List : TStrings; Const DestDir : String);'#013+
   #010+
-  '    Procedure CmdDeleteFiles(List : TStrings);'#010+
+  '  ','  Procedure CmdCreateDir(const DestDir : String);'#013#010+
+  '    Procedure CmdMoveFiles(List : TStrings; Const DestDir : String);'#013+
+  #010+
+  '    Procedure CmdDeleteFiles(List : TStrings);'#013#010+
   '    Procedure CmdArchiveFiles(List : TStrings; Const ArchiveFile : Str'+
-  'ing);'#010+
-  '    Procedure ExecuteCommands(Commands : TCommands; At ',': TCommandAt)'+
-  ';'#010+
-  '    // Dependency commands'#010+
-  '    Function  DependencyOK(ADependency : TDependency) : Boolean;'#010+
-  '    // Target commands'#010+
+  'i','ng);'#013#010+
+  '    Procedure CmdRenameFile(SourceName, DestName : String);'#013#010+
+  '    Procedure CmdRemoveDirs(List: TStrings);'#013#010+
+  '    Procedure CmdRemoveTrees(List: TStrings);'#013#010+
+  '    Procedure ExecuteCommands(Commands : TCommands; At : TCommandAt);'#013+
+  #010+
+  '    // De','pendency commands'#013#010+
+  '    Function  DependencyOK(ADependency : TDependency) : Boolean;'#013#010+
+  '    // Target commands'#013#010+
   '    Function  GetCompilerCommand(APackage : TPackage; ATarget : TTarge'+
-  't) : String;'#010+
-  '    Function  TargetOK(ATar','get : TTarget) : Boolean;'#010+
+  't; Env: TStrings) : String;'#013#010+
+  '    Function  TargetOK(ATarget :',' TTarget) : Boolean;'#013#010+
   '    Function  NeedsCompile(APackage:TPackage; ATarget : TTarget) : Boo'+
-  'lean;'#010+
+  'lean;'#013#010+
   '    Procedure Compile(APackage:TPackage; ATarget : TTarget);  virtual;'+
-  #010+
-  '    Procedure MaybeCompile(APackage:TPackage; ATarget: TTarget);'#010+
-  '  ','  Procedure CompileDependencies(APackage:TPackage; ATarget: TTarge'+
-  't);'#010+
-  '    // Package commands'#010+
+  #013#010+
+  '    Procedure MaybeCompile(APackage:TPackage; ATarget: TTarget);'#013#010+
+  '   ',' Procedure CompileDependencies(APackage:TPackage; ATarget: TTarge'+
+  't);'#013#010+
+  '    // Package commands'#013#010+
   '{    Function  GetPackageDir(APackage : TPackage; AbsolutePath : Boole'+
-  'an = False) : String;'#010+
-  '    Function  GetUnitsOutputDir(APackage : TPackage; A','bsolutePath : '+
-  'Boolean = False) : String;'#010+
+  'an = False) : String;'#013#010+
+  '    Function  GetUnitsOutputDir(APackage : TPackage;',' AbsolutePath : '+
+  'Boolean = False) : String;'#013#010+
   '    Function  GetBinOutputDir(APackage : TPackage; AbsolutePath : Bool'+
-  'ean = False) : String;  }'#010+
-  '    Function  PackageOK(APackage : TPackage) : Boolean; virtual;'#010+
-  '    Procedure DoBeforeCompile(APackage',' : TPackage);virtual;'#010+
-  '    Procedure DoAfterCompile(APackage : TPackage);virtual;'#010+
-  '    Procedure DoBeforeInstall(APackage : TPackage);virtual;'#010+
-  '    Procedure DoAfterInstall(APackage : TPackage);virtual;'#010+
-  '    Procedure DoBeforeArchive(APackage :',' TPackage);virtual;'#010+
-  '    Procedure DoAfterArchive(APackage : TPackage);virtual;'#010+
-  '    Procedure DoBeforeClean(APackage : TPackage);virtual;'#010+
-  '    Procedure DoAfterClean(APackage : TPackage);virtual;'#010+
-  '    Function  NeedsCompile(APackage : TPackage',') : Boolean; virtual;'#010+
-  '    Procedure Compile(APackage : TPackage);'#010+
-  '    Procedure MaybeCompile(APackage:TPackage);'#010+
-  '    Procedure Install(APackage : TPackage);'#010+
-  '    Procedure Archive(APackage : TPackage);'#010+
-  '    Procedure Manifest(APackage : TPack','age);'#010+
-  '    Procedure Clean(APackage : TPackage);'#010+
-  '    Procedure CompileDependencies(APackage : TPackage);'#010+
-  '    Function  CheckExternalPackage(Const APackageName : String):TPacka'+
-  'ge;'#010+
-  '    procedure CreateOutputDir(APackage: TPackage);'#010+
-  '    // Pack','ages commands'#010+
-  '    Procedure Compile(Packages : TPackages);'#010+
-  '    Procedure Install(Packages : TPackages);'#010+
-  '    Procedure Archive(Packages : TPackages);'#010+
-  '    procedure Manifest(Packages: TPackages);'#010+
-  '    Procedure Clean(Packages : TPackages);'#010+
-  '   ',' Property ListMode : Boolean Read FListMode Write FListMode;'#010+
+  'ean = False) : String;  }'#013#010+
+  '    Function  PackageOK(APackage : TPackage) : Boolean; virtual;'#013#010+
+  '    Procedure DoBeforeCompile(APa','ckage : TPackage);virtual;'#013#010+
+  '    Procedure DoAfterCompile(APackage : TPackage);virtual;'#013#010+
+  '    Procedure DoBeforeInstall(APackage : TPackage);virtual;'#013#010+
+  '    Procedure DoAfterInstall(APackage : TPackage);virtual;'#013#010+
+  '    Procedure DoBeforeArchive(A','Package : TPackage);virtual;'#013#010+
+  '    Procedure DoAfterArchive(APackage : TPackage);virtual;'#013#010+
+  '    Procedure DoBeforeClean(APackage : TPackage);virtual;'#013#010+
+  '    Procedure DoAfterClean(APackage : TPackage);virtual;'#013#010+
+  '    Function  NeedsCompile(APacka','ge : TPackage) : Boolean; virtual;'#013+
+  #010+
+  '    Procedure Compile(APackage : TPackage);'#013#010+
+  '    Procedure MaybeCompile(APackage:TPackage);'#013#010+
+  '    Procedure Install(APackage : TPackage);'#013#010+
+  '    Procedure Archive(APackage : TPackage);'#013#010+
+  '    Procedure Manifes','t(APackage : TPackage);'#013#010+
+  '    Procedure Clean(APackage : TPackage; AllTargets: boolean);'#013#010+
+  '    Procedure Clean(APackage : TPackage; ACPU:TCPU; AOS : TOS);'#013#010+
+  '    Procedure CompileDependencies(APackage : TPackage);'#013#010+
+  '    Function  CheckExternalPa','ckage(Const APackageName : String):TPac'+
+  'kage;'#013#010+
+  '    procedure CreateOutputDir(APackage: TPackage);'#013#010+
+  '    // Packages commands'#013#010+
+  '    Procedure Compile(Packages : TPackages);'#013#010+
+  '    Procedure Install(Packages : TPackages);'#013#010+
+  '    Procedure Archive(Pa','ckages : TPackages);'#013#010+
+  '    procedure Manifest(Packages: TPackages);'#013#010+
+  '    Procedure Clean(Packages : TPackages; AllTargets: boolean);'#013#010+
+  #013#010+
+  '    Procedure Log(Level : TVerboseLevel; Const Msg : String);'#013#010+
+  '    Procedure Log(Level : TVerboseLevel; C','onst Fmt : String; const A'+
+  'rgs : Array Of Const);'#013#010+
+  #013#010+
+  '    Property ListMode : Boolean Read FListMode Write FListMode;'#013#010+
   '    Property ForceCompile : Boolean Read FForceCompile Write FForceCom'+
-  'pile;'#010+
-  '    Property ExternalPackages: TPackages Read FExternalPackages;'#010+
-  '    // Events'#010+
-  '    Property BeforeCompi','le : TNotifyEvent Read FBeforeCompile Write '+
-  'FBeforeCompile;'#010+
+  'pile;'#013#010+
+  '    Property ExternalPackages: TPackages Read ','FExternalPackages;'#013+
+  #010+
+  '    Property StartDir: String Read FStartDir;'#013#010+
+  '    // Events'#013#010+
+  '    Property BeforeCompile : TNotifyEvent Read FBeforeCompile Write FB'+
+  'eforeCompile;'#013#010+
   '    Property AfterCompile : TNotifyEvent Read FAfterCompile Write FAft'+
-  'erCompile;'#010+
+  'erC','ompile;'#013#010+
   '    Property BeforeInstall : TNotifyEvent Read FBeforeInstall Write FB'+
-  'eforeInstall;'#010+
-  '    Property Af','terInstall : TNotifyEvent Read FAfterInstall Write FA'+
-  'fterInstall;'#010+
-  '    Property BeforeClean : TNotifyEvent Read FBeforeClean Write FBefor'+
-  'eClean;'#010+
+  'eforeInstall;'#013#010+
+  '    Property AfterInstall : TNotifyEvent Read FAfterInstall Write FAft'+
+  'erInstall;'#013#010+
+  '    Property BeforeClean : TNotifyEvent Read FBeforeClean Write ','FBef'+
+  'oreClean;'#013#010+
   '    Property AfterClean : TNotifyEvent Read FAfterClean Write FAfterCl'+
-  'ean;'#010+
-  '    Property BeforeAr','chive : TNotifyEvent Read FBeforeArchive Write '+
-  'FBeforeArchive;'#010+
-  '    Property AfterArchive : TNotifyEvent Read FAfterArchive Write FAft'+
-  'erArchive;'#010+
+  'ean;'#013#010+
+  '    Property BeforeArchive : TNotifyEvent Read FBeforeArchive Write FB'+
+  'eforeArchive;'#013#010+
+  '    Property AfterArchive : TNotifyEvent Read FAfterArchive Writ','e FA'+
+  'fterArchive;'#013#010+
   '    Property BeforeManifest : TNotifyEvent Read FBeforeManifest Write '+
-  'FBeforeManifest;'#010+
-  '    Prope','rty AfterManifest : TNotifyEvent Read FAfterManifest Write '+
-  'FAfterManifest;'#010+
-  '    Property OnLog : TLogEvent Read FOnLog Write FOnlog;'#010+
-  '  end;'#010+
-  #010+
-  '  { TCustomInstaller }'#010+
-  #010+
-  '  TCustomInstaller = Class(TComponent)'#010+
-  '  private'#010+
-  '    FBuildEngine: TBuildEng','ine;'#010+
-  '    FPackages: TPackages;'#010+
-  '    FRunMode: TRunMode;'#010+
-  '    FListMode : Boolean;'#010+
-  '    FLogLevels : TVerboseLevels;'#010+
-  '  Protected'#010+
-  '    Procedure Log(Level : TVerboseLevel; Const Msg : String);'#010+
-  '    Procedure CreatePackages; virtual;'#010+
-  '    Procedure ','CheckPackages; virtual;'#010+
-  '    Procedure CreateBuildEngine; virtual;'#010+
-  '    Procedure Error(const Msg : String);'#010+
-  '    Procedure Error(const Fmt : String; Args : Array of const);'#010+
-  '    Procedure AnalyzeOptions;'#010+
-  '    Procedure Usage(const FMT : String;',' Args : Array of const);'#010+
-  '    Procedure Compile(Force : Boolean); virtual;'#010+
-  '    Procedure Clean; virtual;'#010+
-  '    Procedure Install; virtual;'#010+
-  '    Procedure Archive; virtual;'#010+
-  '    Procedure Manifest; virtual;'#010+
-  '    Property BuildEngine : TBuildEngine',' Read FBuildEngine;'#010+
-  '  Public'#010+
-  '    Constructor Create(AOwner : TComponent); virtual;'#010+
-  '    Destructor destroy; override;'#010+
-  '    Function AddPackage(Const AName : String) : TPackage;'#010+
-  '    Function Run : Boolean;'#010+
-  '    //files in package'#010+
-  '    Property P','ackages : TPackages Read FPackages;'#010+
-  '    Property RunMode : TRunMode Read FRunMode;'#010+
-  '    Property ListMode : Boolean Read FListMode;'#010+
-  '  end;'#010+
-  #010+
-  '  { TFPCInstaller }'#010+
-  '  TFPCInstaller = class(TCustomInstaller)'#010+
-  '  public'#010+
-  '    Constructor Create(AOwner ',': TComponent); override;'#010+
-  '  end;'#010+
-  #010+
-  '  { TBasicInstaller }'#010+
-  '  TBasicInstaller = class(TCustomInstaller)'#010+
-  '    Constructor Create(AOwner : TComponent); override;'#010+
-  '  end;'#010+
-  #010+
+  'FBeforeManifest;'#013#010+
+  '    Property AfterManifest : TNotifyEvent Read FAfterManifest Write FA'+
+  'fterManifest;'#013#010+
+  '    Property OnLog : TLogEvent Read FOnLog Write ','FOnlog;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TCustomInstaller }'#013#010+
+  #013#010+
+  '  TCustomInstaller = Class(TComponent)'#013#010+
+  '  private'#013#010+
+  '    FBuildEngine: TBuildEngine;'#013#010+
+  '    FPackages: TPackages;'#013#010+
+  '    FRunMode: TRunMode;'#013#010+
+  '    FListMode : Boolean;'#013#010+
+  '    FLogLevels : TVerboseLevels;'#013,#010+
+  '    FFPMakeOptionsString: string;'#013#010+
+  '  Protected'#013#010+
+  '    Procedure Log(Level : TVerboseLevel; Const Msg : String);'#013#010+
+  '    Procedure CreatePackages; virtual;'#013#010+
+  '    Procedure FreePackages; virtual;'#013#010+
+  '    function GetPackages: TPackages; virtual;'#013#010+
+  '   ',' Procedure CheckPackages; virtual;'#013#010+
+  '    Procedure CreateBuildEngine; virtual;'#013#010+
+  '    Procedure Error(const Msg : String);'#013#010+
+  '    Procedure Error(const Fmt : String; Args : Array of const);'#013#010+
+  '    Procedure AnalyzeOptions;'#013#010+
+  '    Procedure Usage(con','st FMT : String; Args : Array of const);'#013#010+
+  '    Procedure Compile(Force : Boolean); virtual;'#013#010+
+  '    Procedure Clean(AllTargets: boolean); virtual;'#013#010+
+  '    Procedure Install; virtual;'#013#010+
+  '    Procedure Archive; virtual;'#013#010+
+  '    Procedure Manifest; virtua','l;'#013#010+
+  '  Public'#013#010+
+  '    Constructor Create(AOwner : TComponent); virtual;'#013#010+
+  '    Destructor destroy; override;'#013#010+
+  '    Function AddPackage(Const AName : String) : TPackage;'#013#010+
+  '    Function Run : Boolean;'#013#010+
+  '    Property FPMakeOptionsString: string read FF','PMakeOptionsString;'#013+
+  #010+
+  '    Property BuildEngine : TBuildEngine Read FBuildEngine;'#013#010+
+  '    //files in package'#013#010+
+  '    Property Packages : TPackages Read GetPackages;'#013#010+
+  '    Property RunMode : TRunMode Read FRunMode;'#013#010+
+  '    Property ListMode : Boolean Re','ad FListMode;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TFPCInstaller }'#013#010+
+  '  TFPCInstaller = class(TCustomInstaller)'#013#010+
+  '  public'#013#010+
+  '    Constructor Create(AOwner : TComponent); override;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TBasicInstaller }'#013#010+
+  '  TBasicInstaller = class(TCustomInstaller)'#013#010+
+  '    Con','structor Create(AOwner : TComponent); override;'#013#010+
+  '  end;'#013#010+
+  #013#010+
   '  TReplaceFunction = Function (Const AName,Args : String) : String of '+
-  'Object;'#010,
-  #010+
-  '  { TValueItem }'#010+
-  #010+
-  '  TValueItem = Class(TObject)'#010+
-  '    FValue : String;'#010+
-  '    Constructor Create(AValue : String);'#010+
-  '  end;'#010+
-  #010+
-  '  { TFunctionItem }'#010+
-  #010+
-  '  TFunctionItem = Class(TObject)'#010+
-  '    FFunc : TReplaceFunction;'#010+
-  '    Constructor Create(AFunc : TRepla','ceFunction);'#010+
-  '  end;'#010+
-  #010+
-  '  { TDictionary }'#010+
-  #010+
-  '  TDictionary = Class(TComponent)'#010+
-  '    FList : TStringList;'#010+
-  '  Public'#010+
-  '    Constructor Create(AOwner : TComponent); override;'#010+
-  '    Destructor Destroy;override;'#010+
-  '    Procedure AddVariable(Const AName,Value ',': String);'#010+
-  '    Procedure AddFunction(Const AName : String; FReplacement : TReplac'+
-  'eFunction);'#010+
-  '    Procedure RemoveItem(Const AName : String);'#010+
-  '    Function GetValue(Const AName : String) : String;'#010+
-  '    Function GetValue(Const AName,Args : Stri','ng) : String; virtual;'#010+
-  '    Function ReplaceStrings(Const ASource : String) : String; virtual;'+
-  #010+
-  '  end;'#010+
-  #010+
-  '  ECollectionError = Class(Exception);'#010+
-  '  EDictionaryError = Class(Exception);'#010+
-  '  EInstallerError = Class(Exception);'#010+
-  #010+
-  '  TInstallerClass = C','lass of TCustomInstaller;'#010+
-  '  TDictionaryClass = Class of TDictionary;'#010+
-  #010+
-  'Type'#010+
+  'Object;'#013#010+
+  #013#010+
+  '  { TValueItem }'#013#010+
+  #013#010+
+  '  TValueItem = Class(TObject)'#013#010+
+  '    FValue : String;'#013#010+
+  '    Constructor Create(AVal','ue : String);'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TFunctionItem }'#013#010+
+  #013#010+
+  '  TFunctionItem = Class(TObject)'#013#010+
+  '    FFunc : TReplaceFunction;'#013#010+
+  '    Constructor Create(AFunc : TReplaceFunction);'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  { TDictionary }'#013#010+
+  #013#010+
+  '  TDictionary = Class(TComponent)'#013#010+
+  '    FList ',': TStringList;'#013#010+
+  '  Public'#013#010+
+  '    Constructor Create(AOwner : TComponent); override;'#013#010+
+  '    Destructor Destroy;override;'#013#010+
+  '    Procedure AddVariable(Const AName,Value : String);'#013#010+
+  '    Procedure AddFunction(Const AName : String; FReplacement : TRepl','a'+
+  'ceFunction);'#013#010+
+  '    Procedure RemoveItem(Const AName : String);'#013#010+
+  '    Function GetValue(Const AName : String) : String;'#013#010+
+  '    Function GetValue(Const AName,Args : String) : String; virtual;'#013+
+  #010+
+  '    Function ReplaceStrings(Const ASource : String) ',': String; virtua'+
+  'l;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  ECollectionError = Class(Exception);'#013#010+
+  '  EDictionaryError = Class(Exception);'#013#010+
+  '  EInstallerError = Class(Exception);'#013#010+
+  #013#010+
+  '  TInstallerClass = Class of TCustomInstaller;'#013#010+
+  '  TDictionaryClass = Class of TDictionary',';'#013#010+
+  #013#010+
+  'Type'#013#010+
   '  TArchiveEvent = Procedure (Const AFileName : String; List : TStrings'+
-  ') of Object;'#010+
+  ') of Object;'#013#010+
   '  TArchiveProc = Procedure (Const AFileName : String; List : TStrings)'+
-  ';'#010+
-  #010+
-  'Var'#010+
-  '  Dic','tionaryClass : TDictionaryClass = TDictionary;'#010+
-  '  OnArchiveFiles : TArchiveEvent = Nil;'#010+
-  '  ArchiveFilesProc : TArchiveProc = Nil;'#010+
-  #010+
-  '  Defaults : TCustomDefaults; // Set by installer.'#010+
-  '  Dictionary : TDictionary;'#010+
-  #010+
-  #010+
-  'Function CurrentOS : String;'#010+
-  'F','unction CurrentCPU : String;'#010+
-  #010+
-  'Function Installer(InstallerClass: TInstallerClass) : TCustomInstaller'+
-  '; overload;'#010+
-  'Function Installer : TCustomInstaller; overload;'#010+
-  #010+
-  'Function OSToString(OS: TOS) : String;'#010+
-  'Function OSesToString(OSes: TOSes) : St','ring;'#010+
-  'Function CPUToString(CPU: TCPU) : String;'#010+
-  'Function CPUSToString(CPUS: TCPUS) : String;'#010+
-  'Function StringToOS(const S : String) : TOS;'#010+
-  'Function OSesToString(const S : String) : TOSes;'#010+
-  'Function StringToCPU(const S : String) : TCPU;'#010+
-  'Functi','on StringToCPUS(const S : String) : TCPUS;'#010+
-  'Function ModeToString(Mode: TCompilerMode) : String;'#010+
-  'Function StringToMode(const S : String) : TCompilerMode;'#010+
-  'Function MakeTargetString(CPU : TCPU;OS: TOS) : String;'#010+
-  'Procedure StringToCPUOS(const S',' : String; Var CPU : TCPU; Var OS: TO'+
-  'S);'#010+
-  'Function FixPath (const APath : String) : String;'#010+
-  'Procedure ChangeDir(const APath : String);'#010+
+  ';'#013#010+
+  #013#010+
+  'Var'#013#010+
+  '  DictionaryClass : TDictionaryClass = TDictionary;'#013#010+
+  '  OnArchiveF','iles : TArchiveEvent = Nil;'#013#010+
+  '  ArchiveFilesProc : TArchiveProc = Nil;'#013#010+
+  #013#010+
+  '  Defaults : TCustomDefaults; // Set by installer.'#013#010+
+  '  Dictionary : TDictionary;'#013#010+
+  #013#010+
+  #013#010+
+  'Function CurrentOS : String;'#013#010+
+  'Function CurrentCPU : String;'#013#010+
+  #013#010+
+  'Function Installer(','InstallerClass: TInstallerClass) : TCustomInstall'+
+  'er; overload;'#013#010+
+  'Function Installer : TCustomInstaller; overload;'#013#010+
+  #013#010+
+  'Function OSToString(OS: TOS) : String;'#013#010+
+  'Function OSesToString(OSes: TOSes) : String;'#013#010+
+  'Function CPUToString(CPU: TCPU) : Stri','ng;'#013#010+
+  'Function CPUSToString(CPUS: TCPUS) : String;'#013#010+
+  'Function StringToOS(const S : String) : TOS;'#013#010+
+  'Function OSesToString(const S : String) : TOSes;'#013#010+
+  'Function StringToCPU(const S : String) : TCPU;'#013#010+
+  'Function StringToCPUS(const S : String) : TCP','US;'#013#010+
+  'Function ModeToString(Mode: TCompilerMode) : String;'#013#010+
+  'Function StringToMode(const S : String) : TCompilerMode;'#013#010+
+  'Function MakeTargetString(CPU : TCPU;OS: TOS) : String;'#013#010+
+  'Procedure StringToCPUOS(const S : String; Var CPU : TCPU; Var OS: ','TO'+
+  'S);'#013#010+
+  'Function FixPath (const APath : String) : String;'#013#010+
+  'Function IsRelativePath(const APath : String) : boolean;'#013#010+
+  'Procedure ChangeDir(const APath : String);'#013#010+
   'Function Substitute(Const Source : String; Macros : Array of string) :'+
-  ' String;'#010+
-  'Procedure SplitCommand(Cons','t Cmd : String; Var Exe,Options : String)'+
-  ';'#010+
-  #010+
-  'Implementation'#010+
+  ' String;'#013#010,
+  'Procedure SplitCommand(Const Cmd : String; Var Exe,Options : String);'#013+
+  #010+
+  'Procedure AddCustomFpmakeCommandlineOption(const ACommandLineOption, H'+
+  'elpMessage : string);'#013#010+
+  'Function GetCustomFpmakeCommandlineOptionValue(const ACommandLineOptio'+
+  'n : st','ring) : string;'#013#010+
+  #013#010+
+  'procedure SearchFiles(const AFileName: string; Recursive: boolean; var'+
+  ' List: TStrings);'#013#010+
+  #013#010+
+  'Implementation'#013#010+
+  #013#010+
+  'uses typinfo, rtlconsts;'#013#010+
+  #013#010+
+  'type'#013#010+
+  '  TUnsortedDuplicatesStringList = class(TStringList)'#013#010+
+  '  public'#013#010+
+  '    function A','dd(const S: string): Integer; override;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'var'#013#010+
+  '  CustomFpmakeCommandlineOptions: TStrings;'#013#010+
+  '  CustomFpMakeCommandlineValues: TStrings;'#013#010+
+  #013#010+
+  'ResourceString'#013#010+
+  '  SErrInvalidCPU        = '#039'Invalid CPU name "%s"'#039';'#013#010+
+  '  SErrInvalidOS         =',' '#039'Invalid OS name "%s"'#039';'#013#010+
+  '  SErrInvalidMode       = '#039'Invalid compiler mode "%s"'#039';'#013#010+
+  '  SErrInvalidTarget     = '#039'Invalid compiler target "%s"'#039';'#013#010+
+  '  SErrNameExists        = '#039'Name "%s" already exists in the collect'+
+  'ion.'#039';'#013#010+
+  '  SErrNoSuchName        ','= '#039'Could not find item with name "%s" in'+
+  ' the collection.'#039';'#013#010+
+  '  SErrInValidArgument   = '#039'Invalid command-line argument at positi'+
+  'on %d: %s'#039';'#013#010+
+  '  SErrNeedArgument      = '#039'Option at position %d (%s) needs an arg'+
+  'ument'#039';'#013#010+
+  '  SErrNoPackagesDefined = ',#039'No action possible: No packages were de'+
+  'fined.'#039';'#013#010+
+  '  SErrInstaller         = '#039'The installer encountered the following'+
+  ' error:'#039';'#013#010+
+  '  SErrDepUnknownTarget  = '#039'Unknown target for unit "%s" in depende'+
+  'ncies for %s in package %s'#039';'#013#010+
+  '  SErrExternalCom','mandFailed = '#039'External command "%s" failed with'+
+  ' exit code %d. Console output:'#039'+LineEnding+'#039'%s'#039';'#013#010+
+  '  SErrCreatingDirectory = '#039'Failed to create directory "%s"'#039';'#013+
   #010+
-  'uses typinfo, rtlconsts;'#010+
+  '  SErrDeletingFile      = '#039'Failed to delete file "%s"'#039';'#013#010+
+  '  SErrRemovingDirectory ','= '#039'Failed to remove directory "%s"'#039';'+
+  #013#010+
+  '  SErrMovingFile        = '#039'Failed to move file "%s" to "%s"'#039';'#013+
   #010+
-  'type'#010+
-  '  TUnsortedDuplicatesStringList = class(TStringList)'#010+
-  '  public'#010+
-  '    function Add(const S: string): Integer; override;'#010+
-  '  end;'#010+
+  '  SErrCopyingFile       = '#039'Failed to copy file "%s" to "%s"'#039';'#013+
   #010+
-  'ResourceString'#010+
-  '  SErrInva','lidCPU        = '#039'Invalid CPU name "%s"'#039';'#010+
-  '  SErrInvalidOS         = '#039'Invalid OS name "%s"'#039';'#010+
-  '  SErrInvalidMode       = '#039'Invalid compiler mode "%s"'#039';'#010+
-  '  SErrInvalidTarget     = '#039'Invalid compiler target "%s"'#039';'#010+
-  '  SErrNameExists        = '#039'Name "%s','" already exists in the colle'+
-  'ction.'#039';'#010+
-  '  SErrNoSuchName        = '#039'Could not find item with name "%s" in t'+
-  'he collection.'#039';'#010+
-  '  SErrInValidArgument   = '#039'Invalid command-line argument at positi'+
-  'on %d: %s'#039';'#010+
-  '  SErrNeedArgument      = '#039'Option at posi','tion %d (%s) needs an a'+
-  'rgument'#039';'#010+
-  '  SErrNoPackagesDefined = '#039'No action possible: No packages were de'+
-  'fined.'#039';'#010+
-  '  SErrInstaller         = '#039'The installer encountered the following'+
-  ' error:'#039';'#010+
-  '  SErrDepUnknownTarget  = '#039'Unknown target for unit "%s" ','in depen'+
-  'dencies for %s in package %s'#039';'#010+
-  '  SErrExternalCommandFailed = '#039'External command "%s" failed with e'+
-  'xit code %d'#039';'#010+
-  '  SErrCreatingDirectory = '#039'Failed to create directory "%s"'#039';'#010+
-  '  SErrDeletingFile      = '#039'Failed to delete file "%s"'#039';'#010+
-  '  SE','rrMovingFile        = '#039'Failed to move file "%s" to "%s"'#039';'+
+  '  SErrChangeDirFailed   = '#039'Failed to enter directory "%s"'#039';'#013+
   #010+
-  '  SErrCopyingFile       = '#039'Failed to copy file "%s" to "%s"'#039';'#010+
-  '  SErrChangeDirFailed   = '#039'Failed to enter directory "%s"'#039';'#010+
-  '  SErrInvalidArgumentToSubstitute = '#039'Invalid number of argum','ents'+
-  ' to Substitute'#039';'#010+
+  '  SErrInvalidAr','gumentToSubstitute = '#039'Invalid number of arguments'+
+  ' to Substitute'#039';'#013#010+
   '  SErrNoArchiveSupport  = '#039'This binary contains no archive support'+
-  '. Please recompile with archive support'#039';'#010+
-  '  SErrNoDictionaryItem  = '#039'No item called "%s" in the dictionary'#039+
-  ';'#010+
-  '  SErrNoDictionaryValue = '#039'The item "%s" in ','the dictionary is no'+
-  't a value'#039';'#010+
+  '. Please recompile with archive support'#039';'#013#010+
+  '  SErrNoDictionaryItem  = '#039'No item called "%s" in the dictionary',#039+
+  ';'#013#010+
+  '  SErrNoDictionaryValue = '#039'The item "%s" in the dictionary is not '+
+  'a value'#039';'#013#010+
   '  SErrNoDictionaryFunc  = '#039'The item "%s" in the dictionary is not '+
-  'a function'#039';'#010+
+  'a function'#039';'#013#010+
   '  SErrInvalidFPCInfo    = '#039'Compiler returns invalid information, c'+
-  'heck if fpc -iV works'#039';'#010+
-  '  SErrDependencyNotFound = '#039'Could not f','ind unit directory for de'+
-  'pendency package "%s"'#039';'#010+
+  'heck if fpc -','iV works'#039';'#013#010+
+  '  SErrDependencyNotFound = '#039'Could not find unit directory for depe'+
+  'ndency package "%s"'#039';'#013#010+
   '  SErrAlreadyInitialized = '#039'Installer can only be initialized once'+
-  #039';'#010+
-  '  SErrInvalidState      = '#039'Invalid state for target %s'#039';'#010+
-  '  SErrCouldNotCompile   = '#039'Could not compile target %s from packa',
-  'ge %s'#039';'#010+
-  #010+
+  #039';'#013#010+
+  '  SErrInvalidState      = '#039'Invalid state for target %s'#039';'#013#010+
+  '  SErrCould','NotCompile   = '#039'Could not compile target %s from pack'+
+  'age %s'#039';'#013#010+
+  '  SErrUnsupportedBuildmode = '#039'Package does not support this buildm'+
+  'ode'#039';'#013#010+
+  #013#010+
   '  SWarnCircularTargetDependency = '#039'Warning: Circular dependency de'+
-  'tected when compiling target %s with target %s'#039';'#010+
+  'tected when compiling target %s with',' target %s'#039';'#013#010+
   '  SWarnCircularPackageDependency = '#039'Warning: Circular dependency d'+
-  'etected when compiling package %s with package %s'#039,';'#010+
+  'etected when compiling package %s with package %s'#039';'#013#010+
   '  SWarnFailedToSetTime    = '#039'Warning: Failed to set timestamp on f'+
-  'ile "%s"'#039';'#010+
-  '  SWarnFailedToGetTime    = '#039'Warning: Failed to get timestamp from'+
-  ' file "%s"'#039';'#010+
+  'ile "%s"'#039';'#013#010+
+  '  SWarnFailedToGetTime    = '#039,'Warning: Failed to get timestamp fro'+
+  'm file "%s"'#039';'#013#010+
   '  SWarnAttemptingToCompileNonNeutralTarget = '#039'Warning: Attempting '+
-  'to compile non-n','eutral target %s'#039';'#010+
+  'to compile non-neutral target %s'#039';'#013#010+
   '  SWarnSourceFileNotFound  = '#039'Warning: Source file "%s" from packa'+
-  'ge %s not found for %s'#039';'#010+
+  'ge %s not found for %','s'#039';'#013#010+
   '  SWarnIncludeFileNotFound = '#039'Warning: Include file "%s" from pack'+
-  'age %s not found for %s'#039';'#010+
-  '  SWarnDepUnitNotFound     = '#039'Warning:',' Dependency on unit %s is '+
-  'not supported for %s'#039';'#010+
-  '  SWarnTargetDependsOnPackage = '#039'Warning: Target %s of package %s '+
-  'depends on another package (%s). These kind of dependencies are not pr'+
-  'ocessed'#039';'#010+
-  '  SWarnDependOnOtherPlatformPackage = '#039'Warnin','g: Package %s depen'+
-  'ds on package %s which is not available for the %s platform'#039';'#010+
-  '  SWarnDone               = '#039'Done'#039';'#010+
-  #010+
-  '  SInfoCompilingPackage   = '#039'Compiling package %s'#039';'#010+
+  'age %s not found for %s'#039';'#013#010+
+  '  SWarnDepUnitNotFound     = '#039'Warning: Dependency on unit %s is no'+
+  't supported for %s'#039';'#013#010+
+  '  SWarnTargetDependsOnPackage = '#039'Warning: Target %s of',' package %'+
+  's depends on another package (%s). These kind of dependencies are not '+
+  'processed'#039';'#013#010+
+  '  SWarnDependOnOtherPlatformPackage = '#039'Warning: Package %s depends'+
+  ' on package %s which is not available for the %s platform'#039';'#013#010+
+  '  SWarnStartCompilin','gPackage = '#039'Start compiling package %s for t'+
+  'arget %s.'#039';'#013#010+
+  '  SWarnCompilingPackagecompleteProgress = '#039'[%3.0f%%] Compiled pack'+
+  'age %s'#039';'#013#010+
+  '  SWarnCompilingPackagecomplete = '#039'Compiled package %s'#039';'#013#010+
+  '  SWarnSkipPackageTargetProgress = '#039'[%3.0f%%] Ski','pped package %s'+
+  ' which has been disabled for target %s'#039';'#013#010+
+  '  SWarnSkipPackageTarget = '#039'Skipped package %s which has been disa'+
+  'bled for target %s'#039';'#013#010+
+  '  SWarnInstallationPackagecomplete = '#039'Installation package %s for '+
+  'target %s succeeded'#039';'#013#010+
+  '  SWar','nCleanPackagecomplete = '#039'Clean of package %s completed'#039+
+  ';'#013#010+
+  #013#010+
   '  SInfoPackageAlreadyProcessed = '#039'Package %s is already processed'#039+
-  ';'#010+
-  '  ','SInfoCompilingTarget    = '#039'Compiling target %s'#039';'#010+
-  '  SInfoExecutingCommand   = '#039'Executing command "%s %s"'#039';'#010+
-  '  SInfoCreatingOutputDir  = '#039'Creating output dir "%s"'#039';'#010+
-  '  SInfoInstallingPackage  = '#039'Installing package %s'#039';'#010+
-  '  SInfoArchivingPackage  ',' = '#039'Archiving package %s in "%s"'#039';'#010+
-  '  SInfoCleaningPackage    = '#039'Cleaning package %s'#039';'#010+
-  '  SInfoManifestPackage    = '#039'Creating manifest for package %s'#039';'+
-  #010+
-  '  SInfoCopyingFile        = '#039'Copying file "%s" to "%s"'#039';'#010+
-  '  SInfoSourceNewerDest    = '#039'Sour','ce file "%s" (%s) is newer than'+
-  ' destination "%s" (%s).'#039';'#010+
-  #010+
+  ';'#013#010+
+  '  SInfoCompilingTarget    = '#039'Compiling target %s'#039';'#013#010+
+  '  SInfoExecutingCommand   = '#039'Executing command "%s %s"'#039';'#013#010+
+  ' ',' SInfoCreatingOutputDir  = '#039'Creating output dir "%s"'#039';'#013#010+
+  '  SInfoInstallingPackage  = '#039'Installing package %s'#039';'#013#010+
+  '  SInfoArchivingPackage   = '#039'Archiving package %s in "%s"'#039';'#013+
+  #010+
+  '  SInfoCleaningPackage    = '#039'Cleaning package %s'#039';'#013#010+
+  '  SInfoManifestPa','ckage    = '#039'Creating manifest for package %s'#039+
+  ';'#013#010+
+  '  SInfoCopyingFile        = '#039'Copying file "%s" to "%s"'#039';'#013#010+
+  '  SInfoSourceNewerDest    = '#039'Source file "%s" (%s) is newer than d'+
+  'estination "%s" (%s).'#039';'#013#010+
+  '  SInfoFallbackBuildmode  = '#039'Buildmode not ','spported by package, '+
+  'falling back to one by one unit compilation'#039';'#013#010+
+  #013#010+
   '  SDbgComparingFileTimes    = '#039'Comparing file "%s" time "%s" to "%'+
-  's" time "%s".'#039';'#010+
+  's" time "%s".'#039';'#013#010+
   '  SDbgCompilingDependenciesOfTarget = '#039'Compiling dependencies of t'+
-  'arget %s'#039';'#010+
-  '  SDbgResolvingSourcesO','fTarget = '#039'Resolving filenames of target '+
-  '%s for %s'#039';'#010+
+  'arget %s'#039';'#013#010+
+  '  SDbgRes','olvingSourcesOfTarget = '#039'Resolving filenames of target '+
+  '%s for %s'#039';'#013#010+
   '  SDbgResolvedSourceFile    = '#039'Resolved source file %s to "%s"'#039+
-  ';'#010+
+  ';'#013#010+
   '  SDbgResolvedIncludeFile   = '#039'Resolved include file %s to "%s"'#039+
-  ';'#010+
-  '  SDbgOutputNotYetAvailable = '#039'Output file %s not availa','ble'#039';'+
+  ';'#013#010+
+  '  SDbgOutputNotYetAvailable = '#039'Output f','ile %s not available'#039';'+
+  #013#010+
+  '  SDbgDependencyOnUnit      = '#039'Dependency of %s on unit %s'#039';'#013+
   #010+
-  '  SDbgDependencyOnUnit      = '#039'Dependency of %s on unit %s'#039';'#010+
   '  SDbgDependencyUnitRecompiled = '#039'Dependent unit %s is being recom'+
-  'piled'#039';'#010+
-  '  SDbgMustCompile           = '#039'Must compile %s'#039';'#010+
-  '  SDbgSkippingTargetWrongCPU = '#039'Skipping target %s',', different CP'+
-  'U (%s)'#039';'#010+
+  'piled'#039';'#013#010+
+  '  SDbgMustCompile           = '#039'Must compile %s'#039';'#013#010+
+  '  SDbgSkippingTargetWrongCPU ','= '#039'Skipping target %s, different CP'+
+  'U (%s)'#039';'#013#010+
   '  SDbgSkippingTargetWrongOS  = '#039'Skipping target %s, different OS ('+
-  '%s)'#039';'#010+
+  '%s)'#039';'#013#010+
   '  SDbgTargetIsNotAUnitOrProgram = '#039'Skipping Target %s, not an unit'+
-  ' or program'#039';'#010+
-  '  SDbgConsideringTarget     = '#039'Considering target %s'#039';'#010+
-  '  SDbgCons','ideringPackage    = '#039'Considering package %s'#039';'#010+
+  ' or program'#039';'#013#010+
+  '  SDbgConsideringTarget     = '#039'Considerin','g target %s'#039';'#013#010+
+  '  SDbgConsideringPackage    = '#039'Considering package %s'#039';'#013#010+
   '  SDbgExternalDependency    = '#039'External dependency %s found in "%s'+
-  '"'#039';'#010+
-  '  SDbgBuildEngineArchiving  = '#039'Build engine archiving'#039';'#010+
-  '  SDbgBuildEngineGenerateManifests = '#039'Build engine generating mani'+
-  'fe','sts'#039';'#010+
-  '  SDbgBuildEngineCleaning   = '#039'Build engine cleaning'#039';'#010+
-  '  SDbgGenerating            = '#039'Generating "%s"'#039';'#010+
-  '  SDbgLoading               = '#039'Loading "%s"'#039';'#010+
-  '  SDbgFound                 = '#039'Found'#039';'#010+
-  '  SDbgNotFound              = '#039'Not Found'#039';'#010+
-  '  ','SDbgDirectoryExists       = '#039'Directory "%s" %s'#039';'#010+
-  '  SDbgFileExists            = '#039'File "%s" %s'#039';'#010+
-  '  SDbgArchivingFile         = '#039'Archiving "%s"'#039';'#010+
-  '  SDbgSearchPath            = '#039'Using %s path "%s"'#039';'#010+
-  '  SDbgEnterDir              = '#039'Entering direc','tory "%s"'#039';'#010+
-  '  SDbgPackageChecksumChanged = '#039'Dependent package %s is modified'#039+
-  ';'#010+
-  '  SDbgFileDoesNotExist      = '#039'File "%s" does not exist'#039';'#010+
+  '"'#039';'#013#010+
+  '  SDbgBuildEngineArchiving  = '#039'Build engine archiving'#039';'#013#010+
+  '  SDbgBuildEngineGenerateManifests = '#039'Bu','ild engine generating ma'+
+  'nifests'#039';'#013#010+
+  '  SDbgBuildEngineCleaning   = '#039'Build engine cleaning'#039';'#013#010+
+  '  SDbgGenerating            = '#039'Generating "%s"'#039';'#013#010+
+  '  SDbgLoading               = '#039'Loading "%s"'#039';'#013#010+
+  '  SDbgFound                 = '#039'Found'#039';'#013#010+
+  '  SDbgNotFou','nd              = '#039'Not Found'#039';'#013#010+
+  '  SDbgDirectoryExists       = '#039'Directory "%s" %s'#039';'#013#010+
+  '  SDbgFileExists            = '#039'File "%s" %s'#039';'#013#010+
+  '  SDbgArchivingFile         = '#039'Archiving "%s"'#039';'#013#010+
+  '  SDbgSearchPath            = '#039'Using %s path "%s"'#039';'#013#010+
+  '  SDbgE','nterDir              = '#039'Entering directory "%s"'#039';'#013+
   #010+
-  '  // Help messages for usage'#010+
-  '  SValue              = '#039'Value'#039';'#010+
-  '  SHelpUsage          = '#039'Usage: %s comma','nd [options]'#039';'#010+
+  '  SDbgPackageChecksumChanged = '#039'Dependent package %s is modified'#039+
+  ';'#013#010+
+  '  SDbgFileDoesNotExist      = '#039'File "%s" does not exist'#039';'#013#010+
+  '  SDbgDirectoryDoesNotExist = '#039'Directory "%s" does not exist'#039';',
+  #013#010+
+  '  SDbgDirectoryNotEmpty     = '#039'Directory "%s" is not empty. Will n'+
+  'ot remove'#039';'#013#010+
+  '  SDbgGenerateBuildUnit     = '#039'Generate build-unit %s'#039';'#013#010+
+  #013#010+
+  '  // Help messages for usage'#013#010+
+  '  SValue              = '#039'Value'#039';'#013#010+
+  '  SHelpUsage          = '#039'Usage: %s c','ommand [options]'#039';'#013#010+
   '  SHelpCommand        = '#039'Where command is one of the following:'#039+
-  ';'#010+
+  ';'#013#010+
   '  SHelpCompile        = '#039'Compile all units in the package(s).'#039';'+
+  #013#010+
+  '  SHelpBuild          = '#039'Build all units in the package(s).'#039';'#013+
   #010+
-  '  SHelpBuild          = '#039'Build all units in the package(s).'#039';'#010+
-  '  SHelpInstall        = '#039'Install ','all units in the package(s).'#039+
-  ';'#010+
+  '  SHelpInstall        = '#039,'Install all units in the package(s).'#039+
+  ';'#013#010+
   '  SHelpClean          = '#039'Clean (remove) all units in the package(s'+
-  ').'#039';'#010+
+  ').'#039';'#013#010+
   '  SHelpArchive        = '#039'Create archive (zip) with all units in th'+
-  'e package(s).'#039';'#010+
-  '  SHelpHelp           = '#039'This message.'#039';'#010+
-  '  SHelpManifest','       = '#039'Create a manifest suitable for import i'+
-  'n repository.'#039';'#010+
+  'e package(s).'#039';'#013#010+
+  '  SHelpHelp           = '#039'This message.'#039';'#013#010+
+  '  S','HelpManifest       = '#039'Create a manifest suitable for import i'+
+  'n repository.'#039';'#013#010+
   '  SHelpCmdOptions     = '#039'Where options is one or more of the follo'+
-  'wing:'#039';'#010+
-  '  SHelpCPU            = '#039'Compile for indicated CPU.'#039';'#010+
-  '  SHelpOS             = '#039'Compile for indicated ','OS'#039';'#010+
-  '  SHelpTarget         = '#039'Compile for indicated target'#039';'#010+
+  'wing:'#039';'#013#010+
+  '  SHelpCPU            = '#039'Compile for indicated CPU.'#039';'#013#010+
+  '  SHelpOS             = '#039'Compile',' for indicated OS'#039';'#013#010+
+  '  SHelpTarget         = '#039'Compile for indicated target'#039';'#013#010+
   '  SHelpList           = '#039'list commands instead of actually executi'+
-  'ng them.'#039';'#010+
+  'ng them.'#039';'#013#010+
   '  SHelpPrefix         = '#039'Use indicated prefix directory for all co'+
-  'mmands.'#039';'#010+
-  '  SHelpNoFPCCfg       = '#039'C','ompiler will not use fpc.cfg'#039';'#010+
+  'mmands.'#039';'#013#010+
+  '  SHelp','NoFPCCfg       = '#039'Compiler will not use fpc.cfg'#039';'#013+
+  #010+
   '  SHelpBaseInstallDir = '#039'Use indicated directory as base install d'+
-  'ir.'#039';'#010+
+  'ir.'#039';'#013#010+
   '  SHelpLocalUnitDir   = '#039'Use indicated directory as local (user) u'+
-  'nit dir.'#039';'#010+
-  '  SHelpGlobalUnitDir  = '#039'Use indicated directory as global u','nit '+
-  'dir.'#039';'#010+
-  '  SHelpCompiler       = '#039'Use indicated binary as compiler'#039';'#010+
+  'nit dir.'#039';'#013#010+
+  '  SHelpGlobalUnitDir  = '#039'Use indicated',' directory as global unit '+
+  'dir.'#039';'#013#010+
+  '  SHelpUnitInstallDir = '#039'Use indicated directory to install units '+
+  'into.'#039';'#013#010+
+  '  SHelpCompiler       = '#039'Use indicated binary as compiler'#039';'#013+
+  #010+
   '  SHelpConfig         = '#039'Use indicated config file when compiling.'+
-  #039';'#010+
+  #039';'#013#010,
   '  SHelpOptions        = '#039'Pass extra options to the compiler.'#039';'+
-  #010+
-  '  SHelpVerbose        = '#039'Be verbose w','hen working.'#039';'#010+
-  #010+
-  #010+
-  'Const'#010+
-  '  // Keys for Defaults file. Do not localize.'#010+
-  '  KeyCompiler = '#039'Compiler'#039';'#010+
-  '  KeyArchive  = '#039'Archive'#039';'#010+
-  '  KeyCopy     = '#039'Copy'#039';'#010+
-  '  KeyMkDir    = '#039'MkDir'#039';'#010+
-  '  KeyMove     = '#039'Move'#039';'#010+
-  '  KeyRemove   = '#039'Remove'#039';'#010+
-  '  KeyOptions  = '#039,'Options'#039';'#010+
-  '  KeyCPU      = '#039'CPU'#039';'#010+
-  '  KeyOS       = '#039'OS'#039';'#010+
-  '  KeyMode     = '#039'Mode'#039';'#010+
-  '  KeyPrefix   = '#039'Prefix'#039';'#010+
-  '  KeyTarget   = '#039'Target'#039';'#010+
-  '  KeyNoFPCCfg = '#039'NoFPCCfg'#039';'#010+
-  '  KeyLocalUnitDir       = '#039'LocalUnitDir'#039';'#010+
-  '  KeyGlobalUnitDir      = '#039'GlobalUnitDi','r'#039';'#010+
-  '  KeyBaseInstallDir     = '#039'BaseInstallDir'#039';'#010+
-  '  KeyUnitInstallDir     = '#039'UnitInstallDir'#039';'#010+
-  '  KeyBinInstallDir      = '#039'BinInstallDir'#039';'#010+
-  '  KeyDocInstallDir      = '#039'DocInstallDir'#039';'#010+
-  '  KeyExamplesInstallDir = '#039'ExamplesInstallDir'#039';'#010+
-  '  // Keys for ','unit config'#010+
-  '  KeyName     = '#039'Name'#039';'#010+
-  '  KeyVersion  = '#039'Version'#039';'#010+
-  '  KeyChecksum = '#039'Checksum'#039';'#010+
-  '  KeyNeedLibC = '#039'NeedLibC'#039';'#010+
-  '  KeyDepends  = '#039'Depends'#039';'#010+
-  #010+
+  #013#010+
+  '  SHelpVerbose        = '#039'Be verbose when working.'#039';'#013#010+
+  '  SHelpInstExamples   = '#039'Install the example-sources.'#039';'#013#010+
+  '  SHelpIgnoreInvOpt   = '#039'Ignore further invalid options.'#039';'#013+
+  #010+
+  '  sHel','pFpdocOutputDir = '#039'Use indicated directory as fpdoc output'+
+  ' folder.'#039';'#013#010+
+  '  sHelpUseEnvironment = '#039'Use environment to pass options to compil'+
+  'er.'#039';'#013#010+
+  '  SHelpUseBuildUnit   = '#039'Compile package in Build-unit mode.'#039';'+
+  #013#010+
+  #013#010+
+  #013#010+
+  'Const'#013#010+
+  '  // Keys for Defaults',' file. Do not localize.'#013#010+
+  '  KeyCompiler = '#039'Compiler'#039';'#013#010+
+  '  KeyArchive  = '#039'Archive'#039';'#013#010+
+  '  KeyCopy     = '#039'Copy'#039';'#013#010+
+  '  KeyMkDir    = '#039'MkDir'#039';'#013#010+
+  '  KeyMove     = '#039'Move'#039';'#013#010+
+  '  KeyRemove   = '#039'Remove'#039';'#013#010+
+  '  KeyRemoveDir= '#039'RemoveDir'#039';'#013#010+
+  '  KeyRemoveTree= '#039'RemoveT','ree'#039';'#013#010+
+  '  KeyOptions  = '#039'Options'#039';'#013#010+
+  '  KeyCPU      = '#039'CPU'#039';'#013#010+
+  '  KeyOS       = '#039'OS'#039';'#013#010+
+  '  KeyMode     = '#039'Mode'#039';'#013#010+
+  '  KeyPrefix   = '#039'Prefix'#039';'#013#010+
+  '  KeyTarget   = '#039'Target'#039';'#013#010+
+  '  KeyNoFPCCfg = '#039'NoFPCCfg'#039';'#013#010+
+  '  KeyUseEnv   = '#039'UseEnv'#039';'#013#010+
+  '  KeyLocalUnitDir      ',' = '#039'LocalUnitDir'#039';'#013#010+
+  '  KeyGlobalUnitDir      = '#039'GlobalUnitDir'#039';'#013#010+
+  '  KeyBaseInstallDir     = '#039'BaseInstallDir'#039';'#013#010+
+  '  KeyUnitInstallDir     = '#039'UnitInstallDir'#039';'#013#010+
+  '  KeyBinInstallDir      = '#039'BinInstallDir'#039';'#013#010+
+  '  KeyDocInstallDir      = '#039'DocInstallDir'#039';',#013#010+
+  '  KeyExamplesInstallDir = '#039'ExamplesInstallDir'#039';'#013#010+
+  '  KeyInstallExamples    = '#039'InstallExamples'#039';'#013#010+
+  '  // Keys for unit config'#013#010+
+  '  KeyName     = '#039'Name'#039';'#013#010+
+  '  KeyVersion  = '#039'Version'#039';'#013#010+
+  '  KeyChecksum = '#039'Checksum'#039';'#013#010+
+  '  KeyNeedLibC = '#039'NeedLibC'#039';'#013#010+
+  '  Key','Depends  = '#039'Depends'#039';'#013#010+
+  '  KeyAddIn    = '#039'FPMakeAddIn'#039';'#013#010+
+  '  KeySourcePath = '#039'SourcePath'#039';'#013#010+
+  '  KeyFPMakeOptions = '#039'FPMakeOptions'#039';'#013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '               ','                 Helpers'#010+
+  '*******'#013#010+
+  '                                ','Helpers'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  #010+
-  'Function QuoteXML(S : String) : string;'#010+
-  #010+
-  '  Procedure W(Var J : Integer; Var R : String; T : String);'#010+
-  '  Var'#010+
-  '    I: integer;'#010+
-  '  begin'#010+
-  '    ','If J+Length(T)>Length(R) then'#010+
-  '      SetLength(R,J+Length(T));'#010+
-  '    For I:=1 to Length(t) do'#010+
-  '      begin'#010+
-  '      R[J]:=T[i];'#010+
-  '      If I<Length(T) then'#010+
-  '        Inc(J);'#010+
-  '      end;'#010+
-  '  end;'#010+
-  #010+
-  'const'#010+
-  '  QuotStr = '#039'&quot;'#039';'#010+
-  '  AmpStr = '#039'&amp;'#039';'#010+
-  '  ltStr = ',#039'&lt;'#039';'#010+
-  '  gtStr = '#039'&gt;'#039';'#010+
-  'Var'#010+
-  '  I,J : Integer;'#010+
-  'begin'#010+
-  '  SetLength(Result,Length(S));'#010+
-  '  J:=0;'#010+
-  '  For I:=1 to Length(S) do'#010+
-  '    begin'#010+
-  '    Inc(J);'#010+
-  '    case S[i] of'#010+
-  '      '#039'"'#039': W(j,Result,QuotStr);'#010+
-  '      '#039'&'#039': W(J,Result,AmpStr);'#010+
-  '      '#039'<'#039': W(J,Resu','lt,ltStr);'#010+
-  '      '#039'>'#039': W(J,Result,gtStr);'#010+
+  '******}'#013#010+
+  #013#010+
+  '{$ifdef HAS_UNIT_PROCESS}'#013#010+
+  'function ExecuteFPC(Verbose: boolean; const Path: string; const ComLin'+
+  'e: string; const Env: TStrings; ConsoleOutput: TMemor','yStream): integ'+
+  'er;'#013#010+
+  'var'#013#010+
+  '  P: TProcess;'#013#010+
+  '  BytesRead: longint;'#013#010+
+  #013#010+
+  '  function ReadFromStream: longint;'#013#010+
+  #013#010+
+  '  const'#013#010+
+  '    READ_BYTES = 2048;'#013#010+
+  #013#010+
+  '  type'#013#010+
+  '    TMessages = (mCompiling, mLinking);'#013#010+
+  #013#010+
+  '  var'#013#010+
+  '    //ifdef the MsgNum so it contains the ','correct message numbers fo'+
+  'r each compiler version.'#013#010+
+  '    MsgNum : array [TMessages] of integer = (3104, 9015);'#013#010+
+  #013#010+
+  '    n: longint;'#013#010+
+  '    BuffPos: longint;'#013#010+
+  '    sLine: string;'#013#010+
+  '    ch: char;'#013#010+
+  '    msg: TMessages;'#013#010+
+  '    ipos: integer;'#013#010+
+  '    snum: s','tring;'#013#010+
+  '  begin'#013#010+
+  '    // make sure we have room'#013#010+
+  '    ConsoleOutput.SetSize(BytesRead + READ_BYTES);'#013#010+
+  #013#010+
+  '    // try reading it'#013#010+
+  '    n := P.Output.Read((ConsoleOutput.Memory + BytesRead)^, READ_BYTES'+
+  ');'#013#010+
+  '    if n > 0 then'#013#010+
+  '    begin'#013#010+
+  '      Inc(B','ytesRead, n);'#013#010+
+  #013#010+
+  '      sLine := '#039#039';'#013#010+
+  '      BuffPos := ConsoleOutput.Position;'#013#010+
+  #013#010+
+  '      //read lines from the stream'#013#010+
+  '      repeat'#013#010+
+  '        ConsoleOutput.Read(ch,1);'#013#010+
+  #013#010+
+  '        if ch in [#10, #13] then'#013#010+
+  '        begin'#013#010+
+  '          if Verbose th','en'#013#010+
+  '            writeln(sLine)'#013#010+
+  '          else'#013#010+
+  '            begin'#013#010+
+  '              for msg := Low(TMessages) to High(TMessages) do'#013#010+
+  '              begin'#013#010+
+  '                snum := Format('#039'(%d)'#039', [MsgNum[msg]]);'#013#010+
+  '                ipos := Pos(snum,',' sLine);'#013#010+
+  '                if ipos = 1 then'#013#010+
+  '                  writeln('#039'      '#039', Copy(sLine, ipos + Length('+
+  'snum), Length(sLine) - ipos - Length(snum) + 1));'#013#010+
+  '              end;'#013#010+
+  '            end;'#013#010+
+  #013#010+
+  '          sLine := '#039#039';'#013#010+
+  '          BuffPos :','= ConsoleOutput.Position;'#013#010+
+  '        end'#013#010+
+  '        else'#013#010+
+  '          sLine := sLine + ch;'#013#010+
+  #013#010+
+  '      until ConsoleOutput.Position >= BytesRead;'#013#010+
+  #013#010+
+  '      ConsoleOutput.Position := BuffPos;'#013#010+
+  '    end'#013#010+
+  '    else'#013#010+
+  '    begin'#013#010+
+  '      // no data, wait 100 m','s'#013#010+
+  '      Sleep(100);'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '    Result := n;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  result := -1;'#013#010+
+  '  BytesRead := 0;'#013#010+
+  '  P := TProcess.Create(nil);'#013#010+
+  '  try'#013#010+
+  '    P.CommandLine := Path + '#039' '#039' + ComLine;'#013#010+
+  '    if assigned(Env) then'#013#010+
+  '      P.Environment.Assign(','Env);'#013#010+
+  #013#010+
+  '    P.Options := [poUsePipes];'#013#010+
+  #013#010+
+  '    P.Execute;'#013#010+
+  '    while P.Running do'#013#010+
+  '      ReadFromStream;'#013#010+
+  #013#010+
+  '    // read last part'#013#010+
+  '    repeat'#013#010+
+  '    until ReadFromStream = 0;'#013#010+
+  '    ConsoleOutput.SetSize(BytesRead);'#013#010+
+  #013#010+
+  '    result := P.ExitStatu','s;'#013#010+
+  '  finally'#013#010+
+  '    P.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  '{$endif HAS_UNIT_PROCESS}'#013#010+
+  #013#010+
+  'function IsDirectoryEmpty(const directory : string) : boolean;'#013#010+
+  'var'#013#010+
+  '  searchRec: TSearchRec;'#013#010+
+  '  SearchResult: longint;'#013#010+
+  'begin'#013#010+
+  '  result := true;'#013#010+
+  '  SearchResult := Find','First(IncludeTrailingPathDelimiter(directory)+'+
+  'AllFilesMask, faAnyFile+faSymLink, searchRec);'#013#010+
+  '  try'#013#010+
+  '    while SearchResult=0 do'#013#010+
+  '      begin'#013#010+
+  '        if (searchRec.Name<>'#039'.'#039') and (searchRec.Name<>'#039'..'#039+
+  ') then'#013#010+
+  '           begin'#013#010+
+  '             ','result := false;'#013#010+
+  '             break;'#013#010+
+  '           end;'#013#010+
+  '        SearchResult := FindNext(searchRec);'#013#010+
+  '      end;'#013#010+
+  '  finally'#013#010+
+  '    FindClose(searchRec);'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function ParsecompilerOutput(M: TMemoryStream; Verbose: boolean): stri'+
+  'ng',';'#013#010+
+  'type'#013#010+
+  '  TParseCompilerOutputState = (cosBeginOfLine, cosSearchColon, cosPars'+
+  'eNumber, cosOther);'#013#010+
+  #013#010+
+  'var'#013#010+
+  '  presult: pchar;'#013#010+
+  '  state: TParseCompilerOutputState;'#013#010+
+  '  ch: char;'#013#010+
+  '  eolchar: char;'#013#010+
+  'begin'#013#010+
+  '  m.Seek(0, soBeginning);'#013#010+
+  '  setlength(','Result,M.Size);'#013#010+
+  #013#010+
+  '  if verbose then'#013#010+
+  '    begin'#013#010+
+  '      m.Read(Result[1],M.Size);'#013#010+
+  '      Exit;'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '  presult := @Result[1];'#013#010+
+  '  eolchar := RightStr(LineEnding,1)[1];'#013#010+
+  '  m.Seek(0,soBeginning);'#013#010+
+  '  state := cosBeginOfLine;'#013#010+
+  '  while m.Po','sition<m.Size do'#013#010+
+  '    begin'#013#010+
+  '      ch := char(m.ReadByte);'#013#010+
+  '      case state of'#013#010+
+  '        cosBeginOfLine:'#013#010+
+  '          begin'#013#010+
+  '            if ch='#039'('#039' then'#013#010+
+  '              state := cosParseNumber'#013#010+
+  '            else if ch='#039' '#039' then'#013#010+
+  '              beg','in'#013#010+
+  '                presult^ := ch;'#013#010+
+  '                inc(presult);'#013#010+
+  '              end'#013#010+
+  '            else'#013#010+
+  '              begin'#013#010+
+  '                presult^ := ch;'#013#010+
+  '                inc(presult);'#013#010+
+  '                state := cosSearchColon;'#013#010+
+  '        ','      end;'#013#010+
+  '          end;'#013#010+
+  '        cosParseNumber:'#013#010+
+  '          begin'#013#010+
+  '            if ch='#039')'#039' then'#013#010+
+  '              begin'#013#010+
+  '              state := cosOther;'#013#010+
+  '              // Omit the space behind the number'#013#010+
+  '              ch := char(m.ReadByte)',';'#013#010+
+  '              assert(ch='#039' '#039');'#013#010+
+  '              end;'#013#010+
+  '          end;'#013#010+
+  '        cosOther:'#013#010+
+  '          begin'#013#010+
+  '            presult^ := ch;'#013#010+
+  '            inc(presult);'#013#010+
+  '            if ch=eolchar then'#013#010+
+  '              state := cosBeginOfLine;'#013#010+
+  '      ','    end;'#013#010+
+  '        cosSearchColon:'#013#010+
+  '          begin'#013#010+
+  '            presult^ := ch;'#013#010+
+  '            inc(presult);'#013#010+
+  '            if (ch='#039':'#039') or (ch=eolchar) then'#013#010+
+  '              state := cosBeginOfLine;'#013#010+
+  '          end;'#013#010+
+  '      end;'#013#010+
+  '    end;'#013#010+
+  '  setlen','gth(Result,presult-@result[1]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function QuoteXML(S : String) : string;'#013#010+
+  #013#010+
+  '  Procedure W(Var J : Integer; Var R : String; T : String);'#013#010+
+  '  Var'#013#010+
+  '    I: integer;'#013#010+
+  '  begin'#013#010+
+  '    If J+Length(T)>Length(R) then'#013#010+
+  '      SetLength(R,J+Length(','T));'#013#010+
+  '    For I:=1 to Length(t) do'#013#010+
+  '      begin'#013#010+
+  '      R[J]:=T[i];'#013#010+
+  '      If I<Length(T) then'#013#010+
+  '        Inc(J);'#013#010+
+  '      end;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'const'#013#010+
+  '  QuotStr = '#039'&quot;'#039';'#013#010+
+  '  AmpStr = '#039'&amp;'#039';'#013#010+
+  '  ltStr = '#039'&lt;'#039';'#013#010+
+  '  gtStr = '#039'&gt;'#039';'#013#010+
+  'Var'#013#010+
+  '  I,J : Inte','ger;'#013#010+
+  'begin'#013#010+
+  '  SetLength(Result,Length(S));'#013#010+
+  '  J:=0;'#013#010+
+  '  For I:=1 to Length(S) do'#013#010+
+  '    begin'#013#010+
+  '    Inc(J);'#013#010+
+  '    case S[i] of'#013#010+
+  '      '#039'"'#039': W(j,Result,QuotStr);'#013#010+
+  '      '#039'&'#039': W(J,Result,AmpStr);'#013#010+
+  '      '#039'<'#039': W(J,Result,ltStr);'#013#010+
+  '      '#039'>'#039': W(J,Resul','t,gtStr);'#013#010+
   '      // Escape whitespace using CharRefs to be consistent with W3 spe'+
-  'c X 3.3.3'#010+
-  '       #9: w(J,Result,'#039'&#x9;'#039');'#010+
-  '{      #10: wrtStr('#039'&#xA;'#039');'#010+
-  '       #13: wrtStr('#039'&#xD;'#039');}'#010+
-  '    else'#010+
-  '      Result[J]:=S[','i];'#010+
-  '    end;'#010+
-  '    If (J=Length(Result)) and (I<Length(S)) then'#010+
-  '      SetLength(Result,J+Length(S)-I);'#010+
-  '    end;'#010+
-  '  If J<>Length(Result) then'#010+
-  '    SetLength(Result,J);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function maybequoted(const s:string):string;'#010+
-  'const'#010+
-  '  {$IFDEF MSWINDOWS','}'#010+
-  '    FORBIDDEN_CHARS = ['#039'!'#039', '#039'@'#039', '#039'#'#039', '#039'$'#039+
-  ', '#039'%'#039', '#039'^'#039', '#039'&'#039', '#039'*'#039', '#039'('#039', '#039+
-  ')'#039','#010+
+  'c X 3.3.3'#013#010+
+  '       #9: w(J,Result,'#039'&#x9;'#039');'#013#010+
+  '{      #10: wrtStr('#039'&#xA;'#039');'#013#010+
+  '       #13: wrtStr('#039'&#xD;'#039');}'#013#010+
+  '    else'#013#010+
+  '      Result[J]:=S[i];'#013#010+
+  '    end;'#013#010+
+  '    If (J=','Length(Result)) and (I<Length(S)) then'#013#010+
+  '      SetLength(Result,J+Length(S)-I);'#013#010+
+  '    end;'#013#010+
+  '  If J<>Length(Result) then'#013#010+
+  '    SetLength(Result,J);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function maybequoted(const s:string):string;'#013#010+
+  'const'#013#010+
+  '  {$IFDEF MSWINDOWS}'#013#010+
+  '    FORBID','DEN_CHARS = ['#039'!'#039', '#039'@'#039', '#039'#'#039', '#039'$'+
+  #039', '#039'%'#039', '#039'^'#039', '#039'&'#039', '#039'*'#039', '#039'('#039', '+
+  #039')'#039','#013#010+
   '                       '#039'{'#039', '#039'}'#039', '#039#039#039#039', '#039'`'+
-  #039', '#039'~'#039'];'#010+
-  '  {$ELSE}'#010+
+  #039', '#039'~'#039'];'#013#010+
+  '  {$ELSE}'#013#010+
   '    FORBIDDEN_CHARS = ['#039'!'#039', '#039'@'#039', '#039'#'#039', '#039'$'#039+
   ', '#039'%'#039', '#039'^'#039', '#039'&'#039', '#039'*'#039', '#039'('#039', '#039+
-  ')'#039','#010+
-  '                       '#039'{'#039', '#039'}'#039',',' '#039#039#039#039', '#039+
-  ':'#039', '#039'\'#039', '#039'`'#039', '#039'~'#039'];'#010+
-  '  {$ENDIF}'#010+
-  'var'#010+
-  '  s1 : string;'#010+
-  '  i  : integer;'#010+
-  '  quoted : boolean;'#010+
-  'begin'#010+
-  '  quoted:=false;'#010+
-  '  s1:='#039'"'#039';'#010+
-  '  for i:=1 to length(s) do'#010+
-  '   begin'#010+
-  '     case s[i] of'#010+
-  '       '#039'"'#039' :'#010+
-  '         begin'#010+
-  '           quoted:=true;'#010+
-  '     ','      s1:=s1+'#039'\"'#039';'#010+
-  '         end;'#010+
-  '       '#039' '#039','#010+
-  '       #128..#255 :'#010+
-  '         begin'#010+
-  '           quoted:=true;'#010+
-  '           s1:=s1+s[i];'#010+
-  '         end;'#010+
-  '       else begin'#010+
-  '         if s[i] in FORBIDDEN_CHARS then'#010+
-  '           quoted:=True;'#010+
-  '         s1:=','s1+s[i];'#010+
-  '       end;'#010+
-  '     end;'#010+
-  '   end;'#010+
-  '  if quoted then'#010+
-  '    maybequoted:=s1+'#039'"'#039#010+
-  '  else'#010+
-  '    maybequoted:=s;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure ReadIniFile(Const AFileName: String;L:TStrings);'#010+
-  'Var'#010+
-  '  F : TFileStream;'#010+
-  '  Line : String;'#010+
-  '  I,P,PC : Integer;'#010+
-  'begin'#010+
-  ' ',' F:=TFileStream.Create(AFileName,fmOpenRead);'#010+
-  '  Try'#010+
-  '    L.LoadFromStream(F);'#010+
-  '    // Fix lines.'#010+
-  '    For I:=L.Count-1 downto 0 do'#010+
-  '      begin'#010+
-  '        Line:=L[I];'#010+
-  '        P:=Pos('#039'='#039',Line);'#010+
-  '        PC:=Pos('#039';'#039',Line);  // Comment line.'#010+
-  '        I','f (P=0) or ((PC<>0) and (PC<P)) then'#010+
-  '          L.Delete(I)'#010+
-  '        else'#010+
+  ')'#039','#013#010+
+  '                       '#039'{'#039', '#039'}'#039', '#039#039#039#039', '#039,
+  ':'#039', '#039'\'#039', '#039'`'#039', '#039'~'#039'];'#013#010+
+  '  {$ENDIF}'#013#010+
+  'var'#013#010+
+  '  s1 : string;'#013#010+
+  '  i  : integer;'#013#010+
+  '  quoted : boolean;'#013#010+
+  'begin'#013#010+
+  '  quoted:=false;'#013#010+
+  '  s1:='#039'"'#039';'#013#010+
+  '  for i:=1 to length(s) do'#013#010+
+  '   begin'#013#010+
+  '     case s[i] of'#013#010+
+  '       '#039'"'#039' :'#013#010+
+  '         begin'#013#010+
+  '           quoted:=true;',#013#010+
+  '           s1:=s1+'#039'\"'#039';'#013#010+
+  '         end;'#013#010+
+  '       '#039' '#039','#013#010+
+  '       #128..#255 :'#013#010+
+  '         begin'#013#010+
+  '           quoted:=true;'#013#010+
+  '           s1:=s1+s[i];'#013#010+
+  '         end;'#013#010+
+  '       else begin'#013#010+
+  '         if s[i] in FORBIDDEN_CHARS then'#013#010+
+  '           quoted:=Tr','ue;'#013#010+
+  '         s1:=s1+s[i];'#013#010+
+  '       end;'#013#010+
+  '     end;'#013#010+
+  '   end;'#013#010+
+  '  if quoted then'#013#010+
+  '    maybequoted:=s1+'#039'"'#039#013#010+
+  '  else'#013#010+
+  '    maybequoted:=s;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure ReadIniFile(Const AFileName: String;L:TStrings);'#013#010+
+  'Var'#013#010+
+  '  F : TFileStream;'#013#010+
+  '  Line : Str','ing;'#013#010+
+  '  I,P,PC : Integer;'#013#010+
+  'begin'#013#010+
+  '  F:=TFileStream.Create(AFileName,fmOpenRead);'#013#010+
+  '  Try'#013#010+
+  '    L.LoadFromStream(F);'#013#010+
+  '    // Fix lines.'#013#010+
+  '    For I:=L.Count-1 downto 0 do'#013#010+
+  '      begin'#013#010+
+  '        Line:=L[I];'#013#010+
+  '        P:=Pos('#039'='#039',Line);'#013#010+
+  '        PC:','=Pos('#039';'#039',Line);  // Comment line.'#013#010+
+  '        If (P=0) or ((PC<>0) and (PC<P)) then'#013#010+
+  '          L.Delete(I)'#013#010+
+  '        else'#013#010+
   '          L[i]:=Trim(System.Copy(Line,1,P-1)+'#039'='#039'+Trim(System.C'+
-  'opy(Line,P+1,Length(Line)-P)));'#010+
-  '      end;'#010+
-  '  Finally'#010+
-  '    F.Free;'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '// Callback for Sysutils ge','tapplicationname.'#010+
-  'Function GetFPMakeName : String;'#010+
-  #010+
-  'begin'#010+
-  '  Result:='#039'fpmake'#039';'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function CurrentOS : String;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=OSToString(Defaults.OS);'#010+
-  'end;'#010+
-  #010+
-  'Function CurrentCPU : String;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=CPUToString(Defaults.CPU);'#010+
-  'end;',#010+
-  #010+
-  'Function OSToString(OS: TOS) : String;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=LowerCase(GetenumName(TypeInfo(TOS),Ord(OS)));'#010+
-  'end;'#010+
-  #010+
-  'Function OSesToString(OSes: TOSes) : String;'#010+
-  #010+
-  'begin'#010+
+  'opy(Line,P+1,Length(Line)-P)));'#013#010+
+  '      end;'#013#010+
+  '  Finally'#013#010+
+  '   ',' F.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '// Callback for Sysutils getapplicationname.'#013#010+
+  'Function GetFPMakeName : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:='#039'fpmake'#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function CurrentOS : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=OSToString(Defaults.OS);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function ','CurrentCPU : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=CPUToString(Defaults.CPU);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function OSToString(OS: TOS) : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=LowerCase(GetenumName(TypeInfo(TOS),Ord(OS)));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function OSesToString(OSes: TOSes) : String;'#013#010+
+  #013#010,
+  'begin'#013#010+
   '  Result:=LowerCase(SetToString(PtypeInfo(TypeInfo(TOSes)),Integer(OSe'+
-  's),Fals','e));'#010+
-  'end;'#010+
-  #010+
-  'Function CPUToString(CPU: TCPU) : String;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=LowerCase(GetenumName(TypeInfo(TCPU),Ord(CPU)));'#010+
-  'end;'#010+
-  #010+
-  'Function CPUSToString(CPUS: TCPUS) : String;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=LowerCase(SetToString(PTypeInfo(TypeInfo(TCPUS)),Inte','ger(C'+
-  'PUS),False));'#010+
-  'end;'#010+
-  #010+
-  'Function StringToOS(const S : String) : TOS;'#010+
-  #010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  #010+
-  'begin'#010+
-  '  I:=GetEnumValue(TypeInfo(TOS),S);'#010+
-  '  if (I=-1) then'#010+
-  '    Raise EInstallerError.CreateFmt(SErrInvalidOS,[S]);'#010+
-  '  Result:=TOS(I);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function ','OSesToString(const S : String) : TOSes;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=TOSes(StringToSet(PTypeInfo(TypeInfo(TOSes)),S));'#010+
-  'end;'#010+
-  #010+
-  'Function StringToCPU(const S : String) : TCPU;'#010+
-  #010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  #010+
-  'begin'#010+
-  '  I:=GetEnumValue(TypeInfo(TCPU),S);'#010+
-  '  if (I=-1) then',#010+
-  '    Raise EInstallerError.CreateFmt(SErrInvalidCPU,[S]);'#010+
-  '  Result:=TCPU(I);'#010+
-  'end;'#010+
-  #010+
-  'Function StringToCPUS(const S : String) : TCPUS;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=TCPUS(StringToSet(PTypeInfo(TypeInfo(TCPUS)),S));'#010+
-  'end;'#010+
-  #010+
-  'Function ModeToString(Mode: TCompil','erMode) : String;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=LowerCase(GetenumName(TypeInfo(TCompilerMode),Ord(Mode)));'#010+
-  '  Delete(Result,1,2);'#010+
-  'end;'#010+
-  #010+
-  'Function StringToMode(const S : String) : TCompilerMode;'#010+
-  #010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  #010+
-  'begin'#010+
-  '  I:=GetEnumValue(TypeInfo(TCompil','erMode),S);'#010+
-  '  if (I=-1) then'#010+
-  '    Raise EInstallerError.CreateFmt(SErrInvalidMode,[S]);'#010+
-  '  Result:=TCompilerMode(I);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function MakeTargetString(CPU : TCPU;OS: TOS) : String;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=CPUToString(CPU)+'#039'-'#039'+OSToString(OS);'#010+
-  'end;'#010+
-  #010+
-  'Pr','ocedure StringToCPUOS(const S : String; Var CPU : TCPU; Var OS: TO'+
-  'S);'#010+
-  #010+
-  'Var'#010+
-  '  P : integer;'#010+
-  #010+
-  'begin'#010+
-  '  P:=Pos('#039'-'#039',S);'#010+
-  '  If (P=0) then'#010+
-  '    Raise EInstallerError.CreateFmt(SErrInvalidTarget,[S]);'#010+
-  '  CPU:=StringToCPU(Copy(S,1,P-1));'#010+
-  '  OS:=StringToO','s(Copy(S,P+1,Length(S)-P));'#010+
-  'end;'#010+
-  #010+
-  #010+
+  's),False));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function CPUToString(CPU: TCPU) : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=LowerCase(GetenumName(TypeInfo(TCPU),Ord(CPU)));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function CPUSToString(','CPUS: TCPUS) : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=LowerCase(SetToString(PTypeInfo(TypeInfo(TCPUS)),Integer(CPU'+
+  'S),False));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function StringToOS(const S : String) : TOS;'#013#010+
+  #013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  I:=GetEnumValue(TypeInfo(TOS),S);'#013#010+
+  ' ',' if (I=-1) then'#013#010+
+  '    Raise EInstallerError.CreateFmt(SErrInvalidOS,[S]);'#013#010+
+  '  Result:=TOS(I);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function OSesToString(const S : String) : TOSes;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=TOSes(StringToSet(PTypeInfo(TypeInfo(TOSes)),S));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function ','StringToCPU(const S : String) : TCPU;'#013#010+
+  #013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  I:=GetEnumValue(TypeInfo(TCPU),S);'#013#010+
+  '  if (I=-1) then'#013#010+
+  '    Raise EInstallerError.CreateFmt(SErrInvalidCPU,[S]);'#013#010+
+  '  Result:=TCPU(I);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function StringToCPUS(const',' S : String) : TCPUS;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=TCPUS(StringToSet(PTypeInfo(TypeInfo(TCPUS)),S));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function ModeToString(Mode: TCompilerMode) : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=LowerCase(GetenumName(TypeInfo(TCompilerMode),Ord(Mode)));'#013+
+  #010+
+  '  Dele','te(Result,1,2);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function StringToMode(const S : String) : TCompilerMode;'#013#010+
+  #013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  I:=GetEnumValue(TypeInfo(TCompilerMode),S);'#013#010+
+  '  if (I=-1) then'#013#010+
+  '    Raise EInstallerError.CreateFmt(SErrInvalidMode,[S]);'#013#010+
+  ' ',' Result:=TCompilerMode(I);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function MakeTargetString(CPU : TCPU;OS: TOS) : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  if OS in AllLimit83fsOses then'#013#010+
+  '    Result := OSToString(OS)'#013#010+
+  '  else'#013#010+
+  '    Result:=CPUToString(CPU)+'#039'-'#039'+OSToString(OS);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Proced','ure StringToCPUOS(const S : String; Var CPU : TCPU; Var OS: TO'+
+  'S);'#013#010+
+  #013#010+
+  'Var'#013#010+
+  '  P : integer;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  P:=Pos('#039'-'#039',S);'#013#010+
+  '  If (P=0) then'#013#010+
+  '    Raise EInstallerError.CreateFmt(SErrInvalidTarget,[S]);'#013#010+
+  '  CPU:=StringToCPU(Copy(S,1,P-1));'#013#010+
+  '  OS:=Str','ingToOs(Copy(S,P+1,Length(S)-P));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Procedure ResolveDependencies(L : TDependencies; P : TNamedCollection)'+
-  ';'#010+
-  'Var'#010+
-  '  I,J : Integer;'#010+
-  '  C : TDependency;'#010+
-  'begin'#010+
-  '  If Assigned(L) then'#010+
-  '    For I:=0 to L.Count-1 do'#010+
-  '      begin'#010+
-  '        C:=L[i];'#010+
-  '       ',' if C.DependencyType in [depPackage,depUnit] then'#010+
-  '          begin'#010+
-  '            J:=P.IndexOfName(C.Value);'#010+
-  '            If J<>-1 then'#010+
-  '              C.Target:=P.Items[J];'#010+
-  '          end;'#010+
-  '      end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function AddConditionalStrings(Dest : TS','trings; Src : TConditionalSt'+
-  'rings;ACPU:TCPU;AOS:TOS; Const APrefix : String='#039#039') : Integer ;'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  C : TConditionalString;'#010+
-  '  S : String;'#010+
-  'begin'#010+
-  '  Result:=0;'#010+
-  '  Dictionary.AddVariable('#039'CPU'#039',CPUToString(ACPU));'#010+
-  '  Dictionary.AddVar','iable('#039'OS'#039',OSToString(AOS));'#010+
-  '  For I:=0 to Src.Count-1 do'#010+
-  '    begin'#010+
-  '      C:=Src[I];'#010+
-  '      if (ACPU in C.CPUs) and (AOS in C.OSes) then'#010+
-  '        begin'#010+
-  '          If (APrefix<>'#039#039') then'#010+
-  '            S:=APrefix+C.Value'#010+
-  '          else'#010+
-  '            ','S:=C.Value;'#010+
-  '          Dest.Add(Dictionary.ReplaceStrings(S));'#010+
-  '          Inc(Result);'#010+
-  '        end;'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  ';'#013#010+
+  'Var'#013#010+
+  '  I,J : Integer;'#013#010+
+  '  C : TDependency;'#013#010+
+  'begin'#013#010+
+  '  If Assigned(L) then'#013#010+
+  '    For I:=0 to L.Count-1 do'#013#010+
+  '      begin'#013#010+
+  '      ','  C:=L[i];'#013#010+
+  '        if C.DependencyType in [depPackage,depUnit] then'#013#010+
+  '          begin'#013#010+
+  '            J:=P.IndexOfName(C.Value);'#013#010+
+  '            If J<>-1 then'#013#010+
+  '              C.Target:=P.Items[J];'#013#010+
+  '          end;'#013#010+
+  '      end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function Ad','dConditionalStrings(Dest : TStrings; Src : TConditionalSt'+
+  'rings;ACPU:TCPU;AOS:TOS; Const APrefix : String='#039#039') : Integer ;'#013+
+  #010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  C : TConditionalString;'#013#010+
+  '  S : String;'#013#010+
+  'begin'#013#010+
+  '  Result:=0;'#013#010+
+  '  Dictionary.AddVariable('#039'CPU'#039',CPU','ToString(ACPU));'#013#010+
+  '  Dictionary.AddVariable('#039'OS'#039',OSToString(AOS));'#013#010+
+  '  For I:=0 to Src.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      C:=Src[I];'#013#010+
+  '      if (ACPU in C.CPUs) and (AOS in C.OSes) then'#013#010+
+  '        begin'#013#010+
+  '          If (APrefix<>'#039#039') then'#013#010+
+  '            S:','=APrefix+C.Value'#013#010+
+  '          else'#013#010+
+  '            S:=C.Value;'#013#010+
+  '          Dest.Add(Dictionary.ReplaceStrings(S));'#013#010+
+  '          Inc(Result);'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'function FileListToString(List : TStrings; const APrefix : String) : S'+
-  'tring;'#010+
-  'Var'#010+
-  '  I : integer;'#010+
-  '  S : String;'#010+
-  'begin'#010+
-  '  Result:=',#039#039';'#010+
-  '  For I:=0 to List.Count-1 do'#010+
-  '    begin'#010+
-  '      If (I>0) then'#010+
-  '        Result:=Result+'#039' '#039';'#010+
-  '      S:=APrefix+List[i];'#010+
-  '      If (Pos('#039' '#039',S)<>0) then'#010+
-  '        S:='#039'"'#039'+S+'#039'"'#039';'#010+
-  '      Result:=Result+S;'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function FixPath (const APath ',': String) : String;'#010+
-  'Var'#010+
-  '  P : PChar;'#010+
-  'begin'#010+
-  '  Result:=APath;'#010+
-  '  If (result<>'#039#039') then'#010+
-  '    begin'#010+
-  '      P:=PChar(Result);'#010+
-  '      While (P^<>#0) do'#010+
-  '        begin'#010+
-  '          If P^ in ['#039'/'#039','#039'\'#039'] then'#010+
-  '            P^:=PathDelim;'#010+
-  '          Inc(P);'#010+
-  '      ','  end;'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure ChangeDir(const APath : String);'#010+
-  'begin'#010+
-  '  if Not SetCurrentDir(APath) then'#010+
-  '    Raise EInstallerError.CreateFmt(SErrChangeDirFailed,[APath]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure SearchFiles(const AFileName: string; Recursive: bo','olean; v'+
-  'ar List: TStrings);'#010+
-  #010+
-  '  procedure AddRecursiveFiles(const SearchDir, FileMask: string; Recur'+
-  'sive: boolean);'#010+
-  '  const'#010+
-  '    IgnoreCase = {$ifdef UNIX}False{$else}True{$endif};'#010+
-  '  var'#010+
-  '    Info : TSearchRec;'#010+
-  '  begin'#010+
-  '    if FindFirst(SearchD','ir+'#039'*'#039',faAnyFile and faDirectory,Inf'+
-  'o)=0 then'#010+
-  '    begin'#010+
-  '      repeat'#010+
+  'tr','ing;'#013#010+
+  'Var'#013#010+
+  '  I : integer;'#013#010+
+  '  S : String;'#013#010+
+  'begin'#013#010+
+  '  Result:='#039#039';'#013#010+
+  '  For I:=0 to List.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      If (I>0) then'#013#010+
+  '        Result:=Result+'#039' '#039';'#013#010+
+  '      S:=APrefix+List[i];'#013#010+
+  '      If (Pos('#039' '#039',S)<>0) then'#013#010+
+  '        S:='#039'"'#039'+S+'#039'"'#039';'#013#010+
+  '   ','   Result:=Result+S;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function FixPath (const APath : String) : String;'#013#010+
+  'Var'#013#010+
+  '  P : PChar;'#013#010+
+  'begin'#013#010+
+  '  Result:=APath;'#013#010+
+  '  If (result<>'#039#039') then'#013#010+
+  '    begin'#013#010+
+  '      UniqueString(Result);'#013#010+
+  '      P:=PChar(Result);'#013#010+
+  '      While (P','^<>#0) do'#013#010+
+  '        begin'#013#010+
+  '          If P^ in ['#039'/'#039','#039'\'#039'] then'#013#010+
+  '            P^:=PathDelim;'#013#010+
+  '          Inc(P);'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function IsRelativePath(const APath: String): boolean;'#013#010+
+  'begin'#013#010+
+  '  if APath='#039#039' then'#013#010+
+  '    result := tru','e'#013#010+
+  '{$ifdef unix}'#013#010+
+  '  else if APath[1] in AllowDirectorySeparators then'#013#010+
+  '    result := false'#013#010+
+  '{$else}'#013#010+
+  '  else if ExtractFileDrive(APath)<>'#039#039' then'#013#010+
+  '    result := false'#013#010+
+  '{$endif}'#013#010+
+  '  else'#013#010+
+  '    result := true;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure ChangeDir(const A','Path : String);'#013#010+
+  'begin'#013#010+
+  '  if Not SetCurrentDir(APath) then'#013#010+
+  '    Raise EInstallerError.CreateFmt(SErrChangeDirFailed,[APath]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure SearchFiles(const AFileName: string; Recursive: boolean; var'+
+  ' List: TStrings);'#013#010+
+  #013#010+
+  '  procedure ','AddRecursiveFiles(const SearchDir, FileMask: string; Rec'+
+  'ursive: boolean);'#013#010+
+  '  const'#013#010+
+  '    IgnoreCase = {$ifdef UNIX}False{$else}True{$endif};'#013#010+
+  '  var'#013#010+
+  '    Info : TSearchRec;'#013#010+
+  '  begin'#013#010+
+  '    if FindFirst(SearchDir+'#039'*'#039',faAnyFile and faDirectory,In','f'+
+  'o)=0 then'#013#010+
+  '    begin'#013#010+
+  '      repeat'#013#010+
   '          if ((Info.Attr and faDirectory) = faDirectory) and (Info.Nam'+
   'e <> '#039'.'#039') and (Info.Name <> '#039'..'#039') and (Recursive) then'+
-  #010+
-  '            AddRecursiveFiles(SearchDir + Info','.Name + PathDelim, Fil'+
-  'eMask, Recursive);'#010+
+  #013#010+
+  '            AddRecursiveFiles(SearchDir + Info.Name + PathDelim, FileM'+
+  'ask, Re','cursive);'#013#010+
   '          if ((Info.Attr and faDirectory) <> faDirectory) and IsWild(I'+
-  'nfo.Name, FileMask, IgnoreCase) then'#010+
-  '            List.Add(SearchDir + Info.Name);'#010+
-  '      until FindNext(Info)<>0;'#010+
-  '    end;'#010+
-  '    Fin','dClose(Info);'#010+
-  '  end;'#010+
-  #010+
-  'var'#010+
-  '  CurrDir,'#010+
-  '  BasePath: string;'#010+
-  '  i: integer;'#010+
-  'begin'#010+
-  '  BasePath := ExtractFilePath(ExpandFileName(AFileName));'#010+
-  '  AddRecursiveFiles(BasePath, ExtractFileName(AFileName), Recursive);'#010+
-  #010+
-  '  CurrDir:=GetCurrentDir;'#010+
-  '  for i ',':= 0 to Pred(List.Count) do'#010+
+  'nfo.Name, FileMask, IgnoreCase) then'#013#010+
+  '            List.Add(SearchDir + Info.Name);'#013#010+
+  '      until FindNext(Info)<>0;'#013#010+
+  '    end;'#013#010+
+  '    FindClose(Info);'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'v','ar'#013#010+
+  '  CurrDir,'#013#010+
+  '  BasePath: string;'#013#010+
+  '  i: integer;'#013#010+
+  'begin'#013#010+
+  '  BasePath := ExtractFilePath(ExpandFileName(AFileName));'#013#010+
+  '  AddRecursiveFiles(BasePath, ExtractFileName(AFileName), Recursive);'#013+
+  #010+
+  #013#010+
+  '  CurrDir:=GetCurrentDir;'#013#010+
+  '  for i := 0 to Pred(L','ist.Count) do'#013#010+
   '    List[i] := ExtractRelativepath(IncludeTrailingPathDelimiter(CurrDi'+
-  'r), List[i]);'#010+
-  'end;'#010+
-  #010+
-  'Const'#010+
-  '  WhiteSpace = [#9,#10,#13,'#039' '#039'];'#010+
-  '  QuoteChars = ['#039#039#039#039','#039'"'#039'];'#010+
-  #010+
-  'procedure SplitCommand(const Cmd : String; var Exe, Opt','ions : String'+
-  ');'#010+
-  #010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  InQuote : Boolean;'#010+
-  '  LastQuote : Char;'#010+
-  '  S : String;'#010+
-  #010+
-  'begin'#010+
-  '  S:=Trim(Cmd);'#010+
-  '  InQuote:=False;'#010+
-  '  LastQuote:=#0;'#010+
-  '  I:=1;'#010+
-  '  While (I<=Length(S)) and (Inquote or not (S[I] in whiteSpace)) do'#010+
-  '    begin'#010+
-  '    I','f S[i] in QuoteChars then'#010+
-  '      begin'#010+
-  '      InQuote:=Not (S[i]=LastQuote);'#010+
-  '      If InQuote then'#010+
-  '         LastQuote:=S[i]'#010+
-  '       else'#010+
-  '         LastQuote:=#0;'#010+
-  '      end;'#010+
-  '    Inc(I);'#010+
-  '    end;'#010+
-  '  Exe:=Copy(S,1,I-1);'#010+
-  '  Delete(S,1,I);'#010+
-  '  Options:=','Trim(S);'#010+
-  'end;'#010+
-  #010+
-  'Function OptionListToString(L : TStrings) : String;'#010+
-  #010+
-  'var'#010+
-  '  I : Integer;'#010+
-  '  S : String;'#010+
-  #010+
-  'begin'#010+
-  '  Result:='#039#039';'#010+
-  '  For I:=0 to L.Count-1 do'#010+
-  '    begin'#010+
-  '    If (Result<>'#039#039') then'#010+
-  '      Result:=Result+'#039' '#039';'#010+
-  '    S:=L[I];'#010+
-  '    If (Pos('#039' '#039',S',')<>0) or (S='#039#039') then'#010+
-  '     Result:='#039'"'#039'+S+'#039'"'#039';'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  'Function OptionsToStringList(S : String) : TStrings;'#010+
-  #010+
-  'Var'#010+
-  '  P : Integer;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=Nil;'#010+
-  '  If (S='#039#039') then'#010+
-  '    Exit;'#010+
-  '  Result:=TStringList.Create;'#010+
-  '  Repeat'#010+
-  '    P:=Pos('#039' '#039',S);'#010,
-  '    If P=0 then'#010+
-  '      P:=Length(S)+1;'#010+
-  '    Result.Add(Copy(S,1,P-1));'#010+
-  '    Delete(S,1,P);'#010+
-  '    S:=Trim(S);'#010+
-  '  Until Length(S)=0;'#010+
-  '  If Result.Count=0 then'#010+
-  '    FreeAndNil(Result);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{$ifdef HAS_UNIT_PROCESS}'#010+
-  'function GetCompilerInfo(const AC','ompiler,AOptions:string):string;'#010+
-  'const'#010+
-  '  BufSize = 1024;'#010+
-  'var'#010+
-  '  S: TProcess;'#010+
-  '  Buf: array [0..BufSize - 1] of char;'#010+
-  '  Count: longint;'#010+
-  'begin'#010+
-  '  S:=TProcess.Create(Nil);'#010+
-  '  S.Commandline:=ACompiler+'#039' '#039'+AOptions;'#010+
-  '  S.Options:=[poUsePipes];'#010+
-  '  S.ex','ecute;'#010+
-  '  Count:=s.output.read(buf,BufSize);'#010+
-  '  S.Free;'#010+
-  '  SetLength(Result,Count);'#010+
-  '  Move(Buf,Result[1],Count);'#010+
-  'end;'#010+
-  '{$endif HAS_UNIT_PROCESS}'#010+
-  #010+
-  #010+
+  'r), List[i]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Const'#013#010+
+  '  WhiteSpace = [#9,#10,#13,'#039' '#039'];'#013#010+
+  '  QuoteChars = ['#039#039#039#039','#039'"'#039'];'#013#010+
+  #013#010+
+  'procedure SplitCommand(const Cmd : String; var Exe, Options :',' String'+
+  ');'#013#010+
+  #013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  InQuote : Boolean;'#013#010+
+  '  LastQuote : Char;'#013#010+
+  '  S : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  S:=Trim(Cmd);'#013#010+
+  '  InQuote:=False;'#013#010+
+  '  LastQuote:=#0;'#013#010+
+  '  I:=1;'#013#010+
+  '  While (I<=Length(S)) and (Inquote or not (S[I] in whiteSpace)) do'#013+
+  #010+
+  '    beg','in'#013#010+
+  '    If S[i] in QuoteChars then'#013#010+
+  '      begin'#013#010+
+  '      InQuote:=Not (S[i]=LastQuote);'#013#010+
+  '      If InQuote then'#013#010+
+  '         LastQuote:=S[i]'#013#010+
+  '       else'#013#010+
+  '         LastQuote:=#0;'#013#010+
+  '      end;'#013#010+
+  '    Inc(I);'#013#010+
+  '    end;'#013#010+
+  '  Exe:=Copy(S,1,I-1);'#013#010+
+  '  Delete','(S,1,I);'#013#010+
+  '  Options:=Trim(S);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure AddCustomFpmakeCommandlineOption(const ACommandLineOption, H'+
+  'elpMessage : string);'#013#010+
+  'begin'#013#010+
+  '  if not assigned(CustomFpmakeCommandlineOptions) then'#013#010+
+  '    CustomFpmakeCommandlineOptions := TString','List.Create;'#013#010+
+  '  CustomFpmakeCommandlineOptions.Values[ACommandLineOption]:=HelpMessa'+
+  'ge;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function GetCustomFpmakeCommandlineOptionValue(const ACommandLineOptio'+
+  'n: string): string;'#013#010+
+  'begin'#013#010+
+  '  if not assigned(CustomFpMakeCommandlineValu','es) then'#013#010+
+  '    result := '#039#039#013#010+
+  '  else'#013#010+
+  '    result := CustomFpMakeCommandlineValues.Values[ACommandLineOption]'+
+  ';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function OptionListToString(L : TStrings) : String;'#013#010+
+  #013#010+
+  'var'#013#010+
+  '  I : Integer;'#013#010+
+  '  S : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:='#039#039';'#013#010+
+  '  For I:','=0 to L.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '    If (Result<>'#039#039') then'#013#010+
+  '      Result:=Result+'#039' '#039';'#013#010+
+  '    S:=L[I];'#013#010+
+  '    If (Pos('#039' '#039',S)<>0) or (S='#039#039') then'#013#010+
+  '     Result:='#039'"'#039'+S+'#039'"'#039';'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function OptionsToStringList(S : String) : TStrings;'#013#010+
+  #013#010+
+  'Var'#013,#010+
+  '  P : Integer;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=Nil;'#013#010+
+  '  If (S='#039#039') then'#013#010+
+  '    Exit;'#013#010+
+  '  Result:=TStringList.Create;'#013#010+
+  '  Repeat'#013#010+
+  '    P:=Pos('#039' '#039',S);'#013#010+
+  '    If P=0 then'#013#010+
+  '      P:=Length(S)+1;'#013#010+
+  '    Result.Add(Copy(S,1,P-1));'#013#010+
+  '    Delete(S,1,P);'#013#010+
+  '    S:=Trim(S);'#013,#010+
+  '  Until Length(S)=0;'#013#010+
+  '  If Result.Count=0 then'#013#010+
+  '    FreeAndNil(Result);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{$ifdef HAS_UNIT_PROCESS}'#013#010+
+  'function GetCompilerInfo(const ACompiler,AOptions:string):string;'#013#010+
+  'const'#013#010+
+  '  BufSize = 1024;'#013#010+
+  'var'#013#010+
+  '  S: TProcess;'#013#010+
+  '  Buf: array [0','..BufSize - 1] of char;'#013#010+
+  '  Count: longint;'#013#010+
+  'begin'#013#010+
+  '  S:=TProcess.Create(Nil);'#013#010+
+  '  S.Commandline:=ACompiler+'#039' '#039'+AOptions;'#013#010+
+  '  S.Options:=[poUsePipes];'#013#010+
+  '  S.execute;'#013#010+
+  '  Count:=s.output.read(buf,BufSize);'#013#010+
+  '  S.Free;'#013#010+
+  '  SetLength(Result,Count);'#013#010,
+  '  Move(Buf,Result[1],Count);'#013#010+
+  'end;'#013#010+
+  '{$endif HAS_UNIT_PROCESS}'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                   ','        TUnsortedDuplicatesStringList'#010+
-  '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'function TUnsortedDuplicatesStringList.Add(const S: string): Integer;'#010+
-  #010+
-  'begin'#010+
-  '  result := IndexOf(S);'#010+
-  '  If result > -1 then'#010,
-  '    Case DUplicates of'#010+
-  '      DupIgnore : Exit;'#010+
-  '      DupError : Error(SDuplicateString,0)'#010+
-  '    end;'#010+
-  '  inherited Add(S);'#010+
-  'end;'#010+
-  #010+
+  '*******'#013#010+
+  '                           TUnsortedDuplicatesStringList'#013#010+
+  '************************************','********************************'+
+  '********}'#013#010+
+  #013#010+
+  'function TUnsortedDuplicatesStringList.Add(const S: string): Integer;'#013+
+  #010+
+  #013#010+
+  'begin'#013#010+
+  '  result := IndexOf(S);'#013#010+
+  '  If result > -1 then'#013#010+
+  '    Case DUplicates of'#013#010+
+  '      DupIgnore : Exit;'#013#010+
+  '      DupError : E','rror(SDuplicateString,0)'#013#010+
+  '    end;'#013#010+
+  '  inherited Add(S);'#013#010+
+  'end;'#013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                                TName','dItem'#010+
-  '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'procedure TNamedItem.SetName(const AValue: String);'#010+
-  #010+
-  'begin'#010+
-  '  if FName=AValue then exit;'#010+
-  '  With TNamedCollection(Collection) do'#010+
-  '    If UniqueNames then'#010+
-  '    ','  If (IndexOfName(AVAlue)<>-1) then'#010+
-  '        Raise ECollectionError.CreateFmt(SErrNameExists,[AValue]);'#010+
-  '  FName:=AValue;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '*******'#013#010+
+  '                                TNamedItem'#013#010+
+  '****************************************************','****************'+
+  '********}'#013#010+
+  #013#010+
+  'procedure TNamedItem.SetName(const AValue: String);'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  if FName=AValue then exit;'#013#010+
+  '  With TNamedCollection(Collection) do'#013#010+
+  '    If UniqueNames then'#013#010+
+  '      If (IndexOfName(AVAlue)<>-1) then'#013#010+
+  '        Raise',' ECollectionError.CreateFmt(SErrNameExists,[AValue]);'#013+
+  #010+
+  '  FName:=AValue;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                                TNa','medCollection'#010+
-  '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'function TNamedCollection.IndexOfName(const AName: String): Integer;'#010+
-  #010+
-  'begin'#010+
-  '  Result:=Count-1;'#010+
-  '  While (Result>=0) and (CompareText(TNamedItem(Item','s[Result]).FName'+
-  ',AName)<>0) do'#010+
-  '    Dec(Result);'#010+
-  'end;'#010+
-  #010+
+  '*******'#013#010+
+  '                                TNamedCollection'#013#010+
+  '****************************','****************************************'+
+  '********}'#013#010+
+  #013#010+
+  'function TNamedCollection.IndexOfName(const AName: String): Integer;'#013+
+  #010+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=Count-1;'#013#010+
+  '  While (Result>=0) and (CompareText(TNamedItem(Items[Result]).FName,A'+
+  'Name)<>0) do'#013#010+
+  '    ','Dec(Result);'#013#010+
+  'end;'#013#010+
+  #013#010+
   'function TNamedCollection.ItemByName(const AName: String): TNamedItem;'+
-  #010+
-  #010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  #010+
-  'begin'#010+
-  '  I:=IndexOfName(AName);'#010+
-  '  If (I=-1) Then'#010+
-  '    Raise ECollectionError.CreateFmt(SErrNoSuc','hName,[AName]);'#010+
-  '  Result:=TNamedItem(Items[i]);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  #013#010+
+  #013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  I:=IndexOfName(AName);'#013#010+
+  '  If (I=-1) Then'#013#010+
+  '    Raise ECollectionError.CreateFmt(SErrNoSuchName,[AName]);'#013#010+
+  '  Resul','t:=TNamedItem(Items[i]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                             TNamedItemList'#010+
-  '***************************************************************','*****'+
-  '********}'#010+
-  #010+
-  'function TNamedItemList.GetNamedItem(Index : Integer): TNamedItem;'#010+
-  'begin'#010+
-  '  Result:=TNamedItem(Items[Index]);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '*******'#013#010+
+  '                             TNamedItemList'#013#010+
+  '**********************************************************************'+
+  '******}'#013#010+
+  #013,#010+
+  'function TNamedItemList.GetNamedItem(Index : Integer): TNamedItem;'#013+
+  #010+
+  'begin'#013#010+
+  '  Result:=TNamedItem(Items[Index]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TNamedItemList.SetNamedItem(Index : Integer; const AValue: T'+
-  'NamedItem);'#010+
-  'begin'#010+
-  '  Items[Index]:=AVal','ue;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TNamedItemList.IndexOfName(const AName: String): Integer;'#010+
-  'begin'#010+
-  '  Result:=Count-1;'#010+
+  'NamedItem);'#013#010+
+  'begin'#013#010+
+  '  Items[Index]:=AValue;'#013#010+
+  'en','d;'#013#010+
+  #013#010+
+  #013#010+
+  'function TNamedItemList.IndexOfName(const AName: String): Integer;'#013+
+  #010+
+  'begin'#013#010+
+  '  Result:=Count-1;'#013#010+
   '  While (Result>=0) and (CompareText(GetNamedItem(Result).Name,AName)<'+
-  '>0) do'#010+
-  '    Dec(Result);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TNamedItemList.ItemByName(c','onst ANAme: String): TNamedItem;'+
-  #010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  I:=IndexOfName(AName);'#010+
-  '  If (I=-1) Then'#010+
-  '    Raise ECollectionError.CreateFmt(SErrNoSuchName,[AName]);'#010+
-  '  Result:=TNamedItem(Items[i]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{**************************************','*****************************'+
-  '*********'#010+
-  '                                TTargets'#010+
+  '>0) do'#013#010+
+  '    Dec(Result);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TNamedItemList.ItemByN','ame(const ANAme: String): TNamedItem;'+
+  #013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  I:=IndexOfName(AName);'#013#010+
+  '  If (I=-1) Then'#013#010+
+  '    Raise ECollectionError.CreateFmt(SErrNoSuchName,[AName]);'#013#010+
+  '  Result:=TNamedItem(Items[i]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{**********************','*********************************************'+
+  '*********'#013#010+
+  '                                TTargets'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'function TTargets.GetTargetItem(Index : Integer): TTarget;'#010+
-  'begin'#010+
-  '  Result:=TTarge','t(Items[Index]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TTargets.GetTarget(const AName : String): TTarget;'#010+
-  'begin'#010+
-  '  Result:=TTarget(ItemByName(AName));'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '******}'#013#010+
+  #013#010+
+  'function TTargets.GetTargetItem(Index : Integer): TTarget;'#013#010+
+  'b','egin'#013#010+
+  '  Result:=TTarget(Items[Index]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TTargets.GetTarget(const AName : String): TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=TTarget(ItemByName(AName));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TTargets.SetTargetItem(Index : Integer; const AValue: TTarge'+
-  't);'#010+
-  'begin'#010+
-  '  Items[Index]:=AValue;'#010+
-  'e','nd;'#010+
-  #010+
-  #010+
-  'Function TTargets.AddUnit(Const AUnitName : String) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddUnit(AUnitName,AllCPUs,AllOSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  't);',#013#010+
+  'begin'#013#010+
+  '  Items[Index]:=AValue;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TTargets.AddFPDoc(const AUnitName, AXMLName: String): TTarget'+
+  ';'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TTarget;'#013#010+
+  '  Result.Name:=AUnitName;'#013#010+
+  '  Result.XML:=AXMLName;'#013#010+
+  '  Result.TargetType:=ttFPDoc;'#013#010+
+  'end;'#013#010+
+  #013#010,
+  'Function TTargets.AddUnit(Const AUnitName : String) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddUnit(AUnitName,AllCPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TTargets.AddUnit(Const AUnitName : String;const OSes:TOSes) :'+
-  ' TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddUnit(AUnitNam','e,AllCPUs,OSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{$ifdef cpu_only_overloads}'#010+
+  ' TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddUnit(AUnitN','ame,AllCPUs,OSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
   'Function TTargets.AddUnit(Const AUnitName : String;const CPUs:TCPUs) :'+
-  ' TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddUnit(AUnitName,CPUs,AllOSes);'#010+
-  'end;'#010+
-  '{$endif cpu_only_overloads}'#010+
-  #010+
-  #010+
-  'Function TTargets.AddUni','t(Const AUnitName : String;const CPUs:TCPUs;'+
-  'const OSes:TOSes) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=Add as TTarget;'#010+
-  '  Result.Name:=AUnitName;'#010+
-  '  Result.TargetType:=TTUnit;'#010+
-  '  Result.CPUs:=CPUs;'#010+
-  '  Result.OSes:=OSes;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TTargets.AddImplicitUn','it(Const AUnitName : String;InstallUn'+
-  'it:boolean=true) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddImplicitUnit(AUnitName,AllCPUs,AllOSes,InstallUnit);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TTargets.AddImplicitUnit(Const AUnitName : String;const OSes:'+
-  'TOSes;InstallUnit:boolean=','true) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddImplicitUnit(AUnitName,AllCPUs,OSes,InstallUnit);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  ' TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddUnit(AUnitName,CPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  #013#010+
+  #013#010+
+  'Function T','Targets.AddUnit(Const AUnitName : String;const CPUs:TCPUs;'+
+  'const OSes:TOSes) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TTarget;'#013#010+
+  '  Result.Name:=AUnitName;'#013#010+
+  '  Result.TargetType:=TTUnit;'#013#010+
+  '  Result.CPUs:=CPUs;'#013#010+
+  '  Result.OSes:=OSes;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Functio','n TTargets.AddImplicitUnit(Const AUnitName : String;InstallUn'+
+  'it:boolean=true) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddImplicitUnit(AUnitName,AllCPUs,AllOSes,InstallUnit);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TTargets.AddImplicitUnit(Const AUnitName : String;const O','Se'+
+  's:TOSes;InstallUnit:boolean=true) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddImplicitUnit(AUnitName,AllCPUs,OSes,InstallUnit);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TTargets.AddImplicitUnit(Const AUnitName : String;const CPUs:'+
-  'TCPUs;InstallUnit:boolean=true) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddImplicitUnit(AU','nitName,CPUs,AllOSes,InstallUnit);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'TCPUs;InstallUnit:boolean=true) : TTarget',';'#013#010+
+  'begin'#013#010+
+  '  Result:=AddImplicitUnit(AUnitName,CPUs,AllOSes,InstallUnit);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TTargets.AddImplicitUnit(Const AUnitName : String;const CPUs:'+
-  'TCPUs;const OSes:TOSes;InstallUnit:boolean=true) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=Add as TTarget;'#010+
-  '  Result.Name:=AUnitName;'#010+
-  '  Result.C','PUs:=CPUs;'#010+
-  '  Result.OSes:=OSes;'#010+
-  '  if InstallUnit then'#010+
-  '    Result.TargetType:=TTImplicitUnit'#010+
-  '  else'#010+
-  '    Result.TargetType:=TTCleanOnlyUnit;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TTargets.AddProgram(Const AProgramName : String) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddProgra','m(AProgramName,AllCPUs,AllOSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'TCPUs;const OSes:TOSes;InstallUnit:boolean=true) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as T','Target;'#013#010+
+  '  Result.Name:=AUnitName;'#013#010+
+  '  Result.CPUs:=CPUs;'#013#010+
+  '  Result.OSes:=OSes;'#013#010+
+  '  if InstallUnit then'#013#010+
+  '    Result.TargetType:=TTImplicitUnit'#013#010+
+  '  else'#013#010+
+  '    Result.TargetType:=TTCleanOnlyUnit;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TTargets.AddProgram(Const APro','gramName : String) : TTarget;'+
+  #013#010+
+  'begin'#013#010+
+  '  Result:=AddProgram(AProgramName,AllCPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TTargets.AddProgram(Const AProgramName : String;const OSes:TO'+
-  'Ses) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddProgram(AProgramName,AllCPUs,OSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{$ifdef cpu_only_overloads}'#010+
-  'Function TTargets.AddPro','gram(Const AProgramName : String;const CPUs:'+
-  'TCPUs) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddProgram(AProgramName,CPUs,AllOSes);'#010+
-  'end;'#010+
-  '{$endif cpu_only_overloads}'#010+
-  #010+
-  #010+
+  'Ses) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddProgram(AProgramName,AllCPUs,OSe','s);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
   'Function TTargets.AddProgram(Const AProgramName : String;const CPUs:TC'+
-  'PUs;const OSes:TOS','es) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=Add as TTarget;'#010+
-  '  Result.Name:=AProgramName;'#010+
-  '  Result.CPUs:=CPUs;'#010+
-  '  Result.OSes:=OSes;'#010+
-  '  Result.TargetType:=ttProgram;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TTargets.AddExampleUnit(Const AUnitName : String) : TTarget;'#010+
-  'begin'#010+
-  '  Resul','t:=AddExampleUnit(AUnitName,AllCPUs,AllOSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'PUs) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddProgram(AProgramName,CPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  #013#010+
+  #013#010+
+  'Function TTar','gets.AddProgram(Const AProgramName : String;const CPUs:'+
+  'TCPUs;const OSes:TOSes) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TTarget;'#013#010+
+  '  Result.Name:=AProgramName;'#013#010+
+  '  Result.CPUs:=CPUs;'#013#010+
+  '  Result.OSes:=OSes;'#013#010+
+  '  Result.TargetType:=ttProgram;'#013#010+
+  'end;'#013#010+
+  #013#010,
+  #013#010+
+  'Function TTargets.AddExampleUnit(Const AUnitName : String) : TTarget;'#013+
+  #010+
+  'begin'#013#010+
+  '  Result:=AddExampleUnit(AUnitName,AllCPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TTargets.AddExampleUnit(Const AUnitName : String;const OSes:T'+
-  'OSes) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddExampleUnit(AUnitName,AllCPUs,OSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{$ifdef cpu_only_overloads}'#010+
-  'Function ','TTargets.AddExampleUnit(Const AUnitName : String;const CPUs'+
-  ':TCPUs) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddExampleUnit(AUnitName,CPUs,AllOSes);'#010+
-  'end;'#010+
-  '{$endif cpu_only_overloads}'#010+
-  #010+
-  #010+
+  'OSes) : TTarget;'#013#010+
+  'begin'#013#010+
+  ' ',' Result:=AddExampleUnit(AUnitName,AllCPUs,OSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
   'Function TTargets.AddExampleUnit(Const AUnitName : String;const CPUs:T'+
-  'C','PUs;const OSes:TOSes) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=Add as TTarget;'#010+
-  '  Result.Name:=AUnitName;'#010+
-  '  Result.CPUs:=CPUs;'#010+
-  '  Result.OSes:=OSes;'#010+
-  '  Result.TargetType:=ttExampleUnit;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TTargets.AddExampleProgram(Const AProgramName : String)',' : T'+
-  'Target;'#010+
-  'begin'#010+
-  '  Result:=AddExampleProgram(AProgramName,AllCPUs,AllOSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'CPUs) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddExampleUnit(AUnitName,CPUs,AllOSes);'#013#010+
+  'end;'#013,#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  #013#010+
+  #013#010+
+  'Function TTargets.AddExampleUnit(Const AUnitName : String;const CPUs:T'+
+  'CPUs;const OSes:TOSes) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TTarget;'#013#010+
+  '  Result.Name:=AUnitName;'#013#010+
+  '  Result.CPUs:=CPUs;'#013#010+
+  '  Result.OSes:=OSe','s;'#013#010+
+  '  Result.TargetType:=ttExampleUnit;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TTargets.AddExampleProgram(Const AProgramName : String) : TTa'+
+  'rget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddExampleProgram(AProgramName,AllCPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TTargets.AddExampleProgram','(Const AProgramName : String;cons'+
+  't OSes:TOSes) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddExampleProgram(AProgramName,AllCPUs,OSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
   'Function TTargets.AddExampleProgram(Const AProgramName : String;const '+
-  'OSes:TOSes) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddExampleProgram(AProgramName,AllCPUs,OSes);'#010+
-  'e','nd;'#010+
-  #010+
-  #010+
-  '{$ifdef cpu_only_overloads}'#010+
+  'CPUs:TCP','Us) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddExampleProgram(AProgramName,CPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  #013#010+
+  #013#010+
   'Function TTargets.AddExampleProgram(Const AProgramName : String;const '+
-  'CPUs:TCPUs) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=AddExampleProgram(AProgramName,CPUs,AllOSes);'#010+
-  'end;'#010+
-  '{$endif cpu_only_overloads}'#010+
-  #010+
-  #010+
-  'Function TTarget','s.AddExampleProgram(Const AProgramName : String;cons'+
-  't CPUs:TCPUs;const OSes:TOSes) : TTarget;'#010+
-  'begin'#010+
-  '  Result:=Add as TTarget;'#010+
-  '  Result.Name:=AProgramName;'#010+
-  '  Result.CPUs:=CPUs;'#010+
-  '  Result.OSes:=OSes;'#010+
-  '  Result.TargetType:=ttExampleProgram;'#010+
-  'end;',#010+
-  #010+
-  #010+
+  'CPUs:TCPUs;const OSes:TOSes) : TTarget;'#013#010+
+  'begin'#013#010+
+  '  R','esult:=Add as TTarget;'#013#010+
+  '  Result.Name:=AProgramName;'#013#010+
+  '  Result.CPUs:=CPUs;'#013#010+
+  '  Result.OSes:=OSes;'#013#010+
+  '  Result.TargetType:=ttExampleProgram;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                                TSources'#010+
+  '*******'#013#010+
+  '             ','                   TSources'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'function TSources.GetSourceItem(Index :',' Integer): TSource;'#010+
-  'begin'#010+
-  '  Result:=TSource(Items[Index]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TSources.SetSourceItem(Index : Integer; const AValue: TSourc'+
-  'e);'#010+
-  'begin'#010+
-  '  Items[Index]:=AValue;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TSources.AddDoc (const AFiles : String) : TSource;'#010+
-  'beg','in'#010+
-  '  Result:=Add as TSource;'#010+
-  '  Result.Name:=AFiles;'#010+
-  '  Result.FSourceType:=stDoc;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '******}'#013#010+
+  #013#010+
+  'function TSources.GetSourceItem(Index : Integer): TSource;'#013#010+
+  'begin'#013#010+
+  '  Result:=TSource(Items[Index]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TSources.','SetSourceItem(Index : Integer; const AValue: TSou'+
+  'rce);'#013#010+
+  'begin'#013#010+
+  '  Items[Index]:=AValue;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TSources.AddDoc (const AFiles : String) : TSource;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TSource;'#013#010+
+  '  Result.Name:=AFiles;'#013#010+
+  '  Result.FSourceType:=s','tDoc;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'function TSources.AddDoc(const AFiles: String; AInstallSourcePath: Str'+
-  'ing): TSource;'#010+
-  'begin'#010+
-  '  Result:=Add as TSource;'#010+
-  '  Result.Name:=AFiles;'#010+
-  '  Result.FIn','stallSourcePath:=AInstallSourcePath;'#010+
-  '  Result.FSourceType:=stDoc;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TSources.AddSrc(const AFiles : String) : TSource;'#010+
-  'begin'#010+
-  '  Result:=Add as TSource;'#010+
-  '  Result.Name:=AFiles;'#010+
-  '  Result.FSourceType:=stSrc;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TSources','.AddExample(const AFiles : String) : TSource;'#010+
-  'begin'#010+
-  '  Result:=Add as TSource;'#010+
-  '  Result.Name:=AFiles;'#010+
-  '  Result.FSourceType:=stExample;'#010+
-  'end;'#010+
-  #010+
+  'ing): TSource;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TSource;'#013#010+
+  '  Result.Name:=AFiles;'#013#010+
+  '  Result.FInstallSourcePath:=AInstallSourcePath;'#013#010+
+  '  Result.FSourceType:=stDoc;'#013,#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TSources.AddSrc(const AFiles : String) : TSource;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TSource;'#013#010+
+  '  Result.Name:=AFiles;'#013#010+
+  '  Result.FSourceType:=stSrc;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TSources.AddExample(const AFiles : String) : TSource;'#013#010+
+  'begin'#013#010,
+  '  Result:=Add as TSource;'#013#010+
+  '  Result.Name:=AFiles;'#013#010+
+  '  Result.FSourceType:=stExample;'#013#010+
+  'end;'#013#010+
+  #013#010+
   'function TSources.AddExample(const AFiles: String; AInstallSourcePath:'+
-  ' String): TSource;'#010+
-  'begin'#010+
-  '  Res','ult:=Add as TSource;'#010+
-  '  Result.Name:=AFiles;'#010+
-  '  Result.FInstallSourcePath:=AInstallSourcePath;'#010+
-  '  Result.FSourceType:=stExample;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TSources.AddTest(const AFiles : String) : TSource;'#010+
-  'begin'#010+
-  '  Result:=Add as TSource;'#010+
-  '  Result.Name:=','AFiles;'#010+
-  '  Result.FSourceType:=stTest;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  ' String): TSource;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TSource;'#013#010+
+  '  Result.Name:=AFiles;'#013,#010+
+  '  Result.FInstallSourcePath:=AInstallSourcePath;'#013#010+
+  '  Result.FSourceType:=stExample;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TSources.AddTest(const AFiles : String) : TSource;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TSource;'#013#010+
+  '  Result.Name:=AFiles;'#013#010+
+  '  Result.FSourceType:=stTe','st;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TSources.AddDocFiles(const AFileMask: string; Recursive: boo'+
-  'lean; AInstallSourcePath : String = '#039#039');'#010+
-  'var'#010+
-  '  List : TStrings;'#010+
-  '  i: integer;'#010+
-  'begin'#010+
-  '  List := TStringList.Create;'#010+
-  '  SearchFil','es(AFileMask, Recursive, List);'#010+
-  '  for i:= 0 to Pred(List.Count) do'#010+
-  '    AddDoc(List[i], AInstallSourcePath);'#010+
-  '  List.Free;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'lean; AInstallSourcePath : String = '#039#039');'#013#010+
+  'var'#013#010+
+  '  List : TStrings;'#013#010+
+  '  i: integer;'#013#010+
+  'begin'#013#010+
+  '  List := TStringList.Create;'#013#010+
+  '  SearchFiles(AFileMask, Recursive,',' List);'#013#010+
+  '  for i:= 0 to Pred(List.Count) do'#013#010+
+  '    AddDoc(List[i], AInstallSourcePath);'#013#010+
+  '  List.Free;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TSources.AddSrcFiles(const AFileMask: string; Recursive: boo'+
-  'lean);'#010+
-  'var'#010+
-  '  List : TStrings;'#010+
-  '  i: integer',';'#010+
-  'begin'#010+
-  '  List := TStringList.Create;'#010+
-  '  SearchFiles(AFileMask, Recursive, List);'#010+
-  '  for i:= 0 to Pred(List.Count) do'#010+
-  '    AddSrc(List[i]);'#010+
-  '  List.Free;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'lean);'#013#010+
+  'var'#013#010+
+  '  List : TStrings;'#013#010+
+  '  i: integer;'#013#010+
+  'begin'#013#010+
+  '  Li','st := TStringList.Create;'#013#010+
+  '  SearchFiles(AFileMask, Recursive, List);'#013#010+
+  '  for i:= 0 to Pred(List.Count) do'#013#010+
+  '    AddSrc(List[i]);'#013#010+
+  '  List.Free;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TSources.AddExampleFiles(const AFileMask: string; Recursive:'+
-  ' boolean; AIn','stallSourcePath : String = '#039#039');'#010+
-  'var'#010+
-  '  List : TStrings;'#010+
-  '  i: integer;'#010+
-  'begin'#010+
-  '  List := TStringList.Create;'#010+
-  '  SearchFiles(AFileMask, Recursive, List);'#010+
-  '  for i:= 0 to Pred(List.Count) do'#010+
-  '    AddExample(List[i], AInstallSourcePath);'#010+
-  '  List.Free;',#010+
-  'end;'#010+
-  #010+
-  #010+
+  ' boolean; AInstal','lSourcePath : String = '#039#039');'#013#010+
+  'var'#013#010+
+  '  List : TStrings;'#013#010+
+  '  i: integer;'#013#010+
+  'begin'#013#010+
+  '  List := TStringList.Create;'#013#010+
+  '  SearchFiles(AFileMask, Recursive, List);'#013#010+
+  '  for i:= 0 to Pred(List.Count) do'#013#010+
+  '    AddExample(List[i], AInstallSourcePath);'#013#010+
+  '  List.','Free;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TSources.AddTestFiles(const AFileMask: string; Recursive: bo'+
-  'olean);'#010+
-  'var'#010+
-  '  List : TStrings;'#010+
-  '  i: integer;'#010+
-  'begin'#010+
-  '  List := TStringList.Create;'#010+
-  '  SearchFiles(AFileMask, Recursive, List);'#010+
-  '  for i:= 0 to Pred(List.Count) do'#010+
-  '   ',' AddTest(List[i]);'#010+
-  '  List.Free;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'olean);'#013#010+
+  'var'#013#010+
+  '  List : TStrings;'#013#010+
+  '  i: integer;'#013#010+
+  'begin'#013#010+
+  '  List := TStringList.Create;'#013#010+
+  '  SearchFiles(AFileMask, Recursive, List);'#013#010+
+  '  for i:= 0 to Pred(Li','st.Count) do'#013#010+
+  '    AddTest(List[i]);'#013#010+
+  '  List.Free;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                             TPackage'#010+
-  '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'constr','uctor TPackage.Create(ACollection: TCollection);'#010+
-  'begin'#010+
-  '  inherited Create(ACollection);'#010+
-  '  FVersion:=TFPVersion.Create;'#010+
-  '  FTargets:=TTargets.Create(TTarget);'#010+
-  '  FSources:=TSources.Create(TSource);'#010+
-  '  FDependencies:=TDependencies.Create(TDepend','ency);'#010+
-  '  FInstallFiles:=TConditionalStrings.Create(TConditionalString);'#010+
-  '  FCleanFiles:=TConditionalStrings.Create(TConditionalString);'#010+
-  '  FUnitPath:=TConditionalStrings.Create(TConditionalString);'#010+
-  '  FObjectPath:=TConditionalStrings.Create(TC','onditionalString);'#010+
-  '  FIncludePath:=TConditionalStrings.Create(TConditionalString);'#010+
-  '  FSourcePath:=TConditionalStrings.Create(TConditionalString);'#010+
-  '  FExamplePath:=TConditionalStrings.Create(TConditionalString);'#010+
-  '  FTestPath:=TConditionalStrin','gs.Create(TConditionalString);'#010+
-  '  FCommands:=TCommands.Create(TCommand);'#010+
-  '  FCPUs:=AllCPUs;'#010+
-  '  FOSes:=AllOSes;'#010+
-  '  FInstalledChecksum:=$ffffffff;'#010+
-  '  // Implicit dependency on RTL'#010+
-  '  FDependencies.Add('#039'rtl'#039');'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'destructor TPackage.destroy;'#010+
-  'beg','in'#010+
-  '  FreeAndNil(FDependencies);'#010+
-  '  FreeAndNil(FInstallFiles);'#010+
-  '  FreeAndNil(FCleanFiles);'#010+
-  '  FreeAndNil(FIncludePath);'#010+
-  '  FreeAndNil(FSourcePath);'#010+
-  '  FreeAndNil(FExamplePath);'#010+
-  '  FreeAndNil(FTestPath);'#010+
-  '  FreeAndNil(FObjectPath);'#010+
-  '  FreeAndNil(FUni','tPath);'#010+
-  '  FreeAndNil(FSources);'#010+
-  '  FreeAndNil(FTargets);'#010+
-  '  FreeAndNil(FVersion);'#010+
-  '  FreeAndNil(FOptions);'#010+
-  '  inherited destroy;'#010+
-  'end;'#010+
-  #010+
-  'function TPackage.HaveOptions: Boolean;'#010+
-  'begin'#010+
-  '  Result:=(FOptions<>Nil);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TPackage.SetName(co','nst AValue: String);'#010+
-  'begin'#010+
-  '  inherited SetName(AValue);'#010+
-  '  // RTL should not have any dependencies'#010+
-  '  if AValue='#039'rtl'#039' then'#010+
-  '    FDependencies.Clear;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TPackage.GetUnitsOutputDir(ACPU:TCPU; AOS : TOS):String;'#010+
-  'begin'#010+
-  '  Result:='#039'unit','s'#039'+PathDelim+MakeTargetString(ACPU,AOS);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TPackage.GetBinOutputDir(ACPU:TCPU; AOS : TOS) : String;'#010+
-  'begin'#010+
-  '  Result:='#039'bin'#039'+PathDelim+MakeTargetString(ACPU,AOS);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TPackage.GetCleanFiles(List: TStrings; ACPU:TCPU;',' AOS : TO'+
-  'S);'#010+
-  'Var'#010+
-  '  OB,OU : String;'#010+
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  OB:=IncludeTrailingPathDelimiter(GetBinOutputDir(Defaults.CPU,Defaul'+
-  'ts.OS));'#010+
-  '  OU:=IncludeTrailingPathDelimiter(GetUnitsOutputDir(Defaults.CPU,Defa'+
-  'ults.OS));'#010+
-  '  AddConditionalStrings(','List,CleanFiles,ACPU,AOS);'#010+
-  '  For I:=0 to FTargets.Count-1 do'#010+
-  '    FTargets.TargetItems[I].GetCleanFiles(List, OU, OB, ACPU, AOS);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '*******'#013#010+
+  '                             TPackage'#013#010+
+  '*************************************************************','*******'+
+  '********}'#013#010+
+  #013#010+
+  'constructor TPackage.Create(ACollection: TCollection);'#013#010+
+  'begin'#013#010+
+  '  inherited Create(ACollection);'#013#010+
+  '  FVersion:=TFPVersion.Create;'#013#010+
+  '  FTargets:=TTargets.Create(TTarget);'#013#010+
+  '  FSources:=TSources.Create(TSource);'#013#010+
+  '  FDependenci','es:=TDependencies.Create(TDependency);'#013#010+
+  '  FInstallFiles:=TConditionalStrings.Create(TConditionalString);'#013#010+
+  '  FCleanFiles:=TConditionalStrings.Create(TConditionalString);'#013#010+
+  '  FUnitPath:=TConditionalStrings.Create(TConditionalString);'#013#010+
+  '  FObjec','tPath:=TConditionalStrings.Create(TConditionalString);'#013#010+
+  '  FIncludePath:=TConditionalStrings.Create(TConditionalString);'#013#010+
+  '  FSourcePath:=TConditionalStrings.Create(TConditionalString);'#013#010+
+  '  FExamplePath:=TConditionalStrings.Create(TConditional','String);'#013#010+
+  '  FTestPath:=TConditionalStrings.Create(TConditionalString);'#013#010+
+  '  FCommands:=TCommands.Create(TCommand);'#013#010+
+  '  FCPUs:=AllCPUs;'#013#010+
+  '  FOSes:=AllOSes;'#013#010+
+  '  FInstalledChecksum:=$ffffffff;'#013#010+
+  '  // Implicit dependency on RTL'#013#010+
+  '  FDependencies.Add('#039,'rtl'#039');'#013#010+
+  '  FSupportBuildModes:=[bmBuildUnit, bmOneByOne];'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'destructor TPackage.destroy;'#013#010+
+  'begin'#013#010+
+  '  FreeAndNil(FDependencies);'#013#010+
+  '  FreeAndNil(FInstallFiles);'#013#010+
+  '  FreeAndNil(FCleanFiles);'#013#010+
+  '  FreeAndNil(FIncludePath);'#013#010+
+  '  FreeAndNil(FSour','cePath);'#013#010+
+  '  FreeAndNil(FExamplePath);'#013#010+
+  '  FreeAndNil(FTestPath);'#013#010+
+  '  FreeAndNil(FObjectPath);'#013#010+
+  '  FreeAndNil(FUnitPath);'#013#010+
+  '  FreeAndNil(FSources);'#013#010+
+  '  FreeAndNil(FTargets);'#013#010+
+  '  FreeAndNil(FVersion);'#013#010+
+  '  FreeAndNil(FOptions);'#013#010+
+  '  inherited destroy;'#013,#010+
+  'end;'#013#010+
+  #013#010+
+  'function TPackage.HaveOptions: Boolean;'#013#010+
+  'begin'#013#010+
+  '  Result:=(FOptions<>Nil);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TPackage.SetName(const AValue: String);'#013#010+
+  'begin'#013#010+
+  '  inherited SetName(AValue);'#013#010+
+  '  // RTL should not have any dependencies'#013#010+
+  '  if AValue='#039'r','tl'#039' then'#013#010+
+  '    FDependencies.Clear;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TPackage.GetUnitsOutputDir(ACPU:TCPU; AOS : TOS):String;'#013#010+
+  'begin'#013#010+
+  '  Result:='#039'units'#039'+PathDelim+MakeTargetString(ACPU,AOS);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TPackage.GetBinOutputDir(ACPU:TCPU; AOS : TO','S) : String;'#013+
+  #010+
+  'begin'#013#010+
+  '  Result:='#039'bin'#039'+PathDelim+MakeTargetString(ACPU,AOS);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TPackage.GetCleanFiles(List: TStrings; ACPU:TCPU; AOS : TOS)'+
+  ';'#013#010+
+  'Var'#013#010+
+  '  OB,OU : String;'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  OB:=IncludeTrailingPathDelimiter','(GetBinOutputDir(ACPU,AOS));'#013#010+
+  '  OU:=IncludeTrailingPathDelimiter(GetUnitsOutputDir(ACPU,AOS));'#013#010+
+  '  AddConditionalStrings(List,CleanFiles,ACPU,AOS);'#013#010+
+  '  For I:=0 to FTargets.Count-1 do'#013#010+
+  '    FTargets.TargetItems[I].GetCleanFiles(List, OU, OB, A','CPU, AOS);'#013+
+  #010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TPackage.GetInstallFiles(List: TStrings;Types : TTargetTypes'+
-  ';ACPU:TCPU; AOS : TOS);'#010+
-  'Var'#010+
-  '  OB,O','U : String;'#010+
-  '  I : Integer;'#010+
-  '  T : TTarget;'#010+
-  'begin'#010+
-  '  OB:=IncludeTrailingPathDelimiter(GetBinOutputDir(Defaults.CPU,Defaul'+
-  'ts.OS));'#010+
+  ';ACPU:TCPU; AOS : TOS);'#013#010+
+  'Var'#013#010+
+  '  OB,OU : String;'#013#010+
+  '  I : Integer;'#013#010+
+  '  T : TTarget;'#013#010+
+  'begin'#013#010+
+  '  OB:=IncludeTrailingPathDelimiter(GetBinOutputDir(Defaults.','CPU,Defa'+
+  'ults.OS));'#013#010+
   '  OU:=IncludeTrailingPathDelimiter(GetUnitsOutputDir(Defaults.CPU,Defa'+
-  'ults.OS));'#010+
-  '  AddConditionalStrings(List,Ins','tallFiles,ACPU,AOS);'#010+
-  '  For I:=0 to FTargets.Count-1 do'#010+
-  '    begin'#010+
-  '      T:=FTargets.TargetItems[I];'#010+
-  '      if (T.TargetType in Types) and (T.Install) then'#010+
-  '        T.GetInstallFiles(List, OU, OB, ACPU, AOS);'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TPackage.','GetInstallSourceFiles(List: TStrings; Types: TSou'+
-  'rceTypes);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  S : TSource;'#010+
-  'begin'#010+
-  '  For I:=0 to FSources.Count-1 do'#010+
-  '    begin'#010+
-  '      S:=FSources.SourceItems[I];'#010+
-  '      if (S.SourceType in Types) then'#010+
-  '        S.GetInstallFile','s(List);'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TPackage.GetArchiveFiles(List: TStrings; ACPU:TCPU; AOS : TO'+
-  'S);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  // Targets only'#010+
-  '  For I:=0 to FTargets.Count-1 do'#010+
-  '    FTargets.TargetItems[I].GetArchiveFiles(List,ACPU,AOS);'#010+
-  'end;',#010+
-  #010+
-  #010+
-  'Function TPackage.GetDescription : string;'#010+
-  'Var'#010+
-  '  FN : String;'#010+
-  '  L : TStringList;'#010+
-  'begin'#010+
-  '  If (FDescription<>'#039#039') then'#010+
-  '    Result:=FDescription'#010+
-  '  else'#010+
-  '    If (FDescriptionFile<>'#039#039') then'#010+
-  '      begin'#010+
-  '        // Always relative to binary name.',#010+
-  '        FN:=ExtractFilePath(ParamStr(0));'#010+
-  '        FN:=FN+FDescriptionFile;'#010+
-  '        If FileExists(FN) then'#010+
-  '          begin'#010+
-  '            L:=TStringList.Create;'#010+
-  '            Try'#010+
-  '              L.LoadFromFile(FN);'#010+
-  '              Result:=L.Text;'#010+
-  '  ','          Finally'#010+
-  '              L.Free;'#010+
-  '            end;'#010+
-  '          end;'#010+
-  '      end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TPackage.GetVersion : string;'#010+
-  'begin'#010+
-  '  result:=FVersion.AsString;'#010+
-  'end;'#010+
-  #010+
-  'procedure TPackage.SetOptions(const AValue: TStrings);'#010+
-  'begin'#010+
-  '  If (AVa','lue=Nil) or (AValue.Count=0) then'#010+
-  '    FreeAndNil(Foptions)'#010+
-  '  else'#010+
-  '    Options.Assign(AValue);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Procedure TPackage.SetVersion(const V : string);'#010+
-  'begin'#010+
-  '  FVersion.AsString:=V;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TPackage.GetFileName : string;'#010+
-  'begin'#010+
-  '  If (F','FileName<>'#039#039') then'#010+
-  '    Result:=FFileName'#010+
-  '  else'#010+
-  '    if not FVersion.Empty then'#010+
-  '      Result := Name + '#039'-'#039' + FVersion.AsString'#010+
-  '    else'#010+
-  '      Result := Name;'#010+
-  'end;'#010+
-  #010+
-  'function TPackage.GetOptions: TStrings;'#010+
-  'begin'#010+
-  '  If (FOptions=Nil) then'#010+
-  '    FO','ptions:=TStringList.Create;'#010+
-  '  Result:=FOptions;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Procedure TPackage.GetManifest(Manifest : TStrings);'#010+
-  #010+
-  '  procedure AddOSes(const AIndent:string;AOSes:TOSes);'#010+
-  '  var'#010+
-  '    IOS : TOS;'#010+
-  '  begin'#010+
-  '    if (AOSes=AllOSes) then'#010+
-  '      exit;'#010+
-  '    Man','ifest.Add(AIndent+'#039'<oses>'#039');'#010+
-  '    for IOS:=low(TOSes) to high(TOSes) do'#010+
-  '      if IOS in AOSes then'#010+
+  'ults.OS));'#013#010+
+  '  AddConditionalStrings(List,InstallFiles,ACPU,AOS);'#013#010+
+  '  For I:=0 to FTargets.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      T:=FTargets.TargetItems[I];'#013#010+
+  '   ','   if (T.TargetType in Types) and (T.Install) then'#013#010+
+  '        T.GetInstallFiles(List, OU, OB, ACPU, AOS);'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TPackage.GetInstallSourceFiles(List: TStrings; SourceTypes :'+
+  ' TSourceTypes; TargetTypes : TTargetTypes);'#013#010,
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  S : TSource;'#013#010+
+  '  T : TTarget;'#013#010+
+  'begin'#013#010+
+  '  For I:=0 to FSources.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      S:=FSources.SourceItems[I];'#013#010+
+  '      if (S.SourceType in SourceTypes) then'#013#010+
+  '        S.GetInstallFiles(List);'#013#010+
+  '    end;'#013#010+
+  '  For I:=0',' to FTargets.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      T:=FTargets.TargetItems[I];'#013#010+
+  '      if (T.TargetType in TargetTypes) then'#013#010+
+  '        T.GetArchiveFiles(List,Defaults.CPU,Defaults.OS);'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TPackage.GetArchiveFiles(List: TStr','ings; ACPU:TCPU; AOS : '+
+  'TOS);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  // Targets only'#013#010+
+  '  For I:=0 to FTargets.Count-1 do'#013#010+
+  '    FTargets.TargetItems[I].GetArchiveFiles(List,ACPU,AOS);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TPackage.GetArchiveSourceFiles(List: TStrings);'#013#010,
+  'var'#013#010+
+  '  i : integer;'#013#010+
+  'begin'#013#010+
+  '  for i := 0 to Sources.Count-1 do'#013#010+
+  '    List.Add(Sources[i].Name);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function TPackage.GetDescription : string;'#013#010+
+  'Var'#013#010+
+  '  FN : String;'#013#010+
+  '  L : TStringList;'#013#010+
+  'begin'#013#010+
+  '  If (FDescription<>'#039#039') then'#013#010+
+  '    Result:=FD','escription'#013#010+
+  '  else'#013#010+
+  '    If (FDescriptionFile<>'#039#039') then'#013#010+
+  '      begin'#013#010+
+  '        // Always relative to binary name.'#013#010+
+  '        FN:=ExtractFilePath(ParamStr(0));'#013#010+
+  '        FN:=FN+FDescriptionFile;'#013#010+
+  '        If FileExists(FN) then'#013#010+
+  '          begin'#013#010+
+  ' ','           L:=TStringList.Create;'#013#010+
+  '            Try'#013#010+
+  '              L.LoadFromFile(FN);'#013#010+
+  '              Result:=L.Text;'#013#010+
+  '            Finally'#013#010+
+  '              L.Free;'#013#010+
+  '            end;'#013#010+
+  '          end;'#013#010+
+  '      end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TPackage.GetV','ersion : string;'#013#010+
+  'begin'#013#010+
+  '  result:=FVersion.AsString;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TPackage.SetOptions(const AValue: TStrings);'#013#010+
+  'begin'#013#010+
+  '  If (AValue=Nil) or (AValue.Count=0) then'#013#010+
+  '    FreeAndNil(Foptions)'#013#010+
+  '  else'#013#010+
+  '    Options.Assign(AValue);'#013#010+
+  'end;'#013#010+
+  #013,#010+
+  #013#010+
+  'Procedure TPackage.SetVersion(const V : string);'#013#010+
+  'begin'#013#010+
+  '  FVersion.AsString:=V;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TPackage.GetFileName : string;'#013#010+
+  'begin'#013#010+
+  '  If (FFileName<>'#039#039') then'#013#010+
+  '    Result:=FFileName'#013#010+
+  '  else'#013#010+
+  '    if not FVersion.Empty then'#013#010+
+  '      R','esult := Name + '#039'-'#039' + FVersion.AsString'#013#010+
+  '    else'#013#010+
+  '      Result := Name;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TPackage.GetOptions: TStrings;'#013#010+
+  'begin'#013#010+
+  '  If (FOptions=Nil) then'#013#010+
+  '    FOptions:=TStringList.Create;'#013#010+
+  '  Result:=FOptions;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Procedure TPackage','.GetManifest(Manifest : TStrings);'#013#010+
+  #013#010+
+  '  procedure AddOSes(const AIndent:string;AOSes:TOSes);'#013#010+
+  '  var'#013#010+
+  '    IOS : TOS;'#013#010+
+  '  begin'#013#010+
+  '    if (AOSes=AllOSes) then'#013#010+
+  '      exit;'#013#010+
+  '    Manifest.Add(AIndent+'#039'<oses>'#039');'#013#010+
+  '    for IOS:=low(TOSes) to high(TOS','es) do'#013#010+
+  '      if IOS in AOSes then'#013#010+
   '        Manifest.Add(Format(AIndent+'#039' <os name="%s"/>'#039',[OSToSt'+
-  'ring(IOS)]));'#010+
-  '    Manifest.Add(AIndent+'#039'</oses>'#039');'#010+
-  '  end;'#010+
-  #010+
-  '  procedure AddCPUs(c','onst AIndent:string;ACPUs:TCPUs);'#010+
-  '  var'#010+
-  '    ICPU : TCPU;'#010+
-  '  begin'#010+
-  '    if (ACPUs=AllCPUs) then'#010+
-  '      exit;'#010+
-  '    Manifest.Add(AIndent+'#039'<cpus>'#039');'#010+
-  '    for ICPU:=low(TCPUs) to high(TCPUs) do'#010+
-  '      if ICPU in ACPUs then'#010+
-  '        Manifest.Add(Format(','AIndent+'#039' <cpu name="%s"/>'#039',[CPU'+
-  'ToString(ICPU)]));'#010+
-  '    Manifest.Add(AIndent+'#039'</cpus>'#039');'#010+
-  '  end;'#010+
+  'ring(IOS)]));'#013#010+
+  '    Manifest.Add(AIndent+'#039'</oses>'#039');'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  procedure AddCPUs(const AIndent:string;ACPUs:TCPUs);'#013#010+
+  '  var'#013#010+
+  '    ICPU : TCPU;',#013#010+
+  '  begin'#013#010+
+  '    if (ACPUs=AllCPUs) then'#013#010+
+  '      exit;'#013#010+
+  '    Manifest.Add(AIndent+'#039'<cpus>'#039');'#013#010+
+  '    for ICPU:=low(TCPUs) to high(TCPUs) do'#013#010+
+  '      if ICPU in ACPUs then'#013#010+
+  '        Manifest.Add(Format(AIndent+'#039' <cpu name="%s"/>'#039',[CPUTo'+
+  'String(ICPU)]))',';'#013#010+
+  '    Manifest.Add(AIndent+'#039'</cpus>'#039');'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  function GetXMLVersionString(sMajor, sMinor, sMicro, sBuild: integer'+
+  '): string;'#013#010+
+  '  begin'#013#010+
+  '    Result := '#039'<version'#039';'#013#010+
+  '    if sMajor <> -1 then'#013#010+
+  '      Result := Result + '#039' major="'#039' + IntToSt','r(sMajor) + '#039+
+  '"'#039';'#013#010+
+  '    if sMinor <> -1 then'#013#010+
+  '      Result := Result + '#039' minor="'#039' + IntToStr(sMinor) + '#039'"'+
+  #039';'#013#010+
+  '    if sMicro <> -1 then'#013#010+
+  '      Result := Result + '#039' micro="'#039' + IntToStr(sMicro) + '#039'"'+
+  #039';'#013#010+
+  '    if sBuild <> -1 then'#013#010+
+  '      Result := Re','sult + '#039' build="'#039' + IntToStr(sBuild) + '#039+
+  '"'#039';'#013#010+
+  #013#010+
+  '    Result := Result + '#039'/>'#039';'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'Var'#013#010+
+  '  S : String;'#013#010+
+  '  i : Integer;'#013#010+
+  '  D : TDependency;'#013#010+
+  'begin'#013#010+
+  '  With Manifest do'#013#010+
+  '    begin'#013#010+
+  '    Add(Format('#039'<package name="%s">'#039',[QuoteXml(Name)]));'#013#010+
+  #013,#010+
+  '    Add('#039' '#039' + GetXMLVersionString(FVersion.Major,FVersion.Mino'+
+  'r,FVersion.Micro,FVersion.Build));'#013#010+
+  '    AddOSes('#039' '#039',OSes);'#013#010+
+  '    AddCPUs('#039' '#039',CPUs);'#013#010+
+  '    Add(Format('#039' <filename>%s</filename>'#039',[QuoteXml(FileName +'+
+  ' ZipExt)]));'#013#010+
+  '    Add(Format('#039' ','<author>%s</author>'#039',[QuoteXml(Author)]));'#013+
   #010+
-  'Var'#010+
-  '  S : String;'#010+
-  '  i : Integer;'#010+
-  '  D : TDependency;'#010+
-  'begin'#010+
-  '  With Manifest do'#010+
-  '    begin'#010+
-  '    Add(Format('#039'<package name="%s">'#039',[QuoteXml(Name)]));'#010,
-  '    Add(Format('#039' <version major="%d" minor="%d" micro="%d" build="'+
-  '%d"/>'#039',[FVersion.Major,FVersion.Minor,FVersion.Micro,FVersion.Buil'+
-  'd]));'#010+
-  '    AddOSes('#039' '#039',OSes);'#010+
-  '    AddCPUs('#039' '#039',CPUs);'#010+
-  '    Add(Format('#039' <filename>%s</filename>'#039',[QuoteXml(File','Name'+
-  ' + ZipExt)]));'#010+
-  '    Add(Format('#039' <author>%s</author>'#039',[QuoteXml(Author)]));'#010+
   '    Add(Format('#039' <license>%s</license>'#039',[QuoteXml(License)]));'+
-  #010+
-  '    if HomepageURL<>'#039#039' then'#010+
+  #013#010+
+  '    if HomepageURL<>'#039#039' then'#013#010+
   '      Add(Format('#039' <homepageurl>%s</homepageurl>'#039',[QuoteXml(Ho'+
-  'mepageUR','L)]));'#010+
-  '    if DownloadURL<>'#039#039' then'#010+
+  'mepageURL)]));'#013#010+
+  '    if DownloadURL<>'#039#039' th','en'#013#010+
   '      Add(Format('#039' <downloadurl>%s</downloadurl>'#039',[QuoteXml(Do'+
-  'wnloadURL)]));'#010+
-  '    Add(Format('#039' <email>%s</email>'#039',[QuoteXMl(Email)]));'#010+
-  '    S:=Description;'#010+
-  '    If (S<>'#039#039') then'#010+
-  '      Add(Format('#039' <description','>%s</description>'#039',[QuoteXML('+
-  'S)]));'#010+
-  '    If (Dependencies.Count>0) then'#010+
-  '      begin'#010+
-  '        Add('#039' <dependencies>'#039');'#010+
-  '        for I:=0 to Dependencies.Count-1 do'#010+
-  '          begin'#010+
-  '            D:=Dependencies[i];'#010+
-  '            Add('#039'  <dependency>'#039')',';'#010+
-  '            Add(Format('#039'   <package packagename="%s"/>'#039',[Quote'+
-  'XML(D.Value)]));'#010+
-  '            if not D.FVersion.Empty then'#010+
-  '              Add(Format('#039'   <version major="%d" minor="%d" micro='+
-  '"%d" build="%d"/>'#039',[D.FVersion.Major,D.FVersion.Mino','r,D.FVersion'+
-  '.Micro,D.FVersion.Build]));'#010+
-  '            AddOSes('#039'   '#039',D.OSes);'#010+
-  '            AddCPUs('#039'   '#039',D.CPUs);'#010+
-  '            Add('#039'  </dependency>'#039');'#010+
-  '          end;'#010+
-  '        Add('#039' </dependencies>'#039');'#010+
-  '      end;'#010+
-  '    Add('#039'</package>'#039');'#010+
-  '    end;'#010+
-  'end',';'#010+
-  #010+
-  #010+
-  'procedure TPackage.LoadUnitConfigFromFile(Const AFileName: String);'#010+
-  'var'#010+
-  '  L,L2 : TStrings;'#010+
-  '  VOS : TOS;'#010+
-  '  VCPU : TCPU;'#010+
-  '  i,k : Integer;'#010+
-  '  DepChecksum : Cardinal;'#010+
-  '  DepName : String;'#010+
-  '  D : TDependency;'#010+
-  'begin'#010+
-  '  L:=TStringList.Create;'#010+
-  '  Tr','y'#010+
-  '    ReadIniFile(AFileName,L);'#010+
-  '    With L do'#010+
-  '      begin'#010+
-  '        Version:=Values[KeyVersion];'#010+
+  'wnloadURL)]));'#013#010+
+  '    Add(Format('#039' <email>%s</email>'#039',[QuoteXMl(Email)]));'#013#010+
+  '    S:=Description;'#013#010+
+  '    If (S<>'#039#039') then'#013#010+
+  '      Add(Format('#039' <description>%s</description>'#039',[QuoteXM','L('+
+  'S)]));'#013#010+
+  '    If (Dependencies.Count>0) then'#013#010+
+  '      begin'#013#010+
+  '        Add('#039' <dependencies>'#039');'#013#010+
+  '        for I:=0 to Dependencies.Count-1 do'#013#010+
+  '          begin'#013#010+
+  '            D:=Dependencies[i];'#013#010+
+  '            Add('#039'  <dependency>'#039');'#013#010+
+  '            Add(F','ormat('#039'   <package packagename="%s"/>'#039',[Quo'+
+  'teXML(D.Value)]));'#013#010+
+  '            if not D.FVersion.Empty then'#013#010+
+  '              Add('#039'   '#039' + GetXMLVersionString(D.FVersion.Major'+
+  ',D.FVersion.Minor,D.FVersion.Micro,D.FVersion.Build));'#013#010+
+  '            AddOS','es('#039'   '#039',D.OSes);'#013#010+
+  '            AddCPUs('#039'   '#039',D.CPUs);'#013#010+
+  '            Add('#039'  </dependency>'#039');'#013#010+
+  '          end;'#013#010+
+  '        Add('#039' </dependencies>'#039');'#013#010+
+  '      end;'#013#010+
+  '    Add('#039'</package>'#039');'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TPackage.LoadUnitConfigFromFile(','Const AFileName: String);'#013+
+  #010+
+  'var'#013#010+
+  '  L,L2 : TStrings;'#013#010+
+  '  VOS : TOS;'#013#010+
+  '  VCPU : TCPU;'#013#010+
+  '  i,k : Integer;'#013#010+
+  '  DepChecksum : Cardinal;'#013#010+
+  '  DepName : String;'#013#010+
+  '  D : TDependency;'#013#010+
+  'begin'#013#010+
+  '  L:=TStringList.Create;'#013#010+
+  '  Try'#013#010+
+  '    ReadIniFile(AFileName,L);'#013#010+
+  ' ','   With L do'#013#010+
+  '      begin'#013#010+
+  '        Version:=Values[KeyVersion];'#013#010+
   '        InstalledChecksum:=Cardinal(StrToInt64Def(Values[KeyChecksum],'+
-  '$ffffffff));'#010+
-  '        VCPU:=StringToCPU(Values[KeyCPU]);'#010+
-  '        VOS:=String','ToOS(Values[KeyOS]);'#010+
-  '        OSes:=[VOS];'#010+
-  '        CPUs:=[VCPU];'#010+
-  '        L2:=TStringList.Create;'#010+
-  '        L2.CommaText:=Values[KeyDepends];'#010+
-  '        for i:=0 to L2.Count-1 do'#010+
-  '          begin'#010+
-  '            DepName:=L2[i];'#010+
-  '            k:=Pos('#039'|'#039',D','epName);'#010+
-  '            if k>0 then'#010+
-  '              begin'#010+
+  '$ffffffff));'#013#010+
+  '        VCPU:=StringToCPU(Values[KeyCPU]);'#013#010+
+  '        VOS:=StringToOS(Values[KeyOS]);'#013#010+
+  '      ','  OSes:=[VOS];'#013#010+
+  '        CPUs:=[VCPU];'#013#010+
+  '        L2:=TStringList.Create;'#013#010+
+  '        L2.CommaText:=Values[KeyDepends];'#013#010+
+  '        for i:=0 to L2.Count-1 do'#013#010+
+  '          begin'#013#010+
+  '            DepName:=L2[i];'#013#010+
+  '            k:=Pos('#039'|'#039',DepName);'#013#010+
+  '          ','  if k>0 then'#013#010+
+  '              begin'#013#010+
   '                DepChecksum:=StrToInt(Copy(DepName,k+1,Length(DepName)'+
-  '-k));'#010+
-  '                DepName:=Copy(DepName,1,k-1);'#010+
-  '              end'#010+
-  '            else'#010+
-  '              DepChecksum:=$ff','ffffff;'#010+
-  '            D:=Dependencies.Add(DepName,CPUs,OSes);'#010+
-  '            D.RequireChecksum:=DepChecksum;'#010+
-  '          end;'#010+
-  '        FreeAndNil(L2);'#010+
-  '        NeedLibC:=Upcase(Values[KeyNeedLibC])='#039'Y'#039';'#010+
-  '      end;'#010+
-  '  Finally'#010+
-  '    L.Free;'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010,
-  #010+
+  '-k));'#013#010+
+  '                DepName:=Copy(DepName,1,k-1);'#013#010+
+  '              end'#013#010+
+  '            else'#013#010+
+  '              DepChecksum:=$ffffffff;'#013#010+
+  '    ','        D:=Dependencies.Add(DepName,CPUs,OSes);'#013#010+
+  '            D.RequireChecksum:=DepChecksum;'#013#010+
+  '          end;'#013#010+
+  '        FreeAndNil(L2);'#013#010+
+  '        NeedLibC:=Upcase(Values[KeyNeedLibC])='#039'Y'#039';'#013#010+
+  '        IsFPMakeAddIn:=Upcase(Values[KeyAddIn])='#039'Y'#039';'#013,#010+
+  '      end;'#013#010+
+  '  Finally'#013#010+
+  '    L.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TPackage.SaveUnitConfigToStringList(const AStringList: TStri'+
+  'ngs; ACPU: TCPU; AOS: TOS);'#013#010+
+  'Var'#013#010+
+  '  Deps : String;'#013#010+
+  '  i : integer;'#013#010+
+  '  D : TDependency;'#013#010+
+  '  p : TPackage;'#013#010+
+  'begin'#013#010+
+  '  wit','h AStringList do'#013#010+
+  '    begin'#013#010+
+  '      Values[KeyName]:=Name;'#013#010+
+  '      Values[KeyVersion]:=Version;'#013#010+
+  '      // TODO Generate checksum based on PPUs'#013#010+
+  '      Values[KeyChecksum]:=IntToStr(DateTimeToFileDate(Now));'#013#010+
+  '      Values[KeyCPU]:=CPUToString(A','CPU);'#013#010+
+  '      Values[KeyOS]:=OSToString(AOS);'#013#010+
+  '      //Installer;'#013#010+
+  '      Values[KeySourcePath]:=IncludeTrailingPathDelimiter(IncludeTrail'+
+  'ingPathDelimiter(Installer.BuildEngine.FStartDir)+Directory);'#013#010+
+  '      Values[KeyFPMakeOptions]:=trim(Inst','aller.FPMakeOptionsString);'+
+  #013#010+
+  '      Deps:='#039#039';'#013#010+
+  '      for i:=0 to Dependencies.Count-1 do'#013#010+
+  '        begin'#013#010+
+  '          D:=Dependencies[i];'#013#010+
+  '          if (ACPU in D.CPUs) and (AOS in D.OSes) then'#013#010+
+  '            begin'#013#010+
+  '              if Deps<>'#039#039' then',#013#010+
+  '                Deps:=Deps+'#039','#039';'#013#010+
+  '              Deps:=Deps+D.Value;'#013#010+
+  '              P:=TPackage(D.Target);'#013#010+
+  '              if assigned(P) and (P.InstalledChecksum<>$ffffffff) then'+
+  #013#010+
+  '                Deps:=Deps+'#039'|'#039'+IntToStr(P.InstalledChecksum)',';'+
+  #013#010+
+  '            end;'#013#010+
+  '        end;'#013#010+
+  '      Values[KeyDepends]:=Deps;'#013#010+
+  '      if NeedLibC then'#013#010+
+  '        Values[KeyNeedLibC]:='#039'Y'#039#013#010+
+  '      else'#013#010+
+  '        Values[KeyNeedLibC]:='#039'N'#039';'#013#010+
+  '      if IsFPMakeAddIn then'#013#010+
+  '        Values[KeyAddIn]:='#039'Y'#039#013#010+
+  '      e','lse'#013#010+
+  '        Values[KeyAddIn]:='#039'N'#039';'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
   'procedure TPackage.SaveUnitConfigToFile(Const AFileName: String;ACPU:T'+
-  'CPU;AOS:TOS);'#010+
-  'Var'#010+
-  '  F : TFileStream;'#010+
-  '  L : TStringList;'#010+
-  '  Deps : String;'#010+
-  '  i : integer;'#010+
-  '  D : TDependency;'#010+
-  '  p : TPackage;'#010+
-  'begin'#010+
-  '  F:=TFileStream.Create(AFileName,fmCrea','te);'#010+
-  '  L:=TStringList.Create;'#010+
-  '  try'#010+
-  '    With L do'#010+
-  '      begin'#010+
-  '        Values[KeyName]:=Name;'#010+
-  '        Values[KeyVersion]:=Version;'#010+
-  '        // TODO Generate checksum based on PPUs'#010+
-  '        Values[KeyChecksum]:=IntToStr(DateTimeToFileDate(Now))',';'#010+
-  '        Values[KeyCPU]:=CPUToString(ACPU);'#010+
-  '        Values[KeyOS]:=OSToString(AOS);'#010+
-  '        Deps:='#039#039';'#010+
-  '        for i:=0 to Dependencies.Count-1 do'#010+
-  '          begin'#010+
-  '            D:=Dependencies[i];'#010+
-  '            if (ACPU in D.CPUs) and (AOS in D','.OSes) then'#010+
-  '              begin'#010+
-  '                if Deps<>'#039#039' then'#010+
-  '                  Deps:=Deps+'#039','#039';'#010+
-  '                Deps:=Deps+D.Value;'#010+
-  '                P:=TPackage(D.Target);'#010+
-  '                if assigned(P) and (P.InstalledChecksum<>$ffffffff',') '+
-  'then'#010+
-  '                  Deps:=Deps+'#039'|'#039'+IntToStr(P.InstalledChecksum)'+
-  ';'#010+
-  '              end;'#010+
-  '          end;'#010+
-  '        Values[KeyDepends]:=Deps;'#010+
-  '        if NeedLibC then'#010+
-  '          Values[KeyNeedLibC]:='#039'Y'#039#010+
-  '        else'#010+
-  '          Values[KeyNeedLibC',']:='#039'N'#039';'#010+
-  '      end;'#010+
-  '    L.SaveToStream(F);'#010+
-  '  Finally'#010+
-  '    L.Free;'#010+
-  '    F.Free;'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  #010+
+  'CPU;AOS:TOS);'#013#010+
+  'Var'#013#010+
+  '  F : TFileStream;'#013#010+
+  '  L : TStringList;'#013#010+
+  'begin'#013#010+
+  '  F:=TFileStream.Create(AFileName,fmCreate);'#013#010+
+  '  ','L:=TStringList.Create;'#013#010+
+  '  try'#013#010+
+  '    SaveUnitConfigToStringList(L,ACPU,AOS);'#013#010+
+  '    L.SaveToStream(F);'#013#010+
+  '  Finally'#013#010+
+  '    L.Free;'#013#010+
+  '    F.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                              TPackages'#010+
-  '*******************************','*************************************'+
-  '********}'#010+
-  #010+
-  'function TPackages.GetPackage(const AName : String): TPackage;'#010+
-  'begin'#010+
-  '  Result:=TPackage(ItemByName(AName))'#010+
-  'end;'#010+
-  #010+
-  'function TPackages.GetPackageItem(AIndex : Integer): TPackage;'#010+
-  'begin'#010+
-  '  Result:=','TPackage(Items[AIndex]);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '*******'#013#010+
+  '    ','                          TPackages'#013#010+
+  '**********************************************************************'+
+  '******}'#013#010+
+  #013#010+
+  'function TPackages.GetPackage(const AName : String): TPackage;'#013#010+
+  'begin'#013#010+
+  '  Result:=TPackage(ItemByName(AName))'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'func','tion TPackages.GetPackageItem(AIndex : Integer): TPackage;'#013#010+
+  'begin'#013#010+
+  '  Result:=TPackage(Items[AIndex]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TPackages.SetPackageItem(AIndex : Integer; const AValue: TPa'+
-  'ckage);'#010+
-  'begin'#010+
-  '  Items[AIndex]:=AValue;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TPackages.AddPackage(const AName: String): TPackage;'#010+
-  'begin'#010+
-  '  Result:=Add as TPackag','e;'#010+
-  '  Result.Name:=AName;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'ckage);'#013#010+
+  'begin'#013#010+
+  '  Items[AIndex]:=AValue;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'funct','ion TPackages.AddPackage(const AName: String): TPackage;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TPackage;'#013#010+
+  '  Result.Name:=AName;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                             TCustomDefaults'#010+
+  '*******'#013#010+
+  '                             TCusto','mDefaults'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'proced','ure TCustomDefaults.SetCPU(const AValue: TCPU);'#010+
-  'begin'#010+
-  '  FCPU:=AValue;'#010+
-  '  RecalcTarget;'#010+
-  'end;'#010+
-  #010+
-  'procedure TCustomDefaults.SetOptions(const AValue: TStrings);'#010+
-  'begin'#010+
-  '  If (AValue=Nil) or (AValue.Count=0) then'#010+
-  '    FreeAndNil(Foptions)'#010+
-  '  else'#010+
-  '    O','ptions.Assign(AValue)'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TCustomDefaults.GetBaseInstallDir: String;'#010+
-  'begin'#010+
-  '  If (FBaseInstallDir<>'#039#039') then'#010+
-  '    Result:=FBaseInstallDir'#010+
-  '  else'#010+
-  '    if UnixPaths then'#010+
+  '******}'#013#010+
+  #013#010+
+  'procedure TCustomDefaults.SetCPU(const AValue: TCPU);'#013#010+
+  'begin'#013#010+
+  '  FCPU:=AValue;'#013#010+
+  '  RecalcTarget;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TCustomDefaults.SetOptions(const A','Value: TStrings);'#013#010+
+  'begin'#013#010+
+  '  If (AValue=Nil) or (AValue.Count=0) then'#013#010+
+  '    FreeAndNil(Foptions)'#013#010+
+  '  else'#013#010+
+  '    Options.Assign(AValue)'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TCustomDefaults.GetBaseInstallDir: String;'#013#010+
+  'begin'#013#010+
+  '  If (FBaseInstallDir<>'#039#039') then'#013#010+
+  '    R','esult:=FBaseInstallDir'#013#010+
+  '  else'#013#010+
+  '    if UnixPaths then'#013#010+
   '      Result:=Prefix +'#039'lib'#039' + PathDelim + '#039'fpc'#039' + Path'+
-  'Delim + FC','ompilerVersion + PathDelim'#010+
-  '    else'#010+
-  '      Result:=Prefix;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TCustomDefaults.GetBinInstallDir: String;'#010+
-  'begin'#010+
-  '  If (FBinInstallDir<>'#039#039') then'#010+
-  '    Result:=FBinInstallDir'#010+
-  '  else'#010+
-  '    If UnixPaths then'#010+
-  '      Result:=Prefix+'#039'bin'#039#010+
-  '    ','else'#010+
-  '      Result:=BaseInstallDir+'#039'bin'#039';'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TCustomDefaults.GetCompiler: String;'#010+
-  'begin'#010+
-  '  If (FCompiler<>'#039#039') then'#010+
-  '    Result:=FCompiler'#010+
-  '  else'#010+
-  '    Result:='#039'fpc'#039';'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TCustomDefaults.GetDocInstallDir: String;'#010+
-  'begin'#010+
-  '  ','If (FDocInstallDir<>'#039#039') then'#010+
-  '    Result:=FDocInstallDir'#010+
-  '  else'#010+
-  '    If UnixPaths then'#010+
-  '      Result:=Prefix+'#039'share'#039'+PathDelim+'#039'doc'#039#010+
-  '    else'#010+
-  '      Result:=BaseInstallDir+'#039'docs'#039';'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TCustomDefaults.GetExamplesInstallDir: String;'#010+
-  'b','egin'#010+
-  '  If (FExamplesInstallDir<>'#039#039') then'#010+
-  '    Result:=FExamplesInstallDir'#010+
-  '  else'#010+
-  '    If UnixPaths then'#010+
-  '      Result:=Prefix+'#039'share'#039'+PathDelim+'#039'doc'#039#010+
-  '    else'#010+
-  '      Result:=BaseInstallDir+'#039'examples'#039';'#010+
-  'end;'#010+
-  #010+
-  'function TCustomDefaults.GetOptions: ','TStrings;'#010+
-  'begin'#010+
-  '  If (FOptions=Nil) then'#010+
-  '    FOptions:=TStringList.Create;'#010+
-  '  Result:=FOptions;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TCustomDefaults.GetUnitInstallDir: String;'#010+
-  'begin'#010+
-  '  If (FUnitInstallDir<>'#039#039') then'#010+
-  '    Result:=FUnitInstallDir'#010+
-  '  else'#010+
-  '    Result:=B','aseInstallDir+'#039'units'#039'+PathDelim+Target;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TCustomDefaults.GetLocalUnitDir: String;'#010+
-  'begin'#010+
-  '  Result:=FLocalUnitDir;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TCustomDefaults.GetGlobalUnitDir: String;'#010+
-  'begin'#010+
-  '  If (FGlobalUnitDir<>'#039#039') then'#010+
-  '    Result:=FGlob','alUnitDir'#010+
-  '  else'#010+
-  '    Result:=UnitInstallDir;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.SetLocalUnitDir(const AValue: String);'#010+
-  'begin'#010+
-  '  // Use ExpandFileName to support ~/ expansion'#010+
-  '  if AValue<>'#039#039' then'#010+
-  '    FLocalUnitDir:=IncludeTrailingPathDelimiter(','ExpandFileName(AValu'+
-  'e))'#010+
-  '  else'#010+
-  '    FLocalUnitDir:='#039#039';'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.SetGlobalUnitDir(const AValue: String);'#010+
-  'begin'#010+
-  '  // Use ExpandFileName to support ~/ expansion'#010+
-  '  if AValue<>'#039#039' then'#010+
-  '    FGlobalUnitDir:=IncludeTrailingPat','hDelimiter(ExpandFileName(AVal'+
-  'ue))'#010+
-  '  else'#010+
-  '    FGlobalUnitDir:='#039#039';'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.SetBaseInstallDir(const AValue: String);'#010+
-  'begin'#010+
-  '  // Use ExpandFileName to support ~/ expansion'#010+
-  '  if AValue<>'#039#039' then'#010+
-  '    FBaseInstallDir:=Incl','udeTrailingPathDelimiter(ExpandFileName(AVa'+
-  'lue))'#010+
-  '  else'#010+
-  '    FBaseInstallDir:='#039#039';'#010+
-  '  UnitInstallDir:='#039#039';'#010+
-  '  BinInstallDir:='#039#039';'#010+
-  '  ExamplesInstallDir:='#039#039';'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.SetOS(const AValue: TOS);'#010+
-  'begin'#010+
-  '  FOS:=AValue;'#010+
-  '  Recalcta','rget;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.SetPrefix(const AValue: String);'#010+
-  'begin'#010+
-  '  if FPrefix=AValue then exit;'#010+
-  '  FPrefix:=IncludeTrailingPathDelimiter(AValue);'#010+
-  '  BaseInstallDir:='#039#039';'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.SetTarget(const AValue: Str','ing);'#010+
-  'Var'#010+
-  '  P : Integer;'#010+
-  'begin'#010+
-  '  if FTarget<>AValue then'#010+
-  '    begin'#010+
-  '      P:=Pos('#039'-'#039',AValue);'#010+
-  '      If (P<>0) then'#010+
-  '        begin'#010+
-  '          FOS:=StringToOS(System.Copy(Avalue,P+1,Length(AValue)-P));'#010+
-  '          FCPU:=StringToCPU(System.Copy(Ava','lue,1,P-1));'#010+
-  '        end'#010+
-  '      else'#010+
-  '        FOS:=StringToOS(AValue);'#010+
-  '      FTarget:=AValue;'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.RecalcTarget;'#010+
-  'begin'#010+
-  '  Ftarget:=CPUToString(FCPU)+'#039'-'#039'+OStoString(FOS);'#010+
-  'end;'#010+
-  #010+
-  'function TCustomDefaults.CmdLi','neOptions: String;'#010+
-  'begin'#010+
-  '  If Haveoptions then'#010+
-  '    Result:=OptionListToString(FOptions);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'constructor TCustomDefaults.Create;'#010+
-  'begin'#010+
-  '  InitDefaults;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.InitDefaults;'#010+
-  'begin'#010+
-  '{$ifdef unix}'#010+
-  '  UnixPaths:=True;'#010,
-  '{$else}'#010+
-  '  UnixPaths:=False;'#010+
-  '{$endif}'#010+
-  '  FNoFPCCfg:=False;'#010+
-  '  FCPU:=cpuNone;'#010+
-  '  FOS:=osNone;'#010+
-  'end;'#010+
-  #010+
-  'function TCustomDefaults.HaveOptions: Boolean;'#010+
-  'begin'#010+
-  '  Result:=Assigned(FOptions);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.LocalInit(Const AFileName : S','tring);'#010+
-  'Var'#010+
-  '  FN : String;'#010+
-  'begin'#010+
-  '  FN:=AFileName;'#010+
-  '  If (FN='#039#039') then'#010+
-  '    begin'#010+
-  '    // Environment variable.'#010+
-  '    FN:=GetEnvironmentVariable('#039'FPMAKECFG'#039');'#010+
-  '    If (FN<>'#039#039') then'#010+
-  '      If not FileExists(FN) then'#010+
-  '        FN:='#039#039';'#010+
-  '    // User config',' file fpmake.cfg'#010+
-  '    If (FN='#039#039') then'#010+
-  '      begin'#010+
-  '      FN:=GetAppConfigFile(False);'#010+
-  '      If Not FileExists(FN) then'#010+
-  '        FN:='#039#039';'#010+
-  '      end;'#010+
-  '    // Global config file fpmake.cfg'#010+
-  '    If (FN='#039#039') then'#010+
-  '      begin'#010+
-  '      FN:=GetAppConfigFile(','True);'#010+
-  '      If Not FileExists(FN) then'#010+
-  '        FN:='#039#039';'#010+
-  '      end;'#010+
-  '    end;'#010+
-  '  If (FN<>'#039#039') and FileExists(FN) then'#010+
-  '    LoadFromFile(FN);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.CompilerDefaults;'#010+
-  '{$ifdef HAS_UNIT_PROCESS}'#010+
-  'var'#010+
-  '  infoSL : TStringList;',#010+
-  '{$endif HAS_UNIT_PROCESS}'#010+
-  'begin'#010+
-  '  if (CPU=cpuNone) or (OS=osNone) or (FCompilerVersion='#039#039') then'#010+
-  '    begin'#010+
-  '{$ifdef HAS_UNIT_PROCESS}'#010+
-  '      // Detect compiler version/target from -i option'#010+
-  '      infosl:=TStringList.Create;'#010+
-  '      infosl.Delim','iter:='#039' '#039';'#010+
-  '      infosl.DelimitedText:=GetCompilerInfo(GetCompiler,'#039'-iVTPTO'#039+
-  ');'#010+
-  '      if infosl.Count<>3 then'#010+
-  '        Raise EInstallerError.Create(SErrInvalidFPCInfo);'#010+
-  '      if FCompilerVersion='#039#039' then'#010+
-  '        FCompilerVersion:=infosl[0];'#010+
-  '  ','    if CPU=cpuNone then'#010+
-  '        CPU:=StringToCPU(infosl[1]);'#010+
-  '      if OS=osNone then'#010+
-  '        OS:=StringToOS(infosl[2]);'#010+
-  '{$else HAS_UNIT_PROCESS}'#010+
-  '      // Defaults taken from compiler used to build fpmake'#010+
-  '      if CPU=cpuNone then'#010+
-  '        CP','U:=StringToCPU({$I %FPCTARGETCPU%});'#010+
-  '      if OS=osNone then'#010+
-  '        OS:=StringToOS({$I %FPCTARGETOS%});'#010+
-  '      if FCompilerVersion='#039#039' then'#010+
-  '        FCompilerVersion:={$I %FPCVERSION%};'#010+
-  '{$endif HAS_UNIT_PROCESS}'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCus','tomDefaults.LoadFromFile(Const AFileName: String);'#010+
-  'Var'#010+
-  '  F : TFileStream;'#010+
-  'begin'#010+
-  '  F:=TFileStream.Create(AFileName,fmOpenRead);'#010+
-  '  Try'#010+
-  '    LoadFromStream(F);'#010+
-  '  Finally'#010+
-  '    F.Free;'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.SaveToFile(Const AFile','Name: String);'#010+
-  'Var'#010+
-  '  F : TFileStream;'#010+
-  'begin'#010+
-  '  F:=TFileStream.Create(AFileName,fmCreate);'#010+
-  '  Try'#010+
-  '    SaveToStream(F);'#010+
-  '  Finally'#010+
-  '    F.Free;'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomDefaults.SaveToStream(S : TStream);'#010+
-  'Var'#010+
-  '  L : TStringList;'#010+
-  'begin'#010+
-  '  L:=T','StringList.Create;'#010+
-  '  try'#010+
-  '    With L do'#010+
-  '      begin'#010+
-  '      Values[KeyArchive]:=FArchive;'#010+
-  '      Values[KeyCompiler]:=FCompiler;'#010+
-  '      Values[KeyCopy]:=FCopy;'#010+
-  '      Values[KeyMkDir]:=FMkDir;'#010+
-  '      Values[KeyMove]:=FMove;'#010+
-  '      Values[KeyOptions',']:=CmdLineOptions;'#010+
-  '      Values[KeyCPU]:=CPUToString(FCPU);'#010+
-  '      Values[KeyOS]:=OSToString(FOS);'#010+
-  '      Values[KeyMode]:=ModeToString(FMode);'#010+
-  '      Values[KeyLocalUnitDir]:=FLocalUnitDir;'#010+
-  '      Values[KeyGlobalUnitDir]:=FGlobalUnitDir;'#010+
-  '    ','  Values[KeyPrefix]:=FPrefix;'#010+
-  '      Values[KeyBaseInstallDir]:=FBaseInstallDir;'#010+
-  '      Values[KeyUnitInstallDir]:=FUnitInstallDir;'#010+
-  '      Values[KeyBinInstallDir]:=FBinInstallDir;'#010+
-  '      Values[KeyDocInstallDir]:=FDocInstallDir;'#010+
-  '      Values[K','eyExamplesInstallDir]:=FExamplesInstallDir;'#010+
-  '      Values[KeyRemove]:=FRemove;'#010+
-  '      Values[KeyTarget]:=FTarget;'#010+
-  '      if FNoFPCCfg then'#010+
-  '        Values[KeyNoFPCCfg]:='#039'Y'#039';'#010+
-  '      end;'#010+
-  '    L.SaveToStream(S);'#010+
-  '  Finally'#010+
-  '    L.Free;'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010,
-  'procedure TCustomDefaults.LoadFromStream(S: TStream);'#010+
-  'Var'#010+
-  '  L : TStrings;'#010+
-  '  Line : String;'#010+
-  '  I,P,PC : Integer;'#010+
-  'begin'#010+
-  '  L:=TStringList.Create;'#010+
-  '  Try'#010+
-  '    L.LoadFromStream(S);'#010+
-  '    // Fix lines.'#010+
-  '    For I:=L.Count-1 downto 0 do'#010+
-  '      begin'#010+
-  '    ','  Line:=L[I];'#010+
-  '      P:=Pos('#039'='#039',Line);'#010+
-  '      PC:=Pos('#039';'#039',Line);  // Comment line.'#010+
-  '      If (P=0) or ((PC<>0) and (PC<P)) then'#010+
-  '        L.Delete(I)'#010+
-  '      else'#010+
-  '        L[i]:=Trim(System.Copy(Line,1,P-1)+'#039'='#039'+Trim(System.Cop'+
-  'y(Line,P+1,Length(Line',')-P)));'#010+
-  '      end;'#010+
-  '    With L do'#010+
-  '      begin'#010+
-  '      FArchive:=Values[KeyArchive];'#010+
-  '      FCompiler:=Values[KeyCompiler];'#010+
-  '      FCopy:=Values[KeyCopy];'#010+
-  '      FMkDir:=Values[KeyMkDir];'#010+
-  '      FMove:=Values[KeyMove];'#010+
-  '      FRemove:=Values[KeyRemo','ve];'#010+
-  '      Options:=OptionsToStringList(Values[KeyOptions]);'#010+
-  '      Line:=Values[KeyCPU];'#010+
-  '      If (Line<>'#039#039') then'#010+
-  '        FCPU:=StringToCPU(Line);'#010+
-  '      Line:=Values[KeyOS];'#010+
-  '      If (Line<>'#039#039') then'#010+
-  '        FOS:=StringToOS(Line);'#010+
-  '      Line',':=Values[KeyMode];'#010+
-  '      If (Line<>'#039#039') then'#010+
-  '        FMode:=StringToMode(Line);'#010+
-  '      FTarget:=Values[KeyTarget];'#010+
-  '      FLocalUnitDir:=Values[KeyLocalUnitDir];'#010+
-  '      FGlobalUnitDir:=Values[KeyGlobalUnitDir];'#010+
-  '      FPrefix:=Values[KeyPrefix];',#010+
-  '      FBaseInstallDir:=Values[KeyBaseInstallDir];'#010+
-  '      FUnitInstallDir:=Values[KeyUnitInstallDir];'#010+
-  '      FBinInstallDir:=Values[KeyBinInstallDir];'#010+
-  '      FDocInstallDir:=Values[KeyDocInstallDir];'#010+
-  '      FExamplesInstallDir:=Values[KeyExampl','esInstallDir];'#010+
-  '      FNoFPCCfg:=(Upcase(Values[KeyNoFPCCfg])='#039'Y'#039');'#010+
-  '      end;'#010+
-  '  Finally'#010+
-  '    L.Free;'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'Delim + FCompilerVersion + PathDelim'#013#010+
+  '    else'#013#010+
+  '      Result:=Prefix;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TCustomDefaults.GetBinInstallDir: String;',#013#010+
+  'begin'#013#010+
+  '  If (FBinInstallDir<>'#039#039') then'#013#010+
+  '    Result:=FBinInstallDir'#013#010+
+  '  else'#013#010+
+  '    If UnixPaths then'#013#010+
+  '      Result:=Prefix+'#039'bin'#039#013#010+
+  '    else'#013#010+
+  '      Result:=BaseInstallDir+'#039'bin'#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TCustomDefaults.GetCompiler: String;'#013#010+
+  'begin'#013#010+
+  ' ',' If (FCompiler<>'#039#039') then'#013#010+
+  '    Result:=FCompiler'#013#010+
+  '  else'#013#010+
+  '    Result:='#039'fpc'#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TCustomDefaults.GetDocInstallDir: String;'#013#010+
+  'begin'#013#010+
+  '  If (FDocInstallDir<>'#039#039') then'#013#010+
+  '    Result:=FDocInstallDir'#013#010+
+  '  else'#013#010+
+  '    If UnixPaths then'#013#010+
+  '   ','   Result:=Prefix+'#039'share'#039'+PathDelim+'#039'doc'#039#013#010+
+  '    else'#013#010+
+  '      Result:=BaseInstallDir+'#039'docs'#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TCustomDefaults.GetExamplesInstallDir: String;'#013#010+
+  'begin'#013#010+
+  '  If (FExamplesInstallDir<>'#039#039') then'#013#010+
+  '    Result:=FExamplesInstallDir'#013#010+
+  '  els','e'#013#010+
+  '    If UnixPaths then'#013#010+
+  '      Result:=Prefix+'#039'share'#039'+PathDelim+'#039'doc'#039#013#010+
+  '    else'#013#010+
+  '      Result:=BaseInstallDir+'#039'examples'#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TCustomDefaults.GetOptions: TStrings;'#013#010+
+  'begin'#013#010+
+  '  If (FOptions=Nil) then'#013#010+
+  '    FOptions:=TStringList.C','reate;'#013#010+
+  '  Result:=FOptions;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TCustomDefaults.GetUnitInstallDir: String;'#013#010+
+  'begin'#013#010+
+  '  Dictionary.AddVariable('#039'target'#039',Target);'#013#010+
+  '  Dictionary.AddVariable('#039'BaseInstallDir'#039',BaseInstallDir);'#013+
+  #010+
+  '  result := FixPath(Dictionary.Replac','eStrings(FUnitInstallDir));'#013+
+  #010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TCustomDefaults.GetLocalUnitDir: String;'#013#010+
+  'begin'#013#010+
+  '  Result:=FLocalUnitDir;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TCustomDefaults.GetFPDocOutputDir: String;'#013#010+
+  'begin'#013#010+
+  '  If (FFPDocOutputDir<>'#039#039') then'#013#010+
+  '    Result:=Incl','udeTrailingPathDelimiter(FixPath(FFPDocOutputDir))'#013+
+  #010+
+  '  else'#013#010+
+  '    Result:=IncludeTrailingPathDelimiter(FixPath('#039'.'#039'+PathDelim'+
+  '+'#039'docs'#039'));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TCustomDefaults.GetGlobalUnitDir: String;'#013#010+
+  'begin'#013#010+
+  '  If (FGlobalUnitDir<>'#039#039') then'#013#010+
+  '    R','esult:=FGlobalUnitDir'#013#010+
+  '  else'#013#010+
+  '    Result:=UnitInstallDir;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.SetLocalUnitDir(const AValue: String);'#013#010+
+  'begin'#013#010+
+  '  // Use ExpandFileName to support ~/ expansion'#013#010+
+  '  if AValue<>'#039#039' then'#013#010+
+  '    FLocalUnitDir:=Include','TrailingPathDelimiter(ExpandFileName(AValu'+
+  'e))'#013#010+
+  '  else'#013#010+
+  '    FLocalUnitDir:='#039#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.SetGlobalUnitDir(const AValue: String);'#013#010+
+  'begin'#013#010+
+  '  // Use ExpandFileName to support ~/ expansion'#013#010+
+  '  if AValue<>'#039#039' then'#013#010+
+  '    FG','lobalUnitDir:=IncludeTrailingPathDelimiter(ExpandFileName(AVal'+
+  'ue))'#013#010+
+  '  else'#013#010+
+  '    FGlobalUnitDir:='#039#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.SetBaseInstallDir(const AValue: String);'#013+
+  #010+
+  'begin'#013#010+
+  '  // Use ExpandFileName to support ~/ expansion'#013#010+
+  '  if ','AValue<>'#039#039' then'#013#010+
+  '    FBaseInstallDir:=IncludeTrailingPathDelimiter(ExpandFileName(AValu'+
+  'e))'#013#010+
+  '  else'#013#010+
+  '    FBaseInstallDir:='#039#039';'#013#010+
+  '  BinInstallDir:='#039#039';'#013#010+
+  '  ExamplesInstallDir:='#039#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.SetOS(const AValue: TOS);'#013#010+
+  'be','gin'#013#010+
+  '  FOS:=AValue;'#013#010+
+  '  Recalctarget;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.SetPrefix(const AValue: String);'#013#010+
+  'begin'#013#010+
+  '  if FPrefix=AValue then exit;'#013#010+
+  '  FPrefix:=IncludeTrailingPathDelimiter(AValue);'#013#010+
+  '  BaseInstallDir:='#039#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure ','TCustomDefaults.SetTarget(const AValue: String);'#013#010+
+  'Var'#013#010+
+  '  P : Integer;'#013#010+
+  'begin'#013#010+
+  '  if FTarget<>AValue then'#013#010+
+  '    begin'#013#010+
+  '      P:=Pos('#039'-'#039',AValue);'#013#010+
+  '      If (P<>0) then'#013#010+
+  '        begin'#013#010+
+  '          FOS:=StringToOS(System.Copy(Avalue,P+1,Length(AVal','ue)-P));'+
+  #013#010+
+  '          FCPU:=StringToCPU(System.Copy(Avalue,1,P-1));'#013#010+
+  '        end'#013#010+
+  '      else'#013#010+
+  '        FOS:=StringToOS(AValue);'#013#010+
+  '      FTarget:=AValue;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TCustomDefaults.SetUnitInstallDir(const AValue: String);'#013+
+  #010+
+  'begi','n'#013#010+
+  '  if AValue<>'#039#039' then'#013#010+
+  '    FUnitInstallDir:=IncludeTrailingPathDelimiter(AValue)'#013#010+
+  '  else'#013#010+
+  '    FUnitInstallDir:='#039#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.RecalcTarget;'#013#010+
+  'begin'#013#010+
+  '  Ftarget:=CPUToString(FCPU)+'#039'-'#039'+OStoString(FOS);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'funct','ion TCustomDefaults.CmdLineOptions: String;'#013#010+
+  'begin'#013#010+
+  '  If Haveoptions then'#013#010+
+  '    Result:=OptionListToString(FOptions);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'constructor TCustomDefaults.Create;'#013#010+
+  'begin'#013#010+
+  '  InitDefaults;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.InitDefaults;'#013#010,
+  'begin'#013#010+
+  '{$ifdef unix}'#013#010+
+  '  UnixPaths:=True;'#013#010+
+  '{$else}'#013#010+
+  '  UnixPaths:=False;'#013#010+
+  '{$endif}'#013#010+
+  '  FNoFPCCfg:=False;'#013#010+
+  '  FCPU:=cpuNone;'#013#010+
+  '  FOS:=osNone;'#013#010+
+  '  FUnitInstallDir:='#039'$(BaseInstallDir)units/$(target)/$(packagename'+
+  ')'#039';'#013#010+
+  '  FBuildMode:=bmOneByOne;'#013#010+
+  'end;'#013,#010+
+  #013#010+
+  'function TCustomDefaults.HaveOptions: Boolean;'#013#010+
+  'begin'#013#010+
+  '  Result:=Assigned(FOptions);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.LocalInit(Const AFileName : String);'#013#010+
+  'Var'#013#010+
+  '  FN : String;'#013#010+
+  'begin'#013#010+
+  '  FN:=AFileName;'#013#010+
+  '  If (FN='#039#039') then'#013#010+
+  '    begin'#013#010+
+  ' ','   // Environment variable.'#013#010+
+  '    FN:=GetEnvironmentVariable('#039'FPMAKECFG'#039');'#013#010+
+  '    If (FN<>'#039#039') then'#013#010+
+  '      If not FileExists(FN) then'#013#010+
+  '        FN:='#039#039';'#013#010+
+  '    // User config file fpmake.cfg'#013#010+
+  '    If (FN='#039#039') then'#013#010+
+  '      begin'#013#010+
+  '      FN:=GetAppConfig','File(False);'#013#010+
+  '      If Not FileExists(FN) then'#013#010+
+  '        FN:='#039#039';'#013#010+
+  '      end;'#013#010+
+  '    // Global config file fpmake.cfg'#013#010+
+  '    If (FN='#039#039') then'#013#010+
+  '      begin'#013#010+
+  '      FN:=GetAppConfigFile(True);'#013#010+
+  '      If Not FileExists(FN) then'#013#010+
+  '        FN:='#039#039';'#013#010+
+  '     ',' end;'#013#010+
+  '    end;'#013#010+
+  '  If (FN<>'#039#039') and FileExists(FN) then'#013#010+
+  '    LoadFromFile(FN);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.CompilerDefaults;'#013#010+
+  '{$ifdef HAS_UNIT_PROCESS}'#013#010+
+  'var'#013#010+
+  '  infoSL : TStringList;'#013#010+
+  '{$endif HAS_UNIT_PROCESS}'#013#010+
+  'begin'#013#010+
+  '  if (CPU=cpuNo','ne) or (OS=osNone) or (FCompilerVersion='#039#039') the'+
+  'n'#013#010+
+  '    begin'#013#010+
+  '{$ifdef HAS_UNIT_PROCESS}'#013#010+
+  '      // Detect compiler version/target from -i option'#013#010+
+  '      infosl:=TStringList.Create;'#013#010+
+  '      infosl.Delimiter:='#039' '#039';'#013#010+
+  '      infosl.DelimitedText:=Get','CompilerInfo(GetCompiler,'#039'-iVTPTO'+
+  #039');'#013#010+
+  '      if infosl.Count<>3 then'#013#010+
+  '        Raise EInstallerError.Create(SErrInvalidFPCInfo);'#013#010+
+  '      if FCompilerVersion='#039#039' then'#013#010+
+  '        FCompilerVersion:=infosl[0];'#013#010+
+  '      if CPU=cpuNone then'#013#010+
+  '        CPU:','=StringToCPU(infosl[1]);'#013#010+
+  '      if OS=osNone then'#013#010+
+  '        OS:=StringToOS(infosl[2]);'#013#010+
+  '{$else HAS_UNIT_PROCESS}'#013#010+
+  '      // Defaults taken from compiler used to build fpmake'#013#010+
+  '      if CPU=cpuNone then'#013#010+
+  '        CPU:=StringToCPU({$I %FPCTARGETC','PU%});'#013#010+
+  '      if OS=osNone then'#013#010+
+  '        OS:=StringToOS({$I %FPCTARGETOS%});'#013#010+
+  '      if FCompilerVersion='#039#039' then'#013#010+
+  '        FCompilerVersion:={$I %FPCVERSION%};'#013#010+
+  '{$endif HAS_UNIT_PROCESS}'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.LoadFrom','File(Const AFileName: String);'#013+
+  #010+
+  'Var'#013#010+
+  '  F : TFileStream;'#013#010+
+  'begin'#013#010+
+  '  F:=TFileStream.Create(AFileName,fmOpenRead);'#013#010+
+  '  Try'#013#010+
+  '    LoadFromStream(F);'#013#010+
+  '  Finally'#013#010+
+  '    F.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.SaveToFile(Const AFileName: S','tring);'#013#010+
+  'Var'#013#010+
+  '  F : TFileStream;'#013#010+
+  'begin'#013#010+
+  '  F:=TFileStream.Create(AFileName,fmCreate);'#013#010+
+  '  Try'#013#010+
+  '    SaveToStream(F);'#013#010+
+  '  Finally'#013#010+
+  '    F.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.SaveToStream(S : TStream);'#013#010+
+  'Var'#013#010+
+  '  L : TStringList;'#013#010+
+  'beg','in'#013#010+
+  '  L:=TStringList.Create;'#013#010+
+  '  try'#013#010+
+  '    With L do'#013#010+
+  '      begin'#013#010+
+  '      Values[KeyArchive]:=FArchive;'#013#010+
+  '      Values[KeyCompiler]:=FCompiler;'#013#010+
+  '      Values[KeyCopy]:=FCopy;'#013#010+
+  '      Values[KeyMkDir]:=FMkDir;'#013#010+
+  '      Values[KeyMove]:=FMove;'#013#010+
+  '    ','  Values[KeyOptions]:=CmdLineOptions;'#013#010+
+  '      Values[KeyCPU]:=CPUToString(FCPU);'#013#010+
+  '      Values[KeyOS]:=OSToString(FOS);'#013#010+
+  '      Values[KeyMode]:=ModeToString(FMode);'#013#010+
+  '      Values[KeyLocalUnitDir]:=FLocalUnitDir;'#013#010+
+  '      Values[KeyGlobalUnitDi','r]:=FGlobalUnitDir;'#013#010+
+  '      Values[KeyPrefix]:=FPrefix;'#013#010+
+  '      Values[KeyBaseInstallDir]:=FBaseInstallDir;'#013#010+
+  '      Values[KeyUnitInstallDir]:=FUnitInstallDir;'#013#010+
+  '      Values[KeyBinInstallDir]:=FBinInstallDir;'#013#010+
+  '      Values[KeyDocInstallDir]:=F','DocInstallDir;'#013#010+
+  '      Values[KeyExamplesInstallDir]:=FExamplesInstallDir;'#013#010+
+  '      Values[KeyRemove]:=FRemove;'#013#010+
+  '      Values[KeyRemoveDir]:=FRemoveDir;'#013#010+
+  '      Values[KeyRemoveTree]:=FRemoveTree;'#013#010+
+  '      Values[KeyTarget]:=FTarget;'#013#010+
+  '      if FN','oFPCCfg then'#013#010+
+  '        Values[KeyNoFPCCfg]:='#039'Y'#039';'#013#010+
+  '      if FUseEnvironment then'#013#010+
+  '        Values[KeyUseEnv]:='#039'Y'#039';'#013#010+
+  '      if FInstallExamples then'#013#010+
+  '          Values[KeyInstallExamples]:='#039'Y'#039';'#013#010+
+  '      end;'#013#010+
+  '    L.SaveToStream(S);'#013#010+
+  '  Finally'#013#010+
+  '    ','L.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomDefaults.LoadFromStream(S: TStream);'#013#010+
+  'Var'#013#010+
+  '  L : TStrings;'#013#010+
+  '  Line : String;'#013#010+
+  '  I,P,PC : Integer;'#013#010+
+  'begin'#013#010+
+  '  L:=TStringList.Create;'#013#010+
+  '  Try'#013#010+
+  '    L.LoadFromStream(S);'#013#010+
+  '    // Fix lines.'#013#010+
+  '    For I:=L','.Count-1 downto 0 do'#013#010+
+  '      begin'#013#010+
+  '      Line:=L[I];'#013#010+
+  '      P:=Pos('#039'='#039',Line);'#013#010+
+  '      PC:=Pos('#039';'#039',Line);  // Comment line.'#013#010+
+  '      If (P=0) or ((PC<>0) and (PC<P)) then'#013#010+
+  '        L.Delete(I)'#013#010+
+  '      else'#013#010+
+  '        L[i]:=Trim(System.Copy(Line,1,P','-1)+'#039'='#039'+Trim(System.C'+
+  'opy(Line,P+1,Length(Line)-P)));'#013#010+
+  '      end;'#013#010+
+  '    With L do'#013#010+
+  '      begin'#013#010+
+  '      FArchive:=Values[KeyArchive];'#013#010+
+  '      FCompiler:=Values[KeyCompiler];'#013#010+
+  '      FCopy:=Values[KeyCopy];'#013#010+
+  '      FMkDir:=Values[KeyMkDir];'#013#010+
+  '      ','FMove:=Values[KeyMove];'#013#010+
+  '      FRemove:=Values[KeyRemove];'#013#010+
+  '      FRemoveDir:=Values[KeyRemoveDir];'#013#010+
+  '      FRemoveTree:=Values[KeyRemoveTree];'#013#010+
+  '      Options:=OptionsToStringList(Values[KeyOptions]);'#013#010+
+  '      Line:=Values[KeyCPU];'#013#010+
+  '      If (','Line<>'#039#039') then'#013#010+
+  '        FCPU:=StringToCPU(Line);'#013#010+
+  '      Line:=Values[KeyOS];'#013#010+
+  '      If (Line<>'#039#039') then'#013#010+
+  '        FOS:=StringToOS(Line);'#013#010+
+  '      Line:=Values[KeyMode];'#013#010+
+  '      If (Line<>'#039#039') then'#013#010+
+  '        FMode:=StringToMode(Line);'#013#010+
+  '      FTarge','t:=Values[KeyTarget];'#013#010+
+  '      FLocalUnitDir:=Values[KeyLocalUnitDir];'#013#010+
+  '      FGlobalUnitDir:=Values[KeyGlobalUnitDir];'#013#010+
+  '      FPrefix:=Values[KeyPrefix];'#013#010+
+  '      FBaseInstallDir:=Values[KeyBaseInstallDir];'#013#010+
+  '      FUnitInstallDir:=Values[KeyUn','itInstallDir];'#013#010+
+  '      FBinInstallDir:=Values[KeyBinInstallDir];'#013#010+
+  '      FDocInstallDir:=Values[KeyDocInstallDir];'#013#010+
+  '      FExamplesInstallDir:=Values[KeyExamplesInstallDir];'#013#010+
+  '      FInstallExamples:=(Upcase(Values[KeyInstallExamples])='#039'Y'#039+
+  ');'#013#010,
+  '      FNoFPCCfg:=(Upcase(Values[KeyNoFPCCfg])='#039'Y'#039');'#013#010+
+  '      FUseEnvironment:=(Upcase(Values[KeyUseEnv])='#039'Y'#039');'#013#010+
+  '      end;'#013#010+
+  '  Finally'#013#010+
+  '    L.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                             TFPCDefaults'#010+
-  '******','**************************************************************'+
-  '********}'#010+
-  #010+
-  'procedure TFPCDefaults.CompilerDefaults;'#010+
-  'var'#010+
-  '  BD : String;'#010+
-  'begin'#010+
-  '  inherited CompilerDefaults;'#010+
-  #010+
-  '  // Use the same algorithm as the compiler, see options.pas'#010+
-  '{$ifdef U','nix}'#010+
-  '  BD:=FixPath(GetEnvironmentVariable('#039'FPCDIR'#039'));'#010+
-  '  if BD='#039#039' then'#010+
-  '    begin'#010+
-  '      BD:='#039'/usr/local/lib/fpc/'#039'+FCompilerVersion;'#010+
-  '      if not DirectoryExists(BD) and'#010+
-  '         DirectoryExists('#039'/usr/lib/fpc/'#039'+FCompilerVersion) the'+
-  'n'#010+
-  '        B','D:='#039'/usr/lib/fpc/'#039'+FCompilerVersion;'#010+
-  '    end;'#010+
-  '{$else unix}'#010+
-  '  BD:=FixPath(GetEnvironmentVariable('#039'FPCDIR'#039'));'#010+
-  '  if BD='#039#039' then'#010+
-  '    begin'#010+
-  '      BD:=ExtractFilePath(FCompiler)+'#039'..'#039';'#010+
-  '      if not(DirectoryExists(BD+'#039'/units'#039')) and'#010+
-  '         not(Dir','ectoryExists(BD+'#039'/rtl'#039')) then'#010+
-  '        BD:=FBaseInstallDir+'#039'..'#039';'#010+
-  '    end;'#010+
-  '{$endif unix}'#010+
-  #010+
-  '  // Where to install by default'#010+
-  '  if (FBaseInstallDir='#039#039') and (FPrefix='#039#039') then'#010+
-  '    BaseInstallDir:=BD;'#010+
-  #010+
-  '  // Where to find the units by default'#010+
-  '  if (','FGlobalUnitDir='#039#039') then'#010+
+  '******','*'#013#010+
+  '                             TFPCDefaults'#013#010+
+  '**********************************************************************'+
+  '******}'#013#010+
+  #013#010+
+  'procedure TFPCDefaults.CompilerDefaults;'#013#010+
+  'var'#013#010+
+  '  BD : String;'#013#010+
+  'begin'#013#010+
+  '  inherited CompilerDefaults;'#013#010+
+  #013#010+
+  '  // Use t','he same algorithm as the compiler, see options.pas'#013#010+
+  '{$ifdef Unix}'#013#010+
+  '  BD:=FixPath(GetEnvironmentVariable('#039'FPCDIR'#039'));'#013#010+
+  '  if BD='#039#039' then'#013#010+
+  '    begin'#013#010+
+  '      BD:='#039'/usr/local/lib/fpc/'#039'+FCompilerVersion;'#013#010+
+  '      if not DirectoryExists(BD) and'#013#010+
+  '      ','   DirectoryExists('#039'/usr/lib/fpc/'#039'+FCompilerVersion) t'+
+  'hen'#013#010+
+  '        BD:='#039'/usr/lib/fpc/'#039'+FCompilerVersion;'#013#010+
+  '    end;'#013#010+
+  '{$else unix}'#013#010+
+  '  BD:=FixPath(GetEnvironmentVariable('#039'FPCDIR'#039'));'#013#010+
+  '  if BD='#039#039' then'#013#010+
+  '    begin'#013#010+
+  '      BD:=ExtractFilePath(FCompi','ler)+'#039'..'#039';'#013#010+
+  '      if not(DirectoryExists(BD+'#039'/units'#039')) and'#013#010+
+  '         not(DirectoryExists(BD+'#039'/rtl'#039')) then'#013#010+
+  '        BD:=FBaseInstallDir+'#039'..'#039';'#013#010+
+  '    end;'#013#010+
+  '{$endif unix}'#013#010+
+  #013#010+
+  '  // Where to install by default'#013#010+
+  '  if (FBaseInstallDir='#039#039') and (FPrefi','x='#039#039') then'#013#010+
+  '    BaseInstallDir:=BD;'#013#010+
+  #013#010+
+  '  // Where to find the units by default'#013#010+
+  '  if (FGlobalUnitDir='#039#039') then'#013#010+
   '    GlobalUnitDir:=IncludeTrailingPathDelimiter(BD)+'#039'units'#039'+Pa'+
-  'thDelim+Target;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{*********************************************************************'+
-  '*******'#010+
-  '                            TCustomInstaller'#010+
-  '********','************************************************************'+
-  '********}'#010+
-  #010+
-  'constructor TCustomInstaller.Create(AOwner: TComponent);'#010+
-  'begin'#010+
-  '  Dictionary:=DictionaryClass.Create(Nil);'#010+
-  '  AnalyzeOptions;'#010+
-  '  CreatePackages;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'destructor TCustomIn','staller.Destroy;'#010+
-  'begin'#010+
-  '  FreeAndNil(Defaults);'#010+
-  '  FreeAndNil(Dictionary);'#010+
-  '  inherited destroy;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'thDelim+Target;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{***************************************','****************************'+
+  '*********'#013#010+
+  '                            TCustomInstaller'#013#010+
+  '**********************************************************************'+
+  '******}'#013#010+
+  #013#010+
+  'constructor TCustomInstaller.Create(AOwner: TComponent);'#013#010+
+  'begin'#013#010+
+  '  Diction','ary:=DictionaryClass.Create(Nil);'#013#010+
+  '  AnalyzeOptions;'#013#010+
+  '  CreatePackages;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'destructor TCustomInstaller.Destroy;'#013#010+
+  'begin'#013#010+
+  '  FreePackages;'#013#010+
+  '  FreeAndNil(Defaults);'#013#010+
+  '  FreeAndNil(Dictionary);'#013#010+
+  '  inherited destroy;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TCus','tomInstaller.GetPackages: TPackages;'#013#010+
+  'begin'#013#010+
+  '  result := FPackages;'#013#010+
+  'end;'#013#010+
+  #013#010+
   'procedure TCustomInstaller.Log(Level: TVerboseLevel; const Msg: String'+
-  ');'#010+
-  'begin'#010+
-  '  If Level in FLogLevels then'#010+
-  '    Writeln(StdOut,Msg);'#010+
-  'end;'#010,
-  #010+
-  #010+
-  'procedure TCustomInstaller.CreatePackages;'#010+
-  'begin'#010+
-  '  FPAckages:=TPackages.Create(TPackage);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.CreateBuildEngine;'#010+
-  'begin'#010+
-  '  FBuildEngine:=TBuildEngine.Create(Self);'#010+
-  '//  FBuildEngine.Defaults:=Defaults;'#010+
-  '  FBuildE','ngine.ListMode:=FListMode;'#010+
-  '  FBuildEngine.OnLog:[email protected];'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.Error(const Msg: String);'#010+
-  'begin'#010+
-  '  Raise EInstallerError.Create(Msg);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.Error(const Fmt: String; Args: array of con',
-  'st);'#010+
-  'begin'#010+
-  '  Raise EInstallerError.CreateFmt(Fmt,Args);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TCustomInstaller.AddPackage(const AName: String) : TPackage;'#010+
-  'begin'#010+
-  '  result:=FPackages.AddPackage(AName);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.AnalyzeOptions;'#010+
-  #010+
-  '  Function ','CheckOption(Index : Integer;const Short,Long : String): B'+
-  'oolean;'#010+
-  '  var'#010+
-  '    O : String;'#010+
-  '  begin'#010+
-  '    O:=Paramstr(Index);'#010+
+  ');'#013#010+
+  'begin'#013#010+
+  '  If Level in FLogLevels then'#013#010+
+  '    Writeln(StdOut,Msg);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCust','omInstaller.CreatePackages;'#013#010+
+  'begin'#013#010+
+  '  FPackages:=TPackages.Create(TPackage);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TCustomInstaller.FreePackages;'#013#010+
+  'begin'#013#010+
+  '  FreeAndNil(FPackages);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomInstaller.CreateBuildEngine;'#013#010+
+  'begin'#013#010+
+  '  FBuildEngine:','=TBuildEngine.Create(Self);'#013#010+
+  '//  FBuildEngine.Defaults:=Defaults;'#013#010+
+  '  FBuildEngine.ListMode:=FListMode;'#013#010+
+  '  FBuildEngine.Verbose := (FLogLevels = AllMessages);'#013#010+
+  '  FBuildEngine.OnLog:[email protected];'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomInstaller.Error(cons','t Msg: String);'#013#010+
+  'begin'#013#010+
+  '  Raise EInstallerError.Create(Msg);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomInstaller.Error(const Fmt: String; Args: array of con'+
+  'st);'#013#010+
+  'begin'#013#010+
+  '  Raise EInstallerError.CreateFmt(Fmt,Args);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TCustomInstaller.Add','Package(const AName: String) : TPackage'+
+  ';'#013#010+
+  'begin'#013#010+
+  '  result:=Packages.AddPackage(AName);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomInstaller.AnalyzeOptions;'#013#010+
+  #013#010+
+  '  Function CheckOption(Index : Integer;const Short,Long : String; AddT'+
+  'oOptionString: boolean = t','rue): Boolean;'#013#010+
+  '  var'#013#010+
+  '    O : String;'#013#010+
+  '  begin'#013#010+
+  '    O:=Paramstr(Index);'#013#010+
   '    Result:=(O='#039'-'#039'+short) or (O='#039'--'#039'+long) or (copy(O,'+
-  '1,Length(Long)+3)=('#039'--'#039'+long+'#039'='#039'));'#010+
-  '  end;'#010+
-  #010+
-  '  Function CheckCommand','(Index : Integer;const Short,Long : String): '+
-  'Boolean;'#010+
-  '  var'#010+
-  '    O : String;'#010+
-  '  begin'#010+
-  '    O:=Paramstr(Index);'#010+
-  '    Result:=(O='#039'-'#039'+short) or (O=long);'#010+
-  '  end;'#010+
-  #010+
-  '  Function OptionArg(Var Index : Integer) : String;'#010+
-  '  Var'#010+
-  '    P : Integer;'#010+
-  '  begin'#010+
-  '  ','  if (Length(ParamStr(Index))>1) and (Paramstr(Index)[2]<>'#039'-'#039+
-  ') then'#010+
-  '      begin'#010+
-  '      If Index<ParamCount then'#010+
-  '        begin'#010+
-  '        Inc(Index);'#010+
-  '        Result:=Paramstr(Index);'#010+
-  '        end'#010+
-  '      else'#010+
-  '        Error(SErrNeedArgument,[Index,P','aramStr(Index)]);'#010+
-  '      end'#010+
-  '    else If length(ParamStr(Index))>2 then'#010+
-  '      begin'#010+
-  '      P:=Pos('#039'='#039',Paramstr(Index));'#010+
-  '      If (P=0) then'#010+
-  '        Error(SErrNeedArgument,[Index,ParamStr(Index)])'#010+
-  '      else'#010+
-  '        begin'#010+
-  '        Result:=Param','str(Index);'#010+
-  '        Delete(Result,1,P);'#010+
-  '        end;'#010+
-  '      end;'#010+
-  '  end;'#010+
-  #010+
-  '  function SplitSpaces(var SplitString: string) : string;'#010+
-  '  var i : integer;'#010+
-  '  begin'#010+
-  '    i := pos('#039' '#039',SplitString);'#010+
-  '    if i > 0 then'#010+
-  '      begin'#010+
-  '        result := copy','(SplitString,1,i-1);'#010+
-  '        delete(SplitString,1,i);'#010+
-  '      end'#010+
-  '    else'#010+
-  '      begin'#010+
-  '        result := SplitString;'#010+
-  '        SplitString:='#039#039';'#010+
-  '      end;'#010+
-  '  end;'#010+
-  #010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  DefaultsFileName : string;'#010+
-  '  OptString : string;'#010+
-  'begin'#010+
-  '  I:','=0;'#010+
-  '  FListMode:=False;'#010+
-  '  FLogLevels:=DefaultMessages;'#010+
-  '  While (I<ParamCount) do'#010+
-  '    begin'#010+
-  '    Inc(I);'#010+
-  '    if CheckOption(I,'#039'v'#039','#039'verbose'#039') then'#010+
-  '      FLogLevels:=AllMessages'#010+
-  '    else if CheckOption(I,'#039'd'#039','#039'debug'#039') then'#010+
-  '      FLogLevels:=AllM','essages+[vlDebug]'#010+
-  '    else if CheckCommand(I,'#039'm'#039','#039'compile'#039') then'#010+
-  '      FRunMode:=rmCompile'#010+
-  '    else if CheckCommand(I,'#039'b'#039','#039'build'#039') then'#010+
-  '      FRunMode:=rmBuild'#010+
-  '    else if CheckCommand(I,'#039'i'#039','#039'install'#039') then'#010+
-  '      FRunMode:=rmInstall'#010+
-  '    els','e if CheckCommand(I,'#039'c'#039','#039'clean'#039') then'#010+
-  '      FRunMode:=rmClean'#010+
-  '    else if CheckCommand(I,'#039'a'#039','#039'archive'#039') then'#010+
-  '      FRunMode:=rmarchive'#010+
-  '    else if CheckCommand(I,'#039'M'#039','#039'manifest'#039') then'#010+
-  '      FRunMode:=rmManifest'#010+
-  '    else if CheckOption(I,'#039'h'#039',',#039'help'#039') then'#010+
-  '      Usage('#039#039',[])'#010+
-  '    else if Checkoption(I,'#039'C'#039','#039'cpu'#039') then'#010+
-  '      Defaults.CPU:=StringToCPU(OptionArg(I))'#010+
-  '    else if Checkoption(I,'#039'O'#039','#039'os'#039') then'#010+
-  '      Defaults.OS:=StringToOS(OptionArg(I))'#010+
-  '    else if Checkoption(I,'#039't'#039','#039'targ','et'#039') then'#010+
-  '      Defaults.Target:=OptionArg(I)'#010+
-  '    else if CheckOption(I,'#039'l'#039','#039'list-commands'#039') then'#010+
-  '      FListMode:=True'#010+
-  '    else if Checkoption(I,'#039'P'#039','#039'prefix'#039') then'#010+
-  '      Defaults.Prefix:=OptionArg(I)'#010+
-  '    else if Checkoption(I,'#039'n'#039','#039'nofpccfg',#039') then'#010+
-  '      Defaults.NoFPCCfg:=true'#010+
-  '    else if CheckOption(I,'#039'B'#039','#039'baseinstalldir'#039') then'#010+
-  '      Defaults.BaseInstallDir:=OptionArg(I)'#010+
-  '    else if CheckOption(I,'#039'UL'#039','#039'localunitdir'#039') then'#010+
-  '      Defaults.LocalUnitDir:=OptionArg(I)'#010+
-  '    else if',' CheckOption(I,'#039'UG'#039','#039'globalunitdir'#039') then'+
-  #010+
-  '      Defaults.GlobalUnitDir:=OptionArg(I)'#010+
-  '    else if CheckOption(I,'#039'o'#039','#039'options'#039') then'#010+
-  '      begin'#010+
-  '        OptString := OptionArg(I);'#010+
-  '        while OptString <> '#039#039' do'#010+
-  '          Defaults.Options.Ad','d(SplitSpaces(OptString));'#010+
-  '      end'#010+
-  '    else if CheckOption(I,'#039'r'#039','#039'compiler'#039') then'#010+
-  '      Defaults.Compiler:=OptionArg(I)'#010+
-  '    else if CheckOption(I,'#039'f'#039','#039'config'#039') then'#010+
-  '      DefaultsFileName:=OptionArg(I)'#010+
-  '    else'#010+
-  '      begin'#010+
-  '      Usage(SEr','rInValidArgument,[I,ParamStr(I)]);'#010+
-  '      end;'#010+
-  '    end;'#010+
-  '  If DefaultsFileName<>'#039#039' then'#010+
-  '    Defaults.LocalInit(DefaultsFileName);'#010+
-  '  Defaults.CompilerDefaults;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.Usage(const FMT: String; Args: array of con'+
-  'st);'#010+
-  #010,
-  '  Procedure LogCmd(const LC,Msg : String);'#010+
-  '  begin'#010+
-  '    Log(vlInfo,Format('#039' %-12s %s'#039',[LC,MSG]));'#010+
-  '  end;'#010+
-  #010+
-  '  Procedure LogOption(const C,LC,Msg : String);'#010+
-  '  begin'#010+
-  '    Log(vlInfo,Format('#039' -%s --%-16s %s'#039',[C,LC,MSG]));'#010+
-  '  end;'#010+
-  #010+
-  '  Procedure LogAr','gOption(const C,LC,Msg : String);'#010+
-  '  begin'#010+
+  '1,Length(Long)+3)=('#039'--'#039'+long+'#039'='#039'));'#013#010+
+  '    if AddToOptionString and Result then FFPMakeOptionsString := FFPMa'+
+  'keOpt','ionsString+'#039' '#039'+O;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  Function CheckCustomOption(Index : Integer; out CustOptName: string)'+
+  ': Boolean;'#013#010+
+  '  var'#013#010+
+  '    O : String;'#013#010+
+  '    i : integer;'#013#010+
+  '  begin'#013#010+
+  '    result := false;'#013#010+
+  '    CustOptName:='#039#039';'#013#010+
+  '    O:=Paramstr(Index);'#013#010+
+  '    if co','py(O,1,2)<>'#039'--'#039' then'#013#010+
+  '      Exit;'#013#010+
+  '    i := pos('#039'='#039',O);'#013#010+
+  '    if i=0 then'#013#010+
+  '      Exit;'#013#010+
+  '    O:=copy(O,3,i-3);'#013#010+
+  '    CustOptName:=O;'#013#010+
+  '    Result:=CustomFpmakeCommandlineOptions.IndexOfName(O)>-1;'#013#010+
+  '    if Result then FFPMakeOptionsString := FFP','MakeOptionsString+'#039+
+  ' '#039'+Paramstr(Index);'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  #013#010+
+  '  Function CheckCommand(Index : Integer;const Short,Long : String): Bo'+
+  'olean;'#013#010+
+  '  var'#013#010+
+  '    O : String;'#013#010+
+  '  begin'#013#010+
+  '    O:=Paramstr(Index);'#013#010+
+  '    Result:=(O='#039'-'#039'+short) or (O=long);'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  ','Function OptionArg(Var Index : Integer) : String;'#013#010+
+  '  Var'#013#010+
+  '    P : Integer;'#013#010+
+  '  begin'#013#010+
+  '    if (Length(ParamStr(Index))>1) and (Paramstr(Index)[2]<>'#039'-'#039+
+  ') then'#013#010+
+  '      begin'#013#010+
+  '      If Index<ParamCount then'#013#010+
+  '        begin'#013#010+
+  '        Inc(Index);'#013#010+
+  '   ','     Result:=Paramstr(Index);'#013#010+
+  '        end'#013#010+
+  '      else'#013#010+
+  '        Error(SErrNeedArgument,[Index,ParamStr(Index)]);'#013#010+
+  '      end'#013#010+
+  '    else If length(ParamStr(Index))>2 then'#013#010+
+  '      begin'#013#010+
+  '      P:=Pos('#039'='#039',Paramstr(Index));'#013#010+
+  '      If (P=0) then'#013#010+
+  ' ','       Error(SErrNeedArgument,[Index,ParamStr(Index)])'#013#010+
+  '      else'#013#010+
+  '        begin'#013#010+
+  '        Result:=Paramstr(Index);'#013#010+
+  '        Delete(Result,1,P);'#013#010+
+  '        end;'#013#010+
+  '      end;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  function SplitSpaces(var SplitString: string) : string;'#013,#010+
+  '  var i : integer;'#013#010+
+  '  begin'#013#010+
+  '    i := pos('#039' '#039',SplitString);'#013#010+
+  '    if i > 0 then'#013#010+
+  '      begin'#013#010+
+  '        result := copy(SplitString,1,i-1);'#013#010+
+  '        delete(SplitString,1,i);'#013#010+
+  '      end'#013#010+
+  '    else'#013#010+
+  '      begin'#013#010+
+  '        result := SplitString;'#013#010+
+  '  ','      SplitString:='#039#039';'#013#010+
+  '      end;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  DefaultsFileName : string;'#013#010+
+  '  OptString : string;'#013#010+
+  '  CustOptName : string;'#013#010+
+  'begin'#013#010+
+  '  I:=0;'#013#010+
+  '  FListMode:=False;'#013#010+
+  '  FLogLevels:=DefaultMessages;'#013#010+
+  '  While (I<ParamCount) do'#013,#010+
+  '    begin'#013#010+
+  '    Inc(I);'#013#010+
+  '    if CheckOption(I,'#039'v'#039','#039'verbose'#039',false) then'#013#010+
+  '      FLogLevels:=AllMessages'#013#010+
+  '    else if CheckOption(I,'#039'd'#039','#039'debug'#039',false) then'#013#010+
+  '      FLogLevels:=AllMessages+[vlDebug]'#013#010+
+  '    else if CheckCommand(I,'#039'm'#039','#039'compile'#039') th','en'#013#010+
+  '      FRunMode:=rmCompile'#013#010+
+  '    else if CheckCommand(I,'#039'b'#039','#039'build'#039') then'#013#010+
+  '      FRunMode:=rmBuild'#013#010+
+  '    else if CheckCommand(I,'#039'i'#039','#039'install'#039') then'#013#010+
+  '      FRunMode:=rmInstall'#013#010+
+  '    else if CheckCommand(I,'#039'c'#039','#039'clean'#039') then'#013#010+
+  '      FRunMode:=r','mClean'#013#010+
+  '    else if CheckCommand(I,'#039'dc'#039','#039'distclean'#039') then'#013#010+
+  '      FRunMode:=rmDistClean'#013#010+
+  '    else if CheckCommand(I,'#039'a'#039','#039'archive'#039') then'#013#010+
+  '      FRunMode:=rmarchive'#013#010+
+  '    else if CheckCommand(I,'#039'M'#039','#039'manifest'#039') then'#013#010+
+  '      FRunMode:=rmManifest'#013#010,
+  '    else if CheckOption(I,'#039'h'#039','#039'help'#039') then'#013#010+
+  '      Usage('#039#039',[])'#013#010+
+  '    else if Checkoption(I,'#039'C'#039','#039'cpu'#039') then'#013#010+
+  '      Defaults.CPU:=StringToCPU(OptionArg(I))'#013#010+
+  '    else if Checkoption(I,'#039'O'#039','#039'os'#039') then'#013#010+
+  '      Defaults.OS:=StringToOS(OptionArg(I))'#013,#010+
+  '    else if Checkoption(I,'#039't'#039','#039'target'#039') then'#013#010+
+  '      Defaults.Target:=OptionArg(I)'#013#010+
+  '    else if CheckOption(I,'#039'l'#039','#039'list-commands'#039') then'#013+
+  #010+
+  '      FListMode:=True'#013#010+
+  '    else if Checkoption(I,'#039'P'#039','#039'prefix'#039') then'#013#010+
+  '      Defaults.Prefix:=OptionArg(I',')'#013#010+
+  '    else if Checkoption(I,'#039'n'#039','#039'nofpccfg'#039') then'#013#010+
+  '      Defaults.NoFPCCfg:=true'#013#010+
+  '{$ifdef HAS_UNIT_PROCESS}'#013#010+
+  '    else if Checkoption(I,'#039'e'#039','#039'useenv'#039') then'#013#010+
+  '      Defaults.UseEnvironment:=true'#013#010+
+  '{$endif}'#013#010+
+  '    else if CheckOption(I,'#039'B'#039','#039'baseins','talldir'#039') then'+
+  #013#010+
+  '      Defaults.BaseInstallDir:=OptionArg(I)'#013#010+
+  '    else if CheckOption(I,'#039'U'#039','#039'unitinstalldir'#039') then'#013+
+  #010+
+  '      Defaults.UnitInstallDir:=OptionArg(I)'#013#010+
+  '    else if CheckOption(I,'#039'UL'#039','#039'localunitdir'#039') then'#013+
+  #010+
+  '      Defaults.LocalUnitDir',':=OptionArg(I)'#013#010+
+  '    else if CheckOption(I,'#039'UG'#039','#039'globalunitdir'#039') then'#013+
+  #010+
+  '      Defaults.GlobalUnitDir:=OptionArg(I)'#013#010+
+  '    else if CheckOption(I,'#039'o'#039','#039'options'#039') then'#013#010+
+  '      begin'#013#010+
+  '        OptString := OptionArg(I);'#013#010+
+  '        while OptString <> '#039#039' ','do'#013#010+
+  '          Defaults.Options.Add(SplitSpaces(OptString));'#013#010+
+  '      end'#013#010+
+  '    else if CheckOption(I,'#039'r'#039','#039'compiler'#039') then'#013#010+
+  '      Defaults.Compiler:=OptionArg(I)'#013#010+
+  '    else if CheckOption(I,'#039'f'#039','#039'config'#039') then'#013#010+
+  '      DefaultsFileName:=OptionArg(I',')'#013#010+
+  '    else if CheckOption(I,'#039'ie'#039','#039'installexamples'#039') then'+
+  #013#010+
+  '      Defaults.InstallExamples:=true'#013#010+
+  '    else if CheckOption(I,'#039'bu'#039','#039'buildunit'#039') then'#013#010+
+  '      Defaults.BuildMode:=bmBuildUnit'#013#010+
+  '    else if CheckOption(I,'#039'io'#039','#039'ignoreinvalidoption'#039') ',
+  'then'#013#010+
+  '      Defaults.IgnoreInvalidOptions:=true'#013#010+
+  '    else if CheckOption(I,'#039'd'#039','#039'doc-folder'#039') then'#013#010+
+  '      Defaults.FPDocOutputDir:=OptionArg(I)'#013#010+
+  '    else if assigned(CustomFpmakeCommandlineOptions) and CheckCustomOp'+
+  'tion(I,CustOptName) then'#013#010,
+  '      begin'#013#010+
+  '      if not assigned(CustomFpMakeCommandlineValues) then'#013#010+
+  '        CustomFpMakeCommandlineValues := TStringList.Create;'#013#010+
+  '      CustomFpMakeCommandlineValues.Values[CustOptName]:=OptionArg(I)'#013+
+  #010+
+  '      end'#013#010+
+  '    else if not Defaults','.IgnoreInvalidOptions then'#013#010+
+  '      begin'#013#010+
+  '      Usage(SErrInValidArgument,[I,ParamStr(I)]);'#013#010+
+  '      end;'#013#010+
+  '    end;'#013#010+
+  '  If DefaultsFileName<>'#039#039' then'#013#010+
+  '    Defaults.LocalInit(DefaultsFileName);'#013#010+
+  '  Defaults.CompilerDefaults;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure T','CustomInstaller.Usage(const FMT: String; Args: array of c'+
+  'onst);'#013#010+
+  #013#010+
+  '  Procedure LogCmd(const LC,Msg : String);'#013#010+
+  '  begin'#013#010+
+  '    Log(vlInfo,Format('#039' %-12s %s'#039',[LC,MSG]));'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  Procedure LogOption(const C,LC,Msg : String);'#013#010+
+  '  begin'#013#010+
+  '    L','og(vlInfo,Format('#039' -%s --%-16s %s'#039',[C,LC,MSG]));'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  Procedure LogArgOption(const C,LC,Msg : String);'#013#010+
+  '  begin'#013#010+
   '    Log(vlInfo,Format('#039' -%s --%-20s %s'#039',[C,LC+'#039'='#039'+SVal'+
-  'ue,MSG]));'#010+
-  '  end;'#010+
-  #010+
-  'begin'#010+
-  '  // Force the Usage to be displayed'#010+
-  '  Include(FLogLevels,vlInfo);'#010+
-  '  If (FMT<>'#039#039') then'#010+
-  '    Log(vlInfo,Format(Fmt,Args))',';'#010+
-  '  Log(vlInfo,Format(SHelpUsage,[Paramstr(0)]));'#010+
-  '  Log(vlInfo,SHelpCommand);'#010+
-  '  LogCmd('#039'compile'#039',SHelpCompile);'#010+
-  '  LogCmd('#039'build'#039',SHelpBuild);'#010+
-  '  LogCmd('#039'install'#039',SHelpInstall);'#010+
-  '  LogCmd('#039'clean'#039',SHelpClean);'#010+
-  '  LogCmd('#039'archive'#039',SHelpArchive);'#010,
-  '  LogCmd('#039'manifest'#039',SHelpManifest);'#010+
-  '  Log(vlInfo,SHelpCmdOptions);'#010+
-  '  LogOption('#039'h'#039','#039'help'#039',SHelpHelp);'#010+
-  '  LogOption('#039'l'#039','#039'list-commands'#039',SHelpList);'#010+
-  '  LogOption('#039'n'#039','#039'nofpccfg'#039',SHelpNoFPCCfg);'#010+
-  '  LogOption('#039'v'#039','#039'verbose'#039',SHelpVerbose);'#010+
-  '  LogArgOp','tion('#039'C'#039','#039'cpu'#039',SHelpCPU);'#010+
-  '  LogArgOption('#039'O'#039','#039'os'#039',SHelpOS);'#010+
-  '  LogArgOption('#039't'#039','#039'target'#039',SHelpTarget);'#010+
-  '  LogArgOption('#039'P'#039','#039'prefix'#039',SHelpPrefix);'#010+
-  '  LogArgOption('#039'B'#039','#039'baseinstalldir'#039',SHelpBaseInstalldi'+
-  'r);'#010+
-  '  LogArgOption('#039'UL'#039','#039'localunitdir'#039',SHe','lpLocalUnitdir'+
-  ');'#010+
+  'ue,MSG]));'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'var'#013#010+
+  '  i: Integer;'#013#010+
+  'begin'#013#010+
+  '  // Force the U','sage to be displayed'#013#010+
+  '  Include(FLogLevels,vlInfo);'#013#010+
+  '  If (FMT<>'#039#039') then'#013#010+
+  '    Log(vlInfo,Format(Fmt,Args));'#013#010+
+  '  Log(vlInfo,Format(SHelpUsage,[Paramstr(0)]));'#013#010+
+  '  Log(vlInfo,SHelpCommand);'#013#010+
+  '  LogCmd('#039'compile'#039',SHelpCompile);'#013#010+
+  '  LogCmd('#039'build'#039',S','HelpBuild);'#013#010+
+  '  LogCmd('#039'install'#039',SHelpInstall);'#013#010+
+  '  LogCmd('#039'clean'#039',SHelpClean);'#013#010+
+  '  LogCmd('#039'archive'#039',SHelpArchive);'#013#010+
+  '  LogCmd('#039'manifest'#039',SHelpManifest);'#013#010+
+  '  Log(vlInfo,SHelpCmdOptions);'#013#010+
+  '  LogOption('#039'h'#039','#039'help'#039',SHelpHelp);'#013#010+
+  '  LogOption('#039'l'#039','#039'list','-commands'#039',SHelpList);'#013#010+
+  '  LogOption('#039'n'#039','#039'nofpccfg'#039',SHelpNoFPCCfg);'#013#010+
+  '  LogOption('#039'v'#039','#039'verbose'#039',SHelpVerbose);'#013#010+
+  '{$ifdef HAS_UNIT_PROCESS}'#013#010+
+  '  LogOption('#039'e'#039', '#039'useenv'#039', sHelpUseEnvironment);'#013#010+
+  '{$endif}'#013#010+
+  '  LogOption('#039'ie'#039','#039'installexamples'#039',SHelpIns','tExamples'+
+  ');'#013#010+
+  '  LogOption('#039'bu'#039','#039'buildunit'#039',SHelpUseBuildUnit);'#013#010+
+  '  LogArgOption('#039'C'#039','#039'cpu'#039',SHelpCPU);'#013#010+
+  '  LogArgOption('#039'O'#039','#039'os'#039',SHelpOS);'#013#010+
+  '  LogArgOption('#039't'#039','#039'target'#039',SHelpTarget);'#013#010+
+  '  LogArgOption('#039'P'#039','#039'prefix'#039',SHelpPrefix);'#013#010+
+  '  LogArgOption('#039'B'#039',',#039'baseinstalldir'#039',SHelpBaseInstalldi'+
+  'r);'#013#010+
+  '  LogArgOption('#039'UL'#039','#039'localunitdir'#039',SHelpLocalUnitdir);'+
+  #013#010+
   '  LogArgOption('#039'UG'#039','#039'globalunitdir'#039',SHelpGlobalUnitdir'+
-  ');'#010+
-  '  LogArgOption('#039'r'#039','#039'compiler'#039',SHelpCompiler);'#010+
-  '  LogArgOption('#039'f'#039','#039'config'#039',SHelpConfig);'#010+
-  '  LogArgOption('#039'o'#039','#039'options'#039',SHelpOptions);'#010+
-  '  Log(vlInfo,'#039#039');'#010+
-  '  If (FMT<>'#039#039') t','hen'#010+
-  '    halt(1)'#010+
-  '  else'#010+
-  '    halt(0);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.Compile(Force: Boolean);'#010+
-  'begin'#010+
-  '  FBuildEngine.ForceCompile:=Force;'#010+
-  '  FBuildEngine.Compile(FPackages);'#010+
-  '  Log(vlWarning,SWarnDone);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.Clean;',#010+
-  'begin'#010+
-  '  BuildEngine.Clean(FPackages);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.Install;'#010+
-  'begin'#010+
-  '  BuildEngine.Install(FPackages);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.Archive;'#010+
-  'begin'#010+
-  '  // Force generation of manifest.xml, this is required for the repos',
-  'itory'#010+
-  '  BuildEngine.Manifest(FPackages);'#010+
-  '  BuildEngine.Archive(FPackages);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.Manifest;'#010+
-  'begin'#010+
-  '  BuildEngine.Manifest(FPackages);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCustomInstaller.CheckPackages;'#010+
-  'begin'#010+
-  '  If (FPackages.Count=0) ','then'#010+
-  '    Error(SErrNoPackagesDefined);'#010+
-  '  // Check for other obvious errors ?'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TCustomInstaller.Run : Boolean;'#010+
-  'begin'#010+
-  '  Result:=True;'#010+
-  '  try'#010+
-  '    CheckPackages;'#010+
-  '    CreateBuildEngine;'#010+
-  '    Case RunMode of'#010+
-  '      rmCompile : Compile','(False);'#010+
-  '      rmBuild   : Compile(True);'#010+
-  '      rmInstall : Install;'#010+
-  '      rmArchive : Archive;'#010+
-  '      rmClean    : Clean;'#010+
-  '      rmManifest : Manifest;'#010+
-  '    end;'#010+
-  '  except'#010+
-  '    On E : Exception do'#010+
-  '      begin'#010+
-  '      Log(vlError,SErrInstaller);'#010+
-  ' ','     Log(vlError,E.Message);'#010+
-  '      Result:=False;'#010+
-  '      end;'#010+
-  '  end;'#010+
-  '  // Force returning an exitcode to the shell'#010+
-  '  if not Result then'#010+
-  '    ExitCode:=1;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  ');'#013#010+
+  '  LogArgOption('#039'U'#039','#039'unitinstalldir'#039',SHelpUnitInstallDi'+
+  'r);'#013#010+
+  '  LogArgOption('#039'r'#039','#039'compile','r'#039',SHelpCompiler);'#013#010+
+  '  LogArgOption('#039'f'#039','#039'config'#039',SHelpConfig);'#013#010+
+  '  LogArgOption('#039'o'#039','#039'options'#039',SHelpOptions);'#013#010+
+  '  LogArgOption('#039'io'#039','#039'ignoreinvalidoption'#039',SHelpIgnoreI'+
+  'nvOpt);'#013#010+
+  '  LogArgOption('#039'd'#039', '#039'doc-folder'#039', sHelpFpdocOutputDir)'+
+  ';'#013#010+
+  '  if assigne','d(CustomFpmakeCommandlineOptions) then for i  := 0 to Cu'+
+  'stomFpmakeCommandlineOptions.Count-1 do'#013#010+
+  '    LogArgOption('#039' '#039',CustomFpmakeCommandlineOptions.Names[i],C'+
+  'ustomFpmakeCommandlineOptions.ValueFromIndex[i]);'#013#010+
+  '  Log(vlInfo,'#039#039');'#013#010+
+  '  If (FMT<>',#039#039') then'#013#010+
+  '    halt(1)'#013#010+
+  '  else'#013#010+
+  '    halt(0);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomInstaller.Compile(Force: Boolean);'#013#010+
+  'begin'#013#010+
+  '  FBuildEngine.ForceCompile:=Force;'#013#010+
+  '  FBuildEngine.Compile(Packages);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomInstaller.Clean(AllTargets',': boolean);'#013#010+
+  'begin'#013#010+
+  '  BuildEngine.Clean(Packages, AllTargets);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomInstaller.Install;'#013#010+
+  'begin'#013#010+
+  '  BuildEngine.Install(Packages);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomInstaller.Archive;'#013#010+
+  'begin'#013#010+
+  '  // Force generation of manifest.','xml, this is required for the repo'+
+  'sitory'#013#010+
+  '  BuildEngine.Manifest(Packages);'#013#010+
+  '  BuildEngine.Archive(Packages);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomInstaller.Manifest;'#013#010+
+  'begin'#013#010+
+  '  BuildEngine.Manifest(Packages);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCustomInstaller.Ch','eckPackages;'#013#010+
+  'begin'#013#010+
+  '  If (Packages.Count=0) then'#013#010+
+  '    Error(SErrNoPackagesDefined);'#013#010+
+  '  // Check for other obvious errors ?'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TCustomInstaller.Run : Boolean;'#013#010+
+  'begin'#013#010+
+  '  Result:=True;'#013#010+
+  '  try'#013#010+
+  '    CheckPackages;'#013#010+
+  '    CreateBu','ildEngine;'#013#010+
+  '    Case RunMode of'#013#010+
+  '      rmCompile : Compile(False);'#013#010+
+  '      rmBuild   : Compile(True);'#013#010+
+  '      rmInstall : Install;'#013#010+
+  '      rmArchive : Archive;'#013#010+
+  '      rmClean    : Clean(False);'#013#010+
+  '      rmDistClean: Clean(True);'#013#010+
+  '      rmManifes','t : Manifest;'#013#010+
+  '    end;'#013#010+
+  '  except'#013#010+
+  '    On E : Exception do'#013#010+
+  '      begin'#013#010+
+  '      Log(vlError,SErrInstaller);'#013#010+
+  '      Log(vlError,E.Message);'#013#010+
+  '      Result:=False;'#013#010+
+  '      end;'#013#010+
+  '  end;'#013#010+
+  '  // Force returning an exitcode to the shell'#013#010+
+  '  if not Res','ult then'#013#010+
+  '    ExitCode:=1;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '   ','                             TFPCInstaller'#010+
+  '*******'#013#010+
+  '                                TFPCInstaller'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'constructor TFPCInstaller.Create(AOwner: TComponent);'#010+
-  'begin'#010+
-  '  if assigned(Defaults) then'#010+
-  '    Error(SErrAlreadyInitiali','zed);'#010+
-  '  Defaults:=TFPCDefaults.Create;'#010+
-  '  inherited Create(AOwner);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '******','}'#013#010+
+  #013#010+
+  'constructor TFPCInstaller.Create(AOwner: TComponent);'#013#010+
+  'begin'#013#010+
+  '  if assigned(Defaults) then'#013#010+
+  '    Error(SErrAlreadyInitialized);'#013#010+
+  '  Defaults:=TFPCDefaults.Create;'#013#010+
+  '  inherited Create(AOwner);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{*********************************','**********************************'+
+  '*********'#013#010+
+  '                                 TBasicInstaller'#013#010+
+  '**********************************************************************'+
+  '******}'#013#010+
+  #013#010+
+  'constructor TBasicInstaller.Create(AOwner: TComponent);'#013#010+
+  'begin'#013#010,
+  '  if assigned(Defaults) then'#013#010+
+  '    Error(SErrAlreadyInitialized);'#013#010+
+  '  Defaults:=TBasicDefaults.Create;'#013#010+
+  '  inherited Create(AOwner);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                                 TBasicInstaller'#010+
-  '***************************************','*****************************'+
-  '********}'#010+
-  #010+
-  'constructor TBasicInstaller.Create(AOwner: TComponent);'#010+
-  'begin'#010+
-  '  if assigned(Defaults) then'#010+
-  '    Error(SErrAlreadyInitialized);'#010+
-  '  Defaults:=TBasicDefaults.Create;'#010+
-  '  inherited Create(AOwner);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{***','****************************************************************'+
-  '*********'#010+
-  '                                 TBuildEngine'#010+
+  '*******'#013#010+
+  '                    ','             TBuildEngine'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'constructor TBuildEngine.Create(AOwner: T','Component);'#010+
-  'begin'#010+
-  '  inherited Create(AOwner);'#010+
-  '  // Maybe this should be the current directory ?'#010+
-  '  // Or have it as a command-line option.'#010+
+  '******}'#013#010+
+  #013#010+
+  'constructor TBuildEngine.Create(AOwner: TComponent);'#013#010+
+  'begin'#013#010+
+  '  inherited Create(AOwner);'#013#010+
+  '  // Maybe this should be the current dire','ctory ?'#013#010+
+  '  // Or have it as a command-line option.'#013#010+
   '  // Would allow to put all '#039'installers'#039' in one dir and call t'+
-  'hem'#010+
-  '  // With --start-dir=/path/to/sourc','es.'#010+
-  '  FStartDir:=includeTrailingPathDelimiter(GetCurrentDir);'#010+
-  '  FExternalPackages:=TPackages.Create(TPackage);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'destructor TBuildEngine.Destroy;'#010+
-  'begin'#010+
-  '  FreeAndNil(FExternalPackages);'#010+
-  '  inherited Destroy;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine','.Error(const Msg: String);'#010+
-  'begin'#010+
-  '  Raise EInstallerError.Create(Msg);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'hem'#013#010+
+  '  // With --start-dir=/path/to/sources.'#013#010+
+  '  FStartDir:=includeTrailingPathDelimiter(GetCurrentDir);'#013#010+
+  '  FExternalPackages:=','TPackages.Create(TPackage);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'destructor TBuildEngine.Destroy;'#013#010+
+  'begin'#013#010+
+  '  FreeAndNil(FExternalPackages);'#013#010+
+  '  inherited Destroy;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Error(const Msg: String);'#013#010+
+  'begin'#013#010+
+  '  Raise EInstallerError.Create(Msg);'#013,#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TBuildEngine.Error(const Fmt: String; const Args: array of c'+
-  'onst);'#010+
-  'begin'#010+
-  '  Raise EInstallerError.CreateFmt(Fmt,Args);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Execu','teCommand(const Cmd,Args : String; Ignor'+
-  'eError : Boolean = False);'#010+
-  'Var'#010+
-  '  E : Integer;'#010+
-  'begin'#010+
-  '  Log(vlInfo,SInfoExecutingCommand,[Cmd,Args]);'#010+
-  '  if ListMode then'#010+
-  '    Log(vlCommand,'#039'%s %s'#039',[Cmd,Args])'#010+
-  '  else'#010+
-  '    begin'#010+
-  '      // We should check c','md for spaces, and move all after first sp'+
-  'ace to args.'#010+
-  '      E:=ExecuteProcess(cmd,args);'#010+
-  '      If (E<>0) and (not IgnoreError) then'#010+
-  '        Error(SErrExternalCommandFailed,[Cmd,E]);'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TBuildEngine.SysDirectoryExists(','const ADir:string):Boolean;'+
-  #010+
-  'begin'#010+
-  '  result:=SysUtils.DirectoryExists(ADir);'#010+
-  '  if result then'#010+
-  '    Log(vlDebug,SDbgDirectoryExists,[ADir,SDbgFound])'#010+
-  '  else'#010+
-  '    Log(vlDebug,SDbgDirectoryExists,[ADir,SDbgNotFound]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TBuildEngine','.SysFileExists(const AFileName:string):Boolean;'+
-  #010+
-  'begin'#010+
-  '  result:=SysUtils.FileExists(AFileName);'#010+
-  '  if result then'#010+
-  '    Log(vlDebug,SDbgFileExists,[AFileName,SDbgFound])'#010+
-  '  else'#010+
-  '    Log(vlDebug,SDbgFileExists,[AFileName,SDbgNotFound]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'p','rocedure TBuildEngine.SysCopyFile(Const Src,Dest : String);'#010+
-  'Var'#010+
-  '  D,S : String;'#010+
-  '  Fin,FOut : TFileStream;'#010+
-  '  Count : Int64;'#010+
-  '  A : Integer;'#010+
-  'begin'#010+
-  '  Log(vlInfo,SInfoCopyingFile,[Src,Dest]);'#010+
-  '  FIn:=TFileStream.Create(Src,fmopenRead);'#010+
-  '  Try'#010+
-  '    ','D:=IncludeTrailingPathDelimiter(Dest);'#010+
-  '    If DirectoryExists(D) then'#010+
-  '      S:=D+ExtractFileName(Src)'#010+
-  '    else'#010+
-  '      S:=Dest;'#010+
-  '    FOut:=TFileStream.Create(S,fmCreate);'#010+
-  '    Try'#010+
-  '      Count:=Fout.CopyFrom(FIn,0);'#010+
-  '      If (Count<>Fin.Size) th','en'#010+
-  '        Error(SErrCopyingFile,[Src,S]);'#010+
-  '    Finally'#010+
-  '      FreeAndNil(Fout);'#010+
-  '    end;'#010+
-  '    A:=FileGetDate(FIn.Handle);'#010+
-  '    If (A=-1) then'#010+
-  '      log(vlWarning,SWarnFailedToGetTime,[Src])'#010+
-  '    else'#010+
-  '      if FileSetDate(S,A)<>0 then'#010+
-  '        Lo','g(vlWarning,SWarnFailedToSetTime,[S]);'#010+
-  '  finally'#010+
-  '    FreeAndNil(Fin);'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.SysMoveFile(Const Src,Dest : String);'#010+
-  'Var'#010+
-  '  S : String;'#010+
-  'begin'#010+
-  '  If DirectoryExists(IncludeTrailingPathDelimiter(Dest)) then'#010+
-  '    S:=In','cludeTrailingPathDelimiter(Dest)+ExtractFileName(Src)'#010+
-  '  else'#010+
-  '    S:=Dest;'#010+
-  '  If Not RenameFile(Src,S) then'#010+
-  '    begin'#010+
-  '      Try'#010+
-  '        SysCopyFile(Src,S);'#010+
-  '        SysDeleteFile(Src);'#010+
-  '      Except'#010+
-  '        On E : Exception Do'#010+
-  '          Error(S','ErrMovingFile,[Src,S]);'#010+
-  '      end;'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.SysDeleteFile(Const AFileName : String);'#010+
-  'begin'#010+
-  '  if not FileExists(AFileName) then'#010+
-  '    Log(vldebug,SDbgFileDoesNotExist,[AFileName])'#010+
-  '  else If Not DeleteFile(AFileNam','e) then'#010+
-  '    Error(SErrDeletingFile,[AFileName]);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'onst);'#013#010+
+  'begin'#013#010+
+  '  Raise EInstallerError.CreateFmt(Fmt,Args);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.ExecuteCommand(const Cmd,Args : String; const E'+
+  'nv: TStrings = nil','; IgnoreError : Boolean = False);'#013#010+
+  'Var'#013#010+
+  '  E : Integer;'#013#010+
+  '  cmdLine: string;'#013#010+
+  '  ConsoleOutput: TMemoryStream;'#013#010+
+  '  s: string;'#013#010+
+  'begin'#013#010+
+  '  Log(vlInfo,SInfoExecutingCommand,[Cmd,Args]);'#013#010+
+  '  if ListMode then'#013#010+
+  '    Log(vlCommand,'#039'%s %s'#039',[Cmd,Args])'#013#010+
+  '  ','else'#013#010+
+  '    begin'#013#010+
+  '      // We should check cmd for spaces, and move all after first spac'+
+  'e to args.'#013#010+
+  '      ConsoleOutput := TMemoryStream.Create;'#013#010+
+  '      try'#013#010+
+  '        {$ifdef HAS_UNIT_PROCESS}'#013#010+
+  '        E:=ExecuteFPC(Verbose, cmd, args, env, Co','nsoleOutput);'#013#010+
+  '        {$else}'#013#010+
+  '        E:=ExecuteProcess(cmd,args);'#013#010+
+  '        {$endif}'#013#010+
+  '        If (E<>0) and (not IgnoreError) then'#013#010+
+  '          begin'#013#010+
+  '            if trim(Args)<>'#039#039' then'#013#010+
+  '              cmdLine := cmd + '#039' '#039' + trim(args)'#013#010+
+  '    ','        else'#013#010+
+  '              cmdline := cmd;'#013#010+
+  '            s := ParsecompilerOutput(ConsoleOutput,Verbose);'#013#010+
+  '            Error(SErrExternalCommandFailed,[cmdLine,E,s]);'#013#010+
+  '          end;'#013#010+
+  '      finally'#013#010+
+  '        ConsoleOutput.Free;'#013#010+
+  '      end;'#013#010,
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TBuildEngine.SysDirectoryExists(const ADir:string):Boolean;'#013+
+  #010+
+  'begin'#013#010+
+  '  result:=SysUtils.DirectoryExists(ADir);'#013#010+
+  '  if result then'#013#010+
+  '    Log(vlDebug,SDbgDirectoryExists,[ADir,SDbgFound])'#013#010+
+  '  else'#013#010+
+  '    Log(vlDebug,SDb','gDirectoryExists,[ADir,SDbgNotFound]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TBuildEngine.SysFileExists(const AFileName:string):Boolean;'#013+
+  #010+
+  'begin'#013#010+
+  '  result:=SysUtils.FileExists(AFileName);'#013#010+
+  '  if result then'#013#010+
+  '    Log(vlDebug,SDbgFileExists,[AFileName,SDbgFound]',')'#013#010+
+  '  else'#013#010+
+  '    Log(vlDebug,SDbgFileExists,[AFileName,SDbgNotFound]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.SysCopyFile(Const Src,Dest : String);'#013#010+
+  'Var'#013#010+
+  '  D,S : String;'#013#010+
+  '  Fin,FOut : TFileStream;'#013#010+
+  '  Count : Int64;'#013#010+
+  '  A : Integer;'#013#010+
+  'begin'#013#010+
+  '  Log(vl','Info,SInfoCopyingFile,[Src,Dest]);'#013#010+
+  '  FIn:=TFileStream.Create(Src,fmopenRead);'#013#010+
+  '  Try'#013#010+
+  '    D:=IncludeTrailingPathDelimiter(Dest);'#013#010+
+  '    If DirectoryExists(D) then'#013#010+
+  '      S:=D+ExtractFileName(Src)'#013#010+
+  '    else'#013#010+
+  '      S:=Dest;'#013#010+
+  '    FOut:=TFileStr','eam.Create(S,fmCreate);'#013#010+
+  '    Try'#013#010+
+  '      Count:=Fout.CopyFrom(FIn,0);'#013#010+
+  '      If (Count<>Fin.Size) then'#013#010+
+  '        Error(SErrCopyingFile,[Src,S]);'#013#010+
+  '    Finally'#013#010+
+  '      FreeAndNil(Fout);'#013#010+
+  '    end;'#013#010+
+  '    A:=FileGetDate(FIn.Handle);'#013#010+
+  '    If (A=-1) t','hen'#013#010+
+  '      log(vlWarning,SWarnFailedToGetTime,[Src])'#013#010+
+  '    else'#013#010+
+  '      if FileSetDate(S,A)<>0 then'#013#010+
+  '        Log(vlWarning,SWarnFailedToSetTime,[S]);'#013#010+
+  '  finally'#013#010+
+  '    FreeAndNil(Fin);'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.SysMoveFile(Const',' Src,Dest : String);'#013#010+
+  'Var'#013#010+
+  '  S : String;'#013#010+
+  'begin'#013#010+
+  '  If DirectoryExists(IncludeTrailingPathDelimiter(Dest)) then'#013#010+
+  '    S:=IncludeTrailingPathDelimiter(Dest)+ExtractFileName(Src)'#013#010+
+  '  else'#013#010+
+  '    S:=Dest;'#013#010+
+  '  If Not RenameFile(Src,S) then'#013#010+
+  '    begin',#013#010+
+  '      Try'#013#010+
+  '        SysCopyFile(Src,S);'#013#010+
+  '        SysDeleteFile(Src);'#013#010+
+  '      Except'#013#010+
+  '        On E : Exception Do'#013#010+
+  '          Error(SErrMovingFile,[Src,S]);'#013#010+
+  '      end;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.SysDeleteFile(Const AFileName',' : String);'#013#010+
+  'begin'#013#010+
+  '  if not FileExists(AFileName) then'#013#010+
+  '    Log(vldebug,SDbgFileDoesNotExist,[AFileName])'#013#010+
+  '  else If Not DeleteFile(AFileName) then'#013#010+
+  '    Error(SErrDeletingFile,[AFileName]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TBuildEngine.SysDeleteDirector','y(const ADirectoryName: Stri'+
+  'ng);'#013#010+
+  'begin'#013#010+
+  '  if not DirectoryExists(ADirectoryName) then'#013#010+
+  '    Log(vldebug,SDbgDirectoryDoesNotExist,[ADirectoryName])'#013#010+
+  '  else if not IsDirectoryEmpty(ADirectoryName) then'#013#010+
+  '    Log(vldebug,SDbgDirectoryNotEmpty,','[ADirectoryName])'#013#010+
+  '  else If Not RemoveDir(ADirectoryName) then'#013#010+
+  '    Error(SErrRemovingDirectory,[ADirectoryName]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.SysDeleteTree(const ADirectoryName: String);'#013+
+  #010+
+  #013#010+
+  '  function IntRemoveTree(const ADirectoryN','ame: String) : boolean;'#013+
+  #010+
+  '  var'#013#010+
+  '    searchRec: TSearchRec;'#013#010+
+  '    SearchResult: longint;'#013#010+
+  '  begin'#013#010+
+  '    result := true;'#013#010+
+  '    SearchResult := FindFirst(IncludeTrailingPathDelimiter(ADirectoryN'+
+  'ame)+AllFilesMask, faAnyFile+faSymLink, searchRec);'#013,#010+
+  '    try'#013#010+
+  '      while SearchResult=0 do'#013#010+
+  '        begin'#013#010+
+  '          if (searchRec.Name<>'#039'.'#039') and (searchRec.Name<>'#039'.'+
+  '.'#039') then'#013#010+
+  '             begin'#013#010+
+  '               if (searchRec.Attr and faDirectory)=faDirectory then'#013+
+  #010+
+  '                 begin'#013#010+
+  '   ','                if not IntRemoveTree(IncludeTrailingPathDelimiter'+
+  '(ADirectoryName)+searchRec.Name) then'#013#010+
+  '                     result := false;'#013#010+
+  '                 end'#013#010+
+  '               else if not DeleteFile(IncludeTrailingPathDelimiter(ADi'+
+  'recto','ryName)+searchRec.Name) then'#013#010+
+  '                 result := False;'#013#010+
+  '             end;'#013#010+
+  '          SearchResult := FindNext(searchRec);'#013#010+
+  '        end;'#013#010+
+  '    finally'#013#010+
+  '      FindClose(searchRec);'#013#010+
+  '    end;'#013#010+
+  '    if not RemoveDir(ADirectoryName) then'#013,#010+
+  '      result := false;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  if not DirectoryExists(ADirectoryName) then'#013#010+
+  '    Log(vldebug,SDbgDirectoryDoesNotExist,[ADirectoryName])'#013#010+
+  '  else If Not IntRemoveTree(ADirectoryName) then'#013#010+
+  '    Error(SErrRemovingDirectory,[ADirect','oryName]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TBuildEngine.SysArchiveFiles(List: TStrings;Const AFileName:'+
-  ' String);'#010+
-  'begin'#010+
+  ' String);'#013#010+
+  'begin'#013#010+
   '  If Not (Assigned(OnArchivefiles) or Assigned(ArchiveFilesProc)) then'+
-  #010+
-  '    Raise EInstallerError.C','reate(SErrNoArchiveSupport);'#010+
-  '  If Assigned(ArchiveFilesProc) then'#010+
-  '    ArchiveFilesProc(AFileName,List)'#010+
-  '  else'#010+
-  '    OnArchiveFiles(AFileName,List);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.LogIndent;'#010+
-  'begin'#010+
-  '  FLogPrefix:=FLogPrefix+'#039'  '#039';'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure',' TBuildEngine.LogUnIndent;'#010+
-  'begin'#010+
-  '  Delete(FLogPrefix,1,2);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Log(Level: TVerboseLevel; const Msg: String);'#010+
-  'begin'#010+
-  '  If Assigned(FOnLog) then'#010+
-  '    begin'#010+
-  '      if Level in [vlInfo,vlDebug] then'#010+
-  '        FOnLog(Level,F','LogPrefix+Msg)'#010+
-  '      else'#010+
-  '        FOnLog(Level,Msg);'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  #013#010+
+  '    Raise EInstallerError.Create(SErrNoArchiveSupport);'#013#010+
+  ' ',' If Assigned(ArchiveFilesProc) then'#013#010+
+  '    ArchiveFilesProc(AFileName,List)'#013#010+
+  '  else'#013#010+
+  '    OnArchiveFiles(AFileName,List);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.LogIndent;'#013#010+
+  'begin'#013#010+
+  '  FLogPrefix:=FLogPrefix+'#039'  '#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Log','UnIndent;'#013#010+
+  'begin'#013#010+
+  '  Delete(FLogPrefix,1,2);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Log(Level: TVerboseLevel; const Msg: String);'#013+
+  #010+
+  'begin'#013#010+
+  '  If Assigned(FOnLog) then'#013#010+
+  '    begin'#013#010+
+  '      if Level in [vlInfo,vlDebug] then'#013#010+
+  '        FOnLog(Level,FLogPre','fix+Msg)'#013#010+
+  '      else'#013#010+
+  '        FOnLog(Level,Msg);'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TBuildEngine.Log(Level: TVerboseLevel; const Fmt: String;con'+
-  'st Args: array of const);'#010+
-  'begin'#010+
-  '  Log(Level,Format(Fmt,Args));'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.EnterDir','(ADir: String);'#010+
-  'Var'#010+
-  '  D : String;'#010+
-  'begin'#010+
-  '  D:=FStartDir;'#010+
-  '  D:=D+ADir;'#010+
-  '  Log(vlDebug,SDbgEnterDir,[D]);'#010+
-  '  If Not SetCurrentDir(D) then'#010+
-  '    Error(SErrChangeDirFailed,[D]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.CmdCopyFiles(List: TStrings; Const DestDi','r: S'+
-  'tring);'#010+
-  #010+
-  'Var'#010+
-  '  Args : String;'#010+
-  '  I : Integer;'#010+
-  '  DestFileName : String;'#010+
-  #010+
-  'begin'#010+
-  '  CmdCreateDir(DestDir);'#010+
-  '  If (Defaults.Copy<>'#039#039') then'#010+
-  '    begin'#010+
-  '      Args:=FileListToString(List,'#039#039');'#010+
-  '      Args:=Args+'#039' '#039'+DestDir;'#010+
-  '      ExecuteCommand(Defa','ults.Copy,Args);'#010+
-  '    end'#010+
-  '  else'#010+
-  '    For I:=0 to List.Count-1 do'#010+
-  '      if List.Names[i]<>'#039#039' then'#010+
-  '        begin'#010+
-  '          DestFileName:=DestDir+list.ValueFromIndex[i];'#010+
-  '          CmdCreateDir(ExtractFilePath(DestFileName));'#010+
-  '          SysCopyFi','le(List.names[i],DestFileName)'#010+
-  '        end'#010+
-  '      else'#010+
-  '        SysCopyFile(List[i],DestDir);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.CmdCreateDir(const DestDir: String);'#010+
-  'begin'#010+
-  '  If (Defaults.MkDir<>'#039#039') then'#010+
-  '    ExecuteCommand(Defaults.MkDir,DestDir)'#010+
-  ' ',' else'#010+
-  '    If not ForceDirectories(DestDir) then'#010+
-  '      Error(SErrCreatingDirectory,[DestDir]);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'st Args: array of const);'#013#010+
+  'begin'#013#010+
+  '  Log(Level,Format(Fmt,Args));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.E','nterDir(ADir: String);'#013#010+
+  'Var'#013#010+
+  '  D : String;'#013#010+
+  'begin'#013#010+
+  '  D:=FStartDir;'#013#010+
+  '  D:=D+ADir;'#013#010+
+  '  Log(vlDebug,SDbgEnterDir,[D]);'#013#010+
+  '  If Not SetCurrentDir(D) then'#013#010+
+  '    Error(SErrChangeDirFailed,[D]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.CmdCopyFiles(List: TSt','rings; Const DestDir: S'+
+  'tring);'#013#010+
+  #013#010+
+  'Var'#013#010+
+  '  Args : String;'#013#010+
+  '  I : Integer;'#013#010+
+  '  DestFileName : String;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  CmdCreateDir(DestDir);'#013#010+
+  '  If (Defaults.Copy<>'#039#039') then'#013#010+
+  '    begin'#013#010+
+  '      Args:=FileListToString(List,'#039#039');'#013#010+
+  '      Args:=Args+'#039' '#039'+Des','tDir;'#013#010+
+  '      ExecuteCommand(Defaults.Copy,Args);'#013#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    For I:=0 to List.Count-1 do'#013#010+
+  '      if List.Names[i]<>'#039#039' then'#013#010+
+  '        begin'#013#010+
+  '          if IsRelativePath(list.ValueFromIndex[i]) then'#013#010+
+  '            DestFileName:=DestDir+','list.ValueFromIndex[i]'#013#010+
+  '          else'#013#010+
+  '            DestFileName:=list.ValueFromIndex[i];'#013#010+
+  '          CmdCreateDir(ExtractFilePath(DestFileName));'#013#010+
+  '          SysCopyFile(List.names[i],DestFileName)'#013#010+
+  '        end'#013#010+
+  '      else'#013#010+
+  '        SysCopyFi','le(List[i],DestDir);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.CmdCreateDir(const DestDir: String);'#013#010+
+  'begin'#013#010+
+  '  If (Defaults.MkDir<>'#039#039') then'#013#010+
+  '    ExecuteCommand(Defaults.MkDir,DestDir)'#013#010+
+  '  else'#013#010+
+  '    If not ForceDirectories(DestDir) then'#013#010+
+  '      Error(S','ErrCreatingDirectory,[DestDir]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TBuildEngine.CmdMoveFiles(List: TStrings; Const DestDir: Str'+
-  'ing);'#010+
-  'Var'#010+
-  '  Args : String;'#010+
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  CmdCreateDir(DestDi','r);'#010+
-  '  If (Defaults.Move<>'#039#039') then'#010+
-  '    begin'#010+
-  '      Args:=FileListToString(List,'#039#039');'#010+
-  '      Args:=Args+'#039' '#039'+DestDir;'#010+
-  '      ExecuteCommand(Defaults.Move,Args);'#010+
-  '    end'#010+
-  '  else'#010+
-  '    For I:=0 to List.Count-1 do'#010+
-  '      SysMoveFile(List[i],DestDir);'#010+
-  'en','d;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.CmdDeleteFiles(List: TStrings);'#010+
-  'Var'#010+
-  '  Args : String;'#010+
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  If (Defaults.Remove<>'#039#039') then'#010+
-  '    begin'#010+
-  '      Args:=FileListToString(List,'#039#039');'#010+
-  '      ExecuteCommand(Defaults.Remove,Args);'#010+
-  '    end'#010+
-  '  els','e'#010+
-  '    For I:=0 to List.Count-1 do'#010+
-  '      SysDeleteFile(List[i]);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'ing);'#013#010+
+  'Var'#013#010+
+  '  Args : String;'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  CmdCreateDir(DestDir);'#013#010+
+  '  If (Defaults.Move<>'#039#039') then'#013#010+
+  '    begin'#013#010+
+  '     ',' Args:=FileListToString(List,'#039#039');'#013#010+
+  '      Args:=Args+'#039' '#039'+DestDir;'#013#010+
+  '      ExecuteCommand(Defaults.Move,Args);'#013#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    For I:=0 to List.Count-1 do'#013#010+
+  '      SysMoveFile(List[i],DestDir);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.CmdDeleteFi','les(List: TStrings);'#013#010+
+  'Var'#013#010+
+  '  Args : String;'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  If (Defaults.Remove<>'#039#039') then'#013#010+
+  '    begin'#013#010+
+  '      Args:=FileListToString(List,'#039#039');'#013#010+
+  '      ExecuteCommand(Defaults.Remove,Args);'#013#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    For I:=0 to List.Count','-1 do'#013#010+
+  '      SysDeleteFile(List[i]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TBuildEngine.CmdArchiveFiles(List: TStrings; Const ArchiveFi'+
-  'le: String);'#010+
-  'Var'#010+
-  '  S,C,O : String;'#010+
-  'begin'#010+
-  '  If (Defaults.Archive='#039#039') then'#010+
-  '    SysArchiveFiles(List,A','rchiveFile)'#010+
-  '  else'#010+
-  '    begin'#010+
-  '      S:=FileListToString(List,'#039#039');'#010+
-  '      SplitCommand(Defaults.Archive,C,O);'#010+
-  '      If (O='#039#039') then'#010+
-  '        O:=ArchiveFile+'#039' '#039'+S'#010+
-  '      else'#010+
+  'le: String);'#013#010+
+  'Var'#013#010+
+  '  S,C,O : String;'#013#010+
+  'begin'#013#010+
+  '  If (Defaults.Archive='#039#039') then'#013#010+
+  '    SysArchiveFiles(List,ArchiveFile)'#013#010+
+  '  els','e'#013#010+
+  '    begin'#013#010+
+  '      S:=FileListToString(List,'#039#039');'#013#010+
+  '      SplitCommand(Defaults.Archive,C,O);'#013#010+
+  '      If (O='#039#039') then'#013#010+
+  '        O:=ArchiveFile+'#039' '#039'+S'#013#010+
+  '      else'#013#010+
   '        O:=Substitute(O,['#039'ARCHIVE'#039',ArchiveFile,'#039'FILESORDIR'+
-  'S'#039']);'#010+
-  '      Ex','ecuteCommand(C,O);'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  'Function TBuildEngine.FileNewer(const Src,Dest : String) : Boolean;'#010+
-  #010+
-  'Var'#010+
-  '  DS,DD : Longint;'#010+
-  '  D1,D2 : TDateTime;'#010+
-  #010+
-  'begin'#010+
-  '  DS:=FileAge(Src);'#010+
-  '  DD:=FileAge(Dest);'#010+
-  '  D1:=FileDateToDateTime(DS);'#010+
-  '  D2:=FileDateT','oDateTime(DD);'#010+
+  'S'#039']);'#013#010+
+  '      ExecuteComm','and(C,O);'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TBuildEngine.CmdRenameFile(SourceName, DestName: String);'#013+
+  #010+
+  'var'#013#010+
+  '  Args: string;'#013#010+
+  'begin'#013#010+
+  '  If (Defaults.Move<>'#039#039') then'#013#010+
+  '    begin'#013#010+
+  '      Args:=SourceName;'#013#010+
+  '      Args:=Args+'#039' '#039'+DestName;'#013#010+
+  '      ExecuteC','ommand(Defaults.Move,Args);'#013#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    SysMoveFile(SourceName,DestName);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TBuildEngine.CmdRemoveDirs(List: TStrings);'#013#010+
+  'Var'#013#010+
+  '  Args : String;'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  If (Defaults.RemoveDir<>'#039#039') then'#013#010+
+  '    begin'#013,#010+
+  '      Args:=FileListToString(List,'#039#039');'#013#010+
+  '      ExecuteCommand(Defaults.RemoveDir,Args);'#013#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    For I:=0 to List.Count-1 do'#013#010+
+  '      SysDeleteDirectory(List[i]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TBuildEngine.CmdRemoveTrees(List: TStrings);'#013#010+
+  'V','ar'#013#010+
+  '  Args : String;'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  If (Defaults.RemoveTree<>'#039#039') then'#013#010+
+  '    begin'#013#010+
+  '      Args:=FileListToString(List,'#039#039');'#013#010+
+  '      ExecuteCommand(Defaults.RemoveTree,Args);'#013#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    For I:=0 to List.Count-1 do'#013#010+
+  '      Sy','sDeleteTree(List[i]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Function TBuildEngine.FileNewer(const Src,Dest : String) : Boolean;'#013+
+  #010+
+  #013#010+
+  'Var'#013#010+
+  '  DS,DD : Longint;'#013#010+
+  '  D1,D2 : TDateTime;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  DS:=FileAge(Src);'#013#010+
+  '  DD:=FileAge(Dest);'#013#010+
+  '  D1:=FileDateToDateTime(DS);'#013#010+
+  '  D2:=Fi','leDateToDateTime(DD);'#013#010+
   '  Log(vlDebug,SDbgComparingFileTimes,[Src,DateTimeToStr(D1),Dest,DateT'+
-  'imeToStr(D2)]);'#010+
-  '  Result:=D1>=D2;'#010+
-  '  If Result then'#010+
+  'imeToStr(D2)]);'#013#010+
+  '  Result:=D1>=D2;'#013#010+
+  '  If Result then'#013#010+
   '    Log(vlInfo,SInfoSourceNewerDest,[Src,DateTimeToStr(D1),Dest,DateTi'+
-  'meToStr(D2)]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TB','uildEngine.ExecuteCommands(Commands: TCommands; At: TCom'+
-  'mandAt);'#010+
-  'Var'#010+
-  '  C : TCommand;'#010+
-  '  I : Integer;'#010+
-  '  Cmd,O : String;'#010+
-  '  E : Boolean;'#010+
-  'begin'#010+
-  '  For I:=0 to Commands.Count-1 do'#010+
-  '    begin'#010+
-  '      C:=Commands.CommandItems[i];'#010+
-  '      if (C.At=At) the','n'#010+
-  '        begin'#010+
-  '          E:=True;'#010+
+  'meToStr(D2)]);'#013#010+
+  'end;'#013#010+
+  #013,#010+
+  #013#010+
+  'procedure TBuildEngine.ExecuteCommands(Commands: TCommands; At: TComma'+
+  'ndAt);'#013#010+
+  'Var'#013#010+
+  '  C : TCommand;'#013#010+
+  '  I : Integer;'#013#010+
+  '  Cmd,O : String;'#013#010+
+  '  E : Boolean;'#013#010+
+  'begin'#013#010+
+  '  For I:=0 to Commands.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      C:=Commands.CommandItems[i]',';'#013#010+
+  '      if (C.At=At) then'#013#010+
+  '        begin'#013#010+
+  '          E:=True;'#013#010+
   '          If (C.SourceFile<>'#039#039') and (C.DestFile<>'#039#039')  then'+
-  #010+
+  #013#010+
   '            E:=FileNewer(C.SourceFile,IncludeTrailingPathDelimiter(Dic'+
-  'tionary.GetValue('#039'OUTPUTDIR'#039'))+C.DestFile);'#010+
-  '          If E then'#010+
-  '            ','begin'#010+
-  '            If Assigned(C.BeforeCommand) then'#010+
-  '              C.BeforeCommand(C);'#010+
+  'tionary.GetValue('#039'OUTPUTDIR'#039'))+C.DestFile);'#013#010+
+  '  ','        If E then'#013#010+
+  '            begin'#013#010+
+  '            If Assigned(C.BeforeCommand) then'#013#010+
+  '              C.BeforeCommand(C);'#013#010+
   '            O:=Substitute(C.CmdLineOptions,['#039'SOURCE'#039',C.SourceF'+
-  'ile,'#039'DEST'#039',C.DestFile]);'#010+
-  '            Cmd:=C.Command;'#010+
-  '            If (ExtractFilePath(Cmd)='#039#039,') then'#010+
+  'ile,'#039'DEST'#039',C.DestFile]);'#013#010+
+  '            Cmd:=C.Command;'#013#010+
+  '   ','         If (ExtractFilePath(Cmd)='#039#039') then'#013#010+
   '              Cmd:=ExeSearch(Cmd,GetEnvironmentvariable('#039'PATH'#039')'+
-  ');'#010+
-  '            ExecuteCommand(Cmd,O,C.IgnoreResult);'#010+
-  '            If Assigned(C.AfterCommand) then'#010+
-  '              C.AfterCommand(C);'#010+
-  '            end;'#010+
-  '        end;'#010+
-  '    end;'#010,
-  'end;'#010+
-  #010+
-  #010+
+  ');'#013#010+
+  '            ExecuteCommand(Cmd,O,nil,C.IgnoreResult);'#013#010+
+  '            If Assigned(C.AfterCommand) then'#013#010+
+  '              C.AfterCommand','(C);'#013#010+
+  '            end;'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Procedure TBuildEngine.LogSearchPath(const ASearchPathName:string;Path'+
-  ':TConditionalStrings; ACPU:TCPU;AOS:TOS);'#010+
-  'var'#010+
-  '  S : String;'#010+
-  '  I : Integer;'#010+
-  '  C : TConditionalString;'#010+
-  'begin'#010+
-  '  S:='#039#039';'#010+
-  '  for i:=0 to Path.Count-1 do'#010+
-  '    begin'#010+
-  '      C',':=Path[I];'#010+
-  '      if (ACPU in C.CPUs) and (AOS in C.OSes) then'#010+
-  '        begin'#010+
-  '          if S<>'#039#039' then'#010+
-  '            S:=S+PathSeparator;'#010+
-  '          S:=S+Dictionary.ReplaceStrings(C.Value)'#010+
-  '        end;'#010+
-  '    end;'#010+
-  '  if S<>'#039#039' then'#010+
-  '    Log(vlDebug,SDbg','SearchPath,[ASearchPathName,S]);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  ':TConditionalStrings; ACPU:TCPU;AOS:TOS);'#013#010+
+  'var'#013#010+
+  '  S : String;'#013#010+
+  '  I : Integer;'#013#010+
+  '  C : TConditionalString;'#013#010+
+  'begin'#013,#010+
+  '  S:='#039#039';'#013#010+
+  '  for i:=0 to Path.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      C:=Path[I];'#013#010+
+  '      if (ACPU in C.CPUs) and (AOS in C.OSes) then'#013#010+
+  '        begin'#013#010+
+  '          if S<>'#039#039' then'#013#010+
+  '            S:=S+PathSeparator;'#013#010+
+  '          S:=S+Dictionary.ReplaceStrings(C.','Value)'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  '  if S<>'#039#039' then'#013#010+
+  '    Log(vlDebug,SDbgSearchPath,[ASearchPathName,S]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TBuildEngine.FindFileInPath(Path:TConditionalStrings; AFileNa'+
-  'me:String; var FoundPath:String;ACPU:TCPU;AOS:TOS):Boolean;'#010+
-  'var'#010+
-  '  I : Integer;'#010+
-  '  C : TConditionalString;'#010+
-  'begin'#010+
-  '  Result:=false;'#010+
-  '  ','for i:=0 to Path.Count-1 do'#010+
-  '    begin'#010+
-  '      C:=Path[I];'#010+
-  '      if (ACPU in C.CPUs) and (AOS in C.OSes) then'#010+
-  '        begin'#010+
-  '          FoundPath:=IncludeTrailingPathDelimiter(Dictionary.ReplaceSt'+
-  'rings(C.Value));'#010+
-  '          if FileExists(FoundPat','h+AFileName) then'#010+
-  '            begin'#010+
-  '              result:=true;'#010+
-  '              exit;'#010+
-  '            end;'#010+
-  '        end;'#010+
-  '    end;'#010+
-  '  FoundPath:='#039#039';'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'me:String; var FoundPath:String;ACPU:TCPU;AOS:TOS):Boolea','n;'#013#010+
+  'var'#013#010+
+  '  I : Integer;'#013#010+
+  '  C : TConditionalString;'#013#010+
+  'begin'#013#010+
+  '  Result:=false;'#013#010+
+  '  for i:=0 to Path.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      C:=Path[I];'#013#010+
+  '      if (ACPU in C.CPUs) and (AOS in C.OSes) then'#013#010+
+  '        begin'#013#010+
+  '          FoundPath:=IncludeTrailin','gPathDelimiter(Dictionary.Replace'+
+  'Strings(C.Value));'#013#010+
+  '          if FileExists(FoundPath+AFileName) then'#013#010+
+  '            begin'#013#010+
+  '              result:=true;'#013#010+
+  '              exit;'#013#010+
+  '            end;'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  '  FoundPath:='#039#039';'#013#010+
+  'end;'#013#010+
+  #013,#010+
+  'procedure TBuildEngine.GetDirectoriesFromFilelist(const AFileList, ADi'+
+  'rectoryList: TStringList);'#013#010+
+  'var'#013#010+
+  '  i: integer;'#013#010+
+  'begin'#013#010+
+  '  ADirectoryList.Sorted:=true;'#013#010+
+  '  ADirectoryList.Duplicates:=dupIgnore;'#013#010+
+  '  for i := 0 to AFileList.Count-1 do'#013#010+
+  '   ',' ADirectoryList.Add(ExtractFileDir(AFileList.Strings[i]));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Procedure TBuildEngine.ResolveFileNames(APackage : TPackage; ACPU:TCPU'+
-  ';AOS:TOS;DoChangeDir:bo','olean=true);'#010+
-  #010+
-  '  procedure FindMainSource(T:TTarget);'#010+
-  '  var'#010+
-  '    SD,SF  : String;'#010+
-  '  begin'#010+
+  ';AOS:TOS;DoChangeDir:boolean=true);'#013#010+
+  #013#010+
+  '  procedure FindMainSource(T:TTarget);'#013#010+
+  '  var'#013#010+
+  '    SD,SF  : S','tring;'#013#010+
+  '  begin'#013#010+
   '    LogSearchPath('#039'package source'#039',APackage.SourcePath,ACPU,AO'+
-  'S);'#010+
-  '    SD:=Dictionary.ReplaceStrings(T.Directory);'#010+
-  '    SF:=Dictionary.ReplaceStrings(T.So','urceFileName);'#010+
-  '    if SD='#039#039' then'#010+
-  '      FindFileInPath(APackage.SourcePath,SF,SD,ACPU,AOS);'#010+
-  '    if SD<>'#039#039' then'#010+
-  '      SD:=IncludeTrailingPathDelimiter(SD);'#010+
-  '    T.FTargetSourceFileName:=SD+SF;'#010+
-  '    if FileExists(T.TargetSourceFileName) then'#010+
-  '   ','   Log(vlDebug,SDbgResolvedSourceFile,[T.SourceFileName,T.TargetS'+
-  'ourceFileName])'#010+
-  '    else'#010+
-  '      begin'#010+
+  'S);'#013#010+
+  '    SD:=Dictionary.ReplaceStrings(T.Directory);'#013#010+
+  '    SF:=Dictionary.ReplaceStrings(T.SourceFileName);'#013#010+
+  '    if SD='#039#039' then'#013#010+
+  '      FindFileInPath(APackage.Sour','cePath,SF,SD,ACPU,AOS);'#013#010+
+  '    if SD<>'#039#039' then'#013#010+
+  '      SD:=IncludeTrailingPathDelimiter(SD);'#013#010+
+  '    T.FTargetSourceFileName:=SD+SF;'#013#010+
+  '    if FileExists(T.TargetSourceFileName) then'#013#010+
+  '      Log(vlDebug,SDbgResolvedSourceFile,[T.SourceFileName,T.Targ','etS'+
+  'ourceFileName])'#013#010+
+  '    else'#013#010+
+  '      begin'#013#010+
   '        Log(vlWarning,SWarnSourceFileNotFound,[T.SourceFileName,APacka'+
-  'ge.Name,MakeTargetString(ACPU,AOS)]);'#010+
-  '        T.FTargetSourceFileNam','e:='#039#039';'#010+
-  '      end;'#010+
-  '  end;'#010+
-  #010+
-  '  procedure FindIncludeSources(T:TTarget);'#010+
-  '  var'#010+
-  '    SD,SF  : String;'#010+
-  '    D : TDependency;'#010+
-  '    j : integer;'#010+
-  '  begin'#010+
-  '    LogSearchPath('#039'target include'#039',T.IncludePath,ACPU,AOS);'#010+
-  '    LogSearchPath('#039'package include'#039',AP','ackage.IncludePath,ACP'+
-  'U,AOS);'#010+
-  '    for j:=0 to T.Dependencies.Count-1 do'#010+
-  '      begin'#010+
-  '        D:=T.Dependencies[j];'#010+
-  '        if (D.DependencyType=depInclude) then'#010+
-  '          begin'#010+
-  '            D.TargetFileName:='#039#039';'#010+
-  '            if (ACPU in D.CPUs',') and (AOS in D.OSes) then'#010+
-  '              begin'#010+
-  '                if ExtractFilePath(D.Value)='#039#039' then'#010+
-  '                  begin'#010+
-  '                    SF:=Dictionary.ReplaceStrings(D.Value);'#010+
-  '                    SD:='#039#039';'#010+
-  '                    // first ','check the target specific path'#010+
-  '                    if not FindFileInPath(T.IncludePath,SF,SD,ACPU,AOS'+
-  ') then'#010+
+  'ge.Name,MakeTargetString(ACPU,AOS)]);'#013#010+
+  '        T.FTargetSourceFileName:='#039#039';'#013#010+
+  '      end;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  procedure FindIncludeSourc','es(T:TTarget);'#013#010+
+  '  var'#013#010+
+  '    SD,SF  : String;'#013#010+
+  '    D : TDependency;'#013#010+
+  '    j : integer;'#013#010+
+  '  begin'#013#010+
+  '    LogSearchPath('#039'target include'#039',T.IncludePath,ACPU,AOS);'#013+
+  #010+
+  '    LogSearchPath('#039'package include'#039',APackage.IncludePath,ACPU,'+
+  'AOS);'#013#010+
+  '    for j:=0 to ','T.Dependencies.Count-1 do'#013#010+
+  '      begin'#013#010+
+  '        D:=T.Dependencies[j];'#013#010+
+  '        if (D.DependencyType=depInclude) then'#013#010+
+  '          begin'#013#010+
+  '            D.TargetFileName:='#039#039';'#013#010+
+  '            if (ACPU in D.CPUs) and (AOS in D.OSes) then'#013#010+
+  '            ','  begin'#013#010+
+  '                if ExtractFilePath(D.Value)='#039#039' then'#013#010+
+  '                  begin'#013#010+
+  '                    SF:=Dictionary.ReplaceStrings(D.Value);'#013#010+
+  '                    SD:='#039#039';'#013#010+
+  '                    // first check the target specific path'#013#010+
+  '  ','                  if not FindFileInPath(T.IncludePath,SF,SD,ACPU,A'+
+  'OS) then'#013#010+
   '                      FindFileInPath(APackage.IncludePath,SF,SD,ACPU,A'+
-  'OS);'#010+
-  '                     if SD<>'#039#039' then'#010+
-  '                     ','  SD:=IncludeTrailingPathDelimiter(SD);'#010+
-  '                     D.TargetFileName:=SD+SF;'#010+
-  '                  end'#010+
-  '                else'#010+
-  '                  D.TargetFileName:=D.Value;'#010+
-  '                if FileExists(D.TargetFileName) then'#010+
-  '             ','     Log(vlDebug,SDbgResolvedIncludeFile,[D.Value,D.Tar'+
-  'getFileName])'#010+
-  '                else'#010+
-  '                  begin'#010+
+  'OS);'#013#010+
+  '                     if SD<>'#039#039' then'#013#010+
+  '                       SD:=IncludeTrailingPathDelim','iter(SD);'#013#010+
+  '                     D.TargetFileName:=SD+SF;'#013#010+
+  '                  end'#013#010+
+  '                else'#013#010+
+  '                  D.TargetFileName:=D.Value;'#013#010+
+  '                if FileExists(D.TargetFileName) then'#013#010+
+  '                  Log(vlDebug,SDbgRes','olvedIncludeFile,[D.Value,D.Tar'+
+  'getFileName])'#013#010+
+  '                else'#013#010+
+  '                  begin'#013#010+
   '                    Log(vlWarning,SWarnIncludeFileNotFound,[D.Value, A'+
-  'Package.Name, MakeTargetString(ACPU,AOS)]);'#010+
-  '            ','        D.TargetFileName:='#039#039';'#010+
-  '                  end;'#010+
-  '              end;'#010+
-  '          end;'#010+
-  '      end;'#010+
-  '  end;'#010+
-  #010+
-  '  procedure FindExampleSource(T:TTarget);'#010+
-  '  var'#010+
-  '    SD,SF  : String;'#010+
-  '  begin'#010+
-  '    LogSearchPath('#039'package example'#039',APackage.ExamplePath,','ACP'+
-  'U,AOS);'#010+
-  '    SD:=Dictionary.ReplaceStrings(T.Directory);'#010+
-  '    SF:=Dictionary.ReplaceStrings(T.SourceFileName);'#010+
-  '    if SD='#039#039' then'#010+
-  '      FindFileInPath(APackage.ExamplePath,SF,SD,ACPU,AOS);'#010+
-  '    if SD<>'#039#039' then'#010+
-  '      SD:=IncludeTrailingPathDel','imiter(SD);'#010+
-  '    T.FTargetSourceFileName:=SD+SF;'#010+
-  '    if FileExists(T.TargetSourceFileName) then'#010+
-  '      Log(vlDebug,SDbgResolvedSourceFile,[T.SourceFileName,T.TargetSou'+
-  'rceFileName])'#010+
-  '    else'#010+
-  '      begin'#010+
-  '        Log(vlWarning,SWarnSourceFileNot','Found,[T.SourceFileName, APa'+
-  'ckage.Name, MakeTargetString(ACPU,AOS)]);'#010+
-  '        T.FTargetSourceFileName:='#039#039';'#010+
-  '      end;'#010+
-  '  end;'#010+
-  #010+
-  'var'#010+
-  '  T : TTarget;'#010+
-  '  i : Integer;'#010+
-  'begin'#010+
-  '  if not((ACPU in APackage.CPUs) and (AOS in APackage.OSes)) then'#010+
-  '    exit',';'#010+
-  '  try'#010+
-  '    if DoChangeDir and (APackage.Directory<>'#039#039') then'#010+
-  '      EnterDir(APackage.Directory);'#010+
-  '    Dictionary.AddVariable('#039'CPU'#039',CPUToString(ACPU));'#010+
-  '    Dictionary.AddVariable('#039'OS'#039',OSToString(AOS));'#010+
-  '    For I:=0 to APackage.Targets.Count-1',' do'#010+
-  '      begin'#010+
-  '        T:=APackage.FTargets.TargetItems[I];'#010+
-  '        if (ACPU in T.CPUs) and (AOS in T.OSes) then'#010+
-  '          begin'#010+
-  '            // Debug information'#010+
-  '            Log(vlDebug,SDbgResolvingSourcesOfTarget,[T.Name,MakeTarge'+
-  'tString','(ACPU,AOS)]);'#010+
-  '            LogIndent;'#010+
-  #010+
-  '            case T.TargetType of'#010+
-  '              ttProgram,'#010+
-  '              ttUnit,'#010+
-  '              ttImplicitUnit :'#010+
-  '                begin'#010+
-  '                  FindMainSource(T);'#010+
-  '                  if T.Dependenc','ies.Count>0 then'#010+
-  '                    FindIncludeSources(T);'#010+
-  '                end;'#010+
-  '              ttExampleUnit,'#010+
-  '              ttExampleProgram :'#010+
-  '                begin'#010+
-  '                  FindExampleSource(T);'#010+
-  '                end;'#010+
-  '            en','d;'#010+
-  #010+
-  '            LogUnIndent;'#010+
-  '          end;'#010+
-  '      end;'#010+
-  '  finally'#010+
-  '    If DoChangeDir and (APackage.Directory<>'#039#039') then'#010+
-  '      EnterDir('#039#039');'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TBuildEngine.GetUnitDir(APackage:TPackage):String;'#010+
-  'begin'#010+
-  '  // Retrieve Full dir','ectory name where to find the units.'#010+
-  '  // The search order is:'#010+
-  '  //  - Package in this fpmake.pp'#010+
-  '  //  - LocalUnitDir'#010+
-  '  //  - GlobalUnitDir'#010+
-  '  if (APackage.UnitDir='#039#039') and'#010+
-  '     (APackage.State in [tsCompiled, tsNoCompile]) then'#010+
-  '    begin'#010+
-  '   ','   APackage.UnitDir:=IncludeTrailingPathDelimiter(FStartDir)+Incl'+
-  'udeTrailingPathDelimiter(APackage.Directory)+APackage.GetUnitsOutputDi'+
-  'r(Defaults.CPU,Defaults.OS);'#010+
-  '    end;'#010+
-  '  if (APackage.UnitDir='#039#039') and'#010+
-  '     (Defaults.LocalUnitDir<>'#039#039') the','n'#010+
-  '    begin'#010+
-  '      APackage.UnitDir:=IncludeTrailingPathDelimiter(Defaults.LocalUni'+
-  'tDir)+APackage.Name;'#010+
-  '      if not SysDirectoryExists(APackage.UnitDir) then'#010+
-  '        APackage.UnitDir:='#039#039';'#010+
-  '    end;'#010+
-  '  if APackage.UnitDir='#039#039' then'#010+
-  '    begin'#010+
-  '   ','   APackage.UnitDir:=IncludeTrailingPathDelimiter(Defaults.Global'+
-  'UnitDir)+APackage.Name;'#010+
-  '      if not SysDirectoryExists(APackage.UnitDir) then'#010+
-  '        APackage.UnitDir:=DirNotFound;'#010+
-  '    end;'#010+
-  '  // Special error marker to prevent searches in',' case of error'#010+
-  '  if APackage.UnitDir=DirNotFound then'#010+
-  '    Result:='#039#039#010+
-  '  else'#010+
-  '    Result:=APackage.UnitDir;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.AddDependencyIncludePaths(L:TStrings;ATarget: T'+
-  'Target);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  D : TDependency;'#010+
-  '  SD : Str','ing;'#010+
-  'begin'#010+
-  '  For I:=0 to ATarget.Dependencies.Count-1 do'#010+
-  '    begin'#010+
-  '      D:=ATarget.Dependencies[i];'#010+
-  '      if (D.DependencyType=depInclude) and'#010+
-  '         (Defaults.CPU in D.CPUs) and (Defaults.OS in D.OSes) then'#010+
-  '        begin'#010+
-  '          SD:=E','xcludeTrailingPathDelimiter(ExtractFilePath(D.TargetF'+
-  'ileName));'#010+
-  '          if SD<>'#039#039' then'#010+
-  '            L.Add(SD);'#010+
-  '        end;'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.AddDependencyUnitPaths(L:TStrings;APackage: TPa'+
-  'ckage);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  ','P : TPackage;'#010+
-  '  D : TDependency;'#010+
-  '  S : String;'#010+
-  'begin'#010+
-  '  For I:=0 to APackage.Dependencies.Count-1 do'#010+
-  '    begin'#010+
-  '      D:=APackage.Dependencies[i];'#010+
-  '      if (D.DependencyType=depPackage) and'#010+
-  '         (Defaults.CPU in D.CPUs) and (Defaults.OS i','n D.OSes) then'#010+
-  '        begin'#010+
-  '          P:=TPackage(D.Target);'#010+
-  '          If Assigned(P) then'#010+
-  '            begin'#010+
-  '              // Already processed?'#010+
-  '              S:=GetUnitDir(P);'#010+
-  '              if L.IndexOf(S)=-1 then'#010+
-  '                begin'#010+
-  '  ','                // Add this package and then dependencies'#010+
-  '                  L.Add(S);'#010+
-  '                  AddDependencyUnitPaths(L,P);'#010+
-  '                end;'#010+
-  '            end;'#010+
-  '        end;'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TBuildEngine.GetCompilerCommand','(APackage : TPackage; ATarge'+
-  't : TTarget) : String;'#010+
-  'Var'#010+
-  '  L : TUnsortedDuplicatesStringList;'#010+
-  '  Args : TStringList;'#010+
-  '  i : Integer;'#010+
-  'begin'#010+
-  '  if ATarget.TargetSourceFileName = '#039#039' then'#010+
-  '    Error(SErrCouldNotCompile,[ATarget.Name, APackage.Name]);',#010+
-  #010+
-  '  Args:=TStringList.Create;'#010+
-  '  Args.Duplicates:=dupIgnore;'#010+
-  #010+
-  '  Result := '#039#039';'#010+
-  #010+
-  '  //compiler configuration'#010+
-  '  if Defaults.NoFPCCfg then'#010+
-  '    Args.Add('#039'-n'#039');'#010+
-  #010+
-  '  // Target OS'#010+
-  '  Args.Add('#039'-T'#039'+OSToString(Defaults.OS));'#010+
-  #010+
-  '  // Compile mode'#010+
-  '  If ATarg','et.Mode<>cmFPC then'#010+
-  '    Args.Add('#039'-M'#039'+ModeToString(ATarget.Mode))'#010+
-  '  else If Defaults.Mode<>cmFPC then'#010+
-  '    Args.Add('#039'-M'#039'+ModeToString(Defaults.Mode));'#010+
-  '  // Output file paths'#010+
-  '  If ATarget.TargetType in ProgramTargets then'#010+
-  '    Args.Add('#039'-FE'#039'+A','Package.GetBinOutputDir(Defaults.CPU,Def'+
-  'aults.OS));'#010+
-  '  Args.Add('#039'-FU'#039'+APackage.GetUnitsOutputDir(Defaults.CPU,Defau'+
-  'lts.OS));'#010+
-  '  // Object Path'#010+
-  '  L:=TUnsortedDuplicatesStringList.Create;'#010+
-  '  L.Duplicates:=dupIgnore;'#010+
-  '  AddConditionalStrings(L,APa','ckage.ObjectPath,Defaults.CPU,Defaults.'+
-  'OS);'#010+
-  '  AddConditionalStrings(L,ATarget.ObjectPath,Defaults.CPU,Defaults.OS)'+
-  ';'#010+
-  '  for i:=0 to L.Count-1 do'#010+
-  '    Args.Add('#039'-Fo'#039'+L[i]);'#010+
-  '  FreeAndNil(L);'#010+
-  '  // Unit Dirs'#010+
-  '  L:=TUnsortedDuplicatesStringList.Crea','te;'#010+
-  '  L.Duplicates:=dupIgnore;'#010+
-  '  AddDependencyUnitPaths(L,APackage);'#010+
-  '  AddConditionalStrings(L,APackage.UnitPath,Defaults.CPU,Defaults.OS);'+
-  #010+
-  '  AddConditionalStrings(L,ATarget.UnitPath,Defaults.CPU,Defaults.OS);'#010+
-  '  for i:=0 to L.Count-1 do'#010+
-  '   ',' Args.Add('#039'-Fu'#039'+L[i]);'#010+
-  '  FreeAndNil(L);'#010+
-  '  // Include Path'#010+
-  '  L:=TUnsortedDuplicatesStringList.Create;'#010+
-  '  L.Duplicates:=dupIgnore;'#010+
-  '  AddDependencyIncludePaths(L,ATarget);'#010+
-  '  AddConditionalStrings(L,APackage.IncludePath,Defaults.CPU,Defaults.O'+
-  'S)',';'#010+
-  '  AddConditionalStrings(L,ATarget.IncludePath,Defaults.CPU,Defaults.OS'+
-  ');'#010+
-  '  for i:=0 to L.Count-1 do'#010+
-  '    Args.Add('#039'-Fi'#039'+L[i]);'#010+
-  '  FreeAndNil(L);'#010+
-  '  // Custom Options'#010+
-  '  If (Defaults.HaveOptions) then'#010+
-  '    Args.AddStrings(Defaults.Options);'#010+
-  '  I','f (APackage.HaveOptions) then'#010+
-  '    Args.AddStrings(APackage.Options);'#010+
-  '  If (ATarget.HaveOptions) then'#010+
-  '    Args.AddStrings(ATarget.Options);'#010+
-  '  // Add Filename to compile'#010+
-  '  Args.Add(ATarget.TargetSourceFileName);'#010+
-  '  // Convert to string'#010+
-  '  Resul','t:='#039#039';'#010+
-  '  for i:=0 to Args.Count-1 do'#010+
-  '    Result:=Result+'#039' '#039'+maybequoted(Args[i]);'#010+
-  '  Delete(result,1,1);'#010+
-  '  Args.Free;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TBuildEngine.GetCompiler : String;'#010+
-  'Var'#010+
-  '  S : String;'#010+
-  'begin'#010+
-  '  // Cache in FCompiler for speed.'#010+
-  '  If (FCompil','er='#039#039') then'#010+
-  '    begin'#010+
-  '    FCompiler:=Defaults.Compiler;'#010+
-  '    If (ExtractFilePath(FCompiler)='#039#039') then'#010+
-  '      begin'#010+
-  '      S:=ExeSearch(FCompiler,GetEnvironmentVariable('#039'PATH'#039'));'#010+
-  '      If (S<>'#039#039') then'#010+
-  '         FCompiler:=S;'#010+
-  '      end;'#010+
-  '    end;'#010+
-  ' ',' Result:=FCompiler;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.CreateOutputDir(APackage: TPackage);'#010+
-  'Var'#010+
-  '  D : String;'#010+
-  '  i: integer;'#010+
-  'begin'#010+
-  '  //create a units directory'#010+
-  '  D:=APackage.GetUnitsOutputDir(Defaults.CPU,Defaults.OS);'#010+
-  '  If not SysDirectoryExists','(D) then'#010+
-  '    begin'#010+
-  '      Log(vlInfo,SInfoCreatingOutputDir,[D]);'#010+
-  '      CmdCreateDir(D);'#010+
-  '    end;'#010+
-  #010+
-  '  //also create a bin directory for programtargets'#010+
-  '  For i := 0 to Pred(APackage.Targets.Count) do'#010+
-  '    begin'#010+
-  '      if APackage.Targets.TargetI','tems[i].TargetType in ProgramTarget'+
-  's then'#010+
-  '        begin'#010+
-  '          D:=APackage.GetBinOutputDir(Defaults.CPU,Defaults.OS);'#010+
-  '          If not SysDirectoryExists(D) then'#010+
-  '            begin'#010+
-  '              Log(vlInfo,SInfoCreatingOutputDir,[D]);'#010+
-  '   ','           CmdCreateDir(D);'#010+
-  '            end;'#010+
-  '          //do not continue loop, directory is made anyway'#010+
-  '          break;'#010+
-  '        end;'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'Package.Name, MakeTargetString(ACPU,AOS)]);'#013#010+
+  '                    D.TargetFile','Name:='#039#039';'#013#010+
+  '                  end;'#013#010+
+  '              end;'#013#010+
+  '          end;'#013#010+
+  '      end;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  procedure FindExampleSource(T:TTarget);'#013#010+
+  '  var'#013#010+
+  '    SD,SF  : String;'#013#010+
+  '  begin'#013#010+
+  '    LogSearchPath('#039'package example'#039',APackage.ExamplePath,ACPU,'+
+  'AOS)',';'#013#010+
+  '    SD:=Dictionary.ReplaceStrings(T.Directory);'#013#010+
+  '    SF:=Dictionary.ReplaceStrings(T.SourceFileName);'#013#010+
+  '    if SD='#039#039' then'#013#010+
+  '      FindFileInPath(APackage.ExamplePath,SF,SD,ACPU,AOS);'#013#010+
+  '    if SD<>'#039#039' then'#013#010+
+  '      SD:=IncludeTrailingPathDelimi','ter(SD);'#013#010+
+  '    T.FTargetSourceFileName:=SD+SF;'#013#010+
+  '    if FileExists(T.TargetSourceFileName) then'#013#010+
+  '      Log(vlDebug,SDbgResolvedSourceFile,[T.SourceFileName,T.TargetSou'+
+  'rceFileName])'#013#010+
+  '    else'#013#010+
+  '      begin'#013#010+
+  '        Log(vlWarning,SWarnSourceFile','NotFound,[T.SourceFileName, APa'+
+  'ckage.Name, MakeTargetString(ACPU,AOS)]);'#013#010+
+  '        T.FTargetSourceFileName:='#039#039';'#013#010+
+  '      end;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'var'#013#010+
+  '  T : TTarget;'#013#010+
+  '  i : Integer;'#013#010+
+  'begin'#013#010+
+  '  if not((ACPU in APackage.CPUs) and (AOS in APackage.OSes)) t','hen'#013+
+  #010+
+  '    exit;'#013#010+
+  '  try'#013#010+
+  '    if DoChangeDir and (APackage.Directory<>'#039#039') then'#013#010+
+  '      EnterDir(APackage.Directory);'#013#010+
+  '    Dictionary.AddVariable('#039'CPU'#039',CPUToString(ACPU));'#013#010+
+  '    Dictionary.AddVariable('#039'OS'#039',OSToString(AOS));'#013#010+
+  '    For I:=0 to APack','age.Targets.Count-1 do'#013#010+
+  '      begin'#013#010+
+  '        T:=APackage.FTargets.TargetItems[I];'#013#010+
+  '        if (ACPU in T.CPUs) and (AOS in T.OSes) then'#013#010+
+  '          begin'#013#010+
+  '            // Debug information'#013#010+
+  '            Log(vlDebug,SDbgResolvingSourcesOfTarget',',[T.Name,MakeTar'+
+  'getString(ACPU,AOS)]);'#013#010+
+  '            LogIndent;'#013#010+
+  #013#010+
+  '            case T.TargetType of'#013#010+
+  '              ttProgram,'#013#010+
+  '              ttUnit,'#013#010+
+  '              ttImplicitUnit :'#013#010+
+  '                begin'#013#010+
+  '                  FindMainSource(T);',#013#010+
+  '                  if T.Dependencies.Count>0 then'#013#010+
+  '                    FindIncludeSources(T);'#013#010+
+  '                end;'#013#010+
+  '              ttExampleUnit,'#013#010+
+  '              ttExampleProgram :'#013#010+
+  '                begin'#013#010+
+  '                  FindExampleSource','(T);'#013#010+
+  '                end;'#013#010+
+  '            end;'#013#010+
+  #013#010+
+  '            LogUnIndent;'#013#010+
+  '          end;'#013#010+
+  '      end;'#013#010+
+  '  finally'#013#010+
+  '    If DoChangeDir and (APackage.Directory<>'#039#039') then'#013#010+
+  '      EnterDir('#039#039');'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TBuildEngine.GetUnitDir(A','Package:TPackage):String;'#013#010+
+  'begin'#013#010+
+  '  if APackage.UnitDir='#039#039' then'#013#010+
+  '    begin'#013#010+
+  '      // Retrieve Full directory name where to find the units.'#013#010+
+  '      // The search order is:'#013#010+
+  '      //  - Package in this fpmake.pp'#013#010+
+  '      //  - LocalUnitDir'#013#010+
+  '    ','  //  - GlobalUnitDir'#013#010+
+  '      if (APackage.State in [tsCompiled, tsNoCompile, tsInstalled]) th'+
+  'en'#013#010+
+  '        begin'#013#010+
+  '          APackage.UnitDir:=IncludeTrailingPathDelimiter(FStartDir)+In'+
+  'cludeTrailingPathDelimiter(APackage.Directory)+APackage.Ge','tUnitsOutp'+
+  'utDir(Defaults.CPU,Defaults.OS);'#013#010+
+  '        end;'#013#010+
+  '      if (APackage.UnitDir='#039#039') and'#013#010+
+  '         (Defaults.LocalUnitDir<>'#039#039') then'#013#010+
+  '        begin'#013#010+
+  '          APackage.UnitDir:=IncludeTrailingPathDelimiter(Defaults.Loca'+
+  'lUnitDir)+APackage','.Name;'#013#010+
+  '          if not SysDirectoryExists(APackage.UnitDir) then'#013#010+
+  '            APackage.UnitDir:='#039#039';'#013#010+
+  '        end;'#013#010+
+  '      if APackage.UnitDir='#039#039' then'#013#010+
+  '        begin'#013#010+
+  '          APackage.UnitDir:=IncludeTrailingPathDelimiter(Defaults.Glob'+
+  'alU','nitDir)+APackage.Name;'#013#010+
+  '          if not SysDirectoryExists(APackage.UnitDir) then'#013#010+
+  '            APackage.UnitDir:=DirNotFound;'#013#010+
+  '        end;'#013#010+
+  #013#010+
+  '      if (APackage.UnitDir<>DirNotFound) then'#013#010+
+  '        begin'#013#010+
+  '          if FileExists(IncludeTra','ilingPathDelimiter(APackage.UnitDi'+
+  'r)+FPMakePPFile) then'#013#010+
+  '            begin'#013#010+
+  '              // The package is not installed, but the source-path is '+
+  'detected.'#013#010+
+  '              // It is an external package so it is impossible to comp'+
+  'ile it, so'#013#010+
+  ' ','             // assume that it has been compiled earlier.'#013#010+
+  '              APackage.UnitDir := IncludeTrailingPathDelimiter(APackag'+
+  'e.UnitDir) + APackage.GetUnitsOutputDir(Defaults.CPU,Defaults.OS);'#013+
+  #010+
+  '              // If the unit-directory does',' not exist, you know for '+
+  'sure that'#013#010+
+  '              // the package is not compiled'#013#010+
+  '              if not SysDirectoryExists(APackage.UnitDir) then'#013#010+
+  '                APackage.UnitDir:=DirNotFound'#013#010+
+  '              else'#013#010+
+  '                // Set the ','state to tsNoCompile and not tsCompiled. '+
+  'Because packages'#013#010+
+  '                // in the tsCompiled state trigger a rebuild of packag'+
+  'es that depend'#013#010+
+  '                // on it.'#013#010+
+  '                APackage.FTargetState:=tsNoCompile;'#013#010+
+  '            end',#013#010+
+  '          else if not (APackage.FTargetState in [tsCompiled, tsNoCompi'+
+  'le]) then'#013#010+
+  '            begin'#013#010+
+  '              APackage.FTargetState:=tsInstalled;'#013#010+
+  '            end;'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '  // Special error marker to prevent search','es in case of error'#013#010+
+  '  if APackage.UnitDir=DirNotFound then'#013#010+
+  '    Result:='#039#039#013#010+
+  '  else'#013#010+
+  '    Result:=APackage.UnitDir;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.AddDependencyPaths(L: TStrings; DependencyType:'+
+  ' TDependencyType; ATarget: TTarget);'#013#010+
+  'Var'#013#010+
+  ' ',' I : Integer;'#013#010+
+  '  D : TDependency;'#013#010+
+  '  SD : String;'#013#010+
+  'begin'#013#010+
+  '  For I:=0 to ATarget.Dependencies.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      D:=ATarget.Dependencies[i];'#013#010+
+  '      if (D.DependencyType=DependencyType) and'#013#010+
+  '         (Defaults.CPU in D.CPUs) and (De','faults.OS in D.OSes) then'#013+
+  #010+
+  '        begin'#013#010+
+  '          SD:=ExcludeTrailingPathDelimiter(ExtractFilePath(D.TargetFil'+
+  'eName));'#013#010+
+  '          if SD<>'#039#039' then'#013#010+
+  '            L.Add(SD);'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.AddDependen','cyUnitPaths(L:TStrings;APackage: T'+
+  'Package);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  P : TPackage;'#013#010+
+  '  D : TDependency;'#013#010+
+  '  S : String;'#013#010+
+  'begin'#013#010+
+  '  For I:=0 to APackage.Dependencies.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      D:=APackage.Dependencies[i];'#013#010+
+  '      if (D.Dependen','cyType=depPackage) and'#013#010+
+  '         (Defaults.CPU in D.CPUs) and (Defaults.OS in D.OSes) then'#013+
+  #010+
+  '        begin'#013#010+
+  '          P:=TPackage(D.Target);'#013#010+
+  '          If Assigned(P) then'#013#010+
+  '            begin'#013#010+
+  '              // Already processed?'#013#010+
+  '            ','  S:=GetUnitDir(P);'#013#010+
+  '              if L.IndexOf(S)=-1 then'#013#010+
+  '                begin'#013#010+
+  '                  // Add this package and then dependencies'#013#010+
+  '                  L.Add(S);'#013#010+
+  '                  AddDependencyUnitPaths(L,P);'#013#010+
+  '                end',';'#013#010+
+  '            end;'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TBuildEngine.GetCompilerCommand(APackage : TPackage; ATarget '+
+  ': TTarget; Env: TStrings) : String;'#013#010+
+  'Var'#013#010+
+  '  L : TUnsortedDuplicatesStringList;'#013#010+
+  '  Args : TStringList;'#013#010+
+  '  s : string',';'#013#010+
+  '  i : Integer;'#013#010+
+  'begin'#013#010+
+  '  if ATarget.TargetSourceFileName = '#039#039' then'#013#010+
+  '    Error(SErrCouldNotCompile,[ATarget.Name, APackage.Name]);'#013#010+
+  #013#010+
+  '  Args:=TStringList.Create;'#013#010+
+  '  Args.Duplicates:=dupIgnore;'#013#010+
+  #013#010+
+  '  Result := '#039#039';'#013#010+
+  #013#010+
+  '  //compiler configurat','ion'#013#010+
+  '  if Defaults.NoFPCCfg then'#013#010+
+  '    Args.Add('#039'-n'#039');'#013#010+
+  #013#010+
+  '  // Target OS'#013#010+
+  '  Args.Add('#039'-T'#039'+OSToString(Defaults.OS));'#013#010+
+  #013#010+
+  '  // Compile mode'#013#010+
+  '  If ATarget.Mode<>cmFPC then'#013#010+
+  '    Args.Add('#039'-M'#039'+ModeToString(ATarget.Mode))'#013#010+
+  '  else If Defaults.Mode<>','cmFPC then'#013#010+
+  '    Args.Add('#039'-M'#039'+ModeToString(Defaults.Mode));'#013#010+
+  '  // Output file paths'#013#010+
+  '  If ATarget.TargetType in ProgramTargets then'#013#010+
+  '    Args.Add('#039'-FE'#039'+APackage.GetBinOutputDir(Defaults.CPU,Defau'+
+  'lts.OS));'#013#010+
+  '  Args.Add('#039'-FU'#039'+APackage.GetUnits','OutputDir(Defaults.CPU,Def'+
+  'aults.OS));'#013#010+
+  '  // Object Path'#013#010+
+  '  L:=TUnsortedDuplicatesStringList.Create;'#013#010+
+  '  L.Duplicates:=dupIgnore;'#013#010+
+  '  AddConditionalStrings(L,APackage.ObjectPath,Defaults.CPU,Defaults.OS'+
+  ');'#013#010+
+  '  AddConditionalStrings(L,ATarget.Obj','ectPath,Defaults.CPU,Defaults.O'+
+  'S);'#013#010+
+  '  for i:=0 to L.Count-1 do'#013#010+
+  '    Args.Add('#039'-Fo'#039'+L[i]);'#013#010+
+  '  FreeAndNil(L);'#013#010+
+  '  // Unit Dirs'#013#010+
+  '  L:=TUnsortedDuplicatesStringList.Create;'#013#010+
+  '  L.Duplicates:=dupIgnore;'#013#010+
+  '  AddDependencyUnitPaths(L,APackage);'#013#010+
+  '  Ad','dDependencyPaths(L,depUnit,ATarget);'#013#010+
+  '  AddConditionalStrings(L,APackage.UnitPath,Defaults.CPU,Defaults.OS);'+
+  #013#010+
+  '  AddConditionalStrings(L,ATarget.UnitPath,Defaults.CPU,Defaults.OS);'#013+
+  #010+
+  '  for i:=0 to L.Count-1 do'#013#010+
+  '    Args.Add('#039'-Fu'#039'+L[i]);'#013#010+
+  '  Fr','eeAndNil(L);'#013#010+
+  '  // Include Path'#013#010+
+  '  L:=TUnsortedDuplicatesStringList.Create;'#013#010+
+  '  L.Duplicates:=dupIgnore;'#013#010+
+  '  AddDependencyPaths(L,depInclude,ATarget);'#013#010+
+  '  AddConditionalStrings(L,APackage.IncludePath,Defaults.CPU,Defaults.O'+
+  'S);'#013#010+
+  '  AddConditiona','lStrings(L,ATarget.IncludePath,Defaults.CPU,Defaults.'+
+  'OS);'#013#010+
+  '  for i:=0 to L.Count-1 do'#013#010+
+  '    Args.Add('#039'-Fi'#039'+L[i]);'#013#010+
+  '  FreeAndNil(L);'#013#010+
+  '  // Custom Options'#013#010+
+  '  If (Defaults.HaveOptions) then'#013#010+
+  '    Args.AddStrings(Defaults.Options);'#013#010+
+  '  If (APackag','e.HaveOptions) then'#013#010+
+  '    Args.AddStrings(APackage.Options);'#013#010+
+  '  If (ATarget.HaveOptions) then'#013#010+
+  '    Args.AddStrings(ATarget.Options);'#013#010+
+  #013#010+
+  '  {$ifdef HAS_UNIT_PROCESS}'#013#010+
+  '  // Force the compiler-output to be easy parseable'#013#010+
+  '  if not Verbose then'#013#010,
+  '    args.Add('#039'-viq'#039');'#013#010+
+  '  {$endif}'#013#010+
+  #013#010+
+  '  // Convert to string'#013#010+
+  '  Result:='#039#039';'#013#010+
+  '  for i:=0 to Args.Count-1 do'#013#010+
+  '    Result:=Result+'#039' '#039'+maybequoted(Args[i]);'#013#010+
+  '  Delete(result,1,1);'#013#010+
+  #013#010+
+  '  if Defaults.UseEnvironment and assigned(Env) then'#013#010+
+  '    begin',#013#010+
+  '      env.Values['#039'FPCEXTCMD'#039'] := Result;'#013#010+
+  '      result := '#039'!FPCEXTCMD'#039';'#013#010+
+  '      // Make sure that this process'#039' environment variables are pa'+
+  'ssed to the'#013#010+
+  '      // compiler'#039's environment'#013#010+
+  '      for i := 0 to GetEnvironmentVariableCount-1 do'#013,#010+
+  '        env.Add(GetEnvironmentString(i));'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '  // Add Filename to compile'#013#010+
+  '  result := result + '#039' '#039' + ATarget.TargetSourceFileName;'#013#010+
+  #013#010+
+  '  Args.Free;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TBuildEngine.GetCompiler : String;'#013#010+
+  'Var'#013#010+
+  '  S : String;'#013#010+
+  'begin',#013#010+
+  '  // Cache in FCompiler for speed.'#013#010+
+  '  If (FCompiler='#039#039') then'#013#010+
+  '    begin'#013#010+
+  '    FCompiler:=Defaults.Compiler;'#013#010+
+  '    If (ExtractFilePath(FCompiler)='#039#039') then'#013#010+
+  '      begin'#013#010+
+  '      S:=ExeSearch(FCompiler,GetEnvironmentVariable('#039'PATH'#039'));'#013+
+  #010+
+  '      If ','(S<>'#039#039') then'#013#010+
+  '         FCompiler:=S;'#013#010+
+  '      end;'#013#010+
+  '    end;'#013#010+
+  '  Result:=FCompiler;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.CreateOutputDir(APackage: TPackage);'#013#010+
+  'Var'#013#010+
+  '  D : String;'#013#010+
+  '  i: integer;'#013#010+
+  'begin'#013#010+
+  '  //create a units directory'#013#010+
+  '  D:=APackage.G','etUnitsOutputDir(Defaults.CPU,Defaults.OS);'#013#010+
+  '  If not SysDirectoryExists(D) then'#013#010+
+  '    begin'#013#010+
+  '      Log(vlInfo,SInfoCreatingOutputDir,[D]);'#013#010+
+  '      CmdCreateDir(D);'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '  //also create a bin directory for programtargets'#013#010+
+  '  For i := 0',' to Pred(APackage.Targets.Count) do'#013#010+
+  '    begin'#013#010+
+  '      if APackage.Targets.TargetItems[i].TargetType in (ProgramTargets'+
+  '-[ttExampleProgram]) then'#013#010+
+  '        begin'#013#010+
+  '          D:=APackage.GetBinOutputDir(Defaults.CPU,Defaults.OS);'#013#010+
+  '          If n','ot SysDirectoryExists(D) then'#013#010+
+  '            begin'#013#010+
+  '              Log(vlInfo,SInfoCreatingOutputDir,[D]);'#013#010+
+  '              CmdCreateDir(D);'#013#010+
+  '            end;'#013#010+
+  '          //do not continue loop, directory is made anyway'#013#010+
+  '          break;'#013#010+
+  '       ',' end;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TBuildEngine.DependencyOK(ADependency : TDependency) : Boolea'+
-  'n;'#010+
-  'begin'#010+
-  '  Result:=(','Defaults.CPU in ADependency.CPUs) and (Defaults.OS in ADe'+
-  'pendency.OSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TBuildEngine.TargetOK(ATarget : TTarget) : Boolean;'#010+
-  'begin'#010+
+  'n;'#013#010+
+  'begin'#013#010+
+  '  Result:=(Defaults.CPU in ADependency.CPUs) and (Defaults.OS in ADepe'+
+  'ndency.OSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TBuildEngine.TargetOK(ATarge','t : TTarget) : Boolean;'#013#010+
+  'begin'#013#010+
   '  Result:=(Defaults.CPU in ATarget.CPUs) and (Defaults.OS in ATarget.O'+
-  'Ses);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function T','BuildEngine.PackageOK(APackage : TPackage) : Boolean;'#010+
-  'begin'#010+
-  '  Result:=(Defaults.CPU in APackage.CPUs) and (Defaults.OS in APackage'+
-  '.OSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.DoBeforeCompile(APackage: TPackage);'#010+
-  'begin'#010+
-  '  ExecuteCommands(APackage.Co','mmands,caBeforeCompile);'#010+
-  '  If Assigned(APackage.BeforeCompile) then'#010+
-  '    APackage.BeforeCompile(APackage);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.DoAfterCompile(APackage: TPackage);'#010+
-  'begin'#010+
-  '  If Assigned(APackage.AfterCompile) then'#010+
-  '    APackage.AfterCo','mpile(APackage);'#010+
-  '  ExecuteCommands(APackage.Commands,caAfterCompile);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'Ses);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TBuildEngine.PackageOK(APackage : TPackage) : Boolean;'#013#010+
+  'begin'#013#010+
+  '  Result:=(Defaults.CPU in APackage.CPUs) and (De','faults.OS in APacka'+
+  'ge.OSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.DoBeforeCompile(APackage: TPackage);'#013#010+
+  'begin'#013#010+
+  '  ExecuteCommands(APackage.Commands,caBeforeCompile);'#013#010+
+  '  If Assigned(APackage.BeforeCompile) then'#013#010+
+  '    APackage.BeforeCompile(APacka','ge);'#013#010+
+  '  If Assigned(APackage.BeforeCompileProc) then'#013#010+
+  '    APackage.BeforeCompileProc(APackage);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.DoAfterCompile(APackage: TPackage);'#013#010+
+  'begin'#013#010+
+  '  If Assigned(APackage.AfterCompile) then'#013#010+
+  '    APackage.AfterCompi','le(APackage);'#013#010+
+  '  If Assigned(APackage.AfterCompileProc) then'#013#010+
+  '    APackage.AfterCompileProc(APackage);'#013#010+
+  '  ExecuteCommands(APackage.Commands,caAfterCompile);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TBuildEngine.NeedsCompile(APackage:TPackage;ATarget: TTarget)'+
-  ': Boolean;'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  D : TDependency;'#010+
-  '  T : TTarget;'#010+
-  '  OD,OFN : String;'#010+
-  'begin'#010+
-  '  Re','sult:=False;'#010+
-  #010+
-  '  // Forced recompile?'#010+
-  '  if FForceCompile then'#010+
-  '    Result:=true;'#010+
-  #010+
-  '  // Check output file'#010+
-  '  if not result then'#010+
-  '    begin'#010+
-  '      if ATarget.TargetType in ProgramTargets then'#010+
-  '        OD:=APackage.GetBinOutputDir(Defaults.CPU,Defau','lts.OS)'#010+
-  '      else'#010+
-  '        OD:=APackage.GetUnitsOutputDir(Defaults.CPU,Defaults.OS);'#010+
-  '      If (OD<>'#039#039') then'#010+
-  '        OD:=IncludeTrailingPathDelimiter(OD);'#010+
-  '      OFN:=OD+ATarget.GetOutPutFileName(Defaults.OS);'#010+
-  '      Result:=Not FileExists(OFN',');'#010+
-  '      if Result then'#010+
-  '        Log(vlDebug,SDbgOutputNotYetAvailable,[OFN]);'#010+
-  '    end;'#010+
-  #010+
-  '  // Check main source'#010+
-  '  If not Result then'#010+
-  '    begin'#010+
-  '      if FileExists(ATarget.TargetSourceFileName) then'#010+
-  '        Result:=FileNewer(ATarget.TargetSou','rceFileName,OFN)'#010+
-  '    end;'#010+
-  #010+
-  '  // Check unit and include dependencies'#010+
-  '  If not Result then'#010+
-  '    begin'#010+
+  ': ','Boolean;'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  D : TDependency;'#013#010+
+  '  T : TTarget;'#013#010+
+  '  OD,OFN : String;'#013#010+
+  'begin'#013#010+
+  '  Result:=False;'#013#010+
+  #013#010+
+  '  // Forced recompile?'#013#010+
+  '  if FForceCompile then'#013#010+
+  '    Result:=true;'#013#010+
+  #013#010+
+  '  // For now examples are not compiled at all'#013#010+
+  '  if ATar','get.TargetType in [ttExampleUnit, ttExampleProgram] then'#013+
+  #010+
+  '    Exit;'#013#010+
+  #013#010+
+  '  // Check output file'#013#010+
+  '  if not result and TargetOK(ATarget) then'#013#010+
+  '    begin'#013#010+
+  '      if ATarget.TargetType in ProgramTargets then'#013#010+
+  '        OD:=APackage.GetBinOutputDir(D','efaults.CPU,Defaults.OS)'#013#010+
+  '      else'#013#010+
+  '        OD:=APackage.GetUnitsOutputDir(Defaults.CPU,Defaults.OS);'#013#010+
+  '      If (OD<>'#039#039') then'#013#010+
+  '        OD:=IncludeTrailingPathDelimiter(OD);'#013#010+
+  '      OFN:=OD+ATarget.GetOutPutFileName(Defaults.OS);'#013#010+
+  '      Res','ult:=Not FileExists(OFN);'#013#010+
+  '      if Result then'#013#010+
+  '        Log(vlDebug,SDbgOutputNotYetAvailable,[OFN]);'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '  // Check main source'#013#010+
+  '  If not Result then'#013#010+
+  '    begin'#013#010+
+  '      if FileExists(ATarget.TargetSourceFileName) then'#013#010+
+  '        Res','ult:=FileNewer(ATarget.TargetSourceFileName,OFN)'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '  // Check unit and include dependencies'#013#010+
+  '  If not Result then'#013#010+
+  '    begin'#013#010+
   '      ResolveDependencies(ATarget.Dependencies,ATarget.Collection as T'+
-  'Targets);'#010+
-  '      I:=0;'#010+
-  '      for i:=0 to ATarget.Dependencies.Count-1 do',#010+
-  '        begin'#010+
-  '          D:=ATarget.Dependencies[i];'#010+
+  'Targets);'#013#010+
+  '      I:=0;'#013#010+
+  '      for',' i:=0 to ATarget.Dependencies.Count-1 do'#013#010+
+  '        begin'#013#010+
+  '          D:=ATarget.Dependencies[i];'#013#010+
   '          if (Defaults.CPU in D.CPUs) and (Defaults.OS in D.OSes) then'+
-  #010+
-  '            begin'#010+
-  '              case D.DependencyType of'#010+
-  '                depUnit :'#010+
-  '                  begin'#010+
-  '         ','           T:=TTarget(D.Target);'#010+
-  '                    If (T=Nil) then'#010+
+  #013#010+
+  '            begin'#013#010+
+  '              case D.DependencyType of'#013#010+
+  '             ','   depUnit :'#013#010+
+  '                  begin'#013#010+
+  '                    T:=TTarget(D.Target);'#013#010+
+  '                    If (T=Nil) then'#013#010+
   '                      Error(SErrDepUnknownTarget,[D.Value, ATarget.Nam'+
-  'e, APackage.Name]);'#010+
-  '                    // If a dependent package is compiled we always ne'+
-  'ed to recom','pile'#010+
+  'e, APackage.Name]);'#013#010+
+  '                    // If a de','pendent package is compiled we always '+
+  'need to recompile'#013#010+
   '                    Log(vldebug, SDbgDependencyOnUnit, [ATarget.Name,T'+
-  '.Name]);'#010+
-  '                    Result:=(T.State=tsCompiled);'#010+
-  '                    if Result then'#010+
-  '                      Log(vldebug, SDbgDependencyUnitRecompiled, [T.Na'+
-  'm','e]);'#010+
-  '                  end;'#010+
-  '                depInclude :'#010+
-  '                  begin'#010+
-  '                    if D.TargetFileName<>'#039#039' then'#010+
-  '                      Result:=FileNewer(D.TargetFileName,OFN)'#010+
-  '                  end;'#010+
-  '                depPackag','e :'#010+
-  '                  begin'#010+
+  '.Name]);'#013#010+
+  '                    Result:=(T.State=tsCompiled);'#013#010+
+  '                    if Result then'#013#010+
+  '                ','      Log(vldebug, SDbgDependencyUnitRecompiled, [T.'+
+  'Name]);'#013#010+
+  '                  end;'#013#010+
+  '                depInclude :'#013#010+
+  '                  begin'#013#010+
+  '                    if D.TargetFileName<>'#039#039' then'#013#010+
+  '                      Result:=FileNewer(D.TargetFi','leName,OFN)'#013#010+
+  '                  end;'#013#010+
+  '                depPackage :'#013#010+
+  '                  begin'#013#010+
   '                    log(vlWarning,SWarnTargetDependsOnPackage,[ATarget'+
-  '.Name, APackage.Name, d.Value]);'#010+
-  '                  end;'#010+
-  '              end;'#010+
-  '              if result then'#010+
-  '                break;'#010+
-  '            end',';'#010+
-  '        end;'#010+
-  '    end;'#010+
-  #010+
-  '  if result then'#010+
-  '    Log(vlDebug,SDbgMustCompile,[ATarget.Name]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Compile(APackage: TPackage; ATarget: TTarget);'#010+
-  'Var'#010+
-  '  S : String;'#010+
-  'begin'#010+
-  '  Log(vlInfo,SInfoCompilingTarget,[ATarget.Name]',');'#010+
-  '  LogIndent;'#010+
-  '  ExecuteCommands(ATarget.Commands,caBeforeCompile);'#010+
-  '  If Assigned(ATarget.BeforeCompile) then'#010+
-  '    ATarget.BeforeCompile(ATarget);'#010+
-  '  S:=GetCompilerCommand(APackage,ATarget);'#010+
-  '  ExecuteCommand(GetCompiler,S);'#010+
-  '  If Assigned(ATa','rget.AfterCompile) then'#010+
-  '    ATarget.AfterCompile(ATarget);'#010+
-  '  ExecuteCommands(ATarget.Commands,caAfterCompile);'#010+
-  '  LogUnIndent;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '.Name, APackage.Name, d.Value]);'#013#010+
+  '                  end;'#013#010+
+  '              end;'#013#010,
+  '              if result then'#013#010+
+  '                break;'#013#010+
+  '            end;'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '  if result then'#013#010+
+  '    Log(vlDebug,SDbgMustCompile,[ATarget.Name]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Compile(APackage: TPackage; ATarget: TTar','get)'+
+  ';'#013#010+
+  'Var'#013#010+
+  '  S : String;'#013#010+
+  '  Env : TStrings;'#013#010+
+  'begin'#013#010+
+  '  Log(vlInfo,SInfoCompilingTarget,[ATarget.Name]);'#013#010+
+  '  LogIndent;'#013#010+
+  '  ExecuteCommands(ATarget.Commands,caBeforeCompile);'#013#010+
+  '  If Assigned(ATarget.BeforeCompile) then'#013#010+
+  '    ATarget.BeforeCompil','e(ATarget);'#013#010+
+  #013#010+
+  '  if APackage.BuildMode=bmBuildUnit then'#013#010+
+  '    begin'#013#010+
+  '      APackage.FBUTarget.Dependencies.AddUnit(ATarget.Name).FTargetFil'+
+  'eName:=ATarget.TargetSourceFileName;'#013#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    begin'#013#010+
+  '      if Defaults.UseEnvironment the','n'#013#010+
+  '        begin'#013#010+
+  '          Env := TStringList.Create;'#013#010+
+  '          try'#013#010+
+  '            S:=GetCompilerCommand(APackage,ATarget,Env);'#013#010+
+  '            ExecuteCommand(GetCompiler,S,Env);'#013#010+
+  '          finally'#013#010+
+  '            Env.Free;'#013#010+
+  '          end;'#013#010+
+  '     ','   end'#013#010+
+  '      else'#013#010+
+  '        begin'#013#010+
+  '          S:=GetCompilerCommand(APackage,ATarget,Env);'#013#010+
+  '          ExecuteCommand(GetCompiler,S,nil);'#013#010+
+  '        end;'#013#010+
+  '      If Assigned(ATarget.AfterCompile) then'#013#010+
+  '        ATarget.AfterCompile(ATarget);'#013#010+
+  '   ','   ExecuteCommands(ATarget.Commands,caAfterCompile);'#013#010+
+  '    end;'#013#010+
+  '  LogUnIndent;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TBuildEngine.CompileDependencies(APackage:TPackage; ATarget:'+
-  ' TTarget);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  T : T','Target;'#010+
-  '  D : TDependency;'#010+
-  'begin'#010+
-  '  Log(vlDebug, Format(SDbgCompilingDependenciesOfTarget, [ATarget.Name'+
-  ']));'#010+
-  '  LogIndent;'#010+
-  '  For I:=0 to ATarget.Dependencies.Count-1 do'#010+
-  '    begin'#010+
-  '      D:=ATarget.Dependencies[i];'#010+
-  '      if (D.DependencyType=de','pPackage) then'#010+
-  '        log(vlWarning,SWarnTargetDependsOnPackage,[ATarget.Name, APack'+
-  'age.Name, d.Value])'#010+
-  '      else if (D.DependencyType=depUnit) and'#010+
-  '         (Defaults.CPU in D.CPUs) and (Defaults.OS in D.OSes) then'#010+
-  '        begin'#010+
-  '         ',' T:=TTarget(D.Target);'#010+
-  '          if Assigned(T) and (T<>ATarget) then'#010+
-  '            begin'#010+
-  '              if TargetOK(T) then'#010+
-  '                begin'#010+
+  ' TTarget);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  T : TTarget;'#013#010+
+  '  D : TDependency;'#013#010+
+  'begin'#013#010+
+  '  Lo','g(vlDebug, Format(SDbgCompilingDependenciesOfTarget, [ATarget.Na'+
+  'me]));'#013#010+
+  '  LogIndent;'#013#010+
+  '  For I:=0 to ATarget.Dependencies.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      D:=ATarget.Dependencies[i];'#013#010+
+  '      if (D.DependencyType=depPackage) then'#013#010+
+  '        log(vlWa','rning,SWarnTargetDependsOnPackage,[ATarget.Name, APa'+
+  'ckage.Name, d.Value])'#013#010+
+  '      else if (D.DependencyType=depUnit) and'#013#010+
+  '         (Defaults.CPU in D.CPUs) and (Defaults.OS in D.OSes) then'#013+
+  #010+
+  '        begin'#013#010+
+  '          T:=TTarget(D.Target);'#013#010+
+  '   ','       if Assigned(T) and (T<>ATarget) then'#013#010+
+  '            begin'#013#010+
+  '              if TargetOK(T) then'#013#010+
+  '                begin'#013#010+
   '                  // We don'#039't need to compile implicit units, they'+
-  ' are only'#010+
-  '                  //',' used for dependency checking'#010+
-  '                  if (T.TargetType<>ttImplicitUnit) then'#010+
-  '                    begin'#010+
-  '                      case T.State of'#010+
-  '                        tsNeutral :'#010+
-  '                          MaybeCompile(APackage,T);'#010+
-  ' ','                       tsConsidering :'#010+
+  ' are only'#013#010+
+  '                  // used for dependency ','checking'#013#010+
+  '                  if (T.TargetType<>ttImplicitUnit) then'#013#010+
+  '                    begin'#013#010+
+  '                      case T.State of'#013#010+
+  '                        tsNeutral :'#013#010+
+  '                          MaybeCompile(APackage,T);'#013#010+
+  '                ','        tsConsidering :'#013#010+
   '                          Log(vlWarning,SWarnCircularTargetDependency,'+
-  '[ATarget.Name,T.Name]);'#010+
-  '                      end;'#010+
-  '                    end;'#010+
-  '                end'#010+
-  '              else'#010+
-  '                ','Log(vlWarning, Format(SWarnDepUnitNotFound, [T.Name,'+
-  ' MakeTargetString(Defaults.CPU,Defaults.OS)]));'#010+
-  '            end'#010+
-  '          else'#010+
+  '[ATarget.Name,T.Name]);'#013#010+
+  '                      end;'#013#010+
+  '                    end;'#013#010+
+  '                end'#013#010+
+  '              else'#013#010+
+  '                Log(vlWar','ning, Format(SWarnDepUnitNotFound, [T.Name,'+
+  ' MakeTargetString(Defaults.CPU,Defaults.OS)]));'#013#010+
+  '            end'#013#010+
+  '          else'#013#010+
   '            Error(SErrDepUnknownTarget,[D.Value, ATarget.Name, APackag'+
-  'e.Name]);'#010+
-  '        end;'#010+
-  '    end;'#010+
-  '  LogUn','Indent;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'e.Name]);'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  '  LogUnInd','ent;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TBuildEngine.MaybeCompile(APackage: TPackage; ATarget: TTarg'+
-  'et);'#010+
-  'begin'#010+
-  '  if ATarget.State<>tsNeutral then'#010+
-  '    Error(SErrInvalidState,[ATarget.Name]);'#010+
-  '  Log(vlDebug, Format(SDbgConsideringTarget, [ATarget.Name]));'#010+
-  '  ','LogIndent;'#010+
-  '  ATarget.FTargetState:=tsConsidering;'#010+
+  'et);'#013#010+
+  'begin'#013#010+
+  '  if ATarget.State<>tsNeutral then'#013#010+
+  '    Error(SErrInvalidState,[ATarget.Name]);'#013#010+
+  '  Log(vlDebug, Format(SDbgConsideringTarget, [ATarget.Name])',');'#013#010+
+  '  LogIndent;'#013#010+
+  '  ATarget.FTargetState:=tsConsidering;'#013#010+
   '  ResolveDependencies(ATarget.Dependencies,ATarget.Collection as TTarg'+
-  'ets);'#010+
-  '  CompileDependencies(APackage, ATarget);'#010+
-  '  if NeedsCompile(APackage, ATarget) then'#010+
-  '    begin'#010+
-  '      Compile(APacka','ge,ATarget);'#010+
-  '      ATarget.FTargetState:=tsCompiled;'#010+
-  '    end'#010+
-  '  else'#010+
-  '    ATarget.FTargetState:=tsNoCompile;'#010+
-  '  LogUnIndent;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TBuildEngine.NeedsCompile(APackage: TPackage): Boolean;'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  P : TPackage;'#010+
-  '  D : TDepe','ndency;'#010+
-  'begin'#010+
-  '  Result:=False;'#010+
-  #010+
-  '  // Forced recompile?'#010+
-  '  if FForceCompile then'#010+
-  '    Result:=true;'#010+
-  #010+
-  '  // Recompile because of Package Dependencies?'#010+
-  '  if not Result then'#010+
-  '    begin'#010+
-  '       I:=0;'#010+
-  '       For I:=0 to APackage.Dependencies.Count-1 d','o'#010+
-  '         begin'#010+
-  '           D:=APackage.Dependencies[i];'#010+
-  '           if (D.DependencyType=depPackage) and'#010+
+  'ets);'#013#010+
+  '  CompileDependencies(APackage, ATarget);'#013#010+
+  '  if NeedsCompile(APackage, ATarget) then'#013#010+
+  '    begin'#013#010+
+  '      Co','mpile(APackage,ATarget);'#013#010+
+  '      ATarget.FTargetState:=tsCompiled;'#013#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    ATarget.FTargetState:=tsNoCompile;'#013#010+
+  '  LogUnIndent;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TBuildEngine.NeedsCompile(APackage: TPackage): Boolean;'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  P',' : TPackage;'#013#010+
+  '  D : TDependency;'#013#010+
+  'begin'#013#010+
+  '  Result:=False;'#013#010+
+  #013#010+
+  '  // Forced recompile?'#013#010+
+  '  if FForceCompile then'#013#010+
+  '    Result:=true;'#013#010+
+  #013#010+
+  '  // Recompile because of Package Dependencies?'#013#010+
+  '  if not Result then'#013#010+
+  '    begin'#013#010+
+  '       I:=0;'#013#010+
+  '       For I:','=0 to APackage.Dependencies.Count-1 do'#013#010+
+  '         begin'#013#010+
+  '           D:=APackage.Dependencies[i];'#013#010+
+  '           if (D.DependencyType=depPackage) and'#013#010+
   '              (Defaults.CPU in D.CPUs) and (Defaults.OS in D.OSes) the'+
-  'n'#010+
-  '             begin'#010+
-  '               P:=TPackage(D.Target);'#010+
-  '      ','         if Assigned(P) then'#010+
-  '                 begin'#010+
-  '                   Result:=(P.State=tsCompiled);'#010+
-  '                   if Result then'#010+
-  '                     break;'#010+
-  '                 end;'#010+
-  '             end;'#010+
-  '         end;'#010+
-  '    end;'#010+
-  #010+
-  '  // Recompil','e a Target of this package?'#010+
-  '  If Not Result then'#010+
-  '    begin'#010+
-  '      try'#010+
-  '        If (APackage.Directory<>'#039#039') then'#010+
-  '          EnterDir(APackage.Directory);'#010+
-  '        for i:=0 to APackage.Targets.Count-1 do'#010+
-  '          begin'#010+
-  '            Result:=NeedsC','ompile(APackage,APackage.Targets.TargetIte'+
-  'ms[i]);'#010+
-  '            if Result then'#010+
-  '              break;'#010+
-  '          end;'#010+
-  '      Finally'#010+
-  '        If (APackage.Directory<>'#039#039') then'#010+
-  '          EnterDir('#039#039');'#010+
-  '      end;'#010+
-  '    end;'#010+
-  #010+
-  '  if result then'#010+
-  '    Log(vl','Debug,SDbgMustCompile,[APackage.Name]);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'n'#013#010+
+  '             begin'#013#010+
+  ' ','              P:=TPackage(D.Target);'#013#010+
+  '               if Assigned(P) then'#013#010+
+  '                 begin'#013#010+
+  '                   Result:=(P.State=tsCompiled);'#013#010+
+  '                   if Result then'#013#010+
+  '                     break;'#013#010+
+  '                 end;'#013#010+
+  '     ','        end;'#013#010+
+  '         end;'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '  // Recompile a Target of this package?'#013#010+
+  '  If Not Result then'#013#010+
+  '    begin'#013#010+
+  '      try'#013#010+
+  '        If (APackage.Directory<>'#039#039') then'#013#010+
+  '          EnterDir(APackage.Directory);'#013#010+
+  '        for i:=0 to APackage.T','argets.Count-1 do'#013#010+
+  '          begin'#013#010+
+  '            Result:=NeedsCompile(APackage,APackage.Targets.TargetItems'+
+  '[i]);'#013#010+
+  '            if Result then'#013#010+
+  '              break;'#013#010+
+  '          end;'#013#010+
+  '      Finally'#013#010+
+  '        If (APackage.Directory<>'#039#039') then'#013#010+
+  '    ','      EnterDir('#039#039');'#013#010+
+  '      end;'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '  if result then'#013#010+
+  '    Log(vlDebug,SDbgMustCompile,[APackage.Name]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'function TBuildEngine.CheckExternalPackage(Const APackageName : String'+
-  '):TPackage;'#010+
-  'var'#010+
-  '  S : String;'#010+
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  // Already checked?'#010+
-  '  I:=ExternalPackages.IndexOfName(APackageName);'#010+
-  ' ',' if I<>-1 then'#010+
-  '    begin'#010+
-  '      result:=ExternalPackages.PackageItems[I];'#010+
-  '      exit;'#010+
-  '    end;'#010+
-  '  // Create new external package'#010+
-  '  Result:=ExternalPackages.AddPackage(APackageName);'#010+
-  '  Result.FTargetState:=tsNotFound;'#010+
-  '  // Load unit config'#010+
-  '  S',':=GetUnitDir(Result);'#010+
-  '  if S<>'#039#039' then'#010+
-  '    begin'#010+
-  '      Log(vldebug, SDbgExternalDependency, [APackageName,S]);'#010+
-  '      Result.FTargetState:=tsInstalled;'#010+
-  '      // Load unit config if it exists'#010+
-  '      S:=IncludeTrailingPathDelimiter(S)+UnitConfig','File;'#010+
-  '      if FileExists(S) then'#010+
-  '        begin'#010+
-  '          Log(vlDebug, Format(SDbgLoading, [S]));'#010+
-  '          Result.LoadUnitConfigFromFile(S);'#010+
-  '        end;'#010+
-  '      // Check recursive implicit dependencies'#010+
-  '      CompileDependencies(Result);'#010+
-  '   ',' end'#010+
-  '  else'#010+
-  '    Error(SErrDependencyNotFound,[APackageName]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.CompileDependencies(APackage: TPackage);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  P : TPackage;'#010+
-  '  D : TDependency;'#010+
-  'begin'#010+
-  '  For I:=0 to APackage.Dependencies.Count-1 do'#010,
-  '    begin'#010+
-  '      D:=APackage.Dependencies[i];'#010+
-  '      if (D.DependencyType=depPackage) and'#010+
-  '         (Defaults.CPU in D.CPUs) and (Defaults.OS in D.OSes) then'#010+
-  '        begin'#010+
-  '          P:=TPackage(D.Target);'#010+
-  '          If Assigned(P) then'#010+
-  '        ','    begin'#010+
+  '):TPackage;'#013#010+
+  'var'#013#010+
+  '  S : String;'#013#010+
+  '  F : String;',#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  // Already checked?'#013#010+
+  '  I:=ExternalPackages.IndexOfName(APackageName);'#013#010+
+  '  if I<>-1 then'#013#010+
+  '    begin'#013#010+
+  '      result:=ExternalPackages.PackageItems[I];'#013#010+
+  '      exit;'#013#010+
+  '    end;'#013#010+
+  '  // Create new external package'#013#010+
+  '  Result',':=ExternalPackages.AddPackage(APackageName);'#013#010+
+  '  Result.FTargetState:=tsNotFound;'#013#010+
+  '  // Load unit config'#013#010+
+  '  S:=GetUnitDir(Result);'#013#010+
+  '  if S<>'#039#039' then'#013#010+
+  '    begin'#013#010+
+  '      Log(vldebug, SDbgExternalDependency, [APackageName,S]);'#013#010+
+  '      // Load unit',' config if it exists'#013#010+
+  '      F:=IncludeTrailingPathDelimiter(S)+UnitConfigFile;'#013#010+
+  '      if FileExists(F) then'#013#010+
+  '        begin'#013#010+
+  '          Log(vlDebug, Format(SDbgLoading, [F]));'#013#010+
+  '          Result.LoadUnitConfigFromFile(F);'#013#010+
+  '        end;'#013#010+
+  '      ','// Check recursive implicit dependencies'#013#010+
+  '      CompileDependencies(Result);'#013#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    Error(SErrDependencyNotFound,[APackageName]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.CompileDependencies(APackage: TPackage);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;',#013#010+
+  '  P : TPackage;'#013#010+
+  '  D : TDependency;'#013#010+
+  'begin'#013#010+
+  '  For I:=0 to APackage.Dependencies.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      D:=APackage.Dependencies[i];'#013#010+
+  '      if (D.DependencyType=depPackage) and'#013#010+
+  '         (Defaults.CPU in D.CPUs) and (Defaults.OS in D','.OSes) then'#013+
+  #010+
+  '        begin'#013#010+
+  '          P:=TPackage(D.Target);'#013#010+
+  '          If Assigned(P) then'#013#010+
+  '            begin'#013#010+
   '              if (Defaults.CPU in P.CPUs) and (Defaults.OS in P.OSes) '+
-  'then'#010+
-  '                begin'#010+
-  '                  case P.State of'#010+
-  '                    tsNeutral :'#010+
-  '                      MaybeCompile(P);'#010+
-  '                    tsConsid','ering :'#010+
+  'then'#013#010+
+  '                begin'#013#010+
+  '                  case P.Stat','e of'#013#010+
+  '                    tsNeutral :'#013#010+
+  '                      MaybeCompile(P);'#013#010+
+  '                    tsConsidering :'#013#010+
   '                      Log(vlWarning,SWarnCircularPackageDependency,[AP'+
-  'ackage.Name,P.Name]);'#010+
-  '                  end;'#010+
-  '                end'#010+
-  '              else'#010+
+  'ackage.Name,P.Name]);'#013#010+
+  '                  end;'#013#010+
+  '       ','         end'#013#010+
+  '              else'#013#010+
   '                Log(vlWarning,SWarnDependOnOtherPlatformPackage,[APack'+
-  'age.Name',', D.Value, MakeTargetString(Defaults.CPU, Defaults.OS)]);'#010+
-  '            end'#010+
-  '          else'#010+
-  '            begin'#010+
-  '              D.Target:=CheckExternalPackage(D.Value);'#010+
-  '              P:=TPackage(D.Target);'#010+
-  '            end;'#010+
-  '          if (D.RequireC','hecksum<>$ffffffff) and'#010+
-  '             (P.InstalledChecksum<>$ffffffff) and'#010+
-  '             (P.InstalledChecksum<>D.RequireChecksum) then'#010+
-  '            Log(vlDebug,SDbgPackageChecksumChanged,[P.Name]);'#010+
-  '        end;'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuild','Engine.Compile(APackage: TPackage);'#010+
-  'Var'#010+
-  '  T : TTarget;'#010+
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  Try'#010+
-  '    Log(vlInfo,SInfoCompilingPackage,[APackage.Name]);'#010+
-  '    If (APackage.Directory<>'#039#039') then'#010+
-  '      EnterDir(APackage.Directory);'#010+
-  '    CreateOutputDir(APackage);',#010+
+  'age.Name, D.Value, MakeTargetString(Defaults.CPU, Defaults.OS)]);'#013#010+
+  '            end'#013#010+
+  '          else'#013#010+
+  '            begin'#013#010+
+  '              D.T','arget:=CheckExternalPackage(D.Value);'#013#010+
+  '              P:=TPackage(D.Target);'#013#010+
+  '            end;'#013#010+
+  '          if (D.RequireChecksum<>$ffffffff) and'#013#010+
+  '             (P.InstalledChecksum<>$ffffffff) and'#013#010+
+  '             (P.InstalledChecksum<>D.RequireC','hecksum) then'#013#010+
+  '            Log(vlDebug,SDbgPackageChecksumChanged,[P.Name]);'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Compile(APackage: TPackage);'#013#010+
+  'Var'#013#010+
+  '  T : TTarget;'#013#010+
+  '  I : Integer;'#013#010+
+  '  Cmd: string;'#013#010+
+  '  cmdOpts: string;'#013#010+
+  '  ','sFPDocFormat: string;'#013#010+
+  '  IFPDocFormat: TFPDocFormat;'#013#010+
+  '  d: integer;'#013#010+
+  '  UC: string;'#013#010+
+  '  dep: TDependency;'#013#010+
+  '  RegenerateUnitconfigFile: boolean;'#013#010+
+  '  BUName: string;'#013#010+
+  #013#010+
+  '  procedure CompileBuildUnit;'#013#010+
+  '  var'#013#010+
+  '    I: Integer;'#013#010+
+  '    T: TTarget;'#013#010+
+  '    ','L: TStrings;'#013#010+
+  '    F: Text;'#013#010+
+  #013#010+
+  '  begin'#013#010+
+  '    if (APackage.FBUTarget.Dependencies.Count>0) then'#013#010+
+  '      begin'#013#010+
+  '        Log(vldebug, Format(SDbgGenerateBuildUnit, [APackage.FBUTarget'+
+  '.Name]));'#013#010+
+  '        system.Assign(F,APackage.FBUTarget.FTargetSo','urceFileName);'#013+
+  #010+
+  '        Rewrite(F);'#013#010+
+  '        writeln(F,'#039'unit '#039' + APackage.FBUTarget.Name +'#039';'#039+
+  ');'#013#010+
+  '        writeln(F,'#039'interface'#039');'#013#010+
+  '        writeln(F,'#039'uses'#039');'#013#010+
+  '        for i := 0 to APackage.FBUTarget.Dependencies.Count-1 do'#013#010+
+  '          begin'#013,#010+
+  '            if i<>0 then'#013#010+
+  '              write(F,'#039','#039');'#013#010+
+  '            writeln(F,APackage.FBUTarget.Dependencies.Dependencies[i].'+
+  'Value);'#013#010+
+  '          end;'#013#010+
+  '        writeln(F,'#039';'#039');'#013#010+
+  '        writeln(F,'#039'implementation'#039');'#013#010+
+  '        writeln(F,'#039'end.'#039');',#013#010+
+  #013#010+
+  '        system.close(F);'#013#010+
+  #013#010+
+  '        APackage.FBuildMode:=bmOneByOne;'#013#010+
+  '        try'#013#010+
+  '          Compile(APackage,APackage.FBUTarget);'#013#010+
+  '        finally'#013#010+
+  '          // Delete temporary build-unit files'#013#010+
+  '          L := TStringList.Create;'#013#010+
+  '   ','       try'#013#010+
+  '            APackage.FBUTarget.GetCleanFiles(L,IncludeTrailingPathDeli'+
+  'miter(APackage.GetUnitsOutputDir(Defaults.CPU,Defaults.OS)),'#039#039',D'+
+  'efaults.CPU,Defaults.OS);'#013#010+
+  '            L.Add(APackage.FBUTarget.SourceFileName);'#013#010+
+  '            ','CmdDeleteFiles(L);'#013#010+
+  '          finally'#013#010+
+  '            L.Free;'#013#010+
+  '          end;'#013#010+
+  '        end;'#013#010+
+  '      end;'#013#010+
+  #013#010+
+  '    For I:=0 to APackage.Targets.Count-1 do'#013#010+
+  '      begin'#013#010+
+  '        T:=APackage.Targets.TargetItems[i];'#013#010+
+  '        if (T.TargetType = ttUnit',') and (TargetOK(T)) then'#013#010+
+  '          begin'#013#010+
+  '            If Assigned(T.AfterCompile) then'#013#010+
+  '              T.AfterCompile(T);'#013#010+
+  '            ExecuteCommands(T.Commands,caAfterCompile);'#013#010+
+  '          end'#013#010+
+  '      end;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  procedure ProcessComp','ileTarget;'#013#010+
+  '  begin'#013#010+
+  '    if TargetOK(T) then'#013#010+
+  '      begin'#013#010+
+  '        if T.State=tsNeutral then'#013#010+
+  '          MaybeCompile(APackage,T);'#013#010+
+  '        // If a target is compiled, re-generate the UnitConfigFile'#013+
+  #010+
+  '        if T.FTargetState<>tsNoCompile th','en'#013#010+
+  '          RegenerateUnitconfigFile:= True;'#013#010+
+  '      end'#013#010+
+  '    else'#013#010+
+  '      begin'#013#010+
+  '        if not(Defaults.CPU in T.CPUs) then'#013#010+
+  '          Log(vldebug, Format(SDbgSkippingTargetWrongCPU, [T.Name, CPU'+
+  'sToString(T.CPUs)]));'#013#010+
+  '        if not(Defau','lts.OS in T.OSes) then'#013#010+
+  '          Log(vldebug, Format(SDbgSkippingTargetWrongOS, [T.Name, OSes'+
+  'ToString(T.OSes)]));'#013#010+
+  '      end;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  cmdOpts := '#039#039';'#013#010+
+  #013#010+
+  '  log(vlWarning,SWarnStartCompilingPackage,[APackage.Name, Defaults.Ta'+
+  'rget]',');'#013#010+
+  #013#010+
+  '  case Defaults.BuildMode of'#013#010+
+  '    bmOneByOne:  begin'#013#010+
+  '                   if bmOneByOne in APackage.SupportBuildModes then'#013+
+  #010+
+  '                     APackage.FBuildMode:=bmOneByOne'#013#010+
+  '                   else'#013#010+
+  '                     raise excep','tion.create(SErrUnsupportedBuildmode'+
+  ');'#013#010+
+  '                 end;'#013#010+
+  '    bmBuildUnit: begin'#013#010+
+  '                   // When bmBuildUnit is supported by the package use'+
+  ' a buildunit.'#013#010+
+  '                   // Unless there is only one target and bmOneByOne',' '+
+  'is also supported'#013#010+
+  '                   if (bmBuildUnit in APackage.SupportBuildModes) and'#013+
+  #010+
+  '                      not ((APackage.Targets.Count=1) and (bmOneByOne '+
+  'in APackage.SupportBuildModes)) then'#013#010+
+  '                     APackage.FBuildMode:','=bmBuildUnit'#013#010+
+  '                   else if bmOneByOne in APackage.SupportBuildModes th'+
+  'en'#013#010+
+  '                     begin'#013#010+
+  '                       log(vlInfo,SInfoFallbackBuildmode);'#013#010+
+  '                       APackage.FBuildMode:=bmOneByOne'#013#010+
+  '        ','             end'#013#010+
+  '                   else'#013#010+
+  '                     raise exception.create(SErrUnsupportedBuildmode);'+
+  #013#010+
+  '                 end;'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  '  Try'#013#010+
+  '    If (APackage.Directory<>'#039#039') then'#013#010+
+  '      EnterDir(APackage.Directory);'#013#010+
+  '    Create','OutputDir(APackage);'#013#010+
   '    Dictionary.AddVariable('#039'UNITSOUTPUTDIR'#039',APackage.GetUnitsO'+
-  'utputDir(Defaults.CPU,Defaults.OS));'#010+
+  'utputDir(Defaults.CPU,Defaults.OS));'#013#010+
   '    Dictionary.AddVariable('#039'BINOUTPUTDIR'#039',APackage.GetBinOutpu'+
-  'tDir(Defaults.CPU,Defaults.OS));'#010+
-  '    DoBeforeCompile(APackage);'#010+
-  '    For I:=0 t','o APackage.Targets.Count-1 do'#010+
-  '      begin'#010+
-  '        T:=APackage.Targets.TargetItems[i];'#010+
-  '        if (T.TargetType in [ttUnit,ttProgram]) then'#010+
-  '          begin'#010+
-  '            if TargetOK(T) then'#010+
-  '              begin'#010+
-  '                if T.State=tsNeut','ral then'#010+
-  '                  MaybeCompile(APackage,T);'#010+
-  '              end'#010+
-  '            else'#010+
-  '              begin'#010+
-  '                if not(Defaults.CPU in T.CPUs) then'#010+
-  '                  Log(vldebug, Format(SDbgSkippingTargetWrongCPU, [T.N'+
-  'ame, CPUsT','oString(T.CPUs)]));'#010+
-  '                if not(Defaults.OS in T.OSes) then'#010+
-  '                  Log(vldebug, Format(SDbgSkippingTargetWrongOS, [T.Na'+
-  'me, OSesToString(T.OSes)]));'#010+
-  '              end;'#010+
-  '          end'#010+
-  '        else'#010+
-  '          log(vldebug, S','DbgTargetIsNotAUnitOrProgram,[T.Name]);'#010+
-  '      end;'#010+
-  '    DoAfterCompile(APackage);'#010+
-  '  Finally'#010+
-  '    If (APackage.Directory<>'#039#039') then'#010+
-  '      EnterDir('#039#039');'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.MaybeCompile(APackage: TPackage);'#010+
-  'begin'#010+
-  '  if APackage.S','tate in [tsCompiled, tsNoCompile] then'#010+
-  '    begin'#010+
-  '      Log(vlInfo,SInfoPackageAlreadyProcessed,[APackage.Name]);'#010+
-  '      Exit;'#010+
-  '    end;'#010+
-  '  if APackage.State<>tsNeutral then'#010+
-  '    Error(SErrInvalidState,[APackage.Name]);'#010+
-  '  Log(vlDebug,SDbgConside','ringPackage,[APackage.Name]);'#010+
-  '  LogIndent;'#010+
-  '  APackage.FTargetState:=tsConsidering;'#010+
+  'tDir(Defaults.CPU,Defaults.OS));'#013#010+
+  '    DoBeforeCompile(AP','ackage);'#013#010+
+  '    RegenerateUnitconfigFile:=False;'#013#010+
+  '    if APackage.BuildMode=bmBuildUnit then'#013#010+
+  '      begin'#013#010+
+  '        APackage.FBUTargets := TTargets.Create(TTarget);'#013#010+
+  '        if Defaults.OS in AllLimit83fsOses then'#013#010+
+  '          BUName := '#039'BUnit.p','p'#039#013#010+
+  '        else'#013#010+
+  '          BUName := '#039'BuildUnit_'#039'+StringReplace(APackage.Name,'#039+
+  '-'#039','#039'_'#039',[rfReplaceAll])+'#039'.pp'#039';'#013#010+
+  '        APackage.FBUTarget := APackage.FBUTargets.AddUnit(BUName);'#013+
+  #010+
+  '        APackage.FBUTarget.FTargetSourceFileName := APackage.','FBUTarg'+
+  'et.SourceFileName;'#013#010+
+  '      end;'#013#010+
+  '    For I:=0 to APackage.Targets.Count-1 do'#013#010+
+  '      begin'#013#010+
+  '        T:=APackage.Targets.TargetItems[i];'#013#010+
+  '        case T.TargetType of'#013#010+
+  '        ttUnit:'#013#010+
+  '          begin'#013#010+
+  '            ProcessCompileTarget;'#013,#010+
+  '          end;'#013#010+
+  '        ttProgram:'#013#010+
+  '          begin // do nothing, are compiled later'#013#010+
+  '          end;'#013#010+
+  '        ttFPDoc:'#013#010+
+  '          begin'#013#010+
+  '            for d := 0 to T.Dependencies.Count - 1 do'#013#010+
+  '            begin'#013#010+
+  '              dep := TDepen','dency(T.Dependencies[d]);'#013#010+
+  #013#010+
+  '              //add unit dependencies'#013#010+
+  '              if dep.DependencyType = depUnit then'#013#010+
+  '                cmdOpts := cmdOpts + '#039' --input='#039' + dep.Value;'#013+
+  #010+
+  '            end;'#013#010+
+  #013#010+
+  '            //check if a documentatio','n target is given'#013#010+
+  '            cmdOpts := cmdOpts + '#039' --input='#039' + T.Directory + T'+
+  '.Name + T.Extension + '#039' --descr='#039'+ T.XML;'#013#010+
+  '          end'#013#010+
+  '        else'#013#010+
+  '          log(vldebug, SDbgTargetIsNotAUnitOrProgram,[T.Name]);'#013#010+
+  '        end;'#013#010+
+  '      en','d;'#013#010+
+  #013#010+
+  '    if APackage.BuildMode=bmBuildUnit then'#013#010+
+  '      CompileBuildUnit;'#013#010+
+  #013#010+
+  '    FreeAndNil(APackage.FBUTarget);'#013#010+
+  #013#010+
+  '    For I:=0 to APackage.Targets.Count-1 do'#013#010+
+  '      begin'#013#010+
+  '        T:=APackage.Targets.TargetItems[i];'#013#010+
+  '        if T.TargetTy','pe=ttProgram then'#013#010+
+  '          begin'#013#010+
+  '            ProcessCompileTarget;'#013#010+
+  '          end;'#013#010+
+  '      end;'#013#010+
+  #013#010+
+  '    if RegenerateUnitconfigFile then'#013#010+
+  '      begin'#013#010+
+  '        UC:=IncludeTrailingPathDelimiter(APackage.GetUnitsOutputDir(De'+
+  'faults.CPU,Default','s.OS))+UnitConfigFile;'#013#010+
+  '        Log(vlInfo, Format(SDbgGenerating, [UC]));'#013#010+
+  '        APackage.SaveUnitConfigToFile(UC,Defaults.CPU,Defaults.OS);'#013+
+  #010+
+  '      end;'#013#010+
+  #013#010+
+  '    //compile documentation, because options were found'#013#010+
+  '    if cmdOpts <> '#039#039' the','n'#013#010+
+  '    begin'#013#010+
+  '      //append package name'#013#010+
+  '      cmdOpts := cmdOpts + '#039' --package='#039' + APackage.Name;'#013#010+
+  #013#010+
+  '      for IFPDocFormat:=Low(TFPDocFormat) to High(TFPDocFormat) do'#013+
+  #010+
+  '      begin'#013#010+
+  '        if IFPDocFormat in APackage.FPDocFormat then'#013#010+
+  ' ','       begin'#013#010+
+  '          //prepend output format'#013#010+
+  '          case IFPDocFormat of'#013#010+
+  '            ffHtml:      sFPDocFormat := '#039'--format=html --output='#039+
+  ' + Defaults.FPDocOutputDir;'#013#010+
+  '            ffHtm:       sFPDocFormat := '#039'--format=htm --output=',#039+
+  ' + Defaults.FPDocOutputDir;'#013#010+
+  '            ffXHtml:     sFPDocFormat := '#039'--format=xhtml --output='+
+  #039' + Defaults.FPDocOutputDir;'#013#010+
+  '            ffLaTex:     sFPDocFormat := '#039'--format=latex --output='+
+  #039' + Defaults.FPDocOutputDir + APackage.Name + '#039'.','tex'#039';'#013#010+
+  '            ffXMLStruct: sFPDocFormat := '#039'--format=xml-struct --ou'+
+  'tput='#039' + Defaults.FPDocOutputDir;'#013#010+
+  '            ffChm:       sFPDocFormat := '#039'--format=chm --output='#039+
+  ' + Defaults.FPDocOutputDir + APackage.Name + '#039'.chm'#039';'#013#010+
+  '          end',';'#013#010+
+  #013#010+
+  '          //execute fpdoc'#013#010+
+  '          Cmd:=ExeSearch('#039'fpdoc'#039',GetEnvironmentvariable('#039'P'+
+  'ATH'#039'));'#013#010+
+  '          if Cmd = '#039#039' then Cmd := '#039'fpdoc'#039';'#013#010+
+  '          ExecuteProcess(Cmd, sFPDocFormat + cmdOpts);'#013#010+
+  '        end;'#013#010+
+  '      end;'#013#010+
+  '    end;'#013#010+
+  #013#010+
+  '   ',' DoAfterCompile(APackage);'#013#010+
+  '  Finally'#013#010+
+  '    If (APackage.Directory<>'#039#039') then'#013#010+
+  '      EnterDir('#039#039');'#013#010+
+  '  end;'#013#010+
+  '  inc(FProgressCount);'#013#010+
+  '  if FProgressMax>0 then'#013#010+
+  '    log(vlWarning,SWarnCompilingPackagecompleteProgress,[(FProgressCou'+
+  'nt)/FProgressM','ax * 100, APackage.Name])'#013#010+
+  '  else'#013#010+
+  '    log(vlWarning,SWarnCompilingPackagecomplete,[APackage.Name]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.MaybeCompile(APackage: TPackage);'#013#010+
+  'begin'#013#010+
+  '  if APackage.State in [tsCompiled, tsNoCompile] then'#013#010+
+  '    begi','n'#013#010+
+  '      Log(vlInfo,SInfoPackageAlreadyProcessed,[APackage.Name]);'#013#010+
+  '      Exit;'#013#010+
+  '    end;'#013#010+
+  '  if APackage.State<>tsNeutral then'#013#010+
+  '    Error(SErrInvalidState,[APackage.Name]);'#013#010+
+  '  Log(vlDebug,SDbgConsideringPackage,[APackage.Name]);'#013#010+
+  '  LogInden','t;'#013#010+
+  '  APackage.FTargetState:=tsConsidering;'#013#010+
   '  ResolveDependencies(APackage.Dependencies,(APackage.Collection as TP'+
-  'ackages));'#010+
-  '  CompileDependencies(APackage);'#010+
-  '  ResolveFileNames(APackage,Defaults.CPU,De','faults.OS);'#010+
-  '  If NeedsCompile(APackage) then'#010+
-  '    begin'#010+
-  '      Compile(APackage);'#010+
-  '      APackage.FTargetState:=tsCompiled;'#010+
-  '    end'#010+
-  '  else'#010+
-  '    APackage.FTargetState:=tsNoCompile;'#010+
-  '  LogUnIndent;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TBuildEngine.InstallPackageFiles(','APAckage : TPackage; tt : '+
-  'TTargetType; Const Dest : String):Boolean;'#010+
-  'Var'#010+
-  '  List : TStringList;'#010+
-  'begin'#010+
-  '  Result:=False;'#010+
-  '  List:=TStringList.Create;'#010+
-  '  Try'#010+
-  '    APackage.GetInstallFiles(List,[tt],Defaults.CPU, Defaults.OS);'#010+
-  '    if (List.Count>0)',' then'#010+
-  '      begin'#010+
-  '        Result:=True;'#010+
-  '        CmdCopyFiles(List,Dest);'#010+
-  '      end;'#010+
-  '  Finally'#010+
-  '    List.Free;'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  'function TBuildEngine.InstallPackageSourceFiles(APAckage: TPackage; tt'+
-  ': TSourceType; const Dest: String): Boolean;'#010+
-  'Var',#010+
-  '  List : TStringList;'#010+
-  'begin'#010+
-  '  Result:=False;'#010+
-  '  List:=TStringList.Create;'#010+
-  '  Try'#010+
-  '    APackage.GetInstallSourceFiles(List,[tt]);'#010+
-  '    if (List.Count>0) then'#010+
-  '      begin'#010+
-  '        Result:=True;'#010+
-  '        CmdCopyFiles(List,Dest);'#010+
-  '      end;'#010+
-  '  Finall','y'#010+
-  '    List.Free;'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.DoBeforeInstall(APackage: TPackage);'#010+
-  'begin'#010+
-  '  ExecuteCommands(APackage.Commands,caBeforeInstall);'#010+
-  '  If Assigned(APackage.BeforeInstall) then'#010+
-  '    APackage.BeforeInstall(APackage);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'p','rocedure TBuildEngine.DoAfterInstall(APackage: TPackage);'#010+
-  'begin'#010+
-  '  If Assigned(APackage.AfterInstall) then'#010+
-  '    APackage.AfterInstall(APackage);'#010+
-  '  ExecuteCommands(APackage.Commands,caAfterInstall);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Install(APacka','ge: TPackage);'#010+
-  'Var'#010+
-  '  UC,D : String;'#010+
-  '  B : Boolean;'#010+
-  'begin'#010+
-  '  If (Apackage.State<>tsCompiled) then'#010+
-  '    MaybeCompile(APackage);'#010+
-  '  try'#010+
-  '    Log(vlInfo,SInfoInstallingPackage,[APackage.Name]);'#010+
-  '    If (APackage.Directory<>'#039#039') then'#010+
-  '      EnterDir(AP','ackage.Directory);'#010+
-  '    DoBeforeInstall(APackage);'#010+
-  '    // units'#010+
-  '    B:=false;'#010+
-  '    D:=IncludeTrailingPathDelimiter(Defaults.UnitInstallDir)+APackage.'+
-  'Name;'#010+
-  '    if InstallPackageFiles(APAckage,ttUnit,D) then'#010+
-  '      B:=true;'#010+
-  '    if InstallPackage','Files(APAckage,ttImplicitUnit,D) then'#010+
-  '      B:=true;'#010+
+  'ackages));'#013#010+
+  '  CompileDependencies(APackage);'#013#010+
+  '  ResolveFileNames(APackage,Defaults.CPU,Defaults.OS);'#013#010+
+  '  If NeedsCompile(APack','age) then'#013#010+
+  '    begin'#013#010+
+  '      Compile(APackage);'#013#010+
+  '      APackage.FTargetState:=tsCompiled;'#013#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    begin'#013#010+
+  '      APackage.FTargetState:=tsNoCompile;'#013#010+
+  '      inc(FProgressCount);'#013#010+
+  '    end;'#013#010+
+  '  LogUnIndent;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TBuild','Engine.InstallPackageFiles(APAckage : TPackage; tt : '+
+  'TTargetType; Const Dest : String):Boolean;'#013#010+
+  'Var'#013#010+
+  '  List : TStringList;'#013#010+
+  'begin'#013#010+
+  '  Result:=False;'#013#010+
+  '  List:=TStringList.Create;'#013#010+
+  '  Try'#013#010+
+  '    APackage.GetInstallFiles(List,[tt],Defaults.CPU, D','efaults.OS);'#013+
+  #010+
+  '    if (List.Count>0) then'#013#010+
+  '      begin'#013#010+
+  '        Result:=True;'#013#010+
+  '        CmdCopyFiles(List,Dest);'#013#010+
+  '      end;'#013#010+
+  '  Finally'#013#010+
+  '    List.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TBuildEngine.InstallUnitConfigFile(APAckage: TPackage; const'+
+  ' De','st: String);'#013#010+
+  'Var'#013#010+
+  '  List : TStringList;'#013#010+
+  'begin'#013#010+
+  '  List:=TStringList.Create;'#013#010+
+  '  Try'#013#010+
+  '    List.add(IncludeTrailingPathDelimiter(APackage.GetUnitsOutputDir(D'+
+  'efaults.CPU,Defaults.OS))+UnitConfigFile);'#013#010+
+  '    CmdCopyFiles(List,Dest);'#013#010+
+  '  Finally'#013#010,
+  '    List.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TBuildEngine.InstallPackageSourceFiles(APAckage : TPackage; s'+
+  'tt : TSourceTypes; ttt : TTargetTypes; Const Dest : String): Boolean;'#013+
+  #010+
+  'Var'#013#010+
+  '  List : TStringList;'#013#010+
+  'begin'#013#010+
+  '  Result:=False;'#013#010+
+  '  List:=TStrin','gList.Create;'#013#010+
+  '  Try'#013#010+
+  '    APackage.GetInstallSourceFiles(List,stt,ttt);'#013#010+
+  '    if (List.Count>0) then'#013#010+
+  '      begin'#013#010+
+  '        Result:=True;'#013#010+
+  '        CmdCopyFiles(List,Dest);'#013#010+
+  '      end;'#013#010+
+  '  Finally'#013#010+
+  '    List.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TB','uildEngine.DoBeforeInstall(APackage: TPackage);'#013#010+
+  'begin'#013#010+
+  '  ExecuteCommands(APackage.Commands,caBeforeInstall);'#013#010+
+  '  If Assigned(APackage.BeforeInstall) then'#013#010+
+  '    APackage.BeforeInstall(APackage);'#013#010+
+  '  If Assigned(APackage.BeforeInstallProc) then',#013#010+
+  '    APackage.BeforeInstallProc(APackage);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.DoAfterInstall(APackage: TPackage);'#013#010+
+  'begin'#013#010+
+  '  If Assigned(APackage.AfterInstall) then'#013#010+
+  '    APackage.AfterInstall(APackage);'#013#010+
+  '  If Assigned(APackage.AfterInstallPr','oc) then'#013#010+
+  '    APackage.AfterInstallProc(APackage);'#013#010+
+  '  ExecuteCommands(APackage.Commands,caAfterInstall);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Install(APackage: TPackage);'#013#010+
+  'Var'#013#010+
+  '  UC,D : String;'#013#010+
+  '  B : Boolean;'#013#010+
+  'begin'#013#010+
+  '  If (Apackage.State<>tsC','ompiled) then'#013#010+
+  '    MaybeCompile(APackage);'#013#010+
+  '  try'#013#010+
+  '    Log(vlInfo,SInfoInstallingPackage,[APackage.Name]);'#013#010+
+  '    If (APackage.Directory<>'#039#039') then'#013#010+
+  '      EnterDir(APackage.Directory);'#013#010+
+  '    DoBeforeInstall(APackage);'#013#010+
+  '    // units'#013#010+
+  '    B:=fals','e;'#013#010+
+  '    Dictionary.AddVariable('#039'PackageName'#039',APackage.Name);'#013#010+
+  '    D:=IncludeTrailingPathDelimiter(Defaults.UnitInstallDir);'#013#010+
+  '    if InstallPackageFiles(APAckage,ttUnit,D) then'#013#010+
+  '      B:=true;'#013#010+
+  '    if InstallPackageFiles(APAckage,ttImplicitU','nit,D) then'#013#010+
+  '      B:=true;'#013#010+
   '    // By default do not install the examples. Maybe add an option for'+
-  ' this later'#010+
-  '    //if InstallPackageFiles(APAckage,ttExampleUnit,D) then'#010+
-  '    //  B:=true;'#010+
-  '    // Unit (dependency) con','figuration if there were units installed'+
-  #010+
-  '    if B then'#010+
-  '      begin'#010+
-  '        UC:=IncludeTrailingPathDelimiter(D)+UnitConfigFile;'#010+
-  '        Log(vlInfo, Format(SDbgGenerating, [UC]));'#010+
-  '        APackage.SaveUnitConfigToFile(UC,Defaults.CPU,Defaults','.OS);'#010+
-  '      end;'#010+
-  '    // Programs'#010+
-  '    D:=IncludeTrailingPathDelimiter(Defaults.BinInstallDir);'#010+
-  '    InstallPackageFiles(APAckage,ttProgram,D);'#010+
-  '    //InstallPackageFiles(APAckage,ttExampleProgram,D);'#010+
-  '    // Documentation'#010+
-  '    D:=IncludeTrailing','PathDelimiter(Defaults.DocInstallDir)+'#039'fpc'+
-  '-'#039'+APackage.FileName+PathDelim;'#010+
-  '    InstallPackageSourceFiles(APackage,stDoc,D);'#010+
-  '    // Examples'#010+
-  '    D:=IncludeTrailingPathDelimiter(Defaults.ExamplesInstallDir)+'#039'f'+
-  'pc-'#039'+APackage.FileName+PathDelim;'#010,
-  '    InstallPackageSourceFiles(APackage,stExample,D);'#010+
-  '    // Done.'#010+
-  '    APackage.FTargetState:=tsInstalled;'#010+
-  '    DoAfterInstall(APackage);'#010+
-  '  Finally'#010+
-  '    If (APackage.Directory<>'#039#039') then'#010+
-  '      EnterDir('#039#039');'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.','DoBeforeArchive(APackage: TPackage);'#010+
-  'begin'#010+
-  '  ExecuteCommands(APackage.Commands,caBeforeArchive);'#010+
-  '  If Assigned(APackage.BeforeArchive) then'#010+
-  '    APackage.BeforeArchive(APackage);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.DoAfterArchive(APackage: TPackag','e);'#010+
-  'begin'#010+
-  '  If Assigned(APackage.AfterArchive) then'#010+
-  '    APackage.AfterArchive(APackage);'#010+
-  '  ExecuteCommands(APackage.Commands,caAfterArchive);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Archive(APackage: TPackage);'#010+
-  'Var'#010+
-  '  L : TStringList;'#010+
-  '  A : String;'#010+
-  '  ','i: integer;'#010+
-  '  ICPU : TCPU;'#010+
-  '  IOS  : TOS;'#010+
-  'begin'#010+
-  '  A:=FStartDir+ APackage.FileName + ZipExt;'#010+
-  '  Log(vlInfo,SInfoArchivingPackage,[APackage.Name,A]);'#010+
-  '  try'#010+
-  '    If (APackage.Directory<>'#039#039') then'#010+
-  '      EnterDir(APackage.Directory);'#010+
-  '    DoBeforeArc','hive(Apackage);'#010+
-  '    L:=TStringList.Create;'#010+
-  '    L.Sorted:=true;'#010+
-  '    L.Duplicates:=dupIgnore;'#010+
-  '    Try'#010+
-  '      // Add fpmake.pp & manifest.xml always'#010+
-  '      L.Add(FPMakePPFile);'#010+
-  '      L.Add(ManifestFile);'#010+
-  '      //get all files from all targets'#010+
-  '  ','    for ICPU:=Low(TCPU) to high(TCPU) do'#010+
-  '        for IOS:=Low(TOS) to high(TOS) do'#010+
-  '          if OSCPUSupported[IOS,ICPU] then'#010+
-  '            begin'#010+
-  '              ResolveFileNames(APackage,ICPU,IOS,false);'#010+
-  '              APackage.GetArchiveFiles(','L, ICPU, IOS);'#010+
-  '            end;'#010+
-  '      //from sources'#010+
-  '      for i := 0 to APackage.Sources.Count-1 do'#010+
-  '        L.Add(APackage.Sources[i].Name);'#010+
-  #010+
-  '      //show all files'#010+
-  '      for i := 0 to L.Count-1 do'#010+
-  '        Log(vlDebug, Format(SDbgArchiving','File, [L[i]]));'#010+
-  #010+
-  '{$ifdef HAS_UNIT_ZIPPER}'#010+
-  '      if not Assigned(ArchiveFilesProc) then'#010+
-  '        begin'#010+
-  '          FZipFile := TZipper.Create;'#010+
-  '          FZipFile.ZipFiles(A, L);'#010+
-  '        end'#010+
-  '      else'#010+
-  '{$endif HAS_UNIT_ZIPPER}'#010+
-  '        CmdArchive','Files(L,A);'#010+
-  '    Finally'#010+
-  '      L.Free;'#010+
-  #010+
-  '{$ifdef HAS_UNIT_ZIPPER}'#010+
-  '      if not Assigned(ArchiveFilesProc) then'#010+
-  '        FreeAndNil(FZipFile);'#010+
-  '{$endif HAS_UNIT_ZIPPER}'#010+
-  '    end;'#010+
-  '    DoAfterArchive(Apackage);'#010+
-  '  Finally'#010+
-  '    If (APackage.Directory<','>'#039#039') then'#010+
-  '      EnterDir('#039#039');'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.DoBeforeClean(APackage: TPackage);'#010+
-  'begin'#010+
-  '  ExecuteCommands(APackage.Commands,caBeforeClean);'#010+
-  '  If Assigned(APackage.BeforeClean) then'#010+
-  '    APackage.BeforeClean(APackage);'#010+
-  'end',';'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.DoAfterClean(APackage: TPackage);'#010+
-  'begin'#010+
-  '  If Assigned(APackage.AfterClean) then'#010+
-  '    APackage.AfterClean(APackage);'#010+
-  '  ExecuteCommands(APackage.Commands,caAfterClean);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Clean(APackage: T','Package);'#010+
-  'Var'#010+
-  '  List : TStringList;'#010+
-  'begin'#010+
-  '  Log(vlInfo,SInfoCleaningPackage,[APackage.Name]);'#010+
-  '  try'#010+
-  '    If (APackage.Directory<>'#039#039') then'#010+
-  '      EnterDir(APackage.Directory);'#010+
-  '    DoBeforeClean(Apackage);'#010+
-  '    List:=TStringList.Create;'#010+
-  '    try'#010,
-  '      APackage.GetCleanFiles(List,Defaults.CPU,Defaults.OS);'#010+
-  '      if (List.Count>0) then'#010+
-  '        CmdDeleteFiles(List);'#010+
-  '    Finally'#010+
-  '      List.Free;'#010+
-  '    end;'#010+
-  '    DoAfterClean(Apackage);'#010+
-  '  Finally'#010+
-  '    If (APackage.Directory<>'#039#039') then'#010+
-  '      E','nterDir('#039#039');'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Procedure TBuildEngine.Manifest(APackage : TPackage);'#010+
-  'Var'#010+
-  '  L : TStrings;'#010+
-  '  PD,'#010+
-  '  MF : String;'#010+
-  'begin'#010+
-  '  L:=TStringList.Create;'#010+
-  '  Try'#010+
-  '    Log(vlInfo, Format(SInfoManifestPackage,[APackage.Name]));'#010+
-  '    PD:=APackage.D','irectory;'#010+
-  '    if PD<>'#039#039' then'#010+
-  '      PD:=IncludeTrailingPathDelimiter(PD);'#010+
-  '    MF:=PD+ManifestFile;'#010+
-  '    Log(vlDebug, Format(SDbgGenerating, [MF]));'#010+
-  '    L.Add('#039'<?xml version="1.0"?>'#039');'#010+
-  '    L.Add('#039'<packages>'#039');'#010+
-  '    APackage.GetManifest(L);'#010+
-  '    ','L.Add('#039'</packages>'#039');'#010+
-  '    L.SaveToFile(MF);'#010+
-  '  Finally'#010+
-  '    L.Free;'#010+
-  '  end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Compile(Packages: TPackages);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  P : TPackage;'#010+
-  'begin'#010+
-  '  If Assigned(BeforeCompile) then'#010+
-  '    BeforeCompile(Self);'#010+
-  '  For I',':=0 to Packages.Count-1 do'#010+
-  '    begin'#010+
-  '      P:=Packages.PackageItems[i];'#010+
-  '      If PackageOK(P) then'#010+
-  '        MaybeCompile(P);'#010+
-  '    end;'#010+
-  '  If Assigned(AfterCompile) then'#010+
-  '    AfterCompile(Self);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Install(Packages: TP','ackages);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  P : TPackage;'#010+
-  'begin'#010+
-  '  If Assigned(BeforeInstall) then'#010+
-  '    BeforeInstall(Self);'#010+
-  '  For I:=0 to Packages.Count-1 do'#010+
-  '    begin'#010+
-  '      P:=Packages.PackageItems[i];'#010+
-  '      If PackageOK(P) then'#010+
-  '        Install(P);'#010+
-  '    ','end;'#010+
-  '  If Assigned(AfterInstall) then'#010+
-  '    AfterInstall(Self);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Archive(Packages: TPackages);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  P : TPackage;'#010+
-  'begin'#010+
-  '  If Assigned(BeforeArchive) then'#010+
-  '    BeforeArchive(Self);'#010+
-  '  Log(vlDebug, SDb','gBuildEngineArchiving);'#010+
-  '  For I:=0 to Packages.Count-1 do'#010+
-  '    begin'#010+
-  '      P:=Packages.PackageItems[i];'#010+
-  '      Archive(P);'#010+
-  '    end;'#010+
-  '  If Assigned(AfterArchive) then'#010+
-  '    AfterArchive(Self);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Manifest(Packages: TPac','kages);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  P : TPackage;'#010+
-  'begin'#010+
-  '  If Assigned(BeforeManifest) then'#010+
-  '    BeforeManifest(Self);'#010+
-  '  Log(vlDebug, SDbgBuildEngineGenerateManifests);'#010+
-  '  For I:=0 to Packages.Count-1 do'#010+
-  '    begin'#010+
-  '      P:=Packages.PackageItems[i];'#010+
-  ' ','     Manifest(P);'#010+
-  '    end;'#010+
-  '  If Assigned(AfterManifest) then'#010+
-  '    AfterManifest(Self);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TBuildEngine.Clean(Packages: TPackages);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  '  P : TPackage;'#010+
-  'begin'#010+
-  '  If Assigned(BeforeClean) then'#010+
-  '    BeforeClean(Self);'#010,
-  '  Log(vldebug, SDbgBuildEngineCleaning);'#010+
-  '  For I:=0 to Packages.Count-1 do'#010+
-  '    begin'#010+
-  '    P:=Packages.PackageItems[i];'#010+
-  '    If PackageOK(P) then'#010+
-  '      Clean(P);'#010+
-  '    end;'#010+
-  '  If Assigned(AfterClean) then'#010+
-  '    AfterClean(Self);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{***********','********************************************************'+
-  '*********'#010+
-  '                               TFPVersion'#010+
-  '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'function TFPVersion.GetAsString: String;'#010+
-  'begin'#010+
-  '  if E','mpty then'#010+
-  '    Result:='#039'<none>'#039#010+
-  '  else'#010+
-  '    Result:=Format('#039'%d.%d.%d-%d'#039',[Major,Minor,Micro,Build]);'#010+
-  'end;'#010+
-  #010+
-  'function TFPVersion.GetEmpty: Boolean;'#010+
-  'begin'#010+
-  '  Result:=(Major=0) and (Minor=0) and (Micro=0) and (Build=0);'#010+
-  'end;'#010+
-  #010+
-  'procedure TFPVersion.','SetAsString(const AValue: String);'#010+
-  #010+
-  '  Function NextDigit(sep : Char; var V : string) : integer;'#010+
-  #010+
-  '  Var'#010+
-  '    P : Integer;'#010+
-  #010+
-  '  begin'#010+
-  '    P:=Pos(Sep,V);'#010+
-  '    If (P=0) then'#010+
-  '      P:=Length(V)+1;'#010+
-  '    Result:=StrToIntDef(Copy(V,1,P-1),-1);'#010+
-  '    If Re','sult<>-1 then'#010+
-  '      Delete(V,1,P)'#010+
-  '    else'#010+
-  '      Result:=0;'#010+
-  '  end;'#010+
-  #010+
-  'Var'#010+
-  '  V : String;'#010+
-  'begin'#010+
-  '  Clear;'#010+
-  '  // Special support for empty version string'#010+
-  '  if (AValue='#039#039') or (AValue='#039'<none>'#039') then'#010+
-  '    exit;'#010+
-  '  V:=AValue;'#010+
-  '  Major:=NextDigit('#039'.'#039',V);'#010,
-  '  Minor:=NextDigit('#039'.'#039',V);'#010+
-  '  Micro:=NextDigit('#039'-'#039',V);'#010+
-  '  Build:=NextDigit(#0,V);'#010+
-  'end;'#010+
-  #010+
-  'procedure TFPVersion.Clear;'#010+
-  'begin'#010+
-  '  Micro:=0;'#010+
-  '  Major:=0;'#010+
-  '  Minor:=0;'#010+
-  '  Build:=0;'#010+
-  'end;'#010+
-  #010+
-  'procedure TFPVersion.Assign(Source: TPersistent);'#010+
-  #010+
-  'Var'#010+
-  '  V : TFPVe','rsion;'#010+
-  #010+
-  'begin'#010+
-  '  if Source is TFPVersion then'#010+
-  '    begin'#010+
-  '    V:=Source as TFPVersion;'#010+
-  '    Major:=V.Major;'#010+
-  '    Minor:=V.Minor;'#010+
-  '    Micro:=V.Micro;'#010+
-  '    Build:=V.Build;'#010+
-  '    end'#010+
-  '  else'#010+
-  '    inherited Assign(Source);'#010+
-  'end;'#010+
-  #010+
-  'function TFPVersion.Compa','reVersion(AVersion: TFPVersion): Integer;'#010+
-  'begin'#010+
-  '  Result:=Major-AVersion.Major;'#010+
-  '  If (Result=0) then'#010+
-  '    begin'#010+
-  '      Result:=Minor-AVersion.Minor;'#010+
-  '      if (Result=0) then'#010+
-  '        begin'#010+
-  '          Result:=Micro-AVersion.Micro;'#010+
-  '          If (','Result=0) then'#010+
-  '            Result:=Build-AVersion.Build;'#010+
-  '        end;'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  'function TFPVersion.SameVersion(AVersion: TFPVersion): Boolean;'#010+
-  'begin'#010+
-  '  Result:=CompareVersion(AVersion)=0;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{***************************************','****************************'+
-  '*********'#010+
-  '                                 TTarget'#010+
+  ' this later'#013#010+
+  '    //if InstallPackageFiles(APAckage,ttExampleUnit,D) then'#013#010+
+  '    //  B:=true;'#013#010+
+  '    // Unit (dependency) configuration if there w','ere units installed'+
+  #013#010+
+  '    if B then'#013#010+
+  '      InstallUnitConfigFile(APackage,D);'#013#010+
+  '    // Programs'#013#010+
+  '    D:=IncludeTrailingPathDelimiter(Defaults.BinInstallDir);'#013#010+
+  '    InstallPackageFiles(APAckage,ttProgram,D);'#013#010+
+  '    //InstallPackageFiles(APAckage,','ttExampleProgram,D);'#013#010+
+  '    // Documentation'#013#010+
+  '    D:=IncludeTrailingPathDelimiter(Defaults.DocInstallDir)+'#039'fpc-'#039+
+  '+APackage.FileName+PathDelim;'#013#010+
+  '    InstallPackageSourceFiles(APackage,[stDoc],[],D);'#013#010+
+  '    // Examples'#013#010+
+  '    if Defaults.InstallExam','ples then'#013#010+
+  '      begin'#013#010+
+  '        D:=IncludeTrailingPathDelimiter(Defaults.ExamplesInstallDir)+'#039+
+  'fpc-'#039'+APackage.FileName+PathDelim+'#039'examples'#039'+PathDelim;'#013+
+  #010+
+  '        InstallPackageSourceFiles(APackage,[stExample],[ttExampleProgr'+
+  'am,ttExampleUnit],D',');'#013#010+
+  '      end;'#013#010+
+  '    // Done.'#013#010+
+  '    APackage.FTargetState:=tsInstalled;'#013#010+
+  '    DoAfterInstall(APackage);'#013#010+
+  '  Finally'#013#010+
+  '    If (APackage.Directory<>'#039#039') then'#013#010+
+  '      EnterDir('#039#039');'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.DoBeforeArchive(APackage: T','Package);'#013#010+
+  'begin'#013#010+
+  '  ExecuteCommands(APackage.Commands,caBeforeArchive);'#013#010+
+  '  If Assigned(APackage.BeforeArchive) then'#013#010+
+  '    APackage.BeforeArchive(APackage);'#013#010+
+  '  If Assigned(APackage.BeforeArchiveProc) then'#013#010+
+  '    APackage.BeforeArchiveProc(APack','age);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.DoAfterArchive(APackage: TPackage);'#013#010+
+  'begin'#013#010+
+  '  If Assigned(APackage.AfterArchive) then'#013#010+
+  '    APackage.AfterArchive(APackage);'#013#010+
+  '  If Assigned(APackage.AfterArchiveProc) then'#013#010+
+  '    APackage.AfterArchivePro','c(APackage);'#013#010+
+  '  ExecuteCommands(APackage.Commands,caAfterArchive);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Archive(APackage: TPackage);'#013#010+
+  'Var'#013#010+
+  '  L : TStringList;'#013#010+
+  '  A : String;'#013#010+
+  '  i: integer;'#013#010+
+  '  ICPU : TCPU;'#013#010+
+  '  IOS  : TOS;'#013#010+
+  'begin'#013#010+
+  '  A:=FStartDir+ ','APackage.FileName + ZipExt;'#013#010+
+  '  Log(vlInfo,SInfoArchivingPackage,[APackage.Name,A]);'#013#010+
+  '  try'#013#010+
+  '    If (APackage.Directory<>'#039#039') then'#013#010+
+  '      EnterDir(APackage.Directory);'#013#010+
+  '    DoBeforeArchive(Apackage);'#013#010+
+  '    L:=TStringList.Create;'#013#010+
+  '    L.Sorted:','=true;'#013#010+
+  '    L.Duplicates:=dupIgnore;'#013#010+
+  '    Try'#013#010+
+  '      // Add fpmake.pp & manifest.xml always'#013#010+
+  '      L.Add(FPMakePPFile);'#013#010+
+  '      L.Add(ManifestFile);'#013#010+
+  '      //get all files from all targets'#013#010+
+  '      for ICPU:=Low(TCPU) to high(TCPU) do'#013#010+
+  '       ',' for IOS:=Low(TOS) to high(TOS) do'#013#010+
+  '          if OSCPUSupported[IOS,ICPU] then'#013#010+
+  '            begin'#013#010+
+  '              ResolveFileNames(APackage,ICPU,IOS,false);'#013#010+
+  '              APackage.GetArchiveFiles(L, ICPU, IOS);'#013#010+
+  '            end;'#013#010+
+  '      //fr','om sources'#013#010+
+  '      APackage.GetArchiveSourceFiles(L);'#013#010+
+  #013#010+
+  '      //show all files'#013#010+
+  '      for i := 0 to L.Count-1 do'#013#010+
+  '        Log(vlDebug, Format(SDbgArchivingFile, [L[i]]));'#013#010+
+  #013#010+
+  '{$ifdef HAS_UNIT_ZIPPER}'#013#010+
+  '      if not Assigned(ArchiveFilesProc) ','then'#013#010+
+  '        begin'#013#010+
+  '          FZipFile := TZipper.Create;'#013#010+
+  '          FZipFile.ZipFiles(A, L);'#013#010+
+  '        end'#013#010+
+  '      else'#013#010+
+  '{$endif HAS_UNIT_ZIPPER}'#013#010+
+  '        CmdArchiveFiles(L,A);'#013#010+
+  '    Finally'#013#010+
+  '      L.Free;'#013#010+
+  #013#010+
+  '{$ifdef HAS_UNIT_ZIPPER}'#013#010+
+  '      ','if not Assigned(ArchiveFilesProc) then'#013#010+
+  '        FreeAndNil(FZipFile);'#013#010+
+  '{$endif HAS_UNIT_ZIPPER}'#013#010+
+  '    end;'#013#010+
+  '    DoAfterArchive(Apackage);'#013#010+
+  '  Finally'#013#010+
+  '    If (APackage.Directory<>'#039#039') then'#013#010+
+  '      EnterDir('#039#039');'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBui','ldEngine.DoBeforeClean(APackage: TPackage);'#013#010+
+  'begin'#013#010+
+  '  ExecuteCommands(APackage.Commands,caBeforeClean);'#013#010+
+  '  If Assigned(APackage.BeforeClean) then'#013#010+
+  '    APackage.BeforeClean(APackage);'#013#010+
+  '  If Assigned(APackage.BeforeCleanProc) then'#013#010+
+  '    APacka','ge.BeforeCleanProc(APackage);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.DoAfterClean(APackage: TPackage);'#013#010+
+  'begin'#013#010+
+  '  If Assigned(APackage.AfterClean) then'#013#010+
+  '    APackage.AfterClean(APackage);'#013#010+
+  '  If Assigned(APackage.AfterInstallProc) then'#013#010+
+  '    APacka','ge.AfterCleanProc(APackage);'#013#010+
+  '  ExecuteCommands(APackage.Commands,caAfterClean);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Clean(APackage: TPackage; AllTargets: boolean);'+
+  #013#010+
+  'var'#013#010+
+  '//  ACPU: TCpu;'#013#010+
+  '//  AOS: TOS;'#013#010+
+  '  DirectoryList : TStringList;'#013#010+
+  'begin'#013#010,
+  '  Log(vlInfo,SInfoCleaningPackage,[APackage.Name]);'#013#010+
+  '  try'#013#010+
+  '    If (APackage.Directory<>'#039#039') then'#013#010+
+  '      EnterDir(APackage.Directory);'#013#010+
+  '    DoBeforeClean(Apackage);'#013#010+
+  '    if AllTargets then'#013#010+
+  '      begin'#013#010+
+  '        // Remove the unit-directory c','ompletely. This is safer in ca'+
+  'se of files'#013#010+
+  '        // being renamed and such. See also bug 19655'#013#010+
+  '        DirectoryList := TStringList.Create;'#013#010+
+  '        try'#013#010+
+  '          DirectoryList.Add(ExtractFileDir(APackage.GetUnitsOutputDir('+
+  'Defaults.CPU,','Defaults.OS)));'#013#010+
+  '          CmdRemoveTrees(DirectoryList);'#013#010+
+  '        finally'#013#010+
+  '          DirectoryList.Free;'#013#010+
+  '        end;'#013#010+
+  '{        for ACPU:=low(TCpu) to high(TCpu) do'#013#010+
+  '          for AOS:=low(TOS) to high(TOS) do'#013#010+
+  '            begin'#013#010+
+  '        ','      if FileExists(APackage.GetUnitsOutputDir(ACPU,AOS)) or'+
+  #013#010+
+  '                 FileExists(APackage.GetBinOutputDir(ACPU,AOS)) then'#013+
+  #010+
+  '                Clean(APackage,ACPU,AOS);'#013#010+
+  '            end;}'#013#010+
+  '      end'#013#010+
+  '    else'#013#010+
+  '      Clean(APackage, Def','aults.CPU, Defaults.OS);'#013#010+
+  '    DoAfterClean(Apackage);'#013#010+
+  '  Finally'#013#010+
+  '    If (APackage.Directory<>'#039#039') then'#013#010+
+  '      EnterDir('#039#039');'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TBuildEngine.Clean(APackage: TPackage; ACPU: TCPU; AOS: TOS)'+
+  ';'#013#010+
+  'Var'#013#010+
+  '  List : TStringList;',#013#010+
+  '  DirectoryList : TStringList;'#013#010+
+  'begin'#013#010+
+  '  List:=TStringList.Create;'#013#010+
+  '  try'#013#010+
+  '    List.Add(APackage.GetUnitsOutputDir(ACPU,AOS) + PathDelim + UnitCo'+
+  'nfigFile);'#013#010+
+  '    APackage.GetCleanFiles(List,ACPU,AOS);'#013#010+
+  '    if (List.Count>0) then'#013#010+
+  '      beg','in'#013#010+
+  '      CmdDeleteFiles(List);'#013#010+
+  '      DirectoryList := TStringList.Create;'#013#010+
+  '      try'#013#010+
+  '        GetDirectoriesFromFilelist(List,DirectoryList);'#013#010+
+  '        CmdRemoveDirs(DirectoryList);'#013#010+
+  #013#010+
+  '        DirectoryList.Clear;'#013#010+
+  '        if DirectoryExis','ts(APackage.GetBinOutputDir(ACPU,AOS)) then'#013+
+  #010+
+  '          DirectoryList.Add(APackage.GetBinOutputDir(ACPU,AOS));'#013#010+
+  '        if DirectoryExists(APackage.GetUnitsOutputDir(ACPU,AOS)) then'#013+
+  #010+
+  '          DirectoryList.Add(APackage.GetUnitsOutputDir(ACP','U,AOS));'#013+
+  #010+
+  '        CmdRemoveDirs(DirectoryList);'#013#010+
+  #013#010+
+  '        DirectoryList.Clear;'#013#010+
+  '        if DirectoryExists(ExtractFileDir(APackage.GetBinOutputDir(ACP'+
+  'U,AOS))) then'#013#010+
+  '          DirectoryList.Add(ExtractFileDir(APackage.GetBinOutputDir(AC'+
+  'PU,A','OS)));'#013#010+
+  '        if DirectoryExists(ExtractFileDir(APackage.GetUnitsOutputDir(A'+
+  'CPU,AOS))) then'#013#010+
+  '          DirectoryList.Add(ExtractFileDir(APackage.GetUnitsOutputDir('+
+  'ACPU,AOS)));'#013#010+
+  '        CmdRemoveDirs(DirectoryList);'#013#010+
+  '      finally'#013#010+
+  '       ',' DirectoryList.Free;'#013#010+
+  '      end;'#013#010+
+  '      end;'#013#010+
+  '  Finally'#013#010+
+  '    List.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Procedure TBuildEngine.Manifest(APackage : TPackage);'#013#010+
+  'Var'#013#010+
+  '  L : TStrings;'#013#010+
+  '  PD,'#013#010+
+  '  MF : String;'#013#010+
+  'begin'#013#010+
+  '  L:=TStringList.Create;'#013#010+
+  '  Try'#013#010+
+  '    Log(v','lInfo, Format(SInfoManifestPackage,[APackage.Name]));'#013#010+
+  '    PD:=APackage.Directory;'#013#010+
+  '    if PD<>'#039#039' then'#013#010+
+  '      PD:=IncludeTrailingPathDelimiter(PD);'#013#010+
+  '    MF:=PD+ManifestFile;'#013#010+
+  '    Log(vlDebug, Format(SDbgGenerating, [MF]));'#013#010+
+  '    L.Add('#039'<?xml',' version="1.0"?>'#039');'#013#010+
+  '    L.Add('#039'<packages>'#039');'#013#010+
+  '    APackage.GetManifest(L);'#013#010+
+  '    L.Add('#039'</packages>'#039');'#013#010+
+  '    L.SaveToFile(MF);'#013#010+
+  '  Finally'#013#010+
+  '    L.Free;'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Compile(Packages: TPackages);'#013#010+
+  'Var'#013#010+
+  '  I : Intege','r;'#013#010+
+  '  P : TPackage;'#013#010+
+  'begin'#013#010+
+  '  If Assigned(BeforeCompile) then'#013#010+
+  '    BeforeCompile(Self);'#013#010+
+  '  FProgressMax:=Packages.Count;'#013#010+
+  '  FProgressCount:=0;'#013#010+
+  '  For I:=0 to Packages.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      P:=Packages.PackageItems[i];'#013#010+
+  '      If Packa','geOK(P) then'#013#010+
+  '        MaybeCompile(P)'#013#010+
+  '      else'#013#010+
+  '        begin'#013#010+
+  '        inc(FProgressCount);'#013#010+
+  '        log(vlWarning,SWarnSkipPackageTargetProgress,[(FProgressCount)'+
+  '/FProgressMax * 100, P.Name, Defaults.Target]);'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  ' ',' If Assigned(AfterCompile) then'#013#010+
+  '    AfterCompile(Self);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Install(Packages: TPackages);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  P : TPackage;'#013#010+
+  'begin'#013#010+
+  '  If Assigned(BeforeInstall) then'#013#010+
+  '    BeforeInstall(Self);'#013#010+
+  '  For I:=0 t','o Packages.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      P:=Packages.PackageItems[i];'#013#010+
+  '      If PackageOK(P) then'#013#010+
+  '        begin'#013#010+
+  '          Install(P);'#013#010+
+  '          log(vlWarning, SWarnInstallationPackagecomplete, [P.Name, De'+
+  'faults.Target]);'#013#010+
+  '        end'#013#010+
+  '   ','   else'#013#010+
+  '        log(vlWarning,SWarnSkipPackageTarget,[P.Name, Defaults.Target]'+
+  ');'#013#010+
+  '    end;'#013#010+
+  '  If Assigned(AfterInstall) then'#013#010+
+  '    AfterInstall(Self);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Archive(Packages: TPackages);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  P',' : TPackage;'#013#010+
+  'begin'#013#010+
+  '  If Assigned(BeforeArchive) then'#013#010+
+  '    BeforeArchive(Self);'#013#010+
+  '  Log(vlDebug, SDbgBuildEngineArchiving);'#013#010+
+  '  For I:=0 to Packages.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      P:=Packages.PackageItems[i];'#013#010+
+  '      Archive(P);'#013#010+
+  '    end;'#013#010+
+  '  If',' Assigned(AfterArchive) then'#013#010+
+  '    AfterArchive(Self);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEngine.Manifest(Packages: TPackages);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  P : TPackage;'#013#010+
+  'begin'#013#010+
+  '  If Assigned(BeforeManifest) then'#013#010+
+  '    BeforeManifest(Self);'#013#010+
+  '  Log(vlDebu','g, SDbgBuildEngineGenerateManifests);'#013#010+
+  '  For I:=0 to Packages.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      P:=Packages.PackageItems[i];'#013#010+
+  '      Manifest(P);'#013#010+
+  '    end;'#013#010+
+  '  If Assigned(AfterManifest) then'#013#010+
+  '    AfterManifest(Self);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TBuildEn','gine.Clean(Packages: TPackages; AllTargets: boolea'+
+  'n);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  '  P : TPackage;'#013#010+
+  'begin'#013#010+
+  '  If Assigned(BeforeClean) then'#013#010+
+  '    BeforeClean(Self);'#013#010+
+  '  Log(vldebug, SDbgBuildEngineCleaning);'#013#010+
+  '  For I:=0 to Packages.Count-1 do'#013#010+
+  '    be','gin'#013#010+
+  '    P:=Packages.PackageItems[i];'#013#010+
+  '    If AllTargets or PackageOK(P) then'#013#010+
+  '      Clean(P, AllTargets);'#013#010+
+  '    log(vlWarning, SWarnCleanPackagecomplete, [P.Name]);'#013#010+
+  '    end;'#013#010+
+  '  If Assigned(AfterClean) then'#013#010+
+  '    AfterClean(Self);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013,#010+
+  '{*********************************************************************'+
+  '*******'#013#010+
+  '                               TFPVersion'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'constructor TTarget.Create(ACollection: TCollection);'#010+
-  'begin'#010+
-  '  inherited Create(ACo','llection);'#010+
-  '  FInstall:=True;'#010+
-  '  FCPUs:=AllCPUs;'#010+
-  '  FOSes:=AllOSes;'#010+
-  '  FUnitPath:=TConditionalStrings.Create(TConditionalString);'#010+
-  '  FIncludePath:=TConditionalStrings.Create(TConditionalString);'#010+
-  '  FObjectPath:=TConditionalStrings.Create(TConditi','onalString);'#010+
-  '  FDependencies:=TDependencies.Create(TDependency);'#010+
-  '  FCommands:=TCOmmands.Create(TCommand);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'destructor TTarget.Destroy;'#010+
-  'begin'#010+
-  '  FreeAndNil(FUnitPath);'#010+
-  '  FreeAndNil(FObjectPath);'#010+
-  '  FreeAndNil(FIncludePath);'#010+
-  '  FreeAndNil(','FDependencies);'#010+
-  '  FreeAndNil(FCommands);'#010+
-  '  FreeAndNil(Foptions);'#010+
-  '  inherited Destroy;'#010+
-  'end;'#010+
-  #010+
-  'function TTarget.GetOptions: TStrings;'#010+
-  'begin'#010+
-  '  If Foptions=Nil then'#010+
-  '    FOptions:=TStringList.Create;'#010+
-  '  Result:=FOptions;'#010+
-  'end;'#010+
-  #010+
-  'procedure TTarget.Se','tOptions(const AValue: TStrings);'#010+
-  'begin'#010+
-  '  If (AValue=Nil) or (AValue.Count=0) then'#010+
-  '    FreeAndNil(FOptions)'#010+
-  '  else'#010+
-  '    Options.Assign(AValue);'#010+
-  'end;'#010+
-  #010+
-  'function TTarget.GetSourceFileName: String;'#010+
-  'begin'#010+
-  '  Result:=Name+FExtension;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'functio','n TTarget.GetUnitFileName: String;'#010+
-  'begin'#010+
-  '  Result:=Name+UnitExt;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TTarget.GetObjectFileName: String;'#010+
-  'begin'#010+
-  '  Result:=Name+ObjExt;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TTarget.GetRSTFileName: String;'#010+
-  'begin'#010+
-  '  Result:=Name+RSText;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TT','arget.GetProgramFileName(AOS : TOS): String;'#010+
-  'begin'#010+
-  '  if AOS in [Go32v2,Win32,Win64,OS2] then'#010+
-  '    Result:=Name+ExeExt'#010+
-  '  else'#010+
-  '    Result:=Name;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TTarget.GetOutputFileName(AOs: TOS): String;'#010+
-  'begin'#010+
-  '  if TargetType in UnitTargets ','then'#010+
-  '    Result:=GetUnitFileName'#010+
-  '  else'#010+
-  '    Result:=GetProgramFileName(AOs);'#010+
-  'end;'#010+
-  #010+
-  'function TTarget.HaveOptions: Boolean;'#010+
-  'begin'#010+
-  '  Result:=(FOptions<>Nil);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TTarget.SetName(const AValue: String);'#010+
-  'Var'#010+
-  '  D,N,E : String;'#010+
-  'begin'#010+
-  ' ',' N:=FixPath(AValue);'#010+
-  '  D:=ExtractFilePath(N);'#010+
-  '  E:=ExtractFileExt(N);'#010+
-  '  N:=ExtractFileName(N);'#010+
-  '  inherited SetName(Copy(N,1,Length(N)-Length(E)));'#010+
-  '  FExtension:=E;'#010+
-  '  FDirectory:=D;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TTarget.GetCleanFiles(List: TStrings; cons','t APrefixU, APre'+
-  'fixB : String; ACPU: TCPU; AOS : TOS);'#010+
-  'begin'#010+
-  '  If not(ACPU in CPUs) or not(AOS in OSes) then'#010+
-  '    exit;'#010+
-  '  List.Add(APrefixU + ObjectFileName);'#010+
+  '******}'#013#010+
+  #013#010+
+  'function TFPVersion.GetAsString: Str','ing;'#013#010+
+  'begin'#013#010+
+  '  if Empty then'#013#010+
+  '    Result:='#039'<none>'#039#013#010+
+  '  else'#013#010+
+  '  begin'#013#010+
+  '    Result := '#039#039';'#013#010+
+  '    if Major <> -1 then'#013#010+
+  '      Result := Result + IntToStr(Major);'#013#010+
+  '    if Minor <> -1 then'#013#010+
+  '      Result := Result + '#039'.'#039' + IntToStr(Minor);'#013#010+
+  '    if Mic','ro <> -1 then'#013#010+
+  '      Result := Result + '#039'.'#039' + IntToStr(Micro);'#013#010+
+  '    if Build <> -1 then'#013#010+
+  '      Result := Result + '#039'-'#039'  + IntToStr(Build);'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TFPVersion.GetEmpty: Boolean;'#013#010+
+  'begin'#013#010+
+  '  Result:=(Major=0) and (Minor=0) and ','(Micro=0) and (Build=0);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TFPVersion.SetAsString(const AValue: String);'#013#010+
+  #013#010+
+  '  Function NextDigit(sep : Char; var V : string) : integer;'#013#010+
+  '  Var'#013#010+
+  '    P : Integer;'#013#010+
+  '  begin'#013#010+
+  '    P:=Pos(Sep,V);'#013#010+
+  '    If (P=0) then'#013#010+
+  '      P:=Leng','th(V)+1;'#013#010+
+  '    Result:=StrToIntDef(Copy(V,1,P-1),-1);'#013#010+
+  '    If Result<>-1 then'#013#010+
+  '      Delete(V,1,P);'#013#010+
+  '  end;'#013#010+
+  #013#010+
+  'Var'#013#010+
+  '  V : String;'#013#010+
+  'begin'#013#010+
+  '  Clear;'#013#010+
+  '  // Special support for empty version string'#013#010+
+  '  if (AValue='#039#039') or (AValue='#039'<none>'#039') then'#013#010+
+  '  ','  exit;'#013#010+
+  '  V:=AValue;'#013#010+
+  '  Major:=NextDigit('#039'.'#039',V);'#013#010+
+  '  Minor:=NextDigit('#039'.'#039',V);'#013#010+
+  '  Micro:=NextDigit('#039'-'#039',V);'#013#010+
+  '  Build:=NextDigit(#0,V);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TFPVersion.Clear;'#013#010+
+  'begin'#013#010+
+  '  Micro:=-1;'#013#010+
+  '  Major:=-1;'#013#010+
+  '  Minor:=-1;'#013#010+
+  '  Build:=-1;'#013#010+
+  'end;'#013#010,
+  #013#010+
+  'procedure TFPVersion.Assign(Source: TPersistent);'#013#010+
+  'Var'#013#010+
+  '  V : TFPVersion;'#013#010+
+  'begin'#013#010+
+  '  if Source is TFPVersion then'#013#010+
+  '    begin'#013#010+
+  '    V:=Source as TFPVersion;'#013#010+
+  '    Major:=V.Major;'#013#010+
+  '    Minor:=V.Minor;'#013#010+
+  '    Micro:=V.Micro;'#013#010+
+  '    Build:=V.Build;'#013,#010+
+  '    end'#013#010+
+  '  else'#013#010+
+  '    inherited Assign(Source);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TFPVersion.CompareVersion(AVersion: TFPVersion): Integer;'#013+
+  #010+
+  'begin'#013#010+
+  '  Result:=Major-AVersion.Major;'#013#010+
+  '  If (Result=0) then'#013#010+
+  '    begin'#013#010+
+  '      Result:=Minor-AVersion.Minor;'#013#010+
+  '     ',' if (Result=0) then'#013#010+
+  '        begin'#013#010+
+  '          Result:=Micro-AVersion.Micro;'#013#010+
+  '          If (Result=0) then'#013#010+
+  '            Result:=Build-AVersion.Build;'#013#010+
+  '        end;'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TFPVersion.SameVersion(AVersion: TFPVersion): Boo','lean;'#013#010+
+  'begin'#013#010+
+  '  Result:=CompareVersion(AVersion)=0;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{*********************************************************************'+
+  '*******'#013#010+
+  '                                 TTarget'#013#010+
+  '********************************************************','************'+
+  '********}'#013#010+
+  #013#010+
+  'constructor TTarget.Create(ACollection: TCollection);'#013#010+
+  'begin'#013#010+
+  '  inherited Create(ACollection);'#013#010+
+  '  FInstall:=True;'#013#010+
+  '  FCPUs:=AllCPUs;'#013#010+
+  '  FOSes:=AllOSes;'#013#010+
+  '  FUnitPath:=TConditionalStrings.Create(TConditionalString);'#013#010,
+  '  FIncludePath:=TConditionalStrings.Create(TConditionalString);'#013#010+
+  '  FObjectPath:=TConditionalStrings.Create(TConditionalString);'#013#010+
+  '  FDependencies:=TDependencies.Create(TDependency);'#013#010+
+  '  FCommands:=TCOmmands.Create(TCommand);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'destru','ctor TTarget.Destroy;'#013#010+
+  'begin'#013#010+
+  '  FreeAndNil(FUnitPath);'#013#010+
+  '  FreeAndNil(FObjectPath);'#013#010+
+  '  FreeAndNil(FIncludePath);'#013#010+
+  '  FreeAndNil(FDependencies);'#013#010+
+  '  FreeAndNil(FCommands);'#013#010+
+  '  FreeAndNil(Foptions);'#013#010+
+  '  inherited Destroy;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TTarget','.GetOptions: TStrings;'#013#010+
+  'begin'#013#010+
+  '  If Foptions=Nil then'#013#010+
+  '    FOptions:=TStringList.Create;'#013#010+
+  '  Result:=FOptions;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TTarget.GetUnitLibFileName: String;'#013#010+
+  'begin'#013#010+
+  '  Result:='#039'libp'#039'+Name+LibExt;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TTarget.SetOptions(','const AValue: TStrings);'#013#010+
+  'begin'#013#010+
+  '  If (AValue=Nil) or (AValue.Count=0) then'#013#010+
+  '    FreeAndNil(FOptions)'#013#010+
+  '  else'#013#010+
+  '    Options.Assign(AValue);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TTarget.GetSourceFileName: String;'#013#010+
+  'begin'#013#010+
+  '  Result:=Name+FExtension;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'fu','nction TTarget.GetUnitFileName: String;'#013#010+
+  'begin'#013#010+
+  '  Result:=Name+UnitExt;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TTarget.GetObjectFileName: String;'#013#010+
+  'begin'#013#010+
+  '  Result:=Name+ObjExt;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TTarget.GetRSTFileName: String;'#013#010+
+  'begin'#013#010+
+  '  Result:=Name+RSText;',#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TTarget.GetProgramFileName(AOS : TOS): String;'#013#010+
+  'begin'#013#010+
+  '  if AOS in [Go32v2,Win32,Win64,OS2] then'#013#010+
+  '    Result:=Name+ExeExt'#013#010+
+  '  else'#013#010+
+  '    Result:=Name;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TTarget.GetOutputFileName(AOs: TOS): String;'#013#010+
+  'begi','n'#013#010+
+  '  if TargetType in UnitTargets then'#013#010+
+  '    Result:=GetUnitFileName'#013#010+
+  '  else'#013#010+
+  '    Result:=GetProgramFileName(AOs);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TTarget.HaveOptions: Boolean;'#013#010+
+  'begin'#013#010+
+  '  Result:=(FOptions<>Nil);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TTarget.SetName(const ','AValue: String);'#013#010+
+  'Var'#013#010+
+  '  D,N,E : String;'#013#010+
+  'begin'#013#010+
+  '  N:=FixPath(AValue);'#013#010+
+  '  D:=ExtractFilePath(N);'#013#010+
+  '  E:=ExtractFileExt(N);'#013#010+
+  '  N:=ExtractFileName(N);'#013#010+
+  '  inherited SetName(Copy(N,1,Length(N)-Length(E)));'#013#010+
+  '  FExtension:=E;'#013#010+
+  '  FDirectory:=D;'#013#010+
+  'en','d;'#013#010+
+  #013#010+
+  'procedure TTarget.SetXML(const AValue: string);'#013#010+
+  'begin'#013#010+
+  '  FXML:=FixPath(AValue);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TTarget.GetCleanFiles(List: TStrings; const APrefixU, APrefi'+
+  'xB : String; ACPU: TCPU; AOS : TOS);'#013#010+
+  'begin'#013#010+
+  '  If not(ACPU in CPUs) or not','(AOS in OSes) then'#013#010+
+  '    exit;'#013#010+
+  '  List.Add(APrefixU + ObjectFileName);'#013#010+
   '  If (TargetType in [ttUnit,ttImplicitUnit,ttExampleUnit, ttCleanOnlyU'+
-  'nit]) then'#010+
-  ' ','   List.Add(APrefixU + UnitFileName)'#010+
-  '  else If (TargetType in [ttProgram,ttExampleProgram]) then'#010+
-  '    List.Add(APrefixB + GetProgramFileName(AOS));'#010+
-  '  If ResourceStrings then'#010+
-  '    List.Add(APrefixU + RSTFileName);'#010+
-  '  // Maybe add later ?  AddCo','nditionalStrings(List,CleanFiles);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'nit]) then'#013#010+
+  '    begin'#013#010+
+  '      List.Add(APrefixU + UnitFileName);'#013#010+
+  '      if (AOS in AllSmartLinkLibra','ryOSes) and FileExists(APrefixU + '+
+  'UnitLibFileName) then'#013#010+
+  '        List.Add(APrefixU + UnitLibFileName);'#013#010+
+  '    end'#013#010+
+  '  else If (TargetType in [ttProgram,ttExampleProgram]) then'#013#010+
+  '    List.Add(APrefixB + GetProgramFileName(AOS));'#013#010+
+  '  If ResourceSt','rings then'#013#010+
+  '    List.Add(APrefixU + RSTFileName);'#013#010+
+  '  // Maybe add later ?  AddConditionalStrings(List,CleanFiles);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TTarget.GetInstallFiles(List: TStrings; const APrefixU, APre'+
-  'fixB: String; ACPU: TCPU; AOS : TOS);'#010+
-  'begin'#010+
-  '  If not(ACPU in CPUs) or not(AOS in OSes) then'#010+
-  '    exit;'#010+
-  '  If Not (TargetType in [t','tProgram,ttExampleProgram]) then'#010+
-  '    List.Add(APrefixU + ObjectFileName);'#010+
-  '  If (TargetType in [ttUnit,ttImplicitUnit,ttExampleUnit]) then'#010+
-  '    List.Add(APrefixU + UnitFileName)'#010+
-  '  else If (TargetType in [ttProgram,ttExampleProgram]) then'#010+
-  '    ','List.Add(APrefixB + GetProgramFileName(AOS));'#010+
-  '  If ResourceStrings then'#010+
-  '    List.Add(APrefixU + RSTFileName);'#010+
-  '  // Maybe add later ?  AddConditionalStrings(List,InstallFiles);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TTarget.GetArchiveFiles(List: TStrings; ACPU: T','CPU; AOS : '+
-  'TOS);'#010+
-  'var'#010+
-  '  i : integer;'#010+
-  '  D : TDependency;'#010+
-  'begin'#010+
-  '  If not(ACPU in CPUs) or not(AOS in OSes) then'#010+
-  '    exit;'#010+
-  '  // Main source'#010+
-  '  if TargetSourceFileName<>'#039#039' then'#010+
-  '    List.Add(TargetSourceFileName);'#010+
-  '  // Includes'#010+
-  '  for i:=0 to Depen','dencies.Count-1 do'#010+
-  '    begin'#010+
-  '      D:=Dependencies[i];'#010+
-  '      if (D.DependencyType=depInclude) and'#010+
-  '         (D.TargetFileName<>'#039#039') then'#010+
-  '        List.Add(D.TargetFileName);'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{****************************************************','***************'+
-  '*********'#010+
-  '                                 TSource'#010+
-  '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'function TSource.GetInstallSourcePath: string;'#010+
-  'begin'#010+
-  '  if FInstallSourcePath<>'#039#039' then'#010+
-  '    resul','t := FInstallSourcePath'#010+
-  '  else if SourceType=stExample then'#010+
-  '    result := '#039'examples'#039#010+
-  '  else'#010+
-  '    result := '#039#039';'#010+
-  'end;'#010+
-  #010+
-  'constructor TSource.Create(ACollection: TCollection);'#010+
-  'begin'#010+
-  '  inherited Create(ACollection);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'destructor TSource.Destr','oy;'#010+
-  'begin'#010+
-  '  inherited Destroy;'#010+
-  'end;'#010+
-  #010+
-  'procedure TSource.GetInstallFiles(List: TStrings);'#010+
-  'begin'#010+
-  '  if InstallSourcePath<>'#039#039' then'#010+
-  '    list.Values[name] := (IncludeTrailingPathDelimiter(InstallSourcePa'+
-  'th)+ExtractFileName(Name))'#010+
-  '  else'#010+
-  '    list.a','dd(Name);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'fixB: String; ACPU: TCPU; AOS : TOS);'#013#010+
+  'begin',#013#010+
+  '  If not(ACPU in CPUs) or not(AOS in OSes) then'#013#010+
+  '    exit;'#013#010+
+  '  If Not (TargetType in [ttProgram,ttExampleProgram]) then'#013#010+
+  '    List.Add(APrefixU + ObjectFileName);'#013#010+
+  '  If (TargetType in [ttUnit,ttImplicitUnit,ttExampleUnit]) then'#013#010+
+  '    begin'#013#010,
+  '    List.Add(APrefixU + UnitFileName);'#013#010+
+  '    if (AOS in AllSmartLinkLibraryOSes) and FileExists(APrefixU + Unit'+
+  'LibFileName) then'#013#010+
+  '      List.Add(APrefixU + UnitLibFileName);'#013#010+
+  '    end'#013#010+
+  '  else If (TargetType in [ttProgram,ttExampleProgram]) th','en'#013#010+
+  '    List.Add(APrefixB + GetProgramFileName(AOS));'#013#010+
+  '  If ResourceStrings then'#013#010+
+  '    List.Add(APrefixU + RSTFileName);'#013#010+
+  '  // Maybe add later ?  AddConditionalStrings(List,InstallFiles);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TTarget.GetArchiveFiles(List: TS','trings; ACPU: TCPU; AOS : '+
+  'TOS);'#013#010+
+  'var'#013#010+
+  '  i : integer;'#013#010+
+  '  D : TDependency;'#013#010+
+  'begin'#013#010+
+  '  If not(ACPU in CPUs) or not(AOS in OSes) then'#013#010+
+  '    exit;'#013#010+
+  '  // Main source'#013#010+
+  '  if TargetSourceFileName<>'#039#039' then'#013#010+
+  '    List.Add(TargetSourceFileName);'#013#010+
+  '  // Inc','ludes'#013#010+
+  '  for i:=0 to Dependencies.Count-1 do'#013#010+
+  '    begin'#013#010+
+  '      D:=Dependencies[i];'#013#010+
+  '      if (D.DependencyType=depInclude) and'#013#010+
+  '         (D.TargetFileName<>'#039#039') then'#013#010+
+  '        List.Add(D.TargetFileName);'#013#010+
+  '    end;'#013#010+
+  '  // FPDoc files'#013#010+
+  '  if XML ','<> '#039#039' then'#013#010+
+  '  begin'#013#010+
+  '    List.Add(Directory + Name + Extension);'#013#010+
+  '    List.Add(XML);'#013#010+
+  '  end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                                 TCommands'#010+
+  '*******'#013#010+
+  '                                 TSource'#013#010+
+  '***************','*****************************************************'+
+  '********}'#013#010+
+  #013#010+
+  'function TSource.GetInstallSourcePath: string;'#013#010+
+  'begin'#013#010+
+  '  if FInstallSourcePath<>'#039#039' then'#013#010+
+  '    result := FInstallSourcePath'#013#010+
+  '  else if SourceType=stExample then'#013#010+
+  '    result := ',#039'examples'#039#013#010+
+  '  else'#013#010+
+  '    result := '#039#039';'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'constructor TSource.Create(ACollection: TCollection);'#013#010+
+  'begin'#013#010+
+  '  inherited Create(ACollection);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'destructor TSource.Destroy;'#013#010+
+  'begin'#013#010+
+  '  inherited Destroy;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure TSource.Get','InstallFiles(List: TStrings);'#013#010+
+  'begin'#013#010+
+  '  if InstallSourcePath<>'#039#039' then'#013#010+
+  '    list.Values[name] := (IncludeTrailingPathDelimiter(InstallSourcePa'+
+  'th)+ExtractFileName(Name))'#013#010+
+  '  else'#013#010+
+  '    list.add(Name);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{*******************************','************************************'+
+  '*********'#013#010+
+  '                                 TCommands'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'function TCommands.GetC','ommand(const Dest : String): TCommand;'#010+
-  'begin'#010+
-  '  Result:=TCommand(ItemByName(Dest));'#010+
-  'end;'#010+
-  #010+
-  'function TCommands.GetCommandItem(Index : Integer): TCommand;'#010+
-  'begin'#010+
-  '  Result:=TCommand(Items[Index]);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TCommands.SetCommandItem(Index :',' Integer; const AValue: TC'+
-  'ommand);'#010+
-  'begin'#010+
-  '  Items[Index]:=AValue;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TCommands.AddCommand(const Cmd: String) : TCommand;'#010+
-  'begin'#010+
-  '  Result:=AddCommand(fdefaultAt,Cmd,'#039#039','#039#039','#039#039');'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TCommands.AddCommand(const Cmd, Option','s: String): TCommand;'+
-  #010+
-  'begin'#010+
-  '  Result:=AddCommand(fdefaultAt,Cmd,Options,'#039#039','#039#039');'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '******}'#013#010+
+  #013#010+
+  'function TCommands.GetCommand(const Dest : String): TCommand;'#013#010+
+  'begin',#013#010+
+  '  Result:=TCommand(ItemByName(Dest));'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TCommands.GetCommandItem(Index : Integer): TCommand;'#013#010+
+  'begin'#013#010+
+  '  Result:=TCommand(Items[Index]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TCommands.SetCommandItem(Index : Integer; const AValue: TCom'+
+  'mand);',#013#010+
+  'begin'#013#010+
+  '  Items[Index]:=AValue;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TCommands.AddCommand(const Cmd: String) : TCommand;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddCommand(fdefaultAt,Cmd,'#039#039','#039#039','#039#039');'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TCommands.AddCommand(const Cmd, Options: String): TCommand;'#013,
+  #010+
+  'begin'#013#010+
+  '  Result:=AddCommand(fdefaultAt,Cmd,Options,'#039#039','#039#039');'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'function TCommands.AddCommand(const Cmd, Options, Dest, Source: String'+
-  ' ): TCommand;'#010+
-  'begin'#010+
-  '  Result:=AddCommand(fdefaultAt,Cmd,options,Dest,Source);'#010+
-  'end;'#010,
-  #010+
-  #010+
-  'Function TCommands.AddCommand(At: TCommandAt; const Cmd: String) : TCo'+
-  'mmand;'#010+
-  'begin'#010+
-  '  Result:=AddCommand(At,Cmd,'#039#039','#039#039','#039#039');'#010+
-  'end;'#010+
-  #010+
-  #010+
+  ' ): TCommand;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddCommand(fdefaultAt,Cmd,options,Dest,Source);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function',' TCommands.AddCommand(At: TCommandAt; const Cmd: String) : T'+
+  'Command;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddCommand(At,Cmd,'#039#039','#039#039','#039#039');'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'function TCommands.AddCommand(At: TCommandAt; const Cmd, Options: Stri'+
-  'ng  ): TCommand;'#010+
-  'begin'#010+
-  '  Result:=AddCom','mand(At,Cmd,Options,'#039#039','#039#039');'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'ng  ): TCommand;'#013#010+
+  'begin'#013#010+
+  '  Result:=AddComma','nd(At,Cmd,Options,'#039#039','#039#039');'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'function TCommands.AddCommand(At: TCommandAt; const Cmd, Options, Dest'+
-  ', Source: String): TCommand;'#010+
-  'begin'#010+
-  '  Result:=Add as TCommand;'#010+
-  '  Result.Command:=Cmd;'#010+
-  '  If (Options<>'#039#039') then'#010+
-  '    Result.ParseOptions(Op','tions);'#010+
-  '  Result.At:=At;'#010+
-  '  Result.SourceFile:=Source;'#010+
-  '  Result.DestFile:=Dest;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  ', Source: String): TCommand;'#013#010+
+  'begin'#013#010+
+  '  Result:=Add as TCommand;'#013#010+
+  '  Result.Command:=Cmd;'#013#010+
+  '  If (Options<>'#039#039') then'#013#010+
+  '    Result.ParseOpt','ions(Options);'#013#010+
+  '  Result.At:=At;'#013#010+
+  '  Result.SourceFile:=Source;'#013#010+
+  '  Result.DestFile:=Dest;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                           TConditionalString'#010+
-  '******************************','**************************************'+
-  '********}'#010+
-  #010+
-  'Constructor TConditionalString.Create;'#010+
-  'begin'#010+
-  '  inherited Create;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '*******'#013#010+
+  '                           TConditionalString'#013#010+
+  '**************','******************************************************'+
+  '********}'#013#010+
+  #013#010+
+  'Constructor TConditionalString.Create;'#013#010+
+  'begin'#013#010+
+  '  inherited Create;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                           TConditionalSt','rings'#010+
+  '*******'#013#010+
+  '                ','           TConditionalStrings'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
+  '******}'#013#010+
+  #013#010+
   'Constructor TConditionalStrings.Create(AClass:TConditionalStringClass)'+
-  ';'#010+
-  'begin'#010+
-  '  inherited Create;'#010+
-  '  FCSClass:=AClass;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TConditionalStrings.G','etConditionalString(Index : Integer): '+
-  'TConditionalString;'#010+
-  'begin'#010+
-  '  Result:=TConditionalString(Items[Index]);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  ';'#013#010+
+  'begin'#013#010+
+  '  inherited Create;'#013#010+
+  '  FCSClass:=AClass;'#013#010+
+  'end;'#013,#010+
+  #013#010+
+  #013#010+
+  'function TConditionalStrings.GetConditionalString(Index : Integer): TC'+
+  'onditionalString;'#013#010+
+  'begin'#013#010+
+  '  Result:=TConditionalString(Items[Index]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TConditionalStrings.SetConditionalString(Index : Integer; co'+
-  'nst AValue: TConditionalString);'#010+
-  'begin'#010+
-  '  Items[Index]:=','AValue;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  'nst AValue: TC','onditionalString);'#013#010+
+  'begin'#013#010+
+  '  Items[Index]:=AValue;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TConditionalStrings.Add(Const Value : String) : TConditionalS'+
-  'tring;'#010+
-  'begin'#010+
-  '  result:=Add(Value,AllCPUs,AllOSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{$ifdef cpu_only_overloads}'#010+
-  'Function TConditionalStrings.Add(Const Value : String;const CPUs:TCPU',
-  's) : TConditionalString;'#010+
-  'begin'#010+
-  '  result:=Add(Value,CPUs,AllOSes);'#010+
-  'end;'#010+
-  '{$endif cpu_only_overloads}'#010+
-  #010+
-  #010+
+  'tring;'#013#010+
+  'begin'#013#010+
+  '  result:=Add(Value,AllCPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
+  'Function TCondi','tionalStrings.Add(Const Value : String;const CPUs:TCP'+
+  'Us) : TConditionalString;'#013#010+
+  'begin'#013#010+
+  '  result:=Add(Value,CPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  #013#010+
+  #013#010+
   'Function TConditionalStrings.Add(Const Value : String;const OSes:TOSes'+
-  ') : TConditionalString;'#010+
-  'begin'#010+
-  '  result:=Add(Value,AllCPUs,OSes);'#010+
-  'end;',#010+
-  #010+
-  #010+
+  ') : TCon','ditionalString;'#013#010+
+  'begin'#013#010+
+  '  result:=Add(Value,AllCPUs,OSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TConditionalStrings.Add(Const Value : String;const CPUs:TCPUs'+
-  ';const OSes:TOSes) : TConditionalString;'#010+
-  'begin'#010+
-  '  Result:=FCSClass.Create;'#010+
-  '  Result.Value:=Value;'#010+
-  '  Result.OSes:=OSes;'#010+
-  '  Result.CPUs:=CPUs;'#010+
-  '  inherited Add(Result);'#010+
-  'end',';'#010+
-  #010+
-  #010+
+  ';const OSes:TOSes) : TConditionalString;'#013#010+
+  'begin'#013#010+
+  '  Result:=FCSClass.Create;'#013#010+
+  '  Result.Value:=Value;'#013,#010+
+  '  Result.OSes:=OSes;'#013#010+
+  '  Result.CPUs:=CPUs;'#013#010+
+  '  inherited Add(Result);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                                TDependency'#010+
-  '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'Constructor TDependency.Create;'#010+
-  'beg','in'#010+
-  '  inherited Create;'#010+
-  '  FVersion:=TFPVersion.Create;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Destructor TDependency.Destroy;'#010+
-  'begin'#010+
-  '  FreeAndNil(FVersion);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TDependency.GetVersion : string;'#010+
-  'begin'#010+
-  '  result:=FVersion.AsString;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Procedure TDependency.SetV','ersion(const V : string);'#010+
-  'begin'#010+
-  '  FVersion.AsString:=V;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '*******'#013#010+
+  '                                TDependency'#013#010+
+  '***********************************','*********************************'+
+  '********}'#013#010+
+  #013#010+
+  'Constructor TDependency.Create;'#013#010+
+  'begin'#013#010+
+  '  inherited Create;'#013#010+
+  '  FVersion:=TFPVersion.Create;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Destructor TDependency.Destroy;'#013#010+
+  'begin'#013#010+
+  '  FreeAndNil(FVersion);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TDepend','ency.GetVersion : string;'#013#010+
+  'begin'#013#010+
+  '  result:=FVersion.AsString;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Procedure TDependency.SetVersion(const V : string);'#013#010+
+  'begin'#013#010+
+  '  FVersion.AsString:=V;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                                TDependencies'#010+
-  '*****************************************************','***************'+
-  '********}'#010+
-  #010+
-  'function TDependencies.GetDependency(Index : Integer): TDependency;'#010+
-  'begin'#010+
-  '  Result:=TDependency(Items[Index]);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '*','******'#013#010+
+  '                                TDependencies'#013#010+
+  '**********************************************************************'+
+  '******}'#013#010+
+  #013#010+
+  'function TDependencies.GetDependency(Index : Integer): TDependency;'#013+
+  #010+
+  'begin'#013#010+
+  '  Result:=TDependency(Items[','Index]);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TDependencies.SetDependency(Index : Integer; const AValue: T'+
-  'Dependency);'#010+
-  'begin'#010+
-  '  Items','[Index]:=AValue;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TDependencies.Add(Const Value : String) : TDependency;'#010+
-  'begin'#010+
-  '  result:=Add(Value,AllCPUs,AllOSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{$ifdef cpu_only_overloads}'#010+
+  'Dependency);'#013#010+
+  'begin'#013#010+
+  '  Items[Index]:=AValue;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TDependencies.Add(Const Value : String) : TDependency;'#013#010+
+  'begin'#013#010+
+  '  result:=Add(Value,Al','lCPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{$ifdef cpu_only_overloads}'#013#010+
   'Function TDependencies.Add(Const Value : String;const CPUs:TCPUs) : TD'+
-  'epe','ndency;'#010+
-  'begin'#010+
-  '  result:=Add(Value,CPUs,AllOSes);'#010+
-  'end;'#010+
-  '{$endif cpu_only_overloads}'#010+
-  #010+
-  #010+
-  'Function TDependencies.Add(Const Value : String;const OSes:TOSes) : TD'+
-  'ependency;'#010+
-  'begin'#010+
-  '  result:=Add(Value,AllCPUs,OSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TDependencies.Add(','Const Value : String;const CPUs:TCPUs;con'+
-  'st OSes:TOSes) : TDependency;'#010+
-  'begin'#010+
-  '  Result:=inherited Add(Value,CPUs,OSes) as TDependency;'#010+
-  '  Result.Target:=nil;'#010+
-  '  Result.FDependencyType:=depPackage;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TDependencies.AddUnit(Const Va','lue : String) : TDependency;'#010+
-  'begin'#010+
-  '  result:=AddUnit(Value,AllCPUs,AllOSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{$ifdef cpu_only_overloads}'#010+
+  'ependency;'#013#010+
+  'begin'#013#010+
+  '  result:=Add(Value,CPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  #013#010+
+  #013#010+
+  'Function TDependenci','es.Add(Const Value : String;const OSes:TOSes) : '+
+  'TDependency;'#013#010+
+  'begin'#013#010+
+  '  result:=Add(Value,AllCPUs,OSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TDependencies.Add(Const Value : String;const CPUs:TCPUs;const'+
+  ' OSes:TOSes) : TDependency;'#013#010+
+  'begin'#013#010+
+  '  Result:=inherited',' Add(Value,CPUs,OSes) as TDependency;'#013#010+
+  '  Result.Target:=nil;'#013#010+
+  '  Result.FDependencyType:=depPackage;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TDependencies.AddUnit(Const Value : String) : TDependency;'#013+
+  #010+
+  'begin'#013#010+
+  '  result:=AddUnit(Value,AllCPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010,
+  '{$ifdef cpu_only_overloads}'#013#010+
   'Function TDependencies.AddUnit(Const Value : String;const CPUs:TCPUs) '+
-  ': TDependency;'#010+
-  'begin'#010+
-  '  result:=AddUnit(Value,CPUs,AllOSes)',';'#010+
-  'end;'#010+
-  '{$endif cpu_only_overloads}'#010+
-  #010+
-  #010+
-  'Function TDependencies.AddUnit(Const Value : String;const OSes:TOSes) '+
-  ': TDependency;'#010+
-  'begin'#010+
-  '  result:=AddUnit(Value,AllCPUs,OSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function TDependencies.AddUnit(Const Value : String;const CPUs:TCP','Us'+
-  ';const OSes:TOSes) : TDependency;'#010+
-  'begin'#010+
-  '  Result:=inherited Add(Value,CPUs,OSes) as TDependency;'#010+
-  '  Result.Target:=nil;'#010+
-  '  Result.FDependencyType:=depUnit;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  ': TDependency;'#013#010+
+  'begin'#013#010+
+  '  result:=AddUnit(Value,CPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  #013#010+
+  #013#010+
+  'Function TDependencies.AddUnit(Const Va','lue : String;const OSes:TOSes'+
+  ') : TDependency;'#013#010+
+  'begin'#013#010+
+  '  result:=AddUnit(Value,AllCPUs,OSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function TDependencies.AddUnit(Const Value : String;const CPUs:TCPUs;c'+
+  'onst OSes:TOSes) : TDependency;'#013#010+
+  'begin'#013#010+
+  '  Result:=inherited Add(Va','lue,CPUs,OSes) as TDependency;'#013#010+
+  '  Result.Target:=nil;'#013#010+
+  '  Result.FDependencyType:=depUnit;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TDependencies.AddInclude(Const Value : String) : TDependency;'+
-  #010+
-  'begin'#010,
-  '  result:=AddInclude(Value,AllCPUs,AllOSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{$ifdef cpu_only_overloads}'#010+
+  #013#010+
+  'begin'#013#010+
+  '  result:=AddInclude(Value,AllCPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{$if','def cpu_only_overloads}'#013#010+
   'Function TDependencies.AddInclude(Const Value : String;const CPUs:TCPU'+
-  's) : TDependency;'#010+
-  'begin'#010+
-  '  result:=AddInclude(Value,CPUs,AllOSes);'#010+
-  'end;'#010+
-  '{$endif cpu_only_ov','erloads}'#010+
-  #010+
-  #010+
-  'Function TDependencies.AddInclude(Const Value : String;const OSes:TOSe'+
-  's) : TDependency;'#010+
-  'begin'#010+
-  '  result:=AddInclude(Value,AllCPUs,OSes);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  's) : TDependency;'#013#010+
+  'begin'#013#010+
+  '  result:=AddInclude(Value,CPUs,AllOSes);'#013#010+
+  'end;'#013#010+
+  '{$endif cpu_only_overloads}'#013#010+
+  #013#010+
+  #013#010+
+  'Function TDependencies.AddInclude(Con','st Value : String;const OSes:TO'+
+  'Ses) : TDependency;'#013#010+
+  'begin'#013#010+
+  '  result:=AddInclude(Value,AllCPUs,OSes);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'Function TDependencies.AddInclude(Const Value : String;const CPUs:TCPU'+
-  's;const OSes:TOS','es) : TDependency;'#010+
-  'Var'#010+
-  '  N : String;'#010+
-  'begin'#010+
-  '  N:=FixPath(Value);'#010+
-  '  if ExtractFileExt(N)='#039#039' then'#010+
-  '    ChangeFileExt(N,IncExt);'#010+
-  '  Result:=inherited Add(N,CPUs,OSes) as TDependency;'#010+
-  '  Result.FDependencyType:=depInclude;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{*****************','**************************************************'+
-  '*********'#010+
-  '                               TValueItem'#010+
+  's;const OSes:TOSes) : TDependency;'#013#010+
+  'Var'#013#010+
+  '  N : String;'#013#010+
+  'be','gin'#013#010+
+  '  N:=FixPath(Value);'#013#010+
+  '  if ExtractFileExt(N)='#039#039' then'#013#010+
+  '    ChangeFileExt(N,IncExt);'#013#010+
+  '  Result:=inherited Add(N,CPUs,OSes) as TDependency;'#013#010+
+  '  Result.FDependencyType:=depInclude;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{***********************************************','********************'+
+  '*********'#013#010+
+  '                               TValueItem'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'constructor TValueItem.Create(AValue: String);'#010+
-  'begin'#010+
-  '  FVal','ue:=AValue;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  '{*********************************************************************'+
-  '*******'#010+
-  '                              TFunctionItem'#010+
+  '******}'#013#010+
+  #013#010+
+  'constructor TValueItem.Create(AValue: String);'#013#010+
+  'begin'#013#010+
+  '  FValue:=AValue;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  '{','*******************************************************************'+
+  '*********'#013#010+
+  '                              TFunctionItem'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'constructor TFunctio','nItem.Create(AFunc: TReplaceFunction);'#010+
-  'begin'#010+
-  '  FFunc:=AFunc;'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '******}'#013#010+
+  #013#010+
+  'constructor TFunctionItem.Create(AFu','nc: TReplaceFunction);'#013#010+
+  'begin'#013#010+
+  '  FFunc:=AFunc;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                                 TDictionary'#010+
-  '*************************************************','*******************'+
-  '********}'#010+
-  #010+
-  'constructor TDictionary.Create(AOwner: TComponent);'#010+
-  'begin'#010+
-  '  inherited Create(AOwner);'#010+
-  '  FList:=TStringList.Create;'#010+
-  '  FList.Sorted:=True;'#010+
-  '  FList.Duplicates:=dupError;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'destructor TDictionary.Destroy;'#010+
-  'Var'#010,
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  For I:=0 to Flist.Count-1 do'#010+
-  '    FList.Objects[i].Free;'#010+
-  '  FreeAndNil(FList);'#010+
-  '  inherited Destroy;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TDictionary.AddVariable(const AName, Value: String);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  I:=Flist.IndexOf(AName',');'#010+
-  '  If I=-1 then'#010+
-  '    I:=FList.Add(Aname)'#010+
-  '  else'#010+
-  '    Flist.Objects[i].Free;'#010+
-  '  Flist.Objects[i]:=TValueItem.Create(Value);'#010+
-  'end;'#010+
-  #010+
-  #010+
+  '*******'#013#010+
+  '                                 TDictionary'#013#010+
+  '*********************************************************','***********'+
+  '********}'#013#010+
+  #013#010+
+  'constructor TDictionary.Create(AOwner: TComponent);'#013#010+
+  'begin'#013#010+
+  '  inherited Create(AOwner);'#013#010+
+  '  FList:=TStringList.Create;'#013#010+
+  '  FList.Sorted:=True;'#013#010+
+  '  FList.Duplicates:=dupError;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'destructor TDictionary.Destroy;'#013#010,
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  For I:=0 to Flist.Count-1 do'#013#010+
+  '    FList.Objects[i].Free;'#013#010+
+  '  FreeAndNil(FList);'#013#010+
+  '  inherited Destroy;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TDictionary.AddVariable(const AName, Value: String);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  I:=F','list.IndexOf(AName);'#013#010+
+  '  If I=-1 then'#013#010+
+  '    I:=FList.Add(Aname)'#013#010+
+  '  else'#013#010+
+  '    Flist.Objects[i].Free;'#013#010+
+  '  Flist.Objects[i]:=TValueItem.Create(Value);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
   'procedure TDictionary.AddFunction(const AName: String; FReplacement: T'+
-  'ReplaceFunction);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  'begi','n'#010+
-  '  I:=Flist.IndexOf(AName);'#010+
-  '  If I=-1 then'#010+
-  '    I:=Flist.Add(AName)'#010+
-  '  else'#010+
-  '    Flist.Objects[i].Free;'#010+
-  '  Flist.Objects[i]:=TFunctionItem.Create(FReplacement);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'procedure TDictionary.RemoveItem(const AName: String);'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  'b','egin'#010+
-  '  I:=Flist.IndexOf(AName);'#010+
-  '  If (I<>-1) then'#010+
-  '    begin'#010+
-  '    FList.Objects[i].Free;'#010+
-  '    FList.Delete(I);'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TDictionary.GetValue(const AName: String): String;'#010+
-  'begin'#010+
-  '  Result:=GetValue(AName,'#039#039');'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TDic','tionary.GetValue(const AName,Args: String): String;'#010+
-  'Var'#010+
-  '  O : TObject;'#010+
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  I:=Flist.IndexOf(AName);'#010+
-  '  If (I=-1) then'#010+
-  '    Raise EDictionaryError.CreateFmt(SErrNoDictionaryItem,[AName]);'#010+
-  '  O:=Flist.Objects[I];'#010+
-  '  If O is TVa','lueItem then'#010+
-  '    Result:=TValueItem(O).FValue'#010+
-  '  else'#010+
-  '    Result:=TFunctionItem(O).FFunc(AName,Args);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TDictionary.ReplaceStrings(Const ASource: String): String;'#010+
-  'Var'#010+
-  '  S,FN,FV : String;'#010+
-  '  P: Integer;'#010+
-  'begin'#010+
-  '  Result:='#039#039';'#010+
-  '  S:=A','Source;'#010+
-  '  P:=Pos('#039'$('#039',S);'#010+
-  '  While (P<>0) do'#010+
-  '    begin'#010+
-  '      Result:=Result+Copy(S,1,P-1);'#010+
-  '      Delete(S,1,P+1);'#010+
-  '      P:=Pos('#039')'#039',S);'#010+
-  '      FN:=Copy(S,1,P-1);'#010+
-  '      Delete(S,1,P);'#010+
-  '      P:=Pos('#039' '#039',FN);'#010+
-  '      If (P<>0) then // function argum','ents ?'#010+
-  '        begin'#010+
-  '        FV:=FN;'#010+
-  '        FN:=Copy(FN,1,P);'#010+
-  '        System.Delete(FV,1,P);'#010+
-  '        end'#010+
-  '      else'#010+
-  '        FV:='#039#039';'#010+
-  '      Result:=Result+GetValue(FN,FV);'#010+
-  '      P:=Pos('#039'$('#039',S);'#010+
-  '    end;'#010+
-  '  Result:=Result+S;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function Su','bstitute(Const Source : String; Macros : Array of string)'+
-  ' : String;'#010+
-  'Var'#010+
-  '  I : Integer;'#010+
-  'begin'#010+
-  '  I:=0;'#010+
-  '  While I<High(Macros) do'#010+
-  '    begin'#010+
-  '      Dictionary.AddVariable(Macros[i],Macros[I+1]);'#010+
-  '      Inc(I,2);'#010+
-  '    end;'#010+
-  '  Result:=Dictionary.Repl','aceStrings(Source);'#010+
-  '  While I<High(Macros) do'#010+
-  '    begin'#010+
-  '      Dictionary.RemoveItem(Macros[i]);'#010+
-  '      Inc(I,2);'#010+
-  '    end;'#010+
-  'end;'#010+
-  #010+
+  'ReplaceFunctio','n);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  I:=Flist.IndexOf(AName);'#013#010+
+  '  If I=-1 then'#013#010+
+  '    I:=Flist.Add(AName)'#013#010+
+  '  else'#013#010+
+  '    Flist.Objects[i].Free;'#013#010+
+  '  Flist.Objects[i]:=TFunctionItem.Create(FReplacement);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'procedure TDictionary.RemoveItem(co','nst AName: String);'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  I:=Flist.IndexOf(AName);'#013#010+
+  '  If (I<>-1) then'#013#010+
+  '    begin'#013#010+
+  '    FList.Objects[i].Free;'#013#010+
+  '    FList.Delete(I);'#013#010+
+  '    end;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TDictionary.GetValue(const AName: String): String;'#013#010+
+  'be','gin'#013#010+
+  '  Result:=GetValue(AName,'#039#039');'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TDictionary.GetValue(const AName,Args: String): String;'#013#010+
+  'Var'#013#010+
+  '  O : TObject;'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  I:=Flist.IndexOf(AName);'#013#010+
+  '  If (I=-1) then'#013#010+
+  '    Raise EDictionaryError.CreateFmt(S','ErrNoDictionaryItem,[AName]);'#013+
+  #010+
+  '  O:=Flist.Objects[I];'#013#010+
+  '  If O is TValueItem then'#013#010+
+  '    Result:=TValueItem(O).FValue'#013#010+
+  '  else'#013#010+
+  '    Result:=TFunctionItem(O).FFunc(AName,Args);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TDictionary.ReplaceStrings(Const ASource: String','): String;'#013+
+  #010+
+  'Var'#013#010+
+  '  S,FN,FV : String;'#013#010+
+  '  P: Integer;'#013#010+
+  'begin'#013#010+
+  '  Result:='#039#039';'#013#010+
+  '  S:=ASource;'#013#010+
+  '  P:=Pos('#039'$('#039',S);'#013#010+
+  '  While (P<>0) do'#013#010+
+  '    begin'#013#010+
+  '      Result:=Result+Copy(S,1,P-1);'#013#010+
+  '      Delete(S,1,P+1);'#013#010+
+  '      P:=Pos('#039')'#039',S);'#013#010+
+  '      FN:=Copy(S,1',',P-1);'#013#010+
+  '      Delete(S,1,P);'#013#010+
+  '      P:=Pos('#039' '#039',FN);'#013#010+
+  '      If (P<>0) then // function arguments ?'#013#010+
+  '        begin'#013#010+
+  '        FV:=FN;'#013#010+
+  '        FN:=Copy(FN,1,P);'#013#010+
+  '        System.Delete(FV,1,P);'#013#010+
+  '        end'#013#010+
+  '      else'#013#010+
+  '        FV:='#039#039';'#013#010+
+  '      Re','sult:=Result+GetValue(FN,FV);'#013#010+
+  '      P:=Pos('#039'$('#039',S);'#013#010+
+  '    end;'#013#010+
+  '  Result:=Result+S;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function Substitute(Const Source : String; Macros : Array of string) :'+
+  ' String;'#013#010+
+  'Var'#013#010+
+  '  I : Integer;'#013#010+
+  'begin'#013#010+
+  '  I:=0;'#013#010+
+  '  While I<High(Macros) do'#013#010+
+  ' ','   begin'#013#010+
+  '      Dictionary.AddVariable(Macros[i],Macros[I+1]);'#013#010+
+  '      Inc(I,2);'#013#010+
+  '    end;'#013#010+
+  '  Result:=Dictionary.ReplaceStrings(Source);'#013#010+
+  '  While I<High(Macros) do'#013#010+
+  '    begin'#013#010+
+  '      Dictionary.RemoveItem(Macros[i]);'#013#010+
+  '      Inc(I,2);'#013#010+
+  '    end',';'#013#010+
+  'end;'#013#010+
+  #013#010+
   '{*********************************************************************'+
-  '*******'#010+
-  '                                 De','fault Instances'#010+
+  '*******'#013#010+
+  '                                 Default Instances'#013#010+
   '**********************************************************************'+
-  '******}'#010+
-  #010+
-  'var'#010+
-  '  DefInstaller : TCustomInstaller;'#010+
-  #010+
+  '******}'#013#010+
+  #013#010+
+  'var'#013#010+
+  '  DefInstall','er : TCustomInstaller;'#013#010+
+  #013#010+
   'Function Installer(InstallerClass: TInstallerClass): TCustomInstaller;'+
-  #010+
-  'begin'#010+
-  '  If Not Assigned(DefInstall','er) then'#010+
-  '    DefInstaller:=InstallerClass.Create(Nil);'#010+
-  '  Result:=DefInstaller;'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'Function Installer: TCustomInstaller;'#010+
-  'begin'#010+
-  '  Result := Installer(TFPCInstaller);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  #010+
-  '{ TCommand }'#010+
-  #010+
-  'function TCommand.GetOptions: TStrings;'#010+
-  'begin'#010+
-  '  If',' (FOptions=Nil) then'#010+
-  '    FOptions:=TStringList.Create;'#010+
-  '  Result:=FOptions;'#010+
-  'end;'#010+
-  #010+
-  'procedure TCommand.SetOptions(const Value: TStrings);'#010+
-  'begin'#010+
-  '  If (Value=Nil) or (Value.Count=0) then'#010+
-  '    FreeAndNil(FOptions)'#010+
-  '  else'#010+
-  '    Options.Assign(Value);',#010+
-  'end;'#010+
-  #010+
-  'destructor TCommand.Destroy;'#010+
-  'begin'#010+
-  '  FreeAndNil(FOptions);'#010+
-  '  inherited Destroy;'#010+
-  'end;'#010+
-  #010+
-  'function TCommand.HaveOptions: Boolean;'#010+
-  'begin'#010+
-  '  Result:=(FOptions<>Nil);'#010+
-  'end;'#010+
-  #010+
-  #010+
-  'function TCommand.CmdLineOptions: String;'#010+
-  'begin'#010+
-  '  If HaveOptions th','en'#010+
-  '    Result:=OptionListToString(Options);'#010+
-  'end;'#010+
-  #010+
-  'procedure TCommand.ParseOptions(S: String);'#010+
-  #010+
-  'begin'#010+
-  '  Options:=OptionsToStringList(S);'#010+
-  'end;'#010+
-  #010+
-  'Initialization'#010+
-  '  OnGetApplicationName:=@GetFPMakeName;'#010+
-  #010+
-  'Finalization'#010+
-  '  FreeAndNil(DefInstaller);'#010+
-  ' ',' FreeAndNil(Dictionary);'#010+
-  '  FreeAndNil(Defaults);'#010+
-  'end.'#010
+  #013#010+
+  'begin'#013#010+
+  '  If Not Assigned(DefInstaller) then'#013#010+
+  '    DefInstaller:=InstallerClass.Create(Nil);'#013#010+
+  '  Result:=DefInstaller;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'Function Instal','ler: TCustomInstaller;'#013#010+
+  'begin'#013#010+
+  '  Result := Installer(TFPCInstaller);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  #013#010+
+  '{ TCommand }'#013#010+
+  #013#010+
+  'function TCommand.GetOptions: TStrings;'#013#010+
+  'begin'#013#010+
+  '  If (FOptions=Nil) then'#013#010+
+  '    FOptions:=TStringList.Create;'#013#010+
+  '  Result:=FOptions;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'proc','edure TCommand.SetOptions(const Value: TStrings);'#013#010+
+  'begin'#013#010+
+  '  If (Value=Nil) or (Value.Count=0) then'#013#010+
+  '    FreeAndNil(FOptions)'#013#010+
+  '  else'#013#010+
+  '    Options.Assign(Value);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'destructor TCommand.Destroy;'#013#010+
+  'begin'#013#010+
+  '  FreeAndNil(FOptions);'#013#010+
+  '  inheri','ted Destroy;'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'function TCommand.HaveOptions: Boolean;'#013#010+
+  'begin'#013#010+
+  '  Result:=(FOptions<>Nil);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  #013#010+
+  'function TCommand.CmdLineOptions: String;'#013#010+
+  'begin'#013#010+
+  '  If HaveOptions then'#013#010+
+  '    Result:=OptionListToString(Options);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'procedure',' TCommand.ParseOptions(S: String);'#013#010+
+  #013#010+
+  'begin'#013#010+
+  '  Options:=OptionsToStringList(S);'#013#010+
+  'end;'#013#010+
+  #013#010+
+  'Initialization'#013#010+
+  '  OnGetApplicationName:=@GetFPMakeName;'#013#010+
+  '  CustomFpmakeCommandlineOptions:=nil;'#013#010+
+  '  CustomFpMakeCommandlineValues:=nil;'#013#010+
+  #013#010+
+  'Finalization'#013,#010+
+  '  FreeAndNil(CustomFpMakeCommandlineValues);'#013#010+
+  '  FreeAndNil(CustomFpmakeCommandlineOptions);'#013#010+
+  '  FreeAndNil(DefInstaller);'#013#010+
+  '  FreeAndNil(Dictionary);'#013#010+
+  '  FreeAndNil(Defaults);'#013#010+
+  'end.'#013#010
 );

packages/fppkg/src/pkgoptions.pp

@@ -19,7 +19,7 @@ interface
 uses Classes, Sysutils, Inifiles, fprepos, fpTemplate, pkgglobals;
 
 Const
-  UnitConfigFileName   = 'fpunits.conf';
+  UnitConfigFileName   = 'fpunits.cfg';
   ManifestFileName     = 'manifest.xml';
   MirrorsFileName      = 'mirrors.xml';
   PackagesFileName     = 'packages.xml';

packages/fppkg/src/pkgrepos.pp

@@ -239,7 +239,7 @@ procedure FindInstalledPackages(ACompilerOptions:TCompilerOptions;showdups:boole
           if ((SR.Attr and faDirectory)=faDirectory) and (SR.Name<>'.') and (SR.Name<>'..') then
             begin
               UD:=IncludeTrailingPathDelimiter(IncludeTrailingPathDelimiter(AUnitDir)+SR.Name);
-              // Try new fpunits.conf
+              // Try new fpunits.cfg
               UF:=UD+UnitConfigFileName;
               if FileExistsLog(UF) then
                 begin

rtl/objpas/sysutils/sysutils.inc

@@ -79,7 +79,7 @@
     {$else unix}
       O:=[sfoImplicitCurrentDir,sfoStripQuotes];
     {$endif unix}
-      Result := FileSearch(Name, D, False);
+      Result := FileSearch(Name, D, O);
     end;
 
   {$ifndef OS_FILEISREADONLY}

rtl/os2/Makefile

@@ -2800,7 +2800,7 @@ crt$(PPUEXT) : crt.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
 objects$(PPUEXT) : $(INC)/objects.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 printer$(PPUEXT) : printer.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-		    objpas$(PPUEXT) dos$(PPUEXT) sysconst$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+		    objpas$(PPUEXT) doscalls$(PPUEXT) sysconst$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
 		   sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) \

rtl/os2/Makefile.fpc

@@ -164,7 +164,7 @@ printer$(PPUEXT) : printer.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
 #
 
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
-                    objpas$(PPUEXT) dos$(PPUEXT) sysconst$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+                    objpas$(PPUEXT) doscalls$(PPUEXT) sysconst$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \

rtl/os2/dos.pas

@@ -54,6 +54,14 @@ Type
 threadvar
 (* For compatibility with VP/2, used for runflags in Exec procedure. *)
     ExecFlags: cardinal;
+(* Note that the TP/BP compatible method for retrieval of exit codes    *)
+(* is limited to only one (the last) execution! Including the following *)
+(* two variables in the interface part allows querying the status of    *)
+(* of asynchronously started programs using DosWaitChild with dtNoWait  *)
+(* parameter, i.e. without waiting for the final program result (as     *)
+(* opposed to calling DosExitCode which would wait for the exit code).  *)
+    LastExecRes: TResultCodes;
+    LastExecFlags: cardinal;
 
 {$i dosh.inc}
 
@@ -64,12 +72,15 @@ function GetEnvPChar (EnvVar: string): PChar;
 function DosErrorModuleName: string;
 (* In case of an error in Dos.Exec returns the name of the module *)
 (* causing the problem - e.g. name of a missing or corrupted DLL. *)
+(* It may also contain a queue name in case of a failed attempt *)
+(* to create queue for reading results of started sessions.     *)
 
 
 
 implementation
 
 {$DEFINE HAS_GETMSCOUNT}
+{$DEFINE HAS_DOSEXITCODE}
 
 {$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
 {$DEFINE FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
@@ -141,26 +152,67 @@ begin
 end;
 
 
+function DosExitCode: word;
+var
+  Res: TResultCodes;
+  PPID: cardinal;
+  RC: cardinal;
+begin
+  if (LastExecFlags = deAsyncResult) or (LastExecFlags = deAsyncResultDb) then
+   begin
+    RC := DosWaitChild (DCWA_PROCESS, dtWait, Res, PPID, LastExecRes.PID);
+    if RC = 0 then
+(* If we succeeded, the process is finished - possible future querying
+   of DosExitCode shall return the result immediately as with synchronous
+   execution. *)
+     begin
+      LastExecFlags := deSync;
+      LastExecRes := Res;
+     end
+    else
+     LastExecRes.ExitCode := RC shl 16;
+   end;
+  if LastExecRes.ExitCode > high (word) then
+    DosExitCode := high (word)
+  else
+    DosExitCode := LastExecRes.ExitCode and $FFFF;
+end;
+
+
 procedure Exec (const Path: PathStr; const ComLine: ComStr);
 {Execute a program.}
-var Args0, Args: PByteArray;
-    ArgSize: word;
-    Res: TResultCodes;
-    ObjName: string;
-    RC: longint;
-    HQ: THandle;
-    SPID, STID, QName: string;
-    SD: TStartData;
-    SID, PID: cardinal;
-    RD: TRequestData;
-    PCI: PChildInfo;
-    CISize: cardinal;
-    Prio: byte;
+var
+  Args0, Args: PByteArray;
+  ArgSize: word;
+  ObjName: string;
+  Res: TResultCodes;
+  RC: cardinal;
+  ExecAppType: cardinal;
+  HQ: THandle;
+  SPID, STID, SCtr, QName: string;
+  SID, PID: cardinal;
+  SD: TStartData;
+  RD: TRequestData;
+  PCI: PChildInfo;
+  CISize: cardinal;
+  Prio: byte;
+  DSS: boolean;
+  SR: SearchRec;
+
 const
-    MaxArgsSize = 3072; (* Amount of memory reserved for arguments in bytes. *)
+  MaxArgsSize = 3072; (* Amount of memory reserved for arguments in bytes. *)
+
 begin
 {  LastDosExitCode := Exec (Path, ExecRunFlags (ExecFlags), efDefault, ComLine);}
-  QName := FExpand (Path);
+  ObjName := '';
+(* FExpand should be used only for the DosStartSession part
+   and only if the executable is in the current directory.  *)
+  FindFirst (Path, AnyFile, SR);
+  if DosError = 0 then
+   QName := FExpand (Path)
+  else
+   QName := Path;
+  FindClose (SR);
   if ComLine = '' then
    begin
     Args0 := nil;
@@ -171,7 +223,7 @@ begin
     GetMem (Args0, MaxArgsSize);
     Args := Args0;
 (* Work around a bug in OS/2 - argument to DosExecPgm *)
-(* should not cross 64K boundary. *)
+(* should not cross a 64K boundary. *)
     if ((PtrUInt (Args) + 1024) and $FFFF) < 1024 then
      Inc (pointer (Args), 1024);
     ArgSize := 0;
@@ -186,57 +238,113 @@ begin
     Inc (ArgSize);
     Args^ [ArgSize] := 0;
    end;
-  RC := DosExecPgm (ObjName, cardinal (ExecFlags), Args, nil, Res, Path);
-  if RC = 0 then
+
+  if (DosQueryAppType (PChar (Args), ExecAppType) = 0) and
+                               (ApplicationType and 3 = ExecAppType and 3) then
+(* DosExecPgm should work... *)
    begin
-    LastDosExitCode := Res.ExitCode;
-    LastDosErrorModuleName := '';
+    DSS := false;
+    Res.ExitCode := $FFFFFFFF;
+    RC := DosExecPgm (ObjName, cardinal (ExecFlags), Args, nil, Res, Path);
+    if RC = 0 then
+     begin
+      LastExecFlags := ExecFlags;
+      LastExecRes := Res;
+      LastDosErrorModuleName := '';
+     end
+    else
+     if (RC = 190) or (RC = 191) then
+      DSS := true;
    end
   else
-   if (RC = 190) or (RC = 191) then
-    begin
-     FillChar (SD, SizeOf (SD), 0);
-     SD.Length := 24;
-     SD.Related := ssf_Related_Child;
-     if Args = nil then
-(* No parameters passed, Args not allocated for DosExecPgm, so allocate now. *)
+   DSS := true;
+  if DSS then
+   begin
+    Str (GetProcessID, SPID);
+    Str (ThreadID, STID);
+    QName := '\QUEUES\FPC_Dos_Exec_p' + SPID + 't' + STID + '.QUE'#0;
+    FillChar (SD, SizeOf (SD), 0);
+    SD.Length := SizeOf (SD);
+    RC := 0;
+    case ExecFlags of
+     deSync:
       begin
-       GetMem (Args, MaxArgsSize);
-       Move (QName [1], Args^ [0], Length (QName));
-       Args^ [Length (QName)] := 0;
-      end
-     else
-      SD.PgmInputs := PChar (@Args^ [Length (QName) + 1]);
-     SD.PgmName := PChar (Args);
-     SD.InheritOpt := ssf_InhertOpt_Parent;
-     Str (GetProcessID, SPID);
-     Str (ThreadID, STID);
-     QName := '\QUEUES\FPC_Dos_Exec_p' + SPID + 't' + STID + '.QUE'#0;
-     SD.TermQ := @QName [1];
-     RC := DosCreateQueue (HQ, quFIFO or quConvert_Address, @QName [1]);
-     if RC = 0 then
+       SD.Related := ssf_Related_Child;
+       LastExecFlags := ExecFlags;
+       SD.TermQ := @QName [1];
+       RC := DosCreateQueue (HQ, quFIFO or quConvert_Address, @QName [1]);
+      end;
+     deAsync,
+     deAsyncResult:
       begin
-       RC := DosStartSession (SD, SID, PID);
-       if (RC = 0) or (RC = 457) then
-        begin
-         RC := DosReadQueue (HQ, RD, CISize, PCI, 0, 0, Prio, 0);
-         if RC = 0 then
-          begin
-           LastDosExitCode := PCI^.Return;
-           DosCloseQueue (HQ);
-           DosFreeMem (PCI);
-          end
-         else
-          DosCloseQueue (HQ);
-        end
-       else
-        DosCloseQueue (HQ);
+(* Current implementation of DosExitCode does not support retrieval *)
+(* of result codes for other session types started asynchronously.  *)
+       LastExecFlags := deAsync;
+       SD.Related := ssf_Related_Independent;
       end;
-    end
-   else
-    LastDosErrorModuleName := ObjName;
+     deBackground:
+      begin
+(* Current implementation of DosExitCode does not support retrieval *)
+(* of result codes for other session types started asynchronously.  *)
+       LastExecFlags := ExecFlags;
+       SD.Related := ssf_Related_Independent;
+       SD.FgBg := ssf_FgBg_Back;
+      end;
+     deAsyncResultDB:
+      begin
+(* Current implementation of DosExitCode does not support retrieval *)
+(* of result codes for other session types started asynchronously.  *)
+       LastExecFlags := ExecFlags;
+       SD.Related := ssf_Related_Child;
+       SD.TraceOpt := ssf_TraceOpt_Trace;
+      end;
+    end;
+    if RC <> 0 then
+     ObjName := Copy (QName, 1, Pred (Length (QName)))
+    else
+     begin
+      if Args = nil then
+(* No parameters passed, Args not allocated for DosExecPgm, so allocate now. *)
+       begin
+        GetMem (Args0, MaxArgsSize);
+        Args := Args0;
+        Move (QName [1], Args^ [0], Length (QName));
+        Args^ [Length (QName)] := 0;
+       end
+      else
+       SD.PgmInputs := PChar (@Args^ [Length (QName) + 1]);
+      SD.PgmName := PChar (Args);
+      SD.InheritOpt := ssf_InhertOpt_Parent;
+      SD.ObjectBuffer := @ObjName [1];
+      SD.ObjectBuffLen := SizeOf (ObjName) - 1;
+      RC := DosStartSession (SD, SID, PID);
+      if (RC = 0) or (RC = 457) then
+       begin
+        LastExecRes.PID := PID;
+        if ExecFlags = deSync then
+         begin
+          RC := DosReadQueue (HQ, RD, CISize, PCI, 0, 0, Prio, 0);
+          if (RC = 0) and (PCI^.SessionID = SID) then
+           begin
+            LastExecRes.ExitCode := PCI^.Return;
+            DosCloseQueue (HQ);
+            DosFreeMem (PCI);
+           end
+          else
+           DosCloseQueue (HQ);
+         end;
+       end
+      else if ExecFlags = deSync then
+       DosCloseQueue (HQ);
+     end;
+   end;
   if RC <> 0 then
-   LastDosExitCode := 0; (* Needed for TP/BP compatibility *)
+   begin
+    LastDosErrorModuleName := ObjName;
+    LastExecFlags := deSync;
+    LastExecRes.ExitCode := 0; (* Needed for TP/BP compatibility *)
+    LastExecRes.TerminateReason := $FFFFFFFF;
+   end;
   DosError := RC;
   if Args0 <> nil then
    FreeMem (Args0, MaxArgsSize);
@@ -526,7 +634,8 @@ begin
 
 
 begin
- LastDosExitCode := 0;
+ FillChar (LastExecRes, SizeOf (LastExecRes), 0);
  LastDosErrorModuleName := '';
  ExecFlags := 0;
+ LastExecFlags := deSync;
 end.

rtl/os2/doscalls.pas

@@ -383,11 +383,15 @@ const   deSync          = 0;    {Wait until program terminates.}
         EXEC_ASYNCRESULTDB =deAsyncResultDb;
 
 type    TResultCodes=record
-            TerminateReason,        {0 = Normal termionation.
+         case byte of
+          0: (
+            TerminateReason,        {0 = Normal termination.
                                      1 = Critical error.
                                      2 = Trapped. (GPE, etc.)
                                      3 = Killed by DosKillProcess.}
-            ExitCode:cardinal;      {Exit code of child.}
+            ExitCode:cardinal);     {Exit code of child.}
+          1: (CodeTerminate: cardinal); {For compatibility only}
+          2: (PID: cardinal);  {Process ID returned for asynchronous execution}
         end;
 
 {Execute a program.
@@ -411,10 +415,15 @@ function DosExecPgm(var ObjName:string;ExecFlag:cardinal;
                     Args,Env:PByteArray;var Res:TResultCodes;
                     const FileName:string):cardinal;
 
+const
+  DCWA_PROCESS     = 0;
+  DCWA_PROCESSTREE = 1;
+
 {Wait until a child process terminated. Sometimes called DosCWait.
 
-Action              = 0 = Wait until child terminates.
-                      1 = Wait until child and all its childs terminate.
+Action              = 0 = Wait until child terminates (DCWA_PROCESS).
+                      1 = Wait until child and all its childs terminate
+                      (DCWA_PROCESSTREE).
 Option              = Flags. Either dtWait or dtNoWait.
 Res                 = See TResultCodes.
 TermPID             = Process ID that has been terminated. Usefull when
@@ -863,17 +872,17 @@ function DosProtectRead (Handle: THandle; var Buffer; Count: cardinal;
     Buffer      = The data to be written.
     Count       = Number of bytes to write.
     ActCount    = Number of bytes actually written.}
-function DosWrite (Handle: longint; var Buffer; Count: longint;
+function DosWrite (Handle: longint; const Buffer; Count: longint;
                   var ActCount:longint):cardinal; cdecl;
 
-function DosWrite (Handle: THandle; var Buffer; Count: cardinal;
+function DosWrite (Handle: THandle; const Buffer; Count: cardinal;
                   var ActCount:cardinal):cardinal; cdecl;
 
-function DosProtectWrite (Handle: longint; var Buffer; Count: longint;
+function DosProtectWrite (Handle: longint; const Buffer; Count: longint;
                           var ActCount: longint;
                           FileHandleLockID: cardinal): cardinal; cdecl;
 
-function DosProtectWrite (Handle: THandle; var Buffer; Count: cardinal;
+function DosProtectWrite (Handle: THandle; const Buffer; Count: cardinal;
                           var ActCount: cardinal;
                           FileHandleLockID: cardinal): cardinal; cdecl;
 
@@ -3651,20 +3660,20 @@ function DosProtectRead (Handle: THandle; var Buffer; Count: cardinal;
           var ActCount: cardinal; FileHandleLockID: cardinal): cardinal; cdecl;
 external 'DOSCALLS' index 641;
 
-function DosWrite(Handle:longint;var Buffer;Count:longint;
+function DosWrite(Handle:longint;const Buffer;Count:longint;
                   var ActCount:longint):cardinal; cdecl;
 external 'DOSCALLS' index 282;
 
-function DosWrite (Handle: THandle; var Buffer; Count: cardinal;
+function DosWrite (Handle: THandle; const Buffer; Count: cardinal;
                    var ActCount: cardinal): cardinal; cdecl;
 external 'DOSCALLS' index 282;
 
-function DosProtectWrite (Handle: longint; var Buffer; Count: longint;
+function DosProtectWrite (Handle: longint; const Buffer; Count: longint;
                           var ActCount: longint;
                           FileHandleLockID: cardinal): cardinal; cdecl;
 external 'DOSCALLS' index 642;
 
-function DosProtectWrite (Handle: THandle; var Buffer; Count: cardinal;
+function DosProtectWrite (Handle: THandle; const Buffer; Count: cardinal;
                           var ActCount: cardinal;
                           FileHandleLockID: cardinal): cardinal; cdecl;
 external 'DOSCALLS' index 642;

rtl/os2/sysutils.pp

@@ -22,9 +22,6 @@ interface
 { force ansistrings }
 {$H+}
 
-uses
- Dos;
-
 {$DEFINE HAS_SLEEP}
 { Include platform independent interface part }
 {$i sysutilh.inc}
@@ -33,460 +30,21 @@ uses
 implementation
 
   uses
-    sysconst;
+    sysconst, DosCalls;
+
+
+type
+(* Necessary here due to a different definition of TDateTime in DosCalls. *)
+  TDateTime = System.TDateTime;
 
 {$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
 {$DEFINE FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
+{$DEFINE FPC_FEXPAND_GETENV_PCHAR}
 
 { Include platform independent implementation part }
 {$i sysutils.inc}
 
 
-{****************************************************************************
-                        System (imported) calls
-****************************************************************************}
-
-(* "uses DosCalls" could not be used here due to type    *)
-(* conflicts, so needed parts had to be redefined here). *)
-
-type
-        TFileStatus = object
-        end;
-        PFileStatus = ^TFileStatus;
-
-        TFileStatus3 = object (TFileStatus)
-            DateCreation,               {Date of file creation.}
-            TimeCreation,               {Time of file creation.}
-            DateLastAccess,             {Date of last access to file.}
-            TimeLastAccess,             {Time of last access to file.}
-            DateLastWrite,              {Date of last modification of file.}
-            TimeLastWrite:word;         {Time of last modification of file.}
-            FileSize,                   {Size of file.}
-            FileAlloc:cardinal;         {Amount of space the file really
-                                         occupies on disk.}
-            AttrFile:cardinal;          {Attributes of file.}
-        end;
-        PFileStatus3=^TFileStatus3;
-
-        TFileStatus4=object(TFileStatus3)
-            cbList:cardinal;            {Length of entire EA set.}
-        end;
-        PFileStatus4=^TFileStatus4;
-
-        TFileStatus3L = object (TFileStatus)
-            DateCreation,               {Date of file creation.}
-            TimeCreation,               {Time of file creation.}
-            DateLastAccess,             {Date of last access to file.}
-            TimeLastAccess,             {Time of last access to file.}
-            DateLastWrite,              {Date of last modification of file.}
-            TimeLastWrite:word;         {Time of last modification of file.}
-            FileSize,                   {Size of file.}
-            FileAlloc:int64;         {Amount of space the file really
-                                         occupies on disk.}
-            AttrFile:cardinal;          {Attributes of file.}
-        end;
-        PFileStatus3L=^TFileStatus3L;
-
-        TFileStatus4L=object(TFileStatus3L)
-            cbList:cardinal;            {Length of entire EA set.}
-        end;
-        PFileStatus4L=^TFileStatus4L;
-
-        TFileFindBuf3=object(TFileStatus)
-            NextEntryOffset: cardinal;  {Offset of next entry}
-            DateCreation,               {Date of file creation.}
-            TimeCreation,               {Time of file creation.}
-            DateLastAccess,             {Date of last access to file.}
-            TimeLastAccess,             {Time of last access to file.}
-            DateLastWrite,              {Date of last modification of file.}
-            TimeLastWrite:word;         {Time of last modification of file.}
-            FileSize,                   {Size of file.}
-            FileAlloc:cardinal;         {Amount of space the file really
-                                         occupies on disk.}
-            AttrFile:cardinal;          {Attributes of file.}
-            Name:shortstring;           {Also possible to use as ASCIIZ.
-                                         The byte following the last string
-                                         character is always zero.}
-        end;
-        PFileFindBuf3=^TFileFindBuf3;
-
-        TFileFindBuf4=object(TFileStatus)
-            NextEntryOffset: cardinal;  {Offset of next entry}
-            DateCreation,               {Date of file creation.}
-            TimeCreation,               {Time of file creation.}
-            DateLastAccess,             {Date of last access to file.}
-            TimeLastAccess,             {Time of last access to file.}
-            DateLastWrite,              {Date of last modification of file.}
-            TimeLastWrite:word;         {Time of last modification of file.}
-            FileSize,                   {Size of file.}
-            FileAlloc:cardinal;         {Amount of space the file really
-                                         occupies on disk.}
-            AttrFile:cardinal;          {Attributes of file.}
-            cbList:cardinal;            {Size of the file's extended attributes.}
-            Name:shortstring;           {Also possible to use as ASCIIZ.
-                                         The byte following the last string
-                                         character is always zero.}
-        end;
-        PFileFindBuf4=^TFileFindBuf4;
-
-        TFileFindBuf3L=object(TFileStatus)
-            NextEntryOffset: cardinal;  {Offset of next entry}
-            DateCreation,               {Date of file creation.}
-            TimeCreation,               {Time of file creation.}
-            DateLastAccess,             {Date of last access to file.}
-            TimeLastAccess,             {Time of last access to file.}
-            DateLastWrite,              {Date of last modification of file.}
-            TimeLastWrite:word;         {Time of last modification of file.}
-            FileSize,                   {Size of file.}
-            FileAlloc:int64;            {Amount of space the file really
-                                         occupies on disk.}
-            AttrFile:cardinal;          {Attributes of file.}
-            Name:shortstring;           {Also possible to use as ASCIIZ.
-                                         The byte following the last string
-                                         character is always zero.}
-        end;
-        PFileFindBuf3L=^TFileFindBuf3L;
-
-        TFileFindBuf4L=object(TFileStatus)
-            NextEntryOffset: cardinal;  {Offset of next entry}
-            DateCreation,               {Date of file creation.}
-            TimeCreation,               {Time of file creation.}
-            DateLastAccess,             {Date of last access to file.}
-            TimeLastAccess,             {Time of last access to file.}
-            DateLastWrite,              {Date of last modification of file.}
-            TimeLastWrite:word;         {Time of last modification of file.}
-            FileSize,                   {Size of file.}
-            FileAlloc:int64;            {Amount of space the file really
-                                         occupies on disk.}
-            AttrFile:cardinal;          {Attributes of file.}
-            cbList:cardinal;            {Size of the file's extended attributes.}
-            Name:shortstring;           {Also possible to use as ASCIIZ.
-                                         The byte following the last string
-                                         character is always zero.}
-        end;
-        PFileFindBuf4L=^TFileFindBuf4L;
-
- TFSInfo = record
-            case word of
-             1:
-              (File_Sys_ID,
-               Sectors_Per_Cluster,
-               Total_Clusters,
-               Free_Clusters: cardinal;
-               Bytes_Per_Sector: word);
-             2:                           {For date/time description,
-                                           see file searching realted
-                                           routines.}
-              (Label_Date,                {Date when volume label was created.}
-               Label_Time: word;          {Time when volume label was created.}
-               VolumeLabel: ShortString); {Volume label. Can also be used
-                                           as ASCIIZ, because the byte
-                                           following the last character of
-                                           the string is always zero.}
-           end;
- PFSInfo = ^TFSInfo;
-
- TCountryCode=record
-               Country,            {Country to query info about (0=current).}
-               CodePage: cardinal; {Code page to query info about (0=current).}
-              end;
- PCountryCode=^TCountryCode;
-
- TTimeFmt = (Clock12, Clock24);
-
- TCountryInfo=record
-               Country, CodePage: cardinal;  {Country and codepage requested.}
-               case byte of
-                0:
-                 (DateFormat: cardinal;     {1=ddmmyy 2=yymmdd 3=mmddyy}
-                  CurrencyUnit: array [0..4] of char;
-                  ThousandSeparator: char;  {Thousands separator.}
-                  Zero1: byte;              {Always zero.}
-                  DecimalSeparator: char;   {Decimals separator,}
-                  Zero2: byte;
-                  DateSeparator: char;      {Date separator.}
-                  Zero3: byte;
-                  TimeSeparator: char;      {Time separator.}
-                  Zero4: byte;
-                  CurrencyFormat,           {Bit field:
-                                             Bit 0: 0=indicator before value
-                                                    1=indicator after value
-                                             Bit 1: 1=insert space after
-                                                      indicator.
-                                             Bit 2: 1=Ignore bit 0&1, replace
-                                                      decimal separator with
-                                                      indicator.}
-                  DecimalPlace: byte;       {Number of decimal places used in
-                                             currency indication.}
-                  TimeFormat: TTimeFmt;     {12/24 hour.}
-                  Reserve1: array [0..1] of word;
-                  DataSeparator: char;      {Data list separator}
-                  Zero5: byte;
-                  Reserve2: array [0..4] of word);
-                1:
-                 (fsDateFmt: cardinal;      {1=ddmmyy 2=yymmdd 3=mmddyy}
-                  szCurrency: array [0..4] of char;
-                                            {null terminated currency symbol}
-                  szThousandsSeparator: array [0..1] of char;
-                                            {Thousands separator + #0}
-                  szDecimal: array [0..1] of char;
-                                            {Decimals separator + #0}
-                  szDateSeparator: array [0..1] of char;
-                                            {Date separator + #0}
-                  szTimeSeparator: array [0..1] of char;
-                                            {Time separator + #0}
-                  fsCurrencyFmt,            {Bit field:
-                                             Bit 0: 0=indicator before value
-                                                    1=indicator after value
-                                             Bit 1: 1=insert space after
-                                                      indicator.
-                                             Bit 2: 1=Ignore bit 0&1, replace
-                                                      decimal separator with
-                                                      indicator}
-                  cDecimalPlace: byte;      {Number of decimal places used in
-                                             currency indication}
-                  fsTimeFmt: byte;          {0=12,1=24 hours}
-                  abReserved1: array [0..1] of word;
-                  szDataSeparator: array [0..1] of char;
-                                            {Data list separator + #0}
-                  abReserved2: array [0..4] of word);
-              end;
- PCountryInfo=^TCountryInfo;
-
- TRequestData=record
-               PID,                {ID of process that wrote element.}
-               Data: cardinal;     {Information from process writing the data.}
-              end;
- PRequestData=^TRequestData;
-
-{Queue data structure for synchronously started sessions.}
- TChildInfo = record
-  case boolean of
-   false:
-    (SessionID,
-     Return: word);  {Return code from the child process.}
-   true:
-    (usSessionID,
-     usReturn: word);     {Return code from the child process.}
- end;
- PChildInfo = ^TChildInfo;
-
- TStartData=record
-  {Note: to omit some fields, use a length smaller than SizeOf(TStartData).}
-  Length:word;                {Length, in bytes, of datastructure
-                               (24/30/32/50/60).}
-  Related:word;               {Independent/child session (0/1).}
-  FgBg:word;                  {Foreground/background (0/1).}
-  TraceOpt:word;              {No trace/trace this/trace all (0/1/2).}
-  PgmTitle:PChar;             {Program title.}
-  PgmName:PChar;              {Filename to program.}
-  PgmInputs:PChar;            {Command parameters (nil allowed).}
-  TermQ:PChar;                {System queue. (nil allowed).}
-  Environment:PChar;          {Environment to pass (nil allowed).}
-  InheritOpt:word;            {Inherit environment from shell/
-                               inherit environment from parent (0/1).}
-  SessionType:word;           {Auto/full screen/window/presentation
-                               manager/full screen Dos/windowed Dos
-                               (0/1/2/3/4/5/6/7).}
-  Iconfile:PChar;             {Icon file to use (nil allowed).}
-  PgmHandle:cardinal;         {0 or the program handle.}
-  PgmControl:word;            {Bitfield describing initial state
-                               of windowed sessions.}
-  InitXPos,InitYPos:word;     {Initial top coordinates.}
-  InitXSize,InitYSize:word;   {Initial size.}
-  Reserved:word;
-  ObjectBuffer:PChar;         {If a module cannot be loaded, its
-                               name will be returned here.}
-  ObjectBuffLen:cardinal;     {Size of your buffer.}
- end;
- PStartData=^TStartData;
-
- TResultCodes=record
-  TerminateReason,        {0 = Normal termionation.
-                           1 = Critical error.
-                           2 = Trapped. (GPE, etc.)
-                           3 = Killed by DosKillProcess.}
-  ExitCode:cardinal;      {Exit code of child.}
- end;
-
-const
- ilStandard      =  1; (* Use TFileStatus3/TFindFileBuf3 *)
- ilQueryEASize   =  2; (* Use TFileStatus4/TFindFileBuf4 *)
- ilQueryEAs      =  3;
- ilQueryFullName =  5;
- ilStandardL     = 11; (* Use TFileStatus3L/TFindFileBuf3L *)
- ilQueryEASizeL  = 12; (* Use TFileStatus4L/TFindFileBuf4L *)
- ilQueryEAsL     = 13;
-
- quFIFO     = 0;
- quLIFO     = 1;
- quPriority = 2;
-
- quNoConvert_Address = 0;
- quConvert_Address   = 4;
-
-{Start the new session independent or as a child.}
- ssf_Related_Independent = 0;    {Start new session independent
-                                  of the calling session.}
- ssf_Related_Child       = 1;    {Start new session as a child
-                                  session to the calling session.}
-
-{Start the new session in the foreground or in the background.}
- ssf_FgBg_Fore           = 0;    {Start new session in foreground.}
- ssf_FgBg_Back           = 1;    {Start new session in background.}
-
-{Should the program started in the new session
- be executed under conditions for tracing?}
- ssf_TraceOpt_None       = 0;    {No trace.}
- ssf_TraceOpt_Trace      = 1;    {Trace with no notification
-                                  of descendants.}
- ssf_TraceOpt_TraceAll   = 2;    {Trace all descendant sessions.
-                                  A termination queue must be
-                                  supplied and Related must be
-                                  ssf_Related_Child (=1).}
-
-{Will the new session inherit open file handles
- and environment from the calling process.}
- ssf_InhertOpt_Shell     = 0;    {Inherit from the shell.}
- ssf_InhertOpt_Parent    = 1;    {Inherit from the calling process.}
-
-{Specifies the type of session to start.}
- ssf_Type_Default        = 0;    {Use program's type.}
- ssf_Type_FullScreen     = 1;    {OS/2 full screen.}
- ssf_Type_WindowableVIO  = 2;    {OS/2 window.}
- ssf_Type_PM             = 3;    {Presentation Manager.}
- ssf_Type_VDM            = 4;    {DOS full screen.}
- ssf_Type_WindowedVDM    = 7;    {DOS window.}
-{Additional values for Windows programs}
- Prog_31_StdSeamlessVDM    = 15; {Windows 3.1 program in its
-                                  own windowed session.}
- Prog_31_StdSeamlessCommon = 16; {Windows 3.1 program in a
-                                  common windowed session.}
- Prog_31_EnhSeamlessVDM    = 17; {Windows 3.1 program in enhanced
-                                  compatibility mode in its own
-                                  windowed session.}
- Prog_31_EnhSeamlessCommon = 18; {Windows 3.1 program in enhanced
-                                  compatibility mode in a common
-                                  windowed session.}
- Prog_31_Enh               = 19; {Windows 3.1 program in enhanced
-                                  compatibility mode in a full
-                                  screen session.}
- Prog_31_Std               = 20; {Windows 3.1 program in a full
-                                  screen session.}
-
-{Specifies the initial attributes for a OS/2 window or DOS window session.}
- ssf_Control_Visible      = 0;   {Window is visible.}
- ssf_Control_Invisible    = 1;   {Window is invisible.}
- ssf_Control_Maximize     = 2;   {Window is maximized.}
- ssf_Control_Minimize     = 4;   {Window is minimized.}
- ssf_Control_NoAutoClose  = 8;   {Window will not close after
-                                  the program has ended.}
- ssf_Control_SetPos   = 32768;   {Use InitXPos, InitYPos,
-                                  InitXSize, and InitYSize for
-                                  the size and placement.}
-
-
-function DosSetFileInfo (Handle: THandle; InfoLevel: cardinal; AFileStatus: PFileStatus;
-        FileStatusLen: cardinal): cardinal; cdecl; external 'DOSCALLS' index 218;
-
-function DosQueryFSInfo (DiskNum, InfoLevel: cardinal; var Buffer: TFSInfo;
-               BufLen: cardinal): cardinal; cdecl; external 'DOSCALLS' index 278;
-
-function DosQueryFileInfo (Handle: THandle; InfoLevel: cardinal;
-           AFileStatus: PFileStatus; FileStatusLen: cardinal): cardinal; cdecl;
-                                                 external 'DOSCALLS' index 279;
-
-function DosScanEnv (Name: PChar; var Value: PChar): cardinal; cdecl;
-                                                 external 'DOSCALLS' index 227;
-
-function DosFindFirst (FileMask: PChar; var Handle: THandle; Attrib: cardinal;
-                       AFileStatus: PFileStatus; FileStatusLen: cardinal;
-                    var Count: cardinal; InfoLevel: cardinal): cardinal; cdecl;
-                                                 external 'DOSCALLS' index 264;
-
-function DosFindNext (Handle: THandle; AFileStatus: PFileStatus;
-                FileStatusLen: cardinal; var Count: cardinal): cardinal; cdecl;
-                                                 external 'DOSCALLS' index 265;
-
-function DosFindClose (Handle: THandle): cardinal; cdecl;
-                                                 external 'DOSCALLS' index 263;
-
-function DosQueryCtryInfo (Size: cardinal; var Country: TCountryCode;
-           var Res: TCountryInfo; var ActualSize: cardinal): cardinal; cdecl;
-                                                        external 'NLS' index 5;
-
-function DosMapCase (Size: cardinal; var Country: TCountryCode;
-                      AString: PChar): cardinal; cdecl; external 'NLS' index 7;
-
-function DosDelete(FileName:PChar): cardinal; cdecl;
-    external 'DOSCALLS' index 259;
-
-function DosMove(OldFile, NewFile:PChar): cardinal; cdecl;
-    external 'DOSCALLS' index 271;
-
-function DosQueryPathInfo(FileName:PChar;InfoLevel:cardinal;
-              AFileStatus:PFileStatus;FileStatusLen:cardinal): cardinal; cdecl;
-    external 'DOSCALLS' index 223;
-
-function DosSetPathInfo(FileName:PChar;InfoLevel:cardinal;
-                        AFileStatus:PFileStatus;FileStatusLen,
-                        Options:cardinal):cardinal; cdecl;
-    external 'DOSCALLS' index 219;
-
-function DosClose(Handle: THandle): cardinal; cdecl;
-    external 'DOSCALLS' index 257;
-
-function DosRead(Handle:THandle; var Buffer; Count: cardinal;
-                                      var ActCount: cardinal): cardinal; cdecl;
-    external 'DOSCALLS' index 281;
-
-function DosWrite(Handle: THandle; Buffer: pointer; Count: cardinal;
-                                      var ActCount: cardinal): cardinal; cdecl;
-    external 'DOSCALLS' index 282;
-
-procedure DosSleep (MSec: cardinal); cdecl; external 'DOSCALLS' index 229;
-
-function DosCreateQueue (var Handle: THandle; Priority:longint;
-                        Name: PChar): cardinal; cdecl;
-                                                  external 'QUECALLS' index 16;
-
-function DosReadQueue (Handle: THandle; var ReqBuffer: TRequestData;
-                      var DataLen: cardinal; var DataPtr: pointer;
-                      Element, Wait: cardinal; var Priority: byte;
-                      ASem: THandle): cardinal; cdecl;
-                                                   external 'QUECALLS' index 9;
-
-function DosCloseQueue (Handle: THandle): cardinal; cdecl;
-                                                  external 'QUECALLS' index 11;
-
-function DosStartSession (var AStartData: TStartData;
-                          var SesID, PID: cardinal): cardinal; cdecl;
-                                                    external 'SESMGR' index 37;
-
-function DosFreeMem(P:pointer):cardinal; cdecl; external 'DOSCALLS' index 304;
-
-function DosExecPgm (ObjName: PChar; ObjLen: longint; ExecFlag: cardinal;
-                     Args, Env: PByteArray; var Res: TResultCodes;
-                     FileName:PChar): cardinal; cdecl;
-                                                 external 'DOSCALLS' index 283;
-
-type
-  TDT=packed record
-    Hour,
-    Minute,
-    Second,
-    Sec100,
-    Day,
-    Month: byte;
-    Year: word;
-    TimeZone: smallint;
-    WeekDay: byte;
-  end;
-
-function DosGetDateTime(var Buf: TDT): cardinal; cdecl;
-    external 'DOSCALLS' index 230;
-
-
 {****************************************************************************
                               File Functions
 ****************************************************************************}
@@ -561,7 +119,7 @@ function FileWrite (Handle: THandle; const Buffer; Count: longint): longint;
 Var
   T: cardinal;
 begin
-  DosWrite (Handle, @Buffer, Count, T);
+  DosWrite (Handle, Buffer, Count, T);
   FileWrite := longint (T);
 end;
 
@@ -625,7 +183,7 @@ end;
 type    TRec = record
             T, D: word;
         end;
-        PSearchRec = ^SearchRec;
+        PSearchRec = ^TSearchRec;
 
 function FindFirst (const Path: string; Attr: longint; out Rslt: TSearchRec): longint;
 
@@ -720,9 +278,10 @@ function FileGetDate (Handle: THandle): longint;
 var
   FStat: TFileStatus3;
   Time: Longint;
+  RC: cardinal;
 begin
-  DosError := DosQueryFileInfo(Handle, ilStandard, @FStat, SizeOf(FStat));
-  if DosError=0 then
+  RC := DosQueryFileInfo(Handle, ilStandard, @FStat, SizeOf(FStat));
+  if RC = 0 then
   begin
     Time := FStat.TimeLastWrite + longint (FStat.DateLastWrite) shl 16;
     if Time = 0 then
@@ -830,32 +389,44 @@ end;
 
 
 function SetCurrentDir (const NewDir: string): boolean;
+var
+ OrigInOutRes: word;
 begin
+ OrigInOutRes := InOutRes;
+ InOutRes := 0;
 {$I-}
-{$WARNING Should be rewritten to avoid unit dos dependency!}
  ChDir (NewDir);
- Result := (IOResult = 0);
+ Result := InOutRes = 0;
 {$I+}
+ InOutRes := OrigInOutRes;
 end;
 
 
 function CreateDir (const NewDir: string): boolean;
+var
+ OrigInOutRes: word;
 begin
+ OrigInOutRes := InOutRes;
+ InOutRes := 0;
 {$I-}
-{$WARNING Should be rewritten to avoid unit dos dependency!}
  MkDir (NewDir);
- Result := (IOResult = 0);
+ Result := InOutRes = 0;
 {$I+}
+ InOutRes := OrigInOutRes;
 end;
 
 
 function RemoveDir (const Dir: string): boolean;
+var
+ OrigInOutRes: word;
 begin
+ OrigInOutRes := InOutRes;
+ InOutRes := 0;
 {$I-}
-{$WARNING Should be rewritten to avoid unit dos dependency!}
  RmDir (Dir);
- Result := (IOResult = 0);
- {$I+}
+ Result := InOutRes = 0;
+{$I+}
+ InOutRes := OrigInOutRes;
 end;
 
 
@@ -885,7 +456,7 @@ end;
 
 procedure GetLocalTime (var SystemTime: TSystemTime);
 var
-  DT: TDT;
+  DT: DosCalls.TDateTime;
 begin
   DosGetDateTime(DT);
   with SystemTime do
@@ -977,6 +548,66 @@ end;
                               OS Utils
 ****************************************************************************}
 
+function GetEnvPChar (EnvVar: shortstring): PChar;
+(* The assembler version is more than three times as fast as Pascal. *)
+var
+ P: PChar;
+begin
+ EnvVar := UpCase (EnvVar);
+{$ASMMODE INTEL}
+ asm
+  cld
+  mov edi, Environment
+  lea esi, EnvVar
+  xor eax, eax
+  lodsb
+@NewVar:
+  cmp byte ptr [edi], 0
+  jz @Stop
+  push eax        { eax contains length of searched variable name }
+  push esi        { esi points to the beginning of the variable name }
+  mov ecx, -1     { our character ('=' - see below) _must_ be found }
+  mov edx, edi    { pointer to beginning of variable name saved in edx }
+  mov al, '='     { searching until '=' (end of variable name) }
+  repne
+  scasb           { scan until '=' not found }
+  neg ecx         { what was the name length? }
+  dec ecx         { corrected }
+  dec ecx         { exclude the '=' character }
+  pop esi         { restore pointer to beginning of variable name }
+  pop eax         { restore length of searched variable name }
+  push eax        { and save both of them again for later use }
+  push esi
+  cmp ecx, eax    { compare length of searched variable name with name }
+  jnz @NotEqual   { ... of currently found variable, jump if different }
+  xchg edx, edi   { pointer to current variable name restored in edi }
+  repe
+  cmpsb           { compare till the end of variable name }
+  xchg edx, edi   { pointer to beginning of variable contents in edi }
+  jz @Equal       { finish if they're equal }
+@NotEqual:
+  xor eax, eax    { look for 00h }
+  mov ecx, -1     { it _must_ be found }
+  repne
+  scasb           { scan until found }
+  pop esi         { restore pointer to beginning of variable name }
+  pop eax         { restore length of searched variable name }
+  jmp @NewVar     { ... or continue with new variable otherwise }
+@Stop:
+  xor eax, eax
+  mov P, eax      { Not found - return nil }
+  jmp @End
+@Equal:
+  pop esi         { restore the stack position }
+  pop eax
+  mov P, edi      { place pointer to variable contents in P }
+@End:
+ end ['eax','ecx','edx','esi','edi'];
+ GetEnvPChar := P;
+end;
+{$ASMMODE ATT}
+
+
 Function GetEnvironmentVariable(Const EnvVar : String) : String;
 
 begin
@@ -1009,108 +640,140 @@ end;
 function ExecuteProcess (const Path: AnsiString; const ComLine: AnsiString;Flags:TExecuteFlags=[]):
                                                                        integer;
 var
- HQ: THandle;
- SPID, STID, QName: shortstring;
- SD: TStartData;
- SID, PID: cardinal;
- RD: TRequestData;
- PCI: PChildInfo;
- CISize: cardinal;
- Prio: byte;
  E: EOSError;
  CommandLine: ansistring;
- Args0, Args: PByteArray;
+ Args0, Args: DosCalls.PByteArray;
  ObjNameBuf: PChar;
  ArgSize: word;
  Res: TResultCodes;
  ObjName: shortstring;
+ RC: cardinal;
+ ExecAppType: cardinal;
 
 const
  MaxArgsSize = 3072; (* Amount of memory reserved for arguments in bytes. *)
  ObjBufSize = 512;
 
+function StartSession: cardinal;
+var
+ HQ: THandle;
+ SPID, STID, QName: shortstring;
+ SID, PID: cardinal;
+ SD: TStartData;
+ RD: TRequestData;
+ PCI: PChildInfo;
+ CISize: cardinal;
+ Prio: byte;
 begin
+ Result := $FFFFFFFF;
+ FillChar (SD, SizeOf (SD), 0);
+ SD.Length := SizeOf (SD);
+ SD.Related := ssf_Related_Child;
+ if FileExists (Path) then
+(* Full path necessary for starting different executable files from current *)
+(* directory. *)
+  CommandLine := ExpandFileName (Path)
+ else
+  CommandLine := Path;
+ SD.PgmName := PChar (CommandLine);
+ if ComLine <> '' then
+  SD.PgmInputs := PChar (ComLine);
+ if ExecInheritsHandles in Flags then
+   SD.InheritOpt := ssf_InhertOpt_Parent;
+ Str (GetProcessID, SPID);
+ Str (ThreadID, STID);
+ QName := '\QUEUES\FPC_ExecuteProcess_p' + SPID + 't' + STID + '.QUE'#0;
+ SD.TermQ := @QName [1];
+ SD.ObjectBuffer := ObjNameBuf;
+ SD.ObjectBuffLen := ObjBufSize;
+ RC := DosCreateQueue (HQ, quFIFO or quConvert_Address, @QName [1]);
+ if RC <> 0 then
+  Move (QName [1], ObjNameBuf^, Length (QName))
+ else
+  begin
+   RC := DosStartSession (SD, SID, PID);
+   if (RC = 0) or (RC = 457) then
+    begin
+     RC := DosReadQueue (HQ, RD, CISize, PCI, 0, 0, Prio, 0);
+     if RC = 0 then
+      begin
+       Result := PCI^.Return;
+       DosCloseQueue (HQ);
+       DosFreeMem (PCI);
+       FreeMem (ObjNameBuf, ObjBufSize);
+      end
+     else
+      DosCloseQueue (HQ);
+    end
+   else
+    DosCloseQueue (HQ);
+  end;
+end;
+
+begin
+ Result := integer ($FFFFFFFF);
  ObjName := '';
  GetMem (ObjNameBuf, ObjBufSize);
  FillChar (ObjNameBuf^, ObjBufSize, 0);
- if ComLine = '' then
-  begin
-   Args0 := nil;
-   Args := nil;
-  end
- else
+
+ if (DosQueryAppType (PChar (Path), ExecAppType) = 0) and
+                               (ApplicationType and 3 = ExecAppType and 3) then
+(* DosExecPgm should work... *)
   begin
-   GetMem (Args0, MaxArgsSize);
-   Args := Args0;
+   if ComLine = '' then
+    begin
+     Args0 := nil;
+     Args := nil;
+    end
+   else
+    begin
+     GetMem (Args0, MaxArgsSize);
+     Args := Args0;
 (* Work around a bug in OS/2 - argument to DosExecPgm *)
 (* should not cross 64K boundary. *)
-   if ((PtrUInt (Args) + 1024) and $FFFF) < 1024 then
-    Inc (pointer (Args), 1024);
-   ArgSize := 0;
-   Move (Path [1], Args^ [ArgSize], Length (Path));
-   Inc (ArgSize, Length (Path));
-   Args^ [ArgSize] := 0;
-   Inc (ArgSize);
-   {Now do the real arguments.}
-   Move (ComLine [1], Args^ [ArgSize], Length (ComLine));
-   Inc (ArgSize, Length (ComLine));
-   Args^ [ArgSize] := 0;
-   Inc (ArgSize);
-   Args^ [ArgSize] := 0;
-  end;
- Result := DosExecPgm (ObjNameBuf, ObjBufSize, 0, Args, nil, Res, PChar (Path));
- if Args0 <> nil then
-  FreeMem (Args0, MaxArgsSize);
- if Result = 0 then
-  begin
-   Result := Res.ExitCode;
-   FreeMem (ObjNameBuf, ObjBufSize);
-  end
- else
-  begin
-   if (Result = 190) or (Result = 191) then
+     if ((PtrUInt (Args) + 1024) and $FFFF) < 1024 then
+      Inc (pointer (Args), 1024);
+     ArgSize := 0;
+     Move (Path [1], Args^ [ArgSize], Length (Path));
+     Inc (ArgSize, Length (Path));
+     Args^ [ArgSize] := 0;
+     Inc (ArgSize);
+     {Now do the real arguments.}
+     Move (ComLine [1], Args^ [ArgSize], Length (ComLine));
+     Inc (ArgSize, Length (ComLine));
+     Args^ [ArgSize] := 0;
+     Inc (ArgSize);
+     Args^ [ArgSize] := 0;
+    end;
+   Res.ExitCode := $FFFFFFFF;
+   RC := DosExecPgm (ObjNameBuf, ObjBufSize, 0, Args, nil, Res, PChar (Path));
+   if Args0 <> nil then
+    FreeMem (Args0, MaxArgsSize);
+   if RC = 0 then
     begin
-     FillChar (SD, SizeOf (SD), 0);
-     SD.Length := 24;
-     SD.Related := ssf_Related_Child;
-     CommandLine := FExpand (Path);    (* Needed for other session types... *)
-     SD.PgmName := PChar (CommandLine);
-     if ComLine <> '' then
-      SD.PgmInputs := PChar (ComLine);
-     SD.InheritOpt := ssf_InhertOpt_Parent;
-     Str (GetProcessID, SPID);
-     Str (ThreadID, STID);
-     QName := '\QUEUES\FPC_ExecuteProcess_p' + SPID + 't' + STID + '.QUE'#0;
-     SD.TermQ := @QName [1];
-     Result := DosCreateQueue (HQ, quFIFO or quConvert_Address, @QName [1]);
-     if Result = 0 then
-      begin
-       Result := DosStartSession (SD, SID, PID);
-       if (Result = 0) or (Result = 457) then
-        begin
-         Result := DosReadQueue (HQ, RD, CISize, PCI, 0, 0, Prio, 0);
-         if Result = 0 then
-          begin
-           Result := PCI^.Return;
-           DosCloseQueue (HQ);
-           DosFreeMem (PCI);
-           Exit;
-          end;
-        end;
-       DosCloseQueue (HQ);
-      end;
+     Result := Res.ExitCode;
+     FreeMem (ObjNameBuf, ObjBufSize);
     end
    else
-    ObjName := StrPas (ObjNameBuf);
+    begin
+     if (RC = 190) or (RC = 191) then
+      Result := StartSession;
+    end;
+  end
+ else
+  Result := StartSession;
+ if RC <> 0 then
+  begin
+   ObjName := StrPas (ObjNameBuf);
    FreeMem (ObjNameBuf, ObjBufSize);
    if ComLine = '' then
     CommandLine := Path
    else
     CommandLine := Path + ' ' + ComLine;
    if ObjName = '' then
-    E := EOSError.CreateFmt (SExecuteProcessFailed, [CommandLine, Result])
+    E := EOSError.CreateFmt (SExecuteProcessFailed, [CommandLine, RC])
    else
-    E := EOSError.CreateFmt (SExecuteProcessFailed + '(' + ObjName + ')', [CommandLine, Result]);
+    E := EOSError.CreateFmt (SExecuteProcessFailed + ' (' + ObjName + ')', [CommandLine, RC]);
    E.ErrorCode := Result;
    raise E;
   end;

utils/instantfpc/instantfpc.lpi

@@ -54,6 +54,12 @@
       <IncludeFiles Value="$(ProjOutDir)"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="True"/>
+        <DebugInfoType Value="dsAuto"/>
+      </Debugging>
+    </Linking>
     <Other>
       <CompilerMessages>
         <UseMsgFile Value="True"/>

utils/instantfpc/instantfpc.pas

@@ -25,7 +25,7 @@ uses
   Classes, SysUtils, InstantFPTools;
 
 const
-  Version = '1.1';
+  Version = '1.2';
 
 
 Procedure Usage;
@@ -175,7 +175,7 @@ begin
     if not IsCacheValid(Src,CacheFilename,OutputFilename) then begin
       // save source in cache to find out next time if something changed
       Src.SaveToFile(CacheFilename);
-      Compile(CacheFilename,OutputFilename);
+      Compile(Filename,CacheFilename,OutputFilename);
     end;
     // run
     Run(OutputFilename);

utils/instantfpc/instantfptools.pas

@@ -12,11 +12,23 @@ unit InstantFPTools;
   {$undef UseFpExecV}
   {$define HASEXEEXT}
 {$endif go32v2}
+{$ifdef watcom}
+  {$undef UseFpExecV}
+  {$define HASEXEEXT}
+{$endif watcom}
+{$ifdef os2}
+  {$undef UseFpExecV}
+  {$define HASEXEEXT}
+{$endif go32v2}
 
 {$IFNDEF VER2_4}
 {$DEFINE UseExeSearch}
 {$ENDIF}
 
+{$if defined(Windows) or defined(darwin) or defined(os2) or defined(go32v2) or defined(watcom)}
+{$define CaseInsensitiveFilenames}
+{$endif}
+
 interface
 
 uses
@@ -31,9 +43,10 @@ function GetCacheDir: string;
 procedure SetCacheDir(AValue : string);
 function IsCacheValid(Src: TStringList;
                       const CachedSrcFile, CachedExeFile: string): boolean;
-procedure Compile(const CacheFilename, OutputFilename: string);
+procedure Compile(const SrcFilename, CacheFilename, OutputFilename: string);
+procedure WriteCompilerOutput(SrcFilename, CacheFilename, CompilerOutput: string);
 function GetCompiler: string;
-procedure SetCompiler(AValue : string); 
+procedure SetCompiler(AValue : string);
 function GetCompilerParameters(const SrcFilename, OutputFilename: string): string;
 procedure Run(const Filename: string);
 
@@ -42,7 +55,7 @@ implementation
 Var
   CmdCacheDir : String;
   CmdCompiler : String;
-  
+
 procedure AddParam(p: string; var Line: string);
 begin
   if p='' then exit;
@@ -91,18 +104,22 @@ end;
 function GetCacheDir: string;
 begin
   Result:=CmdCacheDir;
-  if (Result='') then 
+  if (Result='') then
     begin
     Result:=GetEnvironmentVariable('INSTANTFPCCACHE');
-    if Result='' then 
+    if Result='' then
       begin
       Result:=GetEnvironmentVariable('HOME');
+{$ifdef WINDOWS}
+      if Result='' then
+        Result:=GetEnvironmentVariable('LOCALAPPDATA');
+{$endif WINDOWS}
       if Result<>'' then
         Result:=IncludeTrailingPathDelimiter(Result)+'.cache'+PathDelim+'instantfpc';
       end;
-    end;  
+    end;
   if Result='' then begin
-    writeln('missing environment variable: HOME or INSTANTFPCCACHE');
+    writeln('missing environment variable: HOME or INSTANTFPCCACHE or LOCALAPPDATA');
     Halt(1);
   end;
   Result:=IncludeTrailingPathDelimiter(ExpandFileName(Result));
@@ -135,12 +152,47 @@ begin
   {$ENDIF}
 end;
 
-procedure SetCompiler(AValue : string); 
+procedure SetCompiler(AValue : string);
 
 begin
   CmdCompiler:=AValue;
 end;
 
+procedure WriteCompilerOutput(SrcFilename, CacheFilename, CompilerOutput: string);
+var
+  Lines: TStringList;
+  i: Integer;
+  Line: String;
+  p: SizeInt;
+begin
+  // replace in compiler output CacheFilename with SrcFilename
+  Lines:=TStringList.Create;
+  Lines.Text:=CompilerOutput;
+  {$IFDEF CaseInsensitiveFilenames}
+  CacheFilename:=LowerCase(CacheFilename);
+  {$ENDIF}
+  for i:=0 to Lines.Count-1 do begin
+    repeat
+      Line:=Lines[i];
+      {$IFDEF CaseInsensitiveFilenames}
+      Line:=LowerCase(Line);
+      {$ENDIF}
+      p:=Pos(CacheFilename,Line);
+      if p<1 then break;
+      {$IFDEF CaseInsensitiveFilenames}
+      Line:=Lines[i];
+      {$ENDIF}
+      Lines[i]:=copy(Line,1,p-1)+SrcFilename+copy(Line,p+length(CacheFilename),length(Line));
+    until false;
+  end;
+
+  // write to stdout
+  writeln(Lines.Text);
+  {$IFDEF IFFreeMem}
+  Lines.Free;
+  {$ENDIF}
+end;
+
 function GetCompiler: string;
 var
   CompFile: String;
@@ -155,7 +207,7 @@ begin
   if (Result<>'') then
     begin
     Result:=ExpandFileName(Result);
-    if not FileExists(Result) then 
+    if not FileExists(Result) then
       begin
       writeln('Error: '+Result+' not found, check the --compiler parameter.');
       Halt(1);
@@ -163,7 +215,7 @@ begin
     exit;
     end;
 
-  {$IFDEF Windows}
+  {$IFDEF HASEXEEXT}
   CompFile:='fpc.exe';
   {$ELSE}
   CompFile:='fpc';
@@ -194,7 +246,7 @@ begin
     end;
 end;
 
-procedure Compile(const CacheFilename, OutputFilename: string);
+procedure Compile(const SrcFilename, CacheFilename, OutputFilename: string);
 var
   Compiler: String;
   CompParams: String;
@@ -212,6 +264,7 @@ begin
   end;
   Proc:=TProcess.Create(nil);
   Proc.CommandLine:=Compiler+' '+CompParams;
+{$WARNING Unconditional use of pipes breaks for targets not supporting them}
   Proc.Options:= [poUsePipes, poStdErrToOutput];
   Proc.ShowWindow := swoHide;
   Proc.Execute;
@@ -222,7 +275,7 @@ begin
       ss.write(buf,count);
   until Count=0;
   if (not Proc.WaitOnExit) or (Proc.ExitStatus<>0) then begin
-    write(ss.DataString);
+    WriteCompilerOutput(SrcFilename,CacheFilename,ss.DataString);
     Halt(1);
   end;
   ss.Free;
@@ -245,7 +298,7 @@ begin
     p:=ParamStr(i);
     if (Copy(p,1,1)='-') and (copy(p,1,2)<>'--') then
       AddParam(P,Result);
-    inc(I);  
+    inc(I);
     end;
   AddParam('-o'+OutputFilename {$IFDEF HASEXEEXT} + '.exe' {$ENDIF},Result);
   AddParam(SrcFilename,Result);