mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-14 15:29:14 +02:00
* use random name for tempbuilddir
* fix uninitialized needfpmkunitsource git-svn-id: trunk@12160 -
This commit is contained in:
parent
2a952c89a5
commit
514ccae231
@ -5,7 +5,8 @@ unit pkgfpmake;
|
|||||||
interface
|
interface
|
||||||
|
|
||||||
uses
|
uses
|
||||||
Classes, SysUtils,pkghandler;
|
Classes,SysUtils,DateUtils,
|
||||||
|
pkghandler;
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
@ -151,10 +152,9 @@ var
|
|||||||
OOptions:=OOptions+maybequoted(s);
|
OOptions:=OOptions+maybequoted(s);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
const
|
|
||||||
TempBuildDir = 'build-fpmake';
|
|
||||||
Var
|
Var
|
||||||
i : Integer;
|
i : Integer;
|
||||||
|
TempBuildDir,
|
||||||
DepDir,
|
DepDir,
|
||||||
FPMakeBin,
|
FPMakeBin,
|
||||||
FPMakeSrc : string;
|
FPMakeSrc : string;
|
||||||
@ -163,8 +163,11 @@ Var
|
|||||||
P : TFPPackage;
|
P : TFPPackage;
|
||||||
begin
|
begin
|
||||||
P:=AvailableRepository.PackageByName(PackageName);
|
P:=AvailableRepository.PackageByName(PackageName);
|
||||||
|
NeedFPMKUnitSource:=false;
|
||||||
OOptions:='';
|
OOptions:='';
|
||||||
SetCurrentDir(PackageBuildPath(P));
|
SetCurrentDir(PackageBuildPath(P));
|
||||||
|
// Generate random name for build path
|
||||||
|
TempBuildDir:='build_fpmake_'+HexStr(DateTimeToUnix(Now),8)+HexStr(GetProcessId,4);
|
||||||
// Check for fpmake source
|
// Check for fpmake source
|
||||||
FPMakeBin:='fpmake'+ExeExt;
|
FPMakeBin:='fpmake'+ExeExt;
|
||||||
FPMakeSrc:='fpmake.pp';
|
FPMakeSrc:='fpmake.pp';
|
||||||
|
Loading…
Reference in New Issue
Block a user