Browse Source

* fpmake.pp-files fixes

git-svn-id: trunk@18041 -
joost 14 years ago
parent
commit
4392dd13a4

+ 2 - 2
packages/bzip2/fpmake.pp

@@ -30,14 +30,14 @@ begin
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
 
 
-    T:=P.Targets.AddUnit('bzip2comn.pas');
+    T:=P.Targets.AddUnit('bzip2comn.pp');
     T:=P.Targets.AddUnit('bzip2.pas');
     T:=P.Targets.AddUnit('bzip2.pas');
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
           AddInclude('bzip2i386.inc',[i386],AllOSes);
           AddInclude('bzip2i386.inc',[i386],AllOSes);
           AddUnit('bzip2comn');
           AddUnit('bzip2comn');
         end;
         end;
-    T:=P.Targets.AddUnit('bzip2stream.pas');
+    T:=P.Targets.AddUnit('bzip2stream.pp');
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
           AddInclude('bzip2sii386.inc',[i386],AllOSes);
           AddInclude('bzip2sii386.inc',[i386],AllOSes);

+ 32 - 0
packages/fcl-db/fpmake.pp

@@ -51,6 +51,7 @@ begin
     P.IncludePath.Add('src/memds');  
     P.IncludePath.Add('src/memds');  
     P.IncludePath.Add('src/sqlite');
     P.IncludePath.Add('src/sqlite');
     P.IncludePath.Add('src/dbase');
     P.IncludePath.Add('src/dbase');
+    P.SourcePath.Add('src/sql');
 
 
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-xml');
     P.Dependencies.Add('fcl-xml');
@@ -504,6 +505,13 @@ begin
           AddUnit('fpdbfexport');
           AddUnit('fpdbfexport');
         end;
         end;
     T:=P.Targets.AddUnit('fptexexport.pp');
     T:=P.Targets.AddUnit('fptexexport.pp');
+    T.ResourceStrings:=true;
+      with T.Dependencies do
+        begin
+          AddUnit('db');
+          AddUnit('fpdbexport');
+        end;
+    T:=P.Targets.AddUnit('fpxmlxsdexport.pp');
     T.ResourceStrings:=true;
     T.ResourceStrings:=true;
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
@@ -564,6 +572,18 @@ begin
           AddUnit('db');
           AddUnit('db');
           AddUnit('dbconst');
           AddUnit('dbconst');
         end;
         end;
+
+    T:=P.Targets.AddUnit('mysql51conn.pas');
+    T.ResourceStrings:=true;
+      with T.Dependencies do
+        begin
+          AddInclude('mysqlconn.inc');
+          AddUnit('bufdataset');
+          AddUnit('sqldb');
+          AddUnit('db');
+          AddUnit('dbconst');
+        end;
+
     T:=P.Targets.AddUnit('odbcconn.pas');
     T:=P.Targets.AddUnit('odbcconn.pas');
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
@@ -629,6 +649,18 @@ begin
           AddUnit('db');
           AddUnit('db');
         end;
         end;
 
 
+    // SQL
+    T:=P.Targets.AddUnit('fpsqltree.pp');
+    T:=P.Targets.AddUnit('fpsqlscanner.pp');
+    T.ResourceStrings := True;
+    T:=P.Targets.AddUnit('fpsqlparser.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpsqltree');
+          AddUnit('fpsqlscanner');
+        end;
+    T.ResourceStrings := True;
+
     P.ExamplePath.Add('tests');
     P.ExamplePath.Add('tests');
     T:=P.Targets.AddExampleProgram('dbftoolsunit.pas');
     T:=P.Targets.AddExampleProgram('dbftoolsunit.pas');
     T:=P.Targets.AddExampleProgram('dbtestframework.pas');
     T:=P.Targets.AddExampleProgram('dbtestframework.pas');

+ 5 - 1
packages/fcl-process/fpmake.pp

@@ -22,6 +22,7 @@ begin
     P.HomepageURL := 'www.freepascal.org';
     P.HomepageURL := 'www.freepascal.org';
     P.Email := '';
     P.Email := '';
     P.Description := 'Process (execution) related parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Process (execution) related parts of Free Component Libraries (FCL), FPC''s OOP library.';
+    P.Options.Add('-S2h');
     P.NeedLibC:= false;
     P.NeedLibC:= false;
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
@@ -34,10 +35,13 @@ begin
       T.Dependencies.AddInclude('pipes.inc');
       T.Dependencies.AddInclude('pipes.inc');
     T:=P.Targets.AddUnit('process.pp');
     T:=P.Targets.AddUnit('process.pp');
       T.Dependencies.AddInclude('process.inc');
       T.Dependencies.AddInclude('process.inc');
-//      T.ResourceStrings:=True;
+    T.ResourceStrings:=True;
     T:=P.Targets.AddUnit('simpleipc.pp');
     T:=P.Targets.AddUnit('simpleipc.pp');
       T.Dependencies.AddInclude('simpleipc.inc');
       T.Dependencies.AddInclude('simpleipc.inc');
       T.ResourceStrings:=True;
       T.ResourceStrings:=True;
+    T:=P.Targets.AddUnit('pipesipc.pp');
+      T.Dependencies.AddInclude('simpleipc.inc');
+      T.ResourceStrings:=True;
     T:=P.Targets.AddUnit('dbugmsg.pp');
     T:=P.Targets.AddUnit('dbugmsg.pp');
       T.ResourceStrings:=True;
       T.ResourceStrings:=True;
     T:=P.Targets.AddUnit('dbugintf.pp');
     T:=P.Targets.AddUnit('dbugintf.pp');

+ 17 - 0
packages/fcl-xml/fpmake.pp

