* 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,6 +4735,9 @@ begin
{$ifdef HAS_TAR_SUPPORT} {$ifdef HAS_TAR_SUPPORT}
if not assigned(FTarWriter) then if not assigned(FTarWriter) then
begin begin
If (APackage.Directory<>'') then
EnterDir('');
try
FGZFileStream := TGZFileStream.create(Defaults.ZipPrefix + APackage.Name + MakeZipSuffix(Defaults.CPU,Defaults.OS) +'.tar.gz', gzopenwrite); FGZFileStream := TGZFileStream.create(Defaults.ZipPrefix + APackage.Name + MakeZipSuffix(Defaults.CPU,Defaults.OS) +'.tar.gz', gzopenwrite);
try try
FTarWriter := TTarWriter.Create(FGZFileStream); FTarWriter := TTarWriter.Create(FGZFileStream);
@ -4744,6 +4747,10 @@ begin
except except
FGZFileStream.Free; FGZFileStream.Free;
end; end;
finally
If (APackage.Directory<>'') then
EnterDir(APackage.Directory);
end;
end; end;
{$ifdef unix} {$ifdef unix}
if (FpStat(ASourceFileName, FileStat) = 0) and (FileStat.st_mode and S_IXUSR = S_IXUSR) then if (FpStat(ASourceFileName, FileStat) = 0) and (FileStat.st_mode and S_IXUSR = S_IXUSR) then
@ -8016,3 +8023,4 @@ Finalization
FreeAndNil(GlobalDictionary); FreeAndNil(GlobalDictionary);
FreeAndNil(Defaults); FreeAndNil(Defaults);
end. end.