Browse Source

* Always notice when an external command is executed
* Do not change the current dir in ResolveFileNames when this is already done

git-svn-id: trunk@20762 -

joost 13 years ago
parent
commit
d6033c7890
1 changed files with 2 additions and 1 deletions
  1. 2 1
      packages/fpmkunit/src/fpmkunit.pp

+ 2 - 1
packages/fpmkunit/src/fpmkunit.pp

@@ -4424,6 +4424,7 @@ begin
               C.BeforeCommand(C);
               C.BeforeCommand(C);
             O:=ADictionary.Substitute(C.CmdLineOptions,['SOURCE',SourceFile,'DEST',DestFile]);
             O:=ADictionary.Substitute(C.CmdLineOptions,['SOURCE',SourceFile,'DEST',DestFile]);
 
 
+            Log(vlCommand,SInfoExecutingCommand,[Cmd,O]);
             ExecuteCommand(Cmd,O,nil,C.IgnoreResult);
             ExecuteCommand(Cmd,O,nil,C.IgnoreResult);
             If Assigned(C.AfterCommand) then
             If Assigned(C.AfterCommand) then
               C.AfterCommand(C);
               C.AfterCommand(C);
@@ -4932,7 +4933,7 @@ begin
   If Assigned(APackage.BeforeCompileProc) then
   If Assigned(APackage.BeforeCompileProc) then
     APackage.BeforeCompileProc(APackage);
     APackage.BeforeCompileProc(APackage);
   // It could be that files that weren't found before are available now.
   // It could be that files that weren't found before are available now.
-  ResolveFileNames(APackage,Defaults.CPU,Defaults.OS,true,true);
+  ResolveFileNames(APackage,Defaults.CPU,Defaults.OS,false,true);
 end;
 end;