* Updated makefiles

git-svn-id: trunk@22948 -

.gitattributes

@@ -2506,6 +2506,7 @@ packages/fcl-sdo/examples/load-embedded-schema/project.pas svneol=native#text/pl
 packages/fcl-sdo/examples/simple/simple.pas svneol=native#text/plain
 packages/fcl-sdo/examples/xsd2pas/xsd2pas.lpi svneol=native#text/plain
 packages/fcl-sdo/examples/xsd2pas/xsd2pas.pas svneol=native#text/plain
+packages/fcl-sdo/fpmake.pp svneol=native#text/plain
 packages/fcl-sdo/src/base/pas_generator.pas svneol=native#text/plain
 packages/fcl-sdo/src/base/sdo.pas svneol=native#text/plain
 packages/fcl-sdo/src/base/sdo_binary_streamer.pas svneol=native#text/plain

packages/fcl-sdo/fpmake.pp

@@ -0,0 +1,280 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  T : TTarget;
+  P : TPackage;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+    P:=AddPackage('fcl-sdo');
+{$ifdef ALLPACKAGES}
+    P.Directory:='fcl-sdo';
+{$endif ALLPACKAGES}
+    P.Dependencies.Add('fcl-base');
+    P.Dependencies.Add('fcl-xml');
+    P.Dependencies.Add('fcl-db');
+    P.Version:='1.0';
+    P.Author := 'Inoussa Ouedraogo';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '[email protected]';
+    P.Description := 'Free Pascal implementation of Service Data Objects';
+    // P.NeedLibC:= false;
+    P.SourcePath.Add('src/base');
+    P.SourcePath.Add('src/das');
+
+    T:=P.Targets.AddUnit('sdo_consts.pas');
+    T.ResourceStrings := True;
+    T:=P.Targets.AddUnit('sdo_fpc_xml.pas');
+    T.ResourceStrings := True;
+    T:=P.Targets.AddUnit('sdo_logger_intf.pas');
+    T:=P.Targets.AddUnit('sdo_types.pas');
+    T:=P.Targets.AddUnit('xsd_consts.pas');
+    T:=P.Targets.AddUnit('sdo_binary_streamer.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      end;
+    T:=P.Targets.AddUnit('sdo_linked_list.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      end;
+    T:=P.Targets.AddUnit('sdo_date_utils.pas');
+    T.ResourceStrings := True;
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      end;
+    T:=P.Targets.AddUnit('sdo.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo_linked_list');
+      AddUnit('sdo_date_utils');
+      end;
+    T:=P.Targets.AddUnit('sdo_utils.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      end;
+    T:=P.Targets.AddUnit('sdo_changesummary.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      AddUnit('sdo_utils');
+      end;
+    T:=P.Targets.AddUnit('sdo_cursor_intf.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      end;
+    T:=P.Targets.AddUnit('sdo_imp_utils.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      end;
+    T:=P.Targets.AddUnit('sdo_type.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      AddUnit('sdo_date_utils');
+      AddUnit('sdo_imp_utils');
+      end;
+    T:=P.Targets.AddUnit('sdo_xpath_helper.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      end;
+    T:=P.Targets.AddUnit('sdo_field_imp.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      AddUnit('sdo_type');
+      AddUnit('sdo_date_utils');
+      AddUnit('sdo_imp_utils');
+      end;
+    T:=P.Targets.AddUnit('sdo_dataobject.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo_linked_list');
+      AddUnit('sdo');
+      AddUnit('sdo_changesummary');
+      AddUnit('sdo_type');
+      AddUnit('sdo_xpath_helper');
+      AddUnit('sdo_field_imp');
+      AddUnit('sdo_utils');
+      AddUnit('sdo_imp_utils');
+      end;
+    T:=P.Targets.AddUnit('sdo_datafactory.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      AddUnit('sdo_type');
+      AddUnit('sdo_consts');
+      AddUnit('sdo_imp_utils');
+      AddUnit('sdo_dataobject');
+      end;
+    T:=P.Targets.AddUnit('sdo_dom_cursors.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_fpc_xml');
+      AddUnit('sdo_types');
+      AddUnit('sdo_cursor_intf');
+      end;
+    T:=P.Targets.AddUnit('sdo_rtti_filters.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo_cursor_intf');
+      end;
+    T:=P.Targets.AddUnit('sdo_parserutils.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('xsd_consts');
+      AddUnit('sdo_cursor_intf');
+      AddUnit('sdo_dom_cursors');
+      AddUnit('sdo_rtti_filters');
+      end;
+    T:=P.Targets.AddUnit('sdo_xsdintf.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo');
+      end;
+    T:=P.Targets.AddUnit('sdo_xsdparser.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_fpc_xml');
+      AddUnit('sdo_logger_intf');
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      AddUnit('sdo_cursor_intf');
+      AddUnit('sdo_rtti_filters');
+      AddUnit('sdo_consts');
+      AddUnit('xsd_consts');
+      AddUnit('sdo_utils');
+      AddUnit('sdo_dom_cursors');
+      AddUnit('sdo_parserutils');
+      AddUnit('sdo_xsdintf');
+      end;
+    T:=P.Targets.AddUnit('sdo_locators.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_xsdparser');
+      end;
+    T:=P.Targets.AddUnit('sdo_serialization_utils.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      end;
+    T:=P.Targets.AddUnit('sdo_serialization_binary.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_consts');
+      AddUnit('sdo_types');
+      AddUnit('sdo_binary_streamer');
+      AddUnit('sdo');
+      AddUnit('sdo_serialization_utils');
+      end;
+    T:=P.Targets.AddUnit('sdo_serialization_xml.pas');
+    T.ResourceStrings := True;
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_consts');
+      AddUnit('sdo_fpc_xml');
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      AddUnit('sdo_serialization_utils');
+      AddUnit('sdo_imp_utils');
+      end;
+    T:=P.Targets.AddUnit('xsd_generator.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_fpc_xml');
+      AddUnit('sdo');
+      AddUnit('sdo_types');
+      AddUnit('xsd_consts');
+      AddUnit('sdo_parserutils');
+      AddUnit('sdo_xsdintf');
+      end;
+    T:=P.Targets.AddUnit('pas_generator.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo');
+      AddUnit('sdo_types');
+      AddUnit('xsd_consts');
+      AddUnit('sdo_parserutils');
+      AddUnit('sdo_xsdintf');
+      end;
+    T:=P.Targets.AddUnit('sdo_xsd_helper.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo');
+      AddUnit('sdo_type');
+      AddUnit('sdo_datafactory');
+      AddUnit('sdo_consts');
+      AddUnit('sdo_fpc_xml');
+      AddUnit('sdo_types');
+      AddUnit('xsd_consts');
+      AddUnit('sdo_imp_utils');
+      AddUnit('sdo_parserutils');
+      AddUnit('sdo_xsdintf');
+      AddUnit('sdo_xsdparser');
+      AddUnit('xsd_generator');
+      end;
+    T:=P.Targets.AddUnit('sdo_serialization.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('sdo_types');
+      AddUnit('sdo');
+      AddUnit('sdo_serialization_utils');
+      AddUnit('sdo_serialization_xml');
+      AddUnit('sdo_consts');
+      AddUnit('sdo_utils');
+      AddUnit('sdo_changesummary');
+      AddUnit('sdo_imp_utils');
+      AddUnit('sdo_xpath_helper');
+      AddUnit('sdo_dataobject');
+      AddUnit('sdo_xsd_helper');
+      end;
+    T:=P.Targets.AddUnit('data_acces_intf.pas');
+    T.ResourceStrings := True;
+    T:=P.Targets.AddUnit('sdo_das.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('data_acces_intf');
+      end;
+    T:=P.Targets.AddUnit('sdo_das_utils.pas');
+    with T.Dependencies do
+      begin
+      AddUnit('data_acces_intf');
+      AddUnit('sdo_das');
+      end;
+    T:=P.Targets.AddUnit('sdo_das_imp.pas');
+    T.ResourceStrings := True;
+    with T.Dependencies do
+      begin
+      AddUnit('data_acces_intf');
+      AddUnit('sdo_das');
+      AddUnit('sdo_das_utils');
+      end;    
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif}

packages/fpmake_add.inc

@@ -24,6 +24,7 @@
   add_fcl_process;
   add_fcl_registry;
   add_fcl_res;
+  add_fcl_sdo;
   add_fcl_stl;
   add_fcl_web;
   add_fcl_xml;
@@ -60,6 +61,7 @@
   add_libpng;
   add_librsvg;
   add_libsee;
+  add_libvlc;
   add_libxml;
   add_lua;
   add_mad;
@@ -74,8 +76,8 @@
   add_oggvorbis;
   add_openal;
   add_opencl;
-  add_opengl;
   add_opengles;
+  add_opengl;
   add_openssl;
   add_oracle;
   add_os2units;

packages/fpmake_proc.inc

@@ -146,6 +146,12 @@ begin
 {$include fcl-res/fpmake.pp}
 end;
 
+procedure add_fcl_sdo;
+begin
+  with Installer do
+{$include fcl-sdo/fpmake.pp}
+end;
+
 procedure add_fcl_stl;
 begin
   with Installer do
@@ -350,6 +356,12 @@ begin
 {$include libsee/fpmake.pp}
 end;
 
+procedure add_libvlc;
+begin
+  with Installer do
+{$include libvlc/fpmake.pp}
+end;
+
 procedure add_libxml;
 begin
   with Installer do
@@ -434,16 +446,16 @@ begin
 {$include opencl/fpmake.pp}
 end;
 
-procedure add_opengl;
+procedure add_opengles;
 begin
   with Installer do
-{$include opengl/fpmake.pp}
+{$include opengles/fpmake.pp}
 end;
 
-procedure add_opengles;
+procedure add_opengl;
 begin
   with Installer do
-{$include opengles/fpmake.pp}
+{$include opengl/fpmake.pp}
 end;
 
 procedure add_openssl;

packages/libvlc/fpmake.pp

@@ -15,7 +15,9 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='libvlc';
 {$endif ALLPACKAGES}
-    P.Version:='1.0';
+    P.OSes := [win32, win64, linux, freebsd];
+ 
+     P.Version:='1.0';
     P.License := 'LGPL with modification';
     P.HomepageURL := 'www.freepascal.org';
     P.Email := '[email protected]';