paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-12 19:29:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge of commit 44246 from trunk branch

Browse Source 
+ other fixes to packages/*/fpmake.pp with wrong versions.
  Fixes shortsrc target in fixes_3_2 branch.
------------------------------------------------------------------------
r44246 | pierre | 2020-02-27 07:32:00 +0000 (Thu, 27 Feb 2020) | 3 lines

  * Fix sourcezip make target, correcting mixed case input file names.


------------------------------------------------------------------------
--- Merging r44246 into '.':
U    packages/ide/fpmake.pp
U    packages/libgbafpc/fpmake.pp
U    packages/libndsfpc/fpmake.pp
U    packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r44246 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44247 -
This commit is contained in:
pierre 2020-02-27 16:52:50 +00:00
parent e1d37acf20
commit eec778bcd5
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/gnutls/fpmake.pp
View File

@ -19,7 +19,7 @@ begin
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}
P.Version:='3.3.1';
P.Version:='3.2.0-beta';
P.SourcePath.Add('src');
P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
if Defaults.CPU=jvm then

4
packages/ide/fpmake.pp
View File

@ -297,8 +297,8 @@ begin
with P.Sources do
begin
AddDoc('readme.ide');
AddSrc('readme.txt');
AddSrc('todo.txt');
AddSrc('README.txt');
AddSrc('TODO.txt');
AddSrc('fp.ans');
AddSrcFiles('*.tdf',P.Directory);
AddSrcFiles('*.pas',P.Directory,true);

2
packages/libgbafpc/fpmake.pp
View File

@ -31,7 +31,7 @@ begin
T.IncludePath.Add('src/gba');
with T.Dependencies do
begin
AddInclude('BoyScout.inc');
AddInclude('boyscout.inc');
AddInclude('core_asm.as');
AddInclude('disc.inc');
AddInclude('disc_io.inc');

2
packages/libmagic/fpmake.pp
View File

@ -17,7 +17,7 @@ begin
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}
P.Version:='3.3.1';
P.Version:='3.2.0-beta';
P.Author := 'Library: libmagic';
P.License := 'Library: GPL, header: LGPL with modification, ';
P.HomepageURL := 'www.freepascal.org';

2
packages/libndsfpc/fpmake.pp
View File

@ -109,7 +109,7 @@ begin
AddInclude('dswifi9.inc');
AddInclude('dswifi7.inc');
AddInclude('netdb.inc');
AddInclude('sgIp_errno.inc');
AddInclude('sgIP_errno.inc');
end;
T.IncludePath.Add('src/dswifi/inc/netinet');
T.Dependencies.AddInclude('in.inc');

4
packages/vcl-compat/fpmake.pp
View File

@ -13,7 +13,7 @@ begin
{$endif ALLPACKAGES}
P:=AddPackage('vcl-compat');
P.ShortName:='vclcomp';
P.ShortName:='vcl';
P.Author := 'Michael Van Canneyt';
P.License := 'LGPL with modification';
P.HomepageURL := 'www.freepascal.org';
@ -26,7 +26,7 @@ begin
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}
P.Version:='3.3.1';
P.Version:='3.2.0-beta';
P.Dependencies.Add('fcl-base');
P.Dependencies.Add('fcl-xml');
P.Dependencies.Add('fcl-web');