--- Merging r18163 into '.':

U    packages/fpmkunit/src/fpmkunit.pp
--- Merging r18164 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r18266 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r18269 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r18277 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r18784 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r18796 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r18798 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r18799 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r19044 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r19614 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r19886 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r19896 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r19902 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r19952 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r19958 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r19960 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r19992 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20027 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20028 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20049 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20061 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20066 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20159 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20165 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20166 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20218 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20232 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20233 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20234 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20316 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20320 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20352 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20392 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20410 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20419 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20615 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20669 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
U    packages/fcl-base/fpmake.pp
--- Merging r20670 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20724 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20735 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r20762 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Merging r21448 into '.':
G    packages/fpmkunit/src/fpmkunit.pp

# revisions: 18163,18164,18266,18269,18277,18784,18796,18798,18799,19044,19614,19886,19896,19902,19952,19958,19960,19992,20027,20028,20049,20061,20066,20159,20165,20166,20218,20232,20233,20234,20316,20320,20352,20392,20410,20419,20615,20669,20670,20724,20735,20762,21448
r18163 | joost | 2011-08-10 22:15:13 +0200 (Wed, 10 Aug 2011) | 3 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Do not use the CPU in the unit-output directory on OSes that use 8.3 
   filenames.
 * Add the search for the unit-output directory to the debug log
r18164 | joost | 2011-08-10 22:49:41 +0200 (Wed, 10 Aug 2011) | 2 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * implemented -e option, to use the environment to pass arguments to the
   compiler. Does only work when compiled with fcl-process
r18266 | joost | 2011-08-18 20:26:46 +0200 (Thu, 18 Aug 2011) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Added -bu option, to generate and use a build-unit to compile packages
r18269 | florian | 2011-08-19 00:03:29 +0200 (Fri, 19 Aug 2011) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

* call UniqueString for Result in fpkmkunit.fixpath as suggest by Henry Vermaak, resolves #20015
r18277 | joost | 2011-08-19 23:37:58 +0200 (Fri, 19 Aug 2011) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Improved console-output: show the message that a package is compiled when it is actually compiled.
r18784 | joost | 2011-08-20 11:09:44 +0200 (Sat, 20 Aug 2011) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Set the state of externally compiled but not installed packages to tsNoCompile, to avoid triggering a recompile of packages that depend on it
r18796 | joost | 2011-08-20 23:26:50 +0200 (Sat, 20 Aug 2011) | 2 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Do not create the output-directory for ttExamplePrograms, since they are not compiled
 * Also do not trigger a package-recompile for a missing ttExampleProgram binary.
r18798 | joost | 2011-08-21 14:02:51 +0200 (Sun, 21 Aug 2011) | 2 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Warn when a package is not installed for current target
 * Do not re-process packages which are already installed within the same fpmake-run
r18799 | joost | 2011-08-21 18:41:47 +0200 (Sun, 21 Aug 2011) | 2 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Exampleunits are not compiled, so do not trigger a recompile if they are missing
 * If a unit is not compiled for the current target, do not trigger a recompile when it is missing
r19044 | joost | 2011-09-10 17:52:05 +0200 (Sat, 10 Sep 2011) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Do not add the file to compile twice to compiler command line
r19614 | jonas | 2011-11-09 00:15:48 +0100 (Wed, 09 Nov 2011) | 7 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

  * open fpmake ini files with fmShareDenyNone to prevent spurious
    locking errors on Linux in some cases (it seems some locks linger
    for a while even after the process that created them has finished,
    unless the makefiles are allowed to start processing a new directory
    before the fpmake invocation in a previous directory has
    finished)
r19886 | joost | 2011-12-23 22:38:35 +0100 (Fri, 23 Dec 2011) | 4 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Made logging thread-safe. Handle the indenting of the log separate for each 
   thread.
 * Log deleting files
r19896 | joost | 2011-12-27 21:37:01 +0100 (Tue, 27 Dec 2011) | 6 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * The dictionary has been splitted into two dictionaries, one global and 
   one specific to a package. This because the old dictionary contained 
   global variables and variables that were depending on the package being
   handled. That leads to problems when handling multiple packages at the same
   time in multiple threads.
r19902 | joost | 2011-12-28 22:38:35 +0100 (Wed, 28 Dec 2011) | 3 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * EnterDir and LeaveDir cannot be used in threads, so a threadvar is used
   to store the current directory of each thread.
r19952 | joost | 2012-01-02 16:21:01 +0100 (Mon, 02 Jan 2012) | 3 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Enabled multhi-threaded compilation of packages. With '-T n' the packages 
   are all compiled in n worker threads.
