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

Merge of commit 44311 and 44314 from trunk branch

Browse Source 
------------------------------------------------------------------------
r44311 | pierre | 2020-03-19 13:30:36 +0000 (Thu, 19 Mar 2020) | 1 line

Restore usage of revision.inc file, but do not print date and revision information into generated Makefile's
------------------------------------------------------------------------
--- Merging r44311 into '.':
U    utils/fpcm/fpcmmain.pp
U    utils/fpcm/fpcmwr.pp
--- Recording mergeinfo for merge of r44311 into '.':
 U   .
------------------------------------------------------------------------
r44314 | pierre | 2020-03-20 07:51:17 +0000 (Fri, 20 Mar 2020) | 1 line

 Commit generated change to revision.inc file following commit #44311
------------------------------------------------------------------------
--- Merging r44314 into '.':
U    utils/fpcm/revision.inc
--- Recording mergeinfo for merge of r44314 into '.':
 G   .

git-svn-id: branches/fixes_3_2@44315 -
This commit is contained in:
pierre 2020-03-20 08:48:50 +00:00
parent b2dedf8aec
commit 660a061030
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/fpcm/fpcmmain.pp
View File

@ -59,7 +59,13 @@ interface
const
Version='2.0.0';
Title='FPCMake Version '+Version;
TitleDate=Title;
{$ifdef REVINC}
DateRevision={$i revision.inc};
{$else}
DateRevision={$I %DATE%}+' no revision';
{$endif}
TitleNoDate=Title;
TitleDate=Title+' '+DateRevision;
type
TCpu=(

2
utils/fpcm/fpcmwr.pp
View File

@ -731,7 +731,7 @@ implementation
begin
{ Header }
Add('#');
Add('# Don''t edit, this file is generated by '+TitleDate);
Add('# Don''t edit, this file is generated by '+TitleNoDate);
Add('#');
if FInput.HasVariable('default_rule') then
Add('default: '+FInput.GetVariable('default_rule',false))

2
utils/fpcm/revision.inc
View File

@ -1 +1 @@
'2019-05-28 rev 42133'
'2020-03-20 rev 44315'