@@ -18,6 +18,7 @@ begin
     P.Directory:='fcl-xml';
     P.Directory:='fcl-xml';
 {$endif ALLPACKAGES}
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.Version:='2.2.2-0';
+    P.Options.Add('-S2h');
     D:=P.Dependencies.Add('paszlib');
     D:=P.Dependencies.Add('paszlib');
       D.Version:='2.2.2-0';
       D.Version:='2.2.2-0';
     D:=P.Dependencies.Add('fcl-base');
     D:=P.Dependencies.Add('fcl-base');
@@ -61,6 +62,7 @@ begin
           AddUnit('htmlelements');
           AddUnit('htmlelements');
           AddUnit('htmldefs');
           AddUnit('htmldefs');
         end;
         end;
+    T.ResourceStrings:=True;
     T:=P.Targets.AddUnit('htmwrite.pp');
     T:=P.Targets.AddUnit('htmwrite.pp');
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
@@ -76,6 +78,7 @@ begin
           AddUnit('htmldefs');
           AddUnit('htmldefs');
         end;
         end;
     T:=P.Targets.AddUnit('sax.pp');
     T:=P.Targets.AddUnit('sax.pp');
+    T.ResourceStrings:=True;
     T:=P.Targets.AddUnit('xhtml.pp');
     T:=P.Targets.AddUnit('xhtml.pp');
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
@@ -89,6 +92,7 @@ begin
           AddUnit('xmlread');
           AddUnit('xmlread');
           AddUnit('xmlwrite');
           AddUnit('xmlwrite');
         end;
         end;
+    T.ResourceStrings:=True;
     T:=P.Targets.AddUnit('xmlconf.pp');
     T:=P.Targets.AddUnit('xmlconf.pp');
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
@@ -96,6 +100,7 @@ begin
           AddUnit('xmlread');
           AddUnit('xmlread');
           AddUnit('xmlwrite');
           AddUnit('xmlwrite');
         end;
         end;
+    T.ResourceStrings:=True;
     T:=P.Targets.AddUnit('xmlread.pp');
     T:=P.Targets.AddUnit('xmlread.pp');
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
@@ -122,6 +127,7 @@ begin
         begin
         begin
           AddUnit('dom');
           AddUnit('dom');
         end;
         end;
+    T.ResourceStrings:=True;
     T:=P.Targets.AddUnit('sax_xml.pp');
     T:=P.Targets.AddUnit('sax_xml.pp');
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
@@ -129,6 +135,17 @@ begin
           AddUnit('dom');
           AddUnit('dom');
           AddUnit('htmldefs');
           AddUnit('htmldefs');
         end;
         end;
+    T:=P.Targets.AddUnit('xmliconv.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('xmlread');
+        end;
+    T.ResourceStrings:=True;
+    T:=P.Targets.AddUnit('dtdmodel.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('xmlutils');
+        end;
 
 
  
  
     P.Sources.AddSrc('src/README.txt');
     P.Sources.AddSrc('src/README.txt');

+ 2 - 0
packages/fpgtk/fpmake.pp

@@ -33,11 +33,13 @@ begin
         begin
         begin
           AddUnit('fpgtk');
           AddUnit('fpgtk');
         end;
         end;
+    T.ResourceStrings := True;
     T:=P.Targets.AddUnit('fpgtk.pp');
     T:=P.Targets.AddUnit('fpgtk.pp');
       with T.Dependencies do
       with T.Dependencies do
         begin
         begin
           AddUnit('fpglib');
           AddUnit('fpglib');
         end;
         end;
+    T.ResourceStrings := True;
 
 
     P.ExamplePath.Add('examples');
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('examples/lister.pp');
     P.Targets.AddExampleProgram('examples/lister.pp');

+ 7 - 4
packages/fpvectorial/fpmake.pp

@@ -32,13 +32,16 @@ begin
 
 
     T:=P.Targets.AddImplicitUnit('jwazmouse.pas');
     T:=P.Targets.AddImplicitUnit('jwazmouse.pas');
     T:=P.Targets.AddImplicitUnit('avisocncgcodereader'); 
     T:=P.Targets.AddImplicitUnit('avisocncgcodereader'); 
-    T:=P.Targets.AddImplicitUnit('avisocncgcodewriter'); 
-    T:=P.Targets.AddImplicitUnit('avisozlib'); 
+    T:=P.Targets.AddImplicitUnit('avisocncgcodewriter');
+    T:=P.Targets.AddImplicitUnit('svgvectorialwriter');
+    T:=P.Targets.AddImplicitUnit('avisozlib');
     T:=P.Targets.AddImplicitUnit('fpvectorial'); 
     T:=P.Targets.AddImplicitUnit('fpvectorial'); 
     T:=P.Targets.AddImplicitUnit('fpvtocanvas');  
     T:=P.Targets.AddImplicitUnit('fpvtocanvas');  
-    T:=P.Targets.AddImplicitUnit('pdfvectorialreader'); 
-    T:=P.Targets.AddImplicitUnit('pdfvrlexico'); 
+    T:=P.Targets.AddImplicitUnit('pdfvectorialreader');
+    T:=P.Targets.AddImplicitUnit('cdrvectorialreader');
+    T:=P.Targets.AddImplicitUnit('pdfvrlexico');
     T:=P.Targets.AddImplicitUnit('pdfvrsemantico');
     T:=P.Targets.AddImplicitUnit('pdfvrsemantico');
+    T:=P.Targets.AddImplicitUnit('pdfvrsintatico');
     T:=P.Targets.AddImplicitUnit('epsvectorialreader');
     T:=P.Targets.AddImplicitUnit('epsvectorialreader');
     T:=P.Targets.AddImplicitUnit('fpvutils');
     T:=P.Targets.AddImplicitUnit('fpvutils');