2
0
Эх сурвалжийг харах

* Dotted filenames for package odata

Michaël Van Canneyt 2 жил өмнө
parent
commit
eba6b08625

+ 3 - 0
packages/odata/namespaced/Web.OData.MsGraph.pp

@@ -0,0 +1,3 @@
+unit Web.OData.MsGraph;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i msgraph.pp}

+ 3 - 0
packages/odata/namespaced/Web.OData.Office365Client.pp

@@ -0,0 +1,3 @@
+unit Web.OData.Office365Client;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i office365client.pp}

+ 3 - 0
packages/odata/namespaced/Web.OData.Service.pp

@@ -0,0 +1,3 @@
+unit Web.OData.Service;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i odataservice.pp}

+ 3 - 0
packages/odata/namespaced/Web.OData.Sharepoint.pp

@@ -0,0 +1,3 @@
+unit Web.OData.Sharepoint;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sharepoint.pp}

+ 3 - 0
packages/odata/namespaced/Web.OData.Types.pp

@@ -0,0 +1,3 @@
+unit Web.OData.Types;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i odatabase.pp}

+ 7 - 0
packages/odata/namespaces.lst

@@ -0,0 +1,7 @@
+src/msgraph.pp=namespaced/Web.OData.MsGraph.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/sharepoint.pp=namespaced/Web.OData.Sharepoint.pp
+src/odataservice.pp=namespaced/Web.OData.Service.pp
+src/odatabase.pp=namespaced/Web.OData.Types.pp
+src/office365client.pp=namespaced/Web.OData.Office365Client.pp

+ 6 - 0
packages/odata/src/msgraph.pp

@@ -1,10 +1,16 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit msgraph;
 unit msgraph;
+{$ENDIF FPC_DOTTEDUNITS}
 {$MODE objfpc}
 {$MODE objfpc}
 {$H+}
 {$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, FpJson.Data, FpWeb.Rest.Base, Web.OData.Types, Web.OData.Service;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, classes, fpjson, restbase, odatabase, odataservice;
 uses sysutils, classes, fpjson, restbase, odatabase, odataservice;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 (*
 (*
   Options used to generate: 
   Options used to generate: 

+ 7 - 0
packages/odata/src/odatabase.pp

@@ -1,11 +1,18 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit odatabase;
 unit odatabase;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.TypInfo,System.Classes, System.SysUtils, FpJson.Data, FpWeb.Rest.Base;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   TypInfo,Classes, SysUtils, fpjson, restbase;
   TypInfo,Classes, SysUtils, fpjson, restbase;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Type
 Type
   TInt16 = Type Smallint;
   TInt16 = Type Smallint;

+ 12 - 1
packages/odata/src/odataservice.pp

@@ -1,5 +1,5 @@
 { **********************************************************************
 { **********************************************************************
-    This file is part of the Free Component Library (FCL)
+    This file is part of the Free Component Library (Fcl)
     Copyright (c) 2015 The free pascal team.
     Copyright (c) 2015 The free pascal team.
 
 
     Base OData service API classes
     Base OData service API classes
@@ -12,15 +12,22 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit odataservice;
 unit odataservice;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 {$DEFINE DEBUGODATASERVICE}
 {$DEFINE DEBUGODATASERVICE}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Contnrs, FpWeb.Rest.Base, Web.OData.Types, FpWeb.Client, FpJson.Data;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils, contnrs, restbase, odatabase, fpwebclient, fpjson;
   Classes, SysUtils, contnrs, restbase, odatabase, fpwebclient, fpjson;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Type
 Type
   TODataService = Class;
   TODataService = Class;
@@ -275,7 +282,11 @@ Function ODataFactory : TODataServiceFactory;
 
 
 implementation
 implementation
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Fcl.UriParser,FpWeb.Http.Defs;
+{$ELSE FPC_DOTTEDUNITS}
 uses uriparser,httpdefs;
 uses uriparser,httpdefs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 { ---------------------------------------------------------------------
 { ---------------------------------------------------------------------
   TODataServiceFactory
   TODataServiceFactory

+ 7 - 0
packages/odata/src/office365client.pp

@@ -1,11 +1,18 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit office365client;
 unit office365client;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpWeb.Client, Jwt.Oauth2, Jwt.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 uses
   Classes, SysUtils, fpwebclient, fpoauth2, fpjwt;
   Classes, SysUtils, fpwebclient, fpoauth2, fpjwt;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 Type
 Type
   TAuthMethod = (amOAuth2);
   TAuthMethod = (amOAuth2);

+ 6 - 0
packages/odata/src/sharepoint.pp

@@ -1,10 +1,16 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sharepoint;
 unit sharepoint;
+{$ENDIF FPC_DOTTEDUNITS}
 {$MODE objfpc}
 {$MODE objfpc}
 {$H+}
 {$H+}
 
 
 interface
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, FpJson.Data, FpWeb.Rest.Base, Web.OData.Types, Web.OData.Service;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, classes, fpjson, restbase, odatabase, odataservice;
 uses sysutils, classes, fpjson, restbase, odatabase, odataservice;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 (*
 (*
   Options used to generate: 
   Options used to generate: