فهرست منبع

Merged revisions 12160 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk

........
r12160 | peter | 2008-11-18 20:45:34 +0100 (Tue, 18 Nov 2008) | 3 lines

* use random name for tempbuilddir
* fix uninitialized needfpmkunitsource
........

git-svn-id: branches/fixes_2_2@12161 -

peter 17 سال پیش
والد
کامیت
d66504e48c
1فایلهای تغییر یافته به همراه6 افزوده شده و 3 حذف شده
  1. 6 3
      utils/fppkg/pkgfpmake.pp

+ 6 - 3
utils/fppkg/pkgfpmake.pp

@@ -5,7 +5,8 @@ unit pkgfpmake;
 interface
 
 uses
-  Classes, SysUtils,pkghandler;
+  Classes,SysUtils,DateUtils,
+  pkghandler;
 
 implementation
 
@@ -151,10 +152,9 @@ var
     OOptions:=OOptions+maybequoted(s);
   end;
 
-const
-  TempBuildDir = 'build-fpmake';
 Var
   i : Integer;
+  TempBuildDir,
   DepDir,
   FPMakeBin,
   FPMakeSrc : string;
@@ -163,8 +163,11 @@ Var
   P : TFPPackage;
 begin
   P:=AvailableRepository.PackageByName(PackageName);
+  NeedFPMKUnitSource:=false;
   OOptions:='';
   SetCurrentDir(PackageBuildPath(P));
+  // Generate random name for build path
+  TempBuildDir:='build_fpmake_'+HexStr(DateTimeToUnix(Now),8)+HexStr(GetProcessId,4);
   // Check for fpmake source
   FPMakeBin:='fpmake'+ExeExt;
   FPMakeSrc:='fpmake.pp';