Browse Source

* Fix problems with functions without function result

git-svn-id: trunk@35326 -
joost 8 years ago
parent
commit
1e33458aae
2 changed files with 2 additions and 16 deletions
  1. 2 2
      packages/fppkg/src/pkgfpmake.pp
  2. 0 14
      packages/fppkg/src/pkghandler.pp

+ 2 - 2
packages/fppkg/src/pkgfpmake.pp

@@ -169,7 +169,7 @@ begin
   P:=GFPpkg.PackageByName(PackageName, pkgpkAvailable);
   P:=GFPpkg.PackageByName(PackageName, pkgpkAvailable);
   NeedFPMKUnitSource:=false;
   NeedFPMKUnitSource:=false;
   OOptions:='';
   OOptions:='';
-  SetCurrentDir(PackageBuildPath(P));
+  SetCurrentDir(PackageManager.PackageBuildPath(P));
   // Generate random name for build path
   // Generate random name for build path
   TempBuildDir:='build_fpmake_'+HexStr(DateTimeToUnix(Now),8)+HexStr(GetProcessId,4);
   TempBuildDir:='build_fpmake_'+HexStr(DateTimeToUnix(Now),8)+HexStr(GetProcessId,4);
   // Check for fpmake source
   // Check for fpmake source
@@ -388,7 +388,7 @@ begin
 
 
   { Run FPMake }
   { Run FPMake }
   FPMakeBin:='fpmake'+ExeExt;
   FPMakeBin:='fpmake'+ExeExt;
-  SetCurrentDir(PackageBuildPath(P));
+  SetCurrentDir(PackageManager.PackageBuildPath(P));
   Result:=ExecuteProcess(FPMakeBin,Command+' '+OOptions);
   Result:=ExecuteProcess(FPMakeBin,Command+' '+OOptions);
   if Result<>0 then
   if Result<>0 then
     Error(SErrExecutionFPMake,[Command]);
     Error(SErrExecutionFPMake,[Command]);

+ 0 - 14
packages/fppkg/src/pkghandler.pp

@@ -57,8 +57,6 @@ procedure RegisterPkgHandler(const AAction:string;pkghandlerclass:TPackageHandle
 function GetPkgHandler(const AAction:string):TPackageHandlerClass;
 function GetPkgHandler(const AAction:string):TPackageHandlerClass;
 procedure ExecuteAction(const APackageName,AAction:string; PackageManager: TpkgFPpkg);
 procedure ExecuteAction(const APackageName,AAction:string; PackageManager: TpkgFPpkg);
 
 
-function PackageBuildPath(APackage:TFPPackage):String;
-function PackageLocalArchive(APackage:TFPPackage): String;
 function PackageManifestFile(APackage:TFPPackage): String;
 function PackageManifestFile(APackage:TFPPackage): String;
 procedure ClearExecutedAction;
 procedure ClearExecutedAction;
 
 
@@ -124,18 +122,6 @@ begin
 end;
 end;
 
 
 
 
-function PackageBuildPath(APackage:TFPPackage):String;
-begin
-  GFPpkg.PackageBuildPath(APackage);
-end;
-
-
-function PackageLocalArchive(APackage:TFPPackage): String;
-begin
-  GFPpkg.PackageLocalArchive(APackage);
-end;
-
-
 function PackageManifestFile(APackage:TFPPackage): String;
 function PackageManifestFile(APackage:TFPPackage): String;
 begin
 begin
   Result:=ManifestFileName;
   Result:=ManifestFileName;