|
@@ -734,6 +734,7 @@ Type
|
|
FDirectory: String;
|
|
FDirectory: String;
|
|
FOptions: TStrings;
|
|
FOptions: TStrings;
|
|
FFileName: String;
|
|
FFileName: String;
|
|
|
|
+ FShortName: String;
|
|
FAuthor: String;
|
|
FAuthor: String;
|
|
FLicense: String;
|
|
FLicense: String;
|
|
FHomepageURL: String;
|
|
FHomepageURL: String;
|
|
@@ -763,6 +764,7 @@ Type
|
|
Function GetDescription : string;
|
|
Function GetDescription : string;
|
|
function GetDictionary: TDictionary;
|
|
function GetDictionary: TDictionary;
|
|
Function GetFileName : string;
|
|
Function GetFileName : string;
|
|
|
|
+ Function GetShortName : string;
|
|
function GetOptions: TStrings;
|
|
function GetOptions: TStrings;
|
|
Function GetVersion : string;
|
|
Function GetVersion : string;
|
|
procedure SetOptions(const AValue: TStrings);
|
|
procedure SetOptions(const AValue: TStrings);
|
|
@@ -796,6 +798,7 @@ Type
|
|
procedure SaveUnitConfigToFile(Const AFileName: String;ACPU:TCPU;AOS:TOS);
|
|
procedure SaveUnitConfigToFile(Const AFileName: String;ACPU:TCPU;AOS:TOS);
|
|
Property Version : String Read GetVersion Write SetVersion;
|
|
Property Version : String Read GetVersion Write SetVersion;
|
|
Property FileName : String Read GetFileName Write FFileName;
|
|
Property FileName : String Read GetFileName Write FFileName;
|
|
|
|
+ Property ShortName : String Read GetShortName Write FShortName;
|
|
Property HomepageURL : String Read FHomepageURL Write FHomepageURL;
|
|
Property HomepageURL : String Read FHomepageURL Write FHomepageURL;
|
|
Property DownloadURL : String Read FDownloadURL Write FDownloadURL;
|
|
Property DownloadURL : String Read FDownloadURL Write FDownloadURL;
|
|
Property Email : String Read FEmail Write FEmail;
|
|
Property Email : String Read FEmail Write FEmail;
|
|
@@ -3383,9 +3386,19 @@ begin
|
|
((Defaults.OS in AllLimit83fsOses) or (Defaults.BuildOS in AllLimit83fsOses)) then
|
|
((Defaults.OS in AllLimit83fsOses) or (Defaults.BuildOS in AllLimit83fsOses)) then
|
|
Result := Name + '-' + FVersion.AsString
|
|
Result := Name + '-' + FVersion.AsString
|
|
else
|
|
else
|
|
- Result := Name;
|
|
|
|
|
|
+ Result := ShortName;
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
+
|
|
|
|
+Function TPackage.GetShortName : string;
|
|
|
|
+begin
|
|
|
|
+ if FShortName<>'' then
|
|
|
|
+ result := FShortName
|
|
|
|
+ else
|
|
|
|
+ result := Name;
|
|
|
|
+end;
|
|
|
|
+
|
|
|
|
+
|
|
function TPackage.GetOptions: TStrings;
|
|
function TPackage.GetOptions: TStrings;
|
|
begin
|
|
begin
|
|
If (FOptions=Nil) then
|
|
If (FOptions=Nil) then
|
|
@@ -4788,6 +4801,17 @@ begin
|
|
end;
|
|
end;
|
|
|
|
|
|
procedure TBuildEngine.AddFileToArchive(const APackage: TPackage; const ASourceFileName, ADestFileName: String);
|
|
procedure TBuildEngine.AddFileToArchive(const APackage: TPackage; const ASourceFileName, ADestFileName: String);
|
|
|
|
+
|
|
|
|
+ function GetArchiveName: string;
|
|
|
|
+ begin
|
|
|
|
+ result := Defaults.ZipPrefix;
|
|
|
|
+ if Defaults.BuildOS in AllLimit83fsOses then
|
|
|
|
+ result := result + APackage.ShortName
|
|
|
|
+ else
|
|
|
|
+ result := result + APackage.Name;
|
|
|
|
+ result := result + MakeZipSuffix(Defaults.CPU, Defaults.OS);
|
|
|
|
+ end;
|
|
|
|
+
|
|
{$ifdef UNIX}
|
|
{$ifdef UNIX}
|
|
var
|
|
var
|
|
FileStat: stat;
|
|
FileStat: stat;
|
|
@@ -4797,7 +4821,7 @@ 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);
|
|
|
|
|
|
+ FGZFileStream := TGZFileStream.create(GetArchiveName +'.tar.gz', gzopenwrite);
|
|
try
|
|
try
|
|
FTarWriter := TTarWriter.Create(FGZFileStream);
|
|
FTarWriter := TTarWriter.Create(FGZFileStream);
|
|
FTarWriter.Permissions := [tpReadByOwner, tpWriteByOwner, tpReadByGroup, tpReadByOther];
|
|
FTarWriter.Permissions := [tpReadByOwner, tpWriteByOwner, tpReadByGroup, tpReadByOther];
|
|
@@ -4828,7 +4852,7 @@ begin
|
|
if not assigned(FZipper) then
|
|
if not assigned(FZipper) then
|
|
begin
|
|
begin
|
|
FZipper := TZipper.Create;
|
|
FZipper := TZipper.Create;
|
|
- FZipper.FileName := Defaults.ZipPrefix + APackage.Name + MakeZipSuffix(Defaults.CPU,Defaults.OS) + '.zip';
|
|
|
|
|
|
+ FZipper.FileName := GetArchiveName + '.zip';
|
|
end;
|
|
end;
|
|
|
|
|
|
FZipper.Entries.AddFileEntry(ASourceFileName, ADestFileName);
|
|
FZipper.Entries.AddFileEntry(ASourceFileName, ADestFileName);
|