* Use short 8.3 names for archives on limit83fs-hosts

git-svn-id: trunk@29174 -
This commit is contained in:
joost 2014-11-28 21:35:46 +00:00
parent 9f138fd659
commit 0574714317
72 changed files with 98 additions and 3 deletions

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('bzip2');
P.ShortName:='bz2';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('cdrom');
P.ShortName:='cdr';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-async');
P.ShortName:='fcla';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-base');
P.ShortName:='fclb';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -25,6 +25,7 @@ begin
With Installer do
begin
P:=AddPackage('fcl-db');
P.ShortName:='fcld';
P.Author := '<various>';
P.License := 'LGPL with modification, ';

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-fpcunit');
P.ShortName:='fclu';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-image');
P.ShortName:='fcli';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-js');
P.ShortName:='fcjs';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-json');
P.ShortName:='fclj';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-net');
P.ShortName:='fcln';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-passrc');
P.ShortName:='fcls';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-process');
P.ShortName:='fclp';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-registry');
P.ShortName:='fclr';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-res');
P.ShortName:='fcle';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -12,6 +12,7 @@ begin
begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-sdo');
P.ShortName:='fcsd';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-sound');
P.ShortName:='fsnd';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-stl');
P.ShortName:='fcst';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-web');
P.ShortName:='fclw';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -14,6 +14,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-xml');
P.ShortName:='fclx';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fpgtk');
P.ShortName:='fpgt';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('fpmkunit');
P.ShortName:='fpmk';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

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

View File

@ -23,6 +23,7 @@ begin
begin
P:=AddPackage('fppkg');
P.ShortName:='fppk';
P.Directory:=ADirectory;
P.Version:='2.7.1';

View File

@ -154,6 +154,7 @@ begin
With Installer do
begin
P:=AddPackage('gdbint');
P.ShortName:='gdb';
P.Directory:=ADirectory;
P.Version:='2.7.1';
P.Author := 'Library : Cygnus, header: Peter Vreman';

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('graph');
P.ShortName:='grph';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('hermes');
P.ShortName:='herm';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('httpd13');
P.ShortName:='hd13';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('httpd20');
P.ShortName:='hd20';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('httpd22');
P.ShortName:='hd22';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('httpd24');
P.ShortName:='hd24';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('ibase');
P.ShortName:='ibas';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('imlib');
P.ShortName:='imlb';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('libgd');
P.ShortName:='lgd';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('libpng');
P.ShortName:='lpng';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('libtar');
P.ShortName:='ltar';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('mysql');
P.ShortName:='mysq';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('oggvorbis');
P.ShortName:='oggv';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('openal');
P.ShortName:='oal';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('opengl');
P.ShortName:='ogl';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('openssl');
P.ShortName:='ossl';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('oracle');
P.ShortName:='ora';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -12,6 +12,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('os2units');
P.ShortName:='os2';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('pasjpeg');
P.ShortName:='pjp';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -14,6 +14,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('paszlib');
P.ShortName:='pzl';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('postgres');
P.ShortName:='pgr';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('regexpr');
P.ShortName:='reg';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -34,6 +34,7 @@ begin
With Installer do
begin
P:=AddPackage('rtl-console');
P.ShortName:='rtlc';
P.Directory:=ADirectory;
P.Version:='2.7.1';
P.Author := 'FPC core team, Pierre Mueller, Peter Vreman';

View File

@ -43,6 +43,7 @@ begin
With Installer do
begin
P:=AddPackage('rtl-extra');
P.ShortName:='rtle';
P.Directory:=ADirectory;
P.Version:='2.7.1';
P.Author := 'FPC core team';

View File

@ -36,6 +36,7 @@ begin
With Installer do
begin
P:=AddPackage('rtl-objpas');
P.ShortName:='rtlo';
P.Directory:=ADirectory;
P.Version:='2.7.1';
P.Author := 'FPC core team';

View File

@ -32,6 +32,7 @@ begin
With Installer do
begin
P:=AddPackage('rtl-unicode');
P.ShortName:='rtlu';
P.Directory:=ADirectory;
P.Version:='2.7.1';
P.Author := 'FPC core team';

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('sqlite');
P.ShortName:='sqlt';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -12,6 +12,7 @@ begin
begin
{$endif ALLPACKAGES}
P:=AddPackage('symbolic');
P.ShortName:='symb';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('unzip');
P.ShortName:='zip';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -13,6 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('winunits-base');
P.ShortName:='win';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-dxegen');
P.ShortName:='dxeg';
P.Author := 'Charles Sandmann and others';
P.License := 'LGPL with modification';

View File

@ -209,6 +209,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-fpcm');
P.ShortName:='fpcm';
P.Author := '<various>';
P.License := 'LGPL with modification';

View File

@ -16,6 +16,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-fpcmkcfg');
P.ShortName:='fcmk';
P.Author := '<various>';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-fpcres');
P.ShortName:='fpcres';
P.Author := 'Giulio Bernardi';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-fpcreslipo');
P.ShortName:='fpcreslipo';
P.Author := 'Giulio Bernardi';
P.License := 'LGPL with modification';

View File

@ -17,6 +17,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-fpdoc');
P.ShortName:='fpdoc';
P.Author := '<various>';
P.License := 'LGPL with modification';

View File

@ -17,6 +17,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-fpmc');
P.ShortName:='fpmc';
P.Author := '<various>';
P.License := 'LGPL with modification';

View File

@ -18,6 +18,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-fppkg');
P.ShortName:='fppkg';
P.Author := '<various>';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-fprcp');
P.ShortName:='fprcp';
P.Author := '<various>';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-h2pas');
P.ShortName:='h2pas';
P.Author := '<various>';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-importtl');
P.ShortName:='importttl';
P.Author := '<various>';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-instantfpc');
P.ShortName:='instantfpc';
P.Author := '<various>';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-pas2fpm');
p.ShortName:='p2fm';
P.Author := 'Free Pascal Team';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-pas2jni');
P.ShortName:='p2jn';
P.Author := 'Yury Sidorov';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-pas2ut');
P.ShortName:='p2ut';
P.Author := 'Free Pascal Team';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-rmwait');
p.ShortName:='rmw';
P.Author := 'Tomas Hajny';
P.License := 'LGPL with modification';

View File

@ -16,6 +16,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-lexyacc');
P.ShortName:='tply';
P.Author := '<various>';
P.License := 'LGPL with modification';

View File

@ -15,6 +15,7 @@ begin
With Installer do
begin
P:=AddPackage('utils-unicode');
P.ShortName:='unicode';
P.Author := 'Inoussa OUEDRAOGO';
P.License := 'LGPL with modification';