r19958 | joost | 2012-01-03 15:42:28 +0100 (Tue, 03 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Removed debug-code accidentally introduced in r19952 that fails to compile on some targets
r19960 | joost | 2012-01-04 11:11:16 +0100 (Wed, 04 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Expand ~/ in prefix
r19992 | joost | 2012-01-07 01:00:06 +0100 (Sat, 07 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Use right path when deleting temporary buildunit-files while compiling multiple packages
r20027 | joost | 2012-01-09 16:43:11 +0100 (Mon, 09 Jan 2012) | 6 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Fixed construction of command-line arguments for TCommands
 * Added function AddProgramExtension, to ease adding '.exe' suffix.
 * Replaced function Substitute by TDictionary.Substitute to force the
   selection of the right global or package-specific dictionary
 * Add proper prefix to source and destination files of TCommands
r20028 | joost | 2012-01-09 19:09:15 +0100 (Mon, 09 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Do not show a useless dash in the help message of custom fpmake options
r20049 | joost | 2012-01-11 14:27:34 +0100 (Wed, 11 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Executables also have the .exe extension on WinCE
r20061 | joost | 2012-01-12 21:57:40 +0100 (Thu, 12 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Install binaries into %installdir%\bin\%fpctarget% on non-unices, instead on %installdir%\bin
r20066 | joost | 2012-01-13 19:36:06 +0100 (Fri, 13 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Pass the target-CPU to fpc.
r20159 | hajny | 2012-01-23 22:36:43 +0100 (Mon, 23 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

  * EMX and Watcom use .exe extension too
r20165 | joost | 2012-01-24 12:55:58 +0100 (Tue, 24 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Use defines from the system unit to improve cross-platform behavior
r20166 | joost | 2012-01-24 22:32:30 +0100 (Tue, 24 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Automatically install the import-library files on OSes that uses those.
r20218 | joost | 2012-02-02 21:39:51 +0100 (Thu, 02 Feb 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Copy file-rights (executable bit) from files on unices
r20232 | joost | 2012-02-03 17:39:02 +0100 (Fri, 03 Feb 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Do not use deprecated stat.mode but stat.st_mode
r20233 | joost | 2012-02-03 17:46:46 +0100 (Fri, 03 Feb 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Also clean the bin-output directory on distclean
r20234 | joost | 2012-02-03 17:52:45 +0100 (Fri, 03 Feb 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Restored changes in r20159 which were overwritten in r20166
r20316 | joost | 2012-02-11 22:50:49 +0100 (Sat, 11 Feb 2012) | 2 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Set exitcode=1 when a package failed to compile and threads are used
 * Show the error-message as last message when threads are used
r20320 | pierre | 2012-02-12 11:43:21 +0100 (Sun, 12 Feb 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 Disable Threads for netbsd
r20352 | joost | 2012-02-14 21:31:00 +0100 (Tue, 14 Feb 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Do not change the current directory, that does not work well with multiple threads
r20392 | joost | 2012-02-21 18:31:51 +0100 (Tue, 21 Feb 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Fixed checking of changed files which got broken in r20352
r20410 | pierre | 2012-02-23 14:53:23 +0100 (Thu, 23 Feb 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Fix include file directory and return false for FileNewer if FileAge return -1
r20419 | pierre | 2012-02-24 00:19:09 +0100 (Fri, 24 Feb 2012) | 3 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Avoid double newlines on Dos like systems in ExecuteFPC
 * Add warning if FileAge returns -1 (which indicates failure)
r20615 | joost | 2012-03-24 17:44:55 +0100 (Sat, 24 Mar 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Install the TPackage.InstallFiles only once
r20669 | joost | 2012-03-30 16:29:50 +0200 (Fri, 30 Mar 2012) | 4 lines
Changed paths:
   M /trunk/packages/fcl-base/fpmake.pp
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Added ability to specify installation-destination path of
   TPackage.InstallFiles
 * Added bininstalldir, prefix and unitinstalldir macro''s
r20670 | joost | 2012-03-30 16:41:09 +0200 (Fri, 30 Mar 2012) | 4 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Always show a message when a package is about to be installed, not only in
   verbose mode. This way it is always clear which package is being installed 
   in case of an error.
r20724 | joost | 2012-04-06 22:28:21 +0200 (Fri, 06 Apr 2012) | 5 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * The sourcefilenames have to be resolved to be able to determine if a 
   package has to be compiled. But when not all sources are found, try
   to resolve them again after the beforecompile events are triggered. It
   could be that some sourcefiles are generated in those events.
r20735 | joost | 2012-04-07 00:25:14 +0200 (Sat, 07 Apr 2012) | 6 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Give a proper error message when an external command is not found
 * Always try to run an external command when the destination file does not 
   exist
 * Give only a warning if the destination file is older then the source
   file but the external command could not be found, give give a warning.
r20762 | joost | 2012-04-08 21:44:46 +0200 (Sun, 08 Apr 2012) | 2 lines
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 * Always notice when an external command is executed
 * Do not change the current dir in ResolveFileNames when this is already done
r21448 | pierre | 2012-06-01 10:44:19 +0200 (Fri, 01 Jun 2012) | 1 line
Changed paths:
   M /trunk/packages/fpmkunit/src/fpmkunit.pp

 Avoid installation in units/i386-go32v2 instead of units/go32v2 for global packages go32v2 installation

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

packages/fcl-base/fpmake.pp

@@ -111,7 +111,7 @@ begin
     // Additional sources
     P.Sources.AddSrcFiles('src/win/fclel.*');
     // Install windows resources
-    P.InstallFiles.Add('src/win/fclel.res',AllWindowsOSes);
+    P.InstallFiles.Add('src/win/fclel.res',AllWindowsOSes,'$(unitinstalldir)');
 
     // Examples
     P.ExamplePath.Add('examples');