* Use short 8.3 names for archives on limit83fs-hosts

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@29174 3ad0048d-3df7-0310-abae-a5850022a9f2

72 files changed, 98 insertions, 3 deletions

diff --git a/packages/bzip2/fpmake.pp b/packages/bzip2/fpmake.pp
index 86c5f15834..c4c1bb9392 100644
--- a/packages/bzip2/fpmake.pp
+++ b/packages/bzip2/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('bzip2');
+    P.ShortName:='bz2';
 
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
diff --git a/packages/cdrom/fpmake.pp b/packages/cdrom/fpmake.pp
index 6a2e117afd..9089060a00 100644
--- a/packages/cdrom/fpmake.pp
+++ b/packages/cdrom/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('cdrom');
+    P.ShortName:='cdr';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-async/fpmake.pp b/packages/fcl-async/fpmake.pp
index a39b3d3855..9536258490 100644
--- a/packages/fcl-async/fpmake.pp
+++ b/packages/fcl-async/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-async');
+    P.ShortName:='fcla';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-base/fpmake.pp b/packages/fcl-base/fpmake.pp
index ce2d326740..73e1f31977 100644
--- a/packages/fcl-base/fpmake.pp
+++ b/packages/fcl-base/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-base');
+    P.ShortName:='fclb';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-db/fpmake.pp b/packages/fcl-db/fpmake.pp
index ce8f935e5f..74a293c09f 100644
--- a/packages/fcl-db/fpmake.pp
+++ b/packages/fcl-db/fpmake.pp
@@ -25,6 +25,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('fcl-db');
+    P.ShortName:='fcld';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification, ';
diff --git a/packages/fcl-fpcunit/fpmake.pp b/packages/fcl-fpcunit/fpmake.pp
index d06cfeaa74..51fab18c62 100644
--- a/packages/fcl-fpcunit/fpmake.pp
+++ b/packages/fcl-fpcunit/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-fpcunit');
+    P.ShortName:='fclu';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-image/fpmake.pp b/packages/fcl-image/fpmake.pp
index 01903279d9..152d3aeed3 100644
--- a/packages/fcl-image/fpmake.pp
+++ b/packages/fcl-image/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-image');
+    P.ShortName:='fcli';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-js/fpmake.pp b/packages/fcl-js/fpmake.pp
index 0aea4e70a7..d886a6f7a8 100644
--- a/packages/fcl-js/fpmake.pp
+++ b/packages/fcl-js/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-js');
+    P.ShortName:='fcjs';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-json/fpmake.pp b/packages/fcl-json/fpmake.pp
index df5f88ca1a..5d6f4b4872 100644
--- a/packages/fcl-json/fpmake.pp
+++ b/packages/fcl-json/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-json');
+    P.ShortName:='fclj';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-net/fpmake.pp b/packages/fcl-net/fpmake.pp
index 8112d08866..eda9f570c2 100644
--- a/packages/fcl-net/fpmake.pp
+++ b/packages/fcl-net/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-net');
+    P.ShortName:='fcln';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-passrc/fpmake.pp b/packages/fcl-passrc/fpmake.pp
index 7be493420e..e3438dc733 100644
--- a/packages/fcl-passrc/fpmake.pp
+++ b/packages/fcl-passrc/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-passrc');
+    P.ShortName:='fcls';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-process/fpmake.pp b/packages/fcl-process/fpmake.pp
index 3c91d60dce..84575498c5 100644
--- a/packages/fcl-process/fpmake.pp
+++ b/packages/fcl-process/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-process');
+    P.ShortName:='fclp';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-registry/fpmake.pp b/packages/fcl-registry/fpmake.pp
index 1c0694acc9..06c67233fc 100644
--- a/packages/fcl-registry/fpmake.pp
+++ b/packages/fcl-registry/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-registry');
+    P.ShortName:='fclr';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-res/fpmake.pp b/packages/fcl-res/fpmake.pp
index c9cde6e79a..cab0af473b 100644
--- a/packages/fcl-res/fpmake.pp
+++ b/packages/fcl-res/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-res');
+    P.ShortName:='fcle';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-sdo/fpmake.pp b/packages/fcl-sdo/fpmake.pp
index 0f3e791381..c630168102 100644
--- a/packages/fcl-sdo/fpmake.pp
+++ b/packages/fcl-sdo/fpmake.pp
@@ -12,6 +12,7 @@ begin
     begin
 {$endif ALLPACKAGES}
     P:=AddPackage('fcl-sdo');
