From 66d83bc3d2bd95eaaf0550bf8b7d52554b3796ec Mon Sep 17 00:00:00 2001 From: joost Date: Wed, 22 Aug 2012 18:58:07 +0000 Subject: [PATCH] * When bmBuildUnit is the only available build mode, use it git-svn-id: trunk@22178 - --- packages/fpmkunit/src/fpmkunit.pp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/fpmkunit/src/fpmkunit.pp b/packages/fpmkunit/src/fpmkunit.pp index c761dcdade..b5a77b80ca 100644 --- a/packages/fpmkunit/src/fpmkunit.pp +++ b/packages/fpmkunit/src/fpmkunit.pp @@ -1262,6 +1262,7 @@ ResourceString SInfoSourceNewerDest = 'Source file "%s" (%s) is newer than destination "%s" (%s).'; SInfoDestDoesNotExist = 'Destination file "%s" does not exist.'; SInfoFallbackBuildmode = 'Buildmode not supported by package, falling back to one by one unit compilation'; + SInfoFallbackBuildmodeBU= 'Buildmode not supported by package, falling back to compilation using a buildunit'; SDbgComparingFileTimes = 'Comparing file "%s" time "%s" to "%s" time "%s".'; SDbgCompilingDependenciesOfTarget = 'Compiling dependencies of target %s'; @@ -5427,8 +5428,13 @@ begin case Defaults.BuildMode of bmOneByOne: begin - if bmOneByOne in APackage.SupportBuildModes then - APackage.FBuildMode:=bmOneByOne + if (bmOneByOne in APackage.SupportBuildModes) then + APackage.FBuildMode:=bmBuildUnit + else if bmBuildUnit in APackage.SupportBuildModes then + begin + log(vlInfo,SInfoFallbackBuildmodeBU); + APackage.FBuildMode:=bmBuildUnit; + end else raise exception.create(SErrUnsupportedBuildmode); end;