On 10/24/2014 03:32 PM, Joost van der Sluis wrote:
On 10/24/2014 12:39 AM, Jonas Maebe wrote:
On 23/10/14 17:16, Vsevolod Alekseyev wrote:
There's no separate makefile for fpcmake alone, is there?
It used to be as simple as going into utils/fpcm and performing a "make
all", but with the new FPC-based build system I think that is
unfortunately no longer possible.
The same holds with the fpmake-system. When your fpmake uses some new
functionality that is only available in the new compiler or a new
fpmkunit-unit, you have a problem. For this case fppkg uses two
configurations. One to compile the fpmake.pp-files, and one to compile
the actual packages. But that's not configured by default.
I've tried to build trunk's fpcm with fpc 2.6.2 and that failed due to
new features being used in the fpmake.pp. ;(
So in this case already you'll need the double-fpmake-setup. Or you can
use the attached patch.
Joost.
Index: utils/fpcm/fpmake.pp
===================================================================
--- utils/fpcm/fpmake.pp (revision 28900)
+++ utils/fpcm/fpmake.pp (working copy)
@@ -85,7 +85,9 @@
BuildEngine.Log(vlWarning, 'File revision.inc not found. Svn-revision will not be included in fpcmake executable.');
Exit;
end;
-
+{$IFDEF VER2_6}
+ Exit;
+{$ELSE}
// Run svn info, and catch output.
P := sender as TPackage;
P.Options.Add('-dREVINC');
@@ -194,6 +196,7 @@
end
else
BuildEngine.Log(vlWarning,'Subversion executable (svn) not found. Svn-revision in fpcmake executable might be out of date.');
+{$ENDIF}
end;
end;
{$endif HAS_UNIT_PROCESS}
@@ -221,7 +224,9 @@
P.Directory:=ADirectory;
{$endif ALLPACKAGES}
P.Version:='2.7.1';
+{$IFNDEF VER2_6}
P.SeparateArchive:=false;
+{$ENDIF}
P.Dependencies.Add('fcl-base');
@@ -233,8 +238,10 @@
writeln('Process-unit not available. Svn-revision in fpmake executable might be out-of-date.');
{$endif HAS_UNIT_PROCESS}
+{$IFNDEF VER2_6}
Data2IncBin := AddProgramExtension('data2inc',Defaults.BuildOS);
p.Commands.AddCommand(caBeforeCompile, Data2IncBin, '-b -s fpcmake.ini fpcmake.inc fpcmakeini','fpcmake.inc','fpcmake.ini');
+{$ENDIF}
T:=P.Targets.AddUnit('fpcmmain.pp');
T.install:=false;
T.ResourceStrings:=true;
_______________________________________________
fpc-devel maillist - [email protected]
http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