+    P.ShortName:='fcsd';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-sound/fpmake.pp b/packages/fcl-sound/fpmake.pp
index 3df7327ac7..0b9746031c 100644
--- a/packages/fcl-sound/fpmake.pp
+++ b/packages/fcl-sound/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-sound');
+    P.ShortName:='fsnd';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-stl/fpmake.pp b/packages/fcl-stl/fpmake.pp
index e87ba5c83f..0f0ecb99b4 100644
--- a/packages/fcl-stl/fpmake.pp
+++ b/packages/fcl-stl/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-stl');
+    P.ShortName:='fcst';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-web/fpmake.pp b/packages/fcl-web/fpmake.pp
index 4eaacba72d..bb122cc725 100644
--- a/packages/fcl-web/fpmake.pp
+++ b/packages/fcl-web/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-web');
+    P.ShortName:='fclw';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fcl-xml/fpmake.pp b/packages/fcl-xml/fpmake.pp
index 4c9130e50e..02954f290a 100644
--- a/packages/fcl-xml/fpmake.pp
+++ b/packages/fcl-xml/fpmake.pp
@@ -14,6 +14,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fcl-xml');
+    P.ShortName:='fclx';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fpgtk/fpmake.pp b/packages/fpgtk/fpmake.pp
index c29cfbd589..71ec192d5d 100644
--- a/packages/fpgtk/fpmake.pp
+++ b/packages/fpgtk/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fpgtk');
+    P.ShortName:='fpgt';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fpmkunit/fpmake.pp b/packages/fpmkunit/fpmake.pp
index e6dc585c63..0068d3209e 100644
--- a/packages/fpmkunit/fpmake.pp
+++ b/packages/fpmkunit/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('fpmkunit');
+    P.ShortName:='fpmk';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/fpmkunit/src/fpmkunit.pp b/packages/fpmkunit/src/fpmkunit.pp
index b710481d19..c25f66ca52 100644
--- a/packages/fpmkunit/src/fpmkunit.pp
+++ b/packages/fpmkunit/src/fpmkunit.pp
@@ -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);
diff --git a/packages/fppkg/fpmake.pp b/packages/fppkg/fpmake.pp
index cdc4cb851a..4e2c60881f 100644
--- a/packages/fppkg/fpmake.pp
+++ b/packages/fppkg/fpmake.pp
@@ -23,6 +23,7 @@ begin
     begin
 
     P:=AddPackage('fppkg');
+    P.ShortName:='fppk';
     P.Directory:=ADirectory;
 
     P.Version:='2.7.1';
