From eba6b08625f7648ad264429b12907b98ad88ac0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Mon, 6 Mar 2023 14:58:01 +0100 Subject: [PATCH] * Dotted filenames for package odata --- packages/odata/namespaced/Web.OData.MsGraph.pp | 3 +++ .../odata/namespaced/Web.OData.Office365Client.pp | 3 +++ packages/odata/namespaced/Web.OData.Service.pp | 3 +++ packages/odata/namespaced/Web.OData.Sharepoint.pp | 3 +++ packages/odata/namespaced/Web.OData.Types.pp | 3 +++ packages/odata/namespaces.lst | 7 +++++++ packages/odata/src/msgraph.pp | 6 ++++++ packages/odata/src/odatabase.pp | 7 +++++++ packages/odata/src/odataservice.pp | 13 ++++++++++++- packages/odata/src/office365client.pp | 7 +++++++ packages/odata/src/sharepoint.pp | 6 ++++++ 11 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 packages/odata/namespaced/Web.OData.MsGraph.pp create mode 100644 packages/odata/namespaced/Web.OData.Office365Client.pp create mode 100644 packages/odata/namespaced/Web.OData.Service.pp create mode 100644 packages/odata/namespaced/Web.OData.Sharepoint.pp create mode 100644 packages/odata/namespaced/Web.OData.Types.pp create mode 100644 packages/odata/namespaces.lst diff --git a/packages/odata/namespaced/Web.OData.MsGraph.pp b/packages/odata/namespaced/Web.OData.MsGraph.pp new file mode 100644 index 0000000000..181769ab34 --- /dev/null +++ b/packages/odata/namespaced/Web.OData.MsGraph.pp @@ -0,0 +1,3 @@ +unit Web.OData.MsGraph; +{$DEFINE FPC_DOTTEDUNITS} +{$i msgraph.pp} diff --git a/packages/odata/namespaced/Web.OData.Office365Client.pp b/packages/odata/namespaced/Web.OData.Office365Client.pp new file mode 100644 index 0000000000..0e244da46e --- /dev/null +++ b/packages/odata/namespaced/Web.OData.Office365Client.pp @@ -0,0 +1,3 @@ +unit Web.OData.Office365Client; +{$DEFINE FPC_DOTTEDUNITS} +{$i office365client.pp} diff --git a/packages/odata/namespaced/Web.OData.Service.pp b/packages/odata/namespaced/Web.OData.Service.pp new file mode 100644 index 0000000000..a42b25d74b --- /dev/null +++ b/packages/odata/namespaced/Web.OData.Service.pp @@ -0,0 +1,3 @@ +unit Web.OData.Service; +{$DEFINE FPC_DOTTEDUNITS} +{$i odataservice.pp} diff --git a/packages/odata/namespaced/Web.OData.Sharepoint.pp b/packages/odata/namespaced/Web.OData.Sharepoint.pp new file mode 100644 index 0000000000..e4097b8c2e --- /dev/null +++ b/packages/odata/namespaced/Web.OData.Sharepoint.pp @@ -0,0 +1,3 @@ +unit Web.OData.Sharepoint; +{$DEFINE FPC_DOTTEDUNITS} +{$i sharepoint.pp} diff --git a/packages/odata/namespaced/Web.OData.Types.pp b/packages/odata/namespaced/Web.OData.Types.pp new file mode 100644 index 0000000000..5287995715 --- /dev/null +++ b/packages/odata/namespaced/Web.OData.Types.pp @@ -0,0 +1,3 @@ +unit Web.OData.Types; +{$DEFINE FPC_DOTTEDUNITS} +{$i odatabase.pp} diff --git a/packages/odata/namespaces.lst b/packages/odata/namespaces.lst new file mode 100644 index 0000000000..2342f04d3e --- /dev/null +++ b/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 diff --git a/packages/odata/src/msgraph.pp b/packages/odata/src/msgraph.pp index af1d573382..fab476d813 100644 --- a/packages/odata/src/msgraph.pp +++ b/packages/odata/src/msgraph.pp @@ -1,10 +1,16 @@ +{$IFNDEF FPC_DOTTEDUNITS} unit msgraph; +{$ENDIF FPC_DOTTEDUNITS} {$MODE objfpc} {$H+} 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; +{$ENDIF FPC_DOTTEDUNITS} (* Options used to generate: diff --git a/packages/odata/src/odatabase.pp b/packages/odata/src/odatabase.pp index a5e7ac5d77..4490404265 100644 --- a/packages/odata/src/odatabase.pp +++ b/packages/odata/src/odatabase.pp @@ -1,11 +1,18 @@ +{$IFNDEF FPC_DOTTEDUNITS} unit odatabase; +{$ENDIF FPC_DOTTEDUNITS} {$mode objfpc}{$H+} interface +{$IFDEF FPC_DOTTEDUNITS} +uses + System.TypInfo,System.Classes, System.SysUtils, FpJson.Data, FpWeb.Rest.Base; +{$ELSE FPC_DOTTEDUNITS} uses TypInfo,Classes, SysUtils, fpjson, restbase; +{$ENDIF FPC_DOTTEDUNITS} Type TInt16 = Type Smallint; diff --git a/packages/odata/src/odataservice.pp b/packages/odata/src/odataservice.pp index 4a8cda5bc6..201ff9e5d7 100644 --- a/packages/odata/src/odataservice.pp +++ b/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. Base OData service API classes @@ -12,15 +12,22 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. **********************************************************************} +{$IFNDEF FPC_DOTTEDUNITS} unit odataservice; +{$ENDIF FPC_DOTTEDUNITS} {$mode objfpc}{$H+} {$DEFINE DEBUGODATASERVICE} 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 Classes, SysUtils, contnrs, restbase, odatabase, fpwebclient, fpjson; +{$ENDIF FPC_DOTTEDUNITS} Type TODataService = Class; @@ -275,7 +282,11 @@ Function ODataFactory : TODataServiceFactory; implementation +{$IFDEF FPC_DOTTEDUNITS} +uses Fcl.UriParser,FpWeb.Http.Defs; +{$ELSE FPC_DOTTEDUNITS} uses uriparser,httpdefs; +{$ENDIF FPC_DOTTEDUNITS} { --------------------------------------------------------------------- TODataServiceFactory diff --git a/packages/odata/src/office365client.pp b/packages/odata/src/office365client.pp index 4c1060653e..5910d971a5 100644 --- a/packages/odata/src/office365client.pp +++ b/packages/odata/src/office365client.pp @@ -1,11 +1,18 @@ +{$IFNDEF FPC_DOTTEDUNITS} unit office365client; +{$ENDIF FPC_DOTTEDUNITS} {$mode objfpc}{$H+} interface +{$IFDEF FPC_DOTTEDUNITS} +uses + System.Classes, System.SysUtils, FpWeb.Client, Jwt.Oauth2, Jwt.Types; +{$ELSE FPC_DOTTEDUNITS} uses Classes, SysUtils, fpwebclient, fpoauth2, fpjwt; +{$ENDIF FPC_DOTTEDUNITS} Type TAuthMethod = (amOAuth2); diff --git a/packages/odata/src/sharepoint.pp b/packages/odata/src/sharepoint.pp index 999135bd24..3c2a06b4ef 100644 --- a/packages/odata/src/sharepoint.pp +++ b/packages/odata/src/sharepoint.pp @@ -1,10 +1,16 @@ +{$IFNDEF FPC_DOTTEDUNITS} unit sharepoint; +{$ENDIF FPC_DOTTEDUNITS} {$MODE objfpc} {$H+} 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; +{$ENDIF FPC_DOTTEDUNITS} (* Options used to generate: