Переглянути джерело

* stop when fpmake fails

git-svn-id: trunk@9355 -
peter 18 роки тому
батько
коміт
f3b26a94fe
3 змінених файлів з 5 додано та 3 видалено
  1. 1 1
      utils/fppkg/fppkg.pp
  2. 2 1
      utils/fppkg/pkgfpmake.pp
  3. 2 1
      utils/fppkg/pkgmessages.pp

+ 1 - 1
utils/fppkg/fppkg.pp

@@ -304,7 +304,7 @@ begin
   except
     On E : Exception do
       begin
-        Writeln(StdErr,SErrRunning);
+        Writeln(StdErr,SErrException);
         Writeln(StdErr,E.Message);
         Halt(1);
       end;

+ 2 - 1
utils/fppkg/pkgfpmake.pp

@@ -249,7 +249,8 @@ begin
   FPMakeBin:='fpmake'+ExeExt;
   SetCurrentDir(PackageBuildPath);
   Result:=ExecuteProcess(FPMakeBin,Command+OOptions);
-
+  if Result<>0 then
+    Error(SErrExecutionFPMake,[Command]);
 end;
 
 

+ 2 - 1
utils/fppkg/pkgmessages.pp

@@ -22,7 +22,8 @@ Resourcestring
   SErrNoPackageSpecified     = 'No package specified';
   SErrNoPackageAvailable     = 'Package %s %s is not available';
   SErrOnlyLocalDir           = 'The speficied command "%s" works only on current dir, not on a (remote) package';
-  SErrRunning                = 'The FPC make tool encountered the following error:';
+  SErrExecutionFPMake        = 'Execution of FPMake %s failed';
+  SErrException              = 'The FPC Package tool encountered the following error:';
   SErrActionAlreadyRegistered= 'Action "%s" is already registered';
   SErrActionNotFound         = 'Action "%s" is not supported';
   SErrFailedToCompileFPCMake = 'Could not compile fpmake driver program';