Răsfoiți Sursa

* Several fpmake.pp fixes

git-svn-id: trunk@24524 -
joost 12 ani în urmă
părinte
comite
2fe7dbfc6c
4 a modificat fișierele cu 14 adăugiri și 3 ștergeri
  1. 11 0
      utils/fpcres/fpmake.pp
  2. 1 1
      utils/pas2jni/fpmake.pp
  3. 1 1
      utils/tply/fpmake.pp
  4. 1 1
      utils/unicode/fpmake.pp

+ 11 - 0
utils/fpcres/fpmake.pp

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

+ 1 - 1
utils/pas2jni/fpmake.pp

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

+ 1 - 1
utils/tply/fpmake.pp

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

+ 1 - 1
utils/unicode/fpmake.pp

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