diff --git a/packages/gdbint/fpmake.pp b/packages/gdbint/fpmake.pp
index 972bba81d0..d77c57884b 100644
--- a/packages/gdbint/fpmake.pp
+++ b/packages/gdbint/fpmake.pp
@@ -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';
diff --git a/packages/graph/fpmake.pp b/packages/graph/fpmake.pp
index 0f737c8d4d..a253b91edf 100644
--- a/packages/graph/fpmake.pp
+++ b/packages/graph/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('graph');
+    P.ShortName:='grph';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/hermes/fpmake.pp b/packages/hermes/fpmake.pp
index bf4faeeca9..e64a16bd0a 100644
--- a/packages/hermes/fpmake.pp
+++ b/packages/hermes/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('hermes');
+    P.ShortName:='herm';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/httpd13/fpmake.pp b/packages/httpd13/fpmake.pp
index 8285b232cf..f09398a994 100644
--- a/packages/httpd13/fpmake.pp
+++ b/packages/httpd13/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('httpd13');
+    P.ShortName:='hd13';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/httpd20/fpmake.pp b/packages/httpd20/fpmake.pp
index d095888bec..ce0209b9f5 100644
--- a/packages/httpd20/fpmake.pp
+++ b/packages/httpd20/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('httpd20');
+    P.ShortName:='hd20';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/httpd22/fpmake.pp b/packages/httpd22/fpmake.pp
index 218dd45ca2..b1982bc303 100644
--- a/packages/httpd22/fpmake.pp
+++ b/packages/httpd22/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('httpd22');
+    P.ShortName:='hd22';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/httpd24/fpmake.pp b/packages/httpd24/fpmake.pp
index 2acf16cdb6..fca03c1b21 100644
--- a/packages/httpd24/fpmake.pp
+++ b/packages/httpd24/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('httpd24');
+    P.ShortName:='hd24';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/ibase/fpmake.pp b/packages/ibase/fpmake.pp
index 1b1983c54a..a0bf490247 100644
--- a/packages/ibase/fpmake.pp
+++ b/packages/ibase/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('ibase');
+    P.ShortName:='ibas';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/imlib/fpmake.pp b/packages/imlib/fpmake.pp
index 476ad0501a..9d106a9296 100644
--- a/packages/imlib/fpmake.pp
+++ b/packages/imlib/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('imlib');
+    P.ShortName:='imlb';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libgd/fpmake.pp b/packages/libgd/fpmake.pp
index c1b2ebd3cc..0ce21015c9 100644
--- a/packages/libgd/fpmake.pp
+++ b/packages/libgd/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libgd');
+    P.ShortName:='lgd';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libpng/fpmake.pp b/packages/libpng/fpmake.pp
index f80682bc25..b4a9257f88 100644
--- a/packages/libpng/fpmake.pp
+++ b/packages/libpng/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libpng');
+    P.ShortName:='lpng';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/libtar/fpmake.pp b/packages/libtar/fpmake.pp
index 24252a7dec..bfe2d8fb1a 100644
--- a/packages/libtar/fpmake.pp
+++ b/packages/libtar/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('libtar');
+    P.ShortName:='ltar';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/mysql/fpmake.pp b/packages/mysql/fpmake.pp
index 0ddabbaa02..086b256366 100644
--- a/packages/mysql/fpmake.pp
+++ b/packages/mysql/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('mysql');
+    P.ShortName:='mysq';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/oggvorbis/fpmake.pp b/packages/oggvorbis/fpmake.pp
index 3f3079a175..21f6a36a20 100644
--- a/packages/oggvorbis/fpmake.pp
+++ b/packages/oggvorbis/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('oggvorbis');
+    P.ShortName:='oggv';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/openal/fpmake.pp b/packages/openal/fpmake.pp
index 6600fdbfe1..ab287bd10f 100644
--- a/packages/openal/fpmake.pp
+++ b/packages/openal/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('openal');
+    P.ShortName:='oal';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/opengl/fpmake.pp b/packages/opengl/fpmake.pp
index 4253cc7b88..966b905c13 100644
--- a/packages/opengl/fpmake.pp
+++ b/packages/opengl/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('opengl');
+    P.ShortName:='ogl';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/openssl/fpmake.pp b/packages/openssl/fpmake.pp
index f027cce365..66e323b334 100644
--- a/packages/openssl/fpmake.pp
+++ b/packages/openssl/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('openssl');
+    P.ShortName:='ossl';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/oracle/fpmake.pp b/packages/oracle/fpmake.pp
index 51ead0cac2..639f046e68 100644
--- a/packages/oracle/fpmake.pp
+++ b/packages/oracle/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('oracle');
+    P.ShortName:='ora';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/os2units/fpmake.pp b/packages/os2units/fpmake.pp
index 18ef621b2b..2657780eb7 100644
--- a/packages/os2units/fpmake.pp
+++ b/packages/os2units/fpmake.pp
@@ -12,6 +12,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('os2units');
+    P.ShortName:='os2';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/pasjpeg/fpmake.pp b/packages/pasjpeg/fpmake.pp
index 2c18fb1d69..cbe55c6fa0 100644
--- a/packages/pasjpeg/fpmake.pp
+++ b/packages/pasjpeg/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('pasjpeg');
+    P.ShortName:='pjp';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/paszlib/fpmake.pp b/packages/paszlib/fpmake.pp
index f564379bd6..9ce1bcc1d2 100644
--- a/packages/paszlib/fpmake.pp
+++ b/packages/paszlib/fpmake.pp
@@ -14,6 +14,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('paszlib');
+    P.ShortName:='pzl';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/postgres/fpmake.pp b/packages/postgres/fpmake.pp
index 4d537006af..9d3c41716c 100644
--- a/packages/postgres/fpmake.pp
+++ b/packages/postgres/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('postgres');
+    P.ShortName:='pgr';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/regexpr/fpmake.pp b/packages/regexpr/fpmake.pp
index 2b86daf6e2..3e90b4d836 100644
--- a/packages/regexpr/fpmake.pp
+++ b/packages/regexpr/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('regexpr');
+    P.ShortName:='reg';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/rtl-console/fpmake.pp b/packages/rtl-console/fpmake.pp
index e25aedf6dd..258312405b 100644
--- a/packages/rtl-console/fpmake.pp
+++ b/packages/rtl-console/fpmake.pp
@@ -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';
diff --git a/packages/rtl-extra/fpmake.pp b/packages/rtl-extra/fpmake.pp
index f06528f68d..987ab392c7 100644
--- a/packages/rtl-extra/fpmake.pp
+++ b/packages/rtl-extra/fpmake.pp
@@ -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';
diff --git a/packages/rtl-objpas/fpmake.pp b/packages/rtl-objpas/fpmake.pp
index 3efea563d8..c9b1a37781 100644
--- a/packages/rtl-objpas/fpmake.pp
+++ b/packages/rtl-objpas/fpmake.pp
@@ -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';
diff --git a/packages/rtl-unicode/fpmake.pp b/packages/rtl-unicode/fpmake.pp
index 73e3b300b3..d45be3060a 100644
--- a/packages/rtl-unicode/fpmake.pp
+++ b/packages/rtl-unicode/fpmake.pp
@@ -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';
diff --git a/packages/sqlite/fpmake.pp b/packages/sqlite/fpmake.pp
index d699d6b4d0..bda41025d0 100644
--- a/packages/sqlite/fpmake.pp
+++ b/packages/sqlite/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('sqlite');
+    P.ShortName:='sqlt';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/symbolic/fpmake.pp b/packages/symbolic/fpmake.pp
index 1d2a722dee..27210b1cfd 100644
--- a/packages/symbolic/fpmake.pp
+++ b/packages/symbolic/fpmake.pp
@@ -12,6 +12,7 @@ begin
     begin
 {$endif ALLPACKAGES}
     P:=AddPackage('symbolic');
