Merged revision(s) 3077 from SourceForge:

 Correção da instalação do ShellService para Lazarus.
 Correção do Driver Zeos para Lazarus.

Author: mobius1qwe

CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.lpk

@@ -24,7 +24,7 @@
 "/>
     <License Value="GPL- 3.0"/>
     <Version Major="2"/>
-    <Files Count="2">
+    <Files Count="3">
       <Item1>
         <Filename Value="restdwdriverzeos.lrs"/>
         <Type Value="LRS"/>
@@ -34,6 +34,11 @@
         <HasRegisterProc Value="True"/>
         <UnitName Value="uRESTDWDriverZEOS"/>
       </Item2>
+      <Item3>
+        <Filename Value="..\..\..\..\Source\Database_Drivers\uRESTDWDriverZEOSReg.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="uRESTDWDriverZEOSReg"/>
+      </Item3>
     </Files>
     <CompatibilityMode Value="True"/>
     <RequiredPkgs Count="4">

CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.pas

@@ -8,13 +8,14 @@
 interface
 
 uses
-  uRESTDWDriverZEOS, LazarusPackageIntf;
+  uRESTDWDriverZEOS, uRESTDWDriverZEOSReg, LazarusPackageIntf;
 
 implementation
 
 procedure Register;
 begin
   RegisterUnit('uRESTDWDriverZEOS', @uRESTDWDriverZEOS.Register);
+  RegisterUnit('uRESTDWDriverZEOSReg', @uRESTDWDriverZEOSReg.Register);
 end;
 
 initialization

CORE/Packages/Lazarus/ShellTools/restdatawareshellservices.lpk

@@ -9,7 +9,7 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="..\..\..\Source\ShellTools\Lazarus"/>
+        <OtherUnitFiles Value="..\..\..\Source\ShellTools\Lazarus;..\..\..\Source\ShellTools"/>
         <UnitOutputDirectory Value="..\..\..\Source\compiledlaz"/>
       </SearchPaths>
     </CompilerOptions>
@@ -21,12 +21,11 @@
         <Type Value="LRS"/>
       </Item>
       <Item>
-        <Filename Value="..\..\..\Source\ShellTools\Lazarus\uRESTDWShellServices.pas"/>
+        <Filename Value="..\..\..\Source\ShellTools\uRESTDWShellServicesLazarus.pas"/>
         <UnitName Value="uRESTDWShellServices"/>
       </Item>
       <Item>
-        <Filename Value="..\..\..\Source\ShellTools\Lazarus\uRESTDWShellServicesReg.pas"/>
-        <HasRegisterProc Value="True"/>
+        <Filename Value="..\..\..\Source\ShellTools\uRESTDWShellServicesRegLazarus.pas"/>
         <UnitName Value="uRESTDWShellServicesReg"/>
       </Item>
     </Files>

CORE/Packages/Lazarus/ShellTools/restdatawareshellservices.pas

@@ -8,13 +8,13 @@
 interface
 
 uses
-  uRESTDWShellServices, uRESTDWShellServicesReg, LazarusPackageIntf;
+  uRESTDWShellServicesLazarus, uRESTDWShellServicesRegLazarus, 
+  LazarusPackageIntf;
 
 implementation
 
 procedure Register;
 begin
-  RegisterUnit('uRESTDWShellServicesReg', @uRESTDWShellServicesReg.Register);
 end;
 
 initialization

CORE/Source/Consts/uRESTDWConsts.pas

@@ -71,7 +71,7 @@
  monthnames                 : Array [1 .. 12] Of string = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', {do not localize}
                                                            'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'); {do not localize}
  RESTDWVersionINFO          = 'v2.0.2-';
- RESTDWRelease              = '3075';
+ RESTDWRelease              = '3076';
  RESTDWCodeProject          = 'Savage Reign - GitHub';
  RESTDWVersao               = RESTDWVersionINFO + RESTDWRelease + '(' + RESTDWCodeProject + ')';
  GOffsetFromUTC             : TDateTime = 0{$IFDEF HAS_DEPRECATED}deprecated{$ENDIF};

CORE/Source/ShellTools/uRESTDWShellServicesLazarus.pas

@@ -1,4 +1,4 @@
-unit uRESTDWShellServices;
+unit uRESTDWShellServicesLazarus;
 
 {$I ..\..\..\Source\Includes\uRESTDWPlataform.inc}
 

CORE/Source/ShellTools/uRESTDWShellServicesRegLazarus.pas

@@ -1,4 +1,4 @@
-unit uRESTDWShellServicesReg;
+unit uRESTDWShellServicesRegLazarus;
 
 {$I ..\..\..\Source\Includes\uRESTDWPlataform.inc}
 
@@ -27,10 +27,10 @@ interface
 
 uses
   {$IFDEF FPC}
-    StdCtrls, ComCtrls, Forms, ExtCtrls, DBCtrls, DBGrids, Dialogs, Controls, Variants, TypInfo, uRESTDWShellServices,
+    StdCtrls, ComCtrls, Forms, ExtCtrls, DBCtrls, DBGrids, Dialogs, Controls, Variants, TypInfo, uRESTDWShellServicesLazarus,
     LResources, LazFileUtils, SysUtils, FormEditingIntf, PropEdits, lazideintf, ProjectIntf, ComponentEditors, Classes, fpWeb, uRESTDWComponentBase;
   {$ELSE}
-   Windows, SysUtils, Variants, StrEdit, TypInfo, uRESTDWShellServices, uRESTDWComponentBase,
+   Windows, SysUtils, Variants, StrEdit, TypInfo, uRESTDWShellServicesLazarus, uRESTDWComponentBase,
    RTLConsts,
    {$IFDEF COMPILER16_UP}
    UITypes,