From 660a0610307c7c0a4b801a54542c74c68a7cfb4f Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Fri, 20 Mar 2020 08:48:50 +0000
Subject: [PATCH]   Merge of commit 44311 and 44314 from trunk branch
 ------------------------------------------------------------------------
 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 -
---
 utils/fpcm/fpcmmain.pp  | 8 +++++++-
 utils/fpcm/fpcmwr.pp    | 2 +-
 utils/fpcm/revision.inc | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/utils/fpcm/fpcmmain.pp b/utils/fpcm/fpcmmain.pp
index 87c14421fe..3a32781772 100644
--- a/utils/fpcm/fpcmmain.pp
+++ b/utils/fpcm/fpcmmain.pp
@@ -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=(
diff --git a/utils/fpcm/fpcmwr.pp b/utils/fpcm/fpcmwr.pp
index 02594f2e6f..91ef6e4cad 100644
--- a/utils/fpcm/fpcmwr.pp
+++ b/utils/fpcm/fpcmwr.pp
@@ -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))
diff --git a/utils/fpcm/revision.inc b/utils/fpcm/revision.inc
index 4c47ec2139..4a8d91738e 100644
--- a/utils/fpcm/revision.inc
+++ b/utils/fpcm/revision.inc
@@ -1 +1 @@
-'2019-05-28 rev 42133'
+'2020-03-20 rev 44315'