paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-07 09:30:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix problems with functions without function result

Browse Source 
git-svn-id: trunk@35326 -
This commit is contained in:
joost 2017-01-22 19:59:46 +00:00
parent 790b08948a
commit 1e33458aae
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/fppkg/src/pkgfpmake.pp
View File

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

14
packages/fppkg/src/pkghandler.pp
View File

@ -57,8 +57,6 @@ procedure RegisterPkgHandler(const AAction:string;pkghandlerclass:TPackageHandle
function GetPkgHandler(const AAction:string):TPackageHandlerClass;
procedure ExecuteAction(const APackageName,AAction:string; PackageManager: TpkgFPpkg);
function PackageBuildPath(APackage:TFPPackage):String;
function PackageLocalArchive(APackage:TFPPackage): String;
function PackageManifestFile(APackage:TFPPackage): String;
procedure ClearExecutedAction;
@ -124,18 +122,6 @@ begin
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;
begin
Result:=ManifestFileName;