+    P.ShortName:='symb';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/unzip/fpmake.pp b/packages/unzip/fpmake.pp
index a758c952ff..2aca6e6d97 100644
--- a/packages/unzip/fpmake.pp
+++ b/packages/unzip/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('unzip');
+    P.ShortName:='zip';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/packages/winunits-base/fpmake.pp b/packages/winunits-base/fpmake.pp
index 008e7223ed..3de5d26433 100644
--- a/packages/winunits-base/fpmake.pp
+++ b/packages/winunits-base/fpmake.pp
@@ -13,6 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('winunits-base');
+    P.ShortName:='win';
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
diff --git a/utils/dxegen/fpmake.pp b/utils/dxegen/fpmake.pp
index 2001d8035b..6c35ea062e 100644
--- a/utils/dxegen/fpmake.pp
+++ b/utils/dxegen/fpmake.pp
@@ -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';
diff --git a/utils/fpcm/fpmake.pp b/utils/fpcm/fpmake.pp
index 928511830d..05aa091c39 100644
--- a/utils/fpcm/fpmake.pp
+++ b/utils/fpcm/fpmake.pp
@@ -209,6 +209,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fpcm');
+    P.ShortName:='fpcm';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/fpcmkcfg/fpmake.pp b/utils/fpcmkcfg/fpmake.pp
index 8d1a831531..74a0c0bed5 100644
--- a/utils/fpcmkcfg/fpmake.pp
+++ b/utils/fpcmkcfg/fpmake.pp
@@ -16,6 +16,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fpcmkcfg');
+    P.ShortName:='fcmk';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/fpcres/fpmake.pp b/utils/fpcres/fpmake.pp
index aa46b59fca..825941391e 100644
--- a/utils/fpcres/fpmake.pp
+++ b/utils/fpcres/fpmake.pp
@@ -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';
diff --git a/utils/fpcreslipo/fpmake.pp b/utils/fpcreslipo/fpmake.pp
index dc96eb008a..6870bdeb29 100644
--- a/utils/fpcreslipo/fpmake.pp
+++ b/utils/fpcreslipo/fpmake.pp
@@ -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';
diff --git a/utils/fpdoc/fpmake.pp b/utils/fpdoc/fpmake.pp
index 4d9fddcf64..a52aa18d4f 100644
--- a/utils/fpdoc/fpmake.pp
+++ b/utils/fpdoc/fpmake.pp
@@ -17,6 +17,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fpdoc');
+    P.ShortName:='fpdoc';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/fpmc/fpmake.pp b/utils/fpmc/fpmake.pp
index c89dd596ee..201b1e9d22 100644
--- a/utils/fpmc/fpmake.pp
+++ b/utils/fpmc/fpmake.pp
@@ -17,6 +17,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fpmc');
+    P.ShortName:='fpmc';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/fppkg/fpmake.pp b/utils/fppkg/fpmake.pp
index 01a9b6551d..f2f8e82f9f 100644
--- a/utils/fppkg/fpmake.pp
+++ b/utils/fppkg/fpmake.pp
@@ -18,6 +18,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fppkg');
+    P.ShortName:='fppkg';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/fprcp/fpmake.pp b/utils/fprcp/fpmake.pp
index da6d243ff5..64e7a34401 100644
--- a/utils/fprcp/fpmake.pp
+++ b/utils/fprcp/fpmake.pp
@@ -15,6 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-fprcp');
+    P.ShortName:='fprcp';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/h2pas/fpmake.pp b/utils/h2pas/fpmake.pp
index a50b23334c..da94ec0b45 100644
--- a/utils/h2pas/fpmake.pp
+++ b/utils/h2pas/fpmake.pp
@@ -15,6 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-h2pas');
+    P.ShortName:='h2pas';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/importtl/fpmake.pp b/utils/importtl/fpmake.pp
index 66375cc241..3c1b781a2f 100644
--- a/utils/importtl/fpmake.pp
+++ b/utils/importtl/fpmake.pp
@@ -15,6 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-importtl');
+    P.ShortName:='importttl';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/instantfpc/fpmake.pp b/utils/instantfpc/fpmake.pp
index c70dea79ae..bdac8c0728 100644
--- a/utils/instantfpc/fpmake.pp
+++ b/utils/instantfpc/fpmake.pp
@@ -15,6 +15,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-instantfpc');
+    P.ShortName:='instantfpc';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/pas2fpm/fpmake.pp b/utils/pas2fpm/fpmake.pp
index fabdb5fab6..94963ffc3e 100644
--- a/utils/pas2fpm/fpmake.pp
+++ b/utils/pas2fpm/fpmake.pp
@@ -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';
diff --git a/utils/pas2jni/fpmake.pp b/utils/pas2jni/fpmake.pp
index 0797302e4e..b3f219cdfc 100644
--- a/utils/pas2jni/fpmake.pp
+++ b/utils/pas2jni/fpmake.pp
@@ -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';
diff --git a/utils/pas2ut/fpmake.pp b/utils/pas2ut/fpmake.pp
index 041ebe251a..0b1550928b 100644
--- a/utils/pas2ut/fpmake.pp
+++ b/utils/pas2ut/fpmake.pp
@@ -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';
diff --git a/utils/rmwait/fpmake.pp b/utils/rmwait/fpmake.pp
index d47a19cdc1..3a87b4dc12 100644
--- a/utils/rmwait/fpmake.pp
+++ b/utils/rmwait/fpmake.pp
@@ -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';
diff --git a/utils/tply/fpmake.pp b/utils/tply/fpmake.pp
index ea95ab95fa..b876157cb3 100644
--- a/utils/tply/fpmake.pp
+++ b/utils/tply/fpmake.pp
@@ -16,6 +16,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('utils-lexyacc');
+    P.ShortName:='tply';
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
diff --git a/utils/unicode/fpmake.pp b/utils/unicode/fpmake.pp
index 6f5752a35e..b88f1a9215 100644
--- a/utils/unicode/fpmake.pp
+++ b/utils/unicode/fpmake.pp
@@ -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';