paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-18 17:19:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Avoid double newlines on Dos like systems in ExecuteFPC

Browse Source 
* Add warning if FileAge returns -1 (which indicates failure)

git-svn-id: trunk@20419 -
This commit is contained in:
pierre 2012-02-23 23:19:09 +00:00
parent 3dd4514724
commit 60bebca1ea
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/fpmkunit/src/fpmkunit.pp
View File

@ -1210,6 +1210,7 @@ ResourceString
SWarnCleanPackagecomplete = 'Clean of package %s completed';
SWarnCanNotGetAccessRights = 'Warning: Failed to copy access-rights from file %s';
SWarnCanNotSetAccessRights = 'Warning: Failed to copy access-rights to file %s';
SWarnCanNotGetFileAge = 'Warning: Failed to get FileAge for %s';
SInfoPackageAlreadyProcessed = 'Package %s is already processed';
SInfoCompilingTarget = 'Compiling target %s';
@ -1222,7 +1223,7 @@ ResourceString
SInfoCopyingFile = 'Copying file "%s" to "%s"';
SInfoDeletingFile = 'Deleting file "%s"';
SInfoSourceNewerDest = 'Source file "%s" (%s) is newer than destination "%s" (%s).';
SInfoFallbackBuildmode = 'Buildmode not spported by package, falling back to one by one unit compilation';
SInfoFallbackBuildmode = 'Buildmode not supported by package, falling back to one by one unit compilation';
SDbgComparingFileTimes = 'Comparing file "%s" time "%s" to "%s" time "%s".';
SDbgCompilingDependenciesOfTarget = 'Compiling dependencies of target %s';
@ -1387,8 +1388,17 @@ var
installer.log(vlCommand,' '+ Copy(sLine, ipos + Length(snum), Length(sLine) - ipos - Length(snum) + 1));
end;
end;
sLine := '';
if (LineEnding=#13#10) and (ch=#13) and
(ConsoleOutput.Position<BytesRead) then
begin
ConsoleOutput.Read(ch,1);
if ch=#10 then
sLine:=''
else
sLine:=ch;
end
else
sLine := '';
BuffPos := ConsoleOutput.Position;
end
else
@ -4247,6 +4257,7 @@ begin
{ Return false if file not found or not accessible }
if DS=-1 then
begin
Log(vlWarning,SWarnCanNotGetFileAge,[Src]);
Result:=false;
exit;
end;