* Several fpmake.pp fixes

git-svn-id: trunk@24524 -
This commit is contained in:
joost 2013-05-18 08:28:58 +00:00
parent f1f89c77c3
commit 2fe7dbfc6c
4 changed files with 14 additions and 3 deletions

View File

@ -33,17 +33,28 @@ begin
P.Dependencies.Add('fcl-res'); P.Dependencies.Add('fcl-res');
T:=P.Targets.AddProgram('fpcres.pas'); T:=P.Targets.AddProgram('fpcres.pas');
T.Dependencies.AddUnit('closablefilestream'); T.Dependencies.AddUnit('closablefilestream');
T.Dependencies.AddUnit('msghandler'); T.Dependencies.AddUnit('msghandler');
T.Dependencies.AddUnit('paramparser'); T.Dependencies.AddUnit('paramparser');
T.Dependencies.AddUnit('sourcehandler'); T.Dependencies.AddUnit('sourcehandler');
T.Dependencies.AddUnit('target'); T.Dependencies.AddUnit('target');
T:=P.Targets.AddProgram('fpcjres');
T.Dependencies.AddUnit('closablefilestream');
T.Dependencies.AddUnit('msghandler');
T.Dependencies.AddUnit('paramparser');
T.Dependencies.AddUnit('sourcehandler');
T.Dependencies.AddUnit('target');
T.Dependencies.AddUnit('jarsourcehandler');
P.Targets.AddUnit('closablefilestream.pas').install:=false; P.Targets.AddUnit('closablefilestream.pas').install:=false;
P.Targets.AddUnit('msghandler.pas').install:=false; P.Targets.AddUnit('msghandler.pas').install:=false;
P.Targets.AddUnit('paramparser.pas').install:=false; P.Targets.AddUnit('paramparser.pas').install:=false;
P.Targets.AddUnit('sourcehandler.pas').install:=false; P.Targets.AddUnit('sourcehandler.pas').install:=false;
P.Targets.AddUnit('target.pas').install:=false; P.Targets.AddUnit('target.pas').install:=false;
P.Targets.AddUnit('jarsourcehandler.pas').install:=false;
end; end;
end; end;

View File

@ -28,6 +28,7 @@ begin
{$endif ALLPACKAGES} {$endif ALLPACKAGES}
P.Version:='2.7.1'; P.Version:='2.7.1';
P.Dependencies.Add('fcl-base'); P.Dependencies.Add('fcl-base');
P.Dependencies.Add('fcl-process');
P.Dependencies.Add('fcl-json'); P.Dependencies.Add('fcl-json');
T:=P.Targets.AddImplicitUnit('def.pas'); T:=P.Targets.AddImplicitUnit('def.pas');
@ -37,7 +38,6 @@ begin
T:=P.Targets.AddImplicitUnit('writer.pas'); T:=P.Targets.AddImplicitUnit('writer.pas');
T.Install := false; T.Install := false;
T:=P.Targets.AddProgram('pas2jni.pas'); T:=P.Targets.AddProgram('pas2jni.pas');
T.Install := false;
end; end;
end; end;

View File

@ -15,7 +15,7 @@ Var
begin begin
With Installer do With Installer do
begin begin
P:=AddPackage('tply'); P:=AddPackage('lexyacc');
P.Author := '<various>'; P.Author := '<various>';
P.License := 'LGPL with modification'; P.License := 'LGPL with modification';

View File

@ -22,7 +22,7 @@ begin
P.Email := ''; P.Email := '';
{$ifdef ALLPACKAGES} {$ifdef ALLPACKAGES}
P.Directory:='fpcreslipo'; P.Directory:='unicode';
{$endif ALLPACKAGES} {$endif ALLPACKAGES}
P.Version:='2.7.1'; P.Version:='2.7.1';
P.Dependencies.Add('rtl'); P.Dependencies.Add('rtl');