소스 검색

* add fpmake.pp

git-svn-id: trunk@9957 -
peter 17 년 전
부모
커밋
6e2eedcf17

+ 1 - 2
.gitattributes

@@ -3705,8 +3705,7 @@ packages/fcl-net/src/win/resolve.inc svneol=native#text/plain
 packages/fcl-net/src/xmlrpc.pp svneol=native#text/plain
 packages/fcl-passrc/Makefile svneol=native#text/plain
 packages/fcl-passrc/Makefile.fpc svneol=native#text/plain
-packages/fcl-passrc/src/fpmake.inc svneol=native#text/plain
-packages/fcl-passrc/src/fpmake.pp svneol=native#text/plain
+packages/fcl-passrc/fpmake.pp svneol=native#text/plain
 packages/fcl-passrc/src/pastree.pp svneol=native#text/plain
 packages/fcl-passrc/src/paswrite.pp svneol=native#text/plain
 packages/fcl-passrc/src/pparser.pp svneol=native#text/plain

+ 43 - 0
packages/fcl-passrc/fpmake.pp

@@ -0,0 +1,43 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  T : TTarget;
+  P : TPackage;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('fcl-passrc');
+{$ifdef ALLPACKAGES}
+    P.Directory:='fcl-passrc';
+{$endif ALLPACKAGES}
+    P.Version:='2.2.1';
+
+    P.Dependencies.Add('fcl-base');
+
+    P.SourcePath.Add('src');
+
+    T:=P.Targets.AddUnit('pastree.pp');
+    T:=P.Targets.AddUnit('paswrite.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('pastree');
+        end;
+    T:=P.Targets.AddUnit('pparser.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('pastree');
+          AddUnit('pscanner');
+        end;
+    T:=P.Targets.AddUnit('pscanner.pp');
+
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}

+ 0 - 12
packages/fcl-passrc/src/fpmake.inc

@@ -1,12 +0,0 @@
-{ Make passrc directory and all subdirectories }
-{ FULLFCL will be defined if included from main FCL directory }
-
-Targets.ResetDefaults;
-Targets.DefaultDir:='passrc';
-T:=Targets.AddUnit('pastree');
-T.ResourceStrings:=True;
-T:=Targets.AddUnit('pscanner');
-T.ResourceStrings:=True;
-T:=Targets.AddUnit('pparser');
-T.ResourceStrings:=True;
-T:=Targets.AddUnit('paswrite');

+ 0 - 20
packages/fcl-passrc/src/fpmake.pp

@@ -1,20 +0,0 @@
-{$mode objfpc}
-{$H+}
-program fpmake;
-
-uses fpmkunit;
-
-Var
-  T : TTarget;
-   
-begin
-  ChangeDir('..');
-  With Installer do 
-    begin
-    {$i ../fclmake.inc}
-    {$i fpmake.inc}
-    EndPackage;
-    Run;
-    end;
-end.
-

+ 2 - 0
packages/fcl-passrc/src/pastree.pp

@@ -14,6 +14,8 @@
 
  **********************************************************************}
 
+{$mode objfpc}
+{$h+}
 
 unit PasTree;
 

+ 2 - 0
packages/fcl-passrc/src/paswrite.pp

@@ -14,6 +14,8 @@
 
  **********************************************************************}
 
+{$mode objfpc}
+{$h+}
 
 unit PasWrite;
 

+ 2 - 0
packages/fcl-passrc/src/pparser.pp

@@ -14,6 +14,8 @@
 
  **********************************************************************}
 
+{$mode objfpc}
+{$h+}
 
 unit PParser;
 

+ 2 - 0
packages/fcl-passrc/src/pscanner.pp

@@ -14,6 +14,8 @@
 
  **********************************************************************}
 
+{$mode objfpc}
+{$h+}
 
 unit PScanner;