* Create the archives for multiple packages in the same location as the head fpmake.pp

git-svn-id: trunk@28915 -
This commit is contained in:
joost 2014-10-24 21:36:01 +00:00
parent ac85ad39df
commit 618f9745f8

View File

@ -4735,14 +4735,21 @@ begin
{$ifdef HAS_TAR_SUPPORT} {$ifdef HAS_TAR_SUPPORT}
if not assigned(FTarWriter) then if not assigned(FTarWriter) then
begin begin
FGZFileStream := TGZFileStream.create(Defaults.ZipPrefix + APackage.Name + MakeZipSuffix(Defaults.CPU,Defaults.OS) +'.tar.gz', gzopenwrite); If (APackage.Directory<>'') then
EnterDir('');
try try
FTarWriter := TTarWriter.Create(FGZFileStream); FGZFileStream := TGZFileStream.create(Defaults.ZipPrefix + APackage.Name + MakeZipSuffix(Defaults.CPU,Defaults.OS) +'.tar.gz', gzopenwrite);
FTarWriter.Permissions := [tpReadByOwner, tpWriteByOwner, tpReadByGroup, tpReadByOther]; try
FTarWriter.UserName := 'root'; FTarWriter := TTarWriter.Create(FGZFileStream);
FTarWriter.GroupName := 'root'; FTarWriter.Permissions := [tpReadByOwner, tpWriteByOwner, tpReadByGroup, tpReadByOther];
except FTarWriter.UserName := 'root';
FGZFileStream.Free; FTarWriter.GroupName := 'root';
except
FGZFileStream.Free;
end;
finally
If (APackage.Directory<>'') then
EnterDir(APackage.Directory);
end; end;
end; end;
{$ifdef unix} {$ifdef unix}
@ -8016,3 +8023,4 @@ Finalization
FreeAndNil(GlobalDictionary); FreeAndNil(GlobalDictionary);
FreeAndNil(Defaults); FreeAndNil(Defaults);
end. end.