Browse Source

* Allow to compile with dotted units

Michaël Van Canneyt 8 months ago
parent
commit
89da1e0729

+ 10 - 3
packages/fcl-openapi/src/fpopenapi.codegen.pp

@@ -19,7 +19,11 @@ unit fpopenapi.codegen;
 interface
 interface
 
 
 uses
 uses
+  {$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, System.StrUtils, System.DateUtils, Pascal.CodeGenerator, System.IniFiles,
+  {$ELSE}
   Classes, SysUtils, strutils, dateutils,  pascodegen, inifiles,
   Classes, SysUtils, strutils, dateutils,  pascodegen, inifiles,
+  {$ENDIF}
   fpjson.schema.types,
   fpjson.schema.types,
   fpjson.schema.Pascaltypes,
   fpjson.schema.Pascaltypes,
   fpjson.schema.codegen,
   fpjson.schema.codegen,
@@ -504,9 +508,12 @@ begin
       GenerateServiceInterface(lAPIData);
       GenerateServiceInterface(lAPIData);
       GenerateServiceImplementation(lAPIData);
       GenerateServiceImplementation(lAPIData);
       end;
       end;
-    GenerateServerHandlerModule(lAPIData);
-    if AbstractServiceCalls and not SkipServerServiceImplementationModule then
-      GenerateServerModuleImplementation(lAPIData);
+    if GenerateServer then
+      begin
+      GenerateServerHandlerModule(lAPIData);
+      if AbstractServiceCalls and not SkipServerServiceImplementationModule then
+        GenerateServerModuleImplementation(lAPIData);
+      end;
     GetUUIDMap(lAPIData);
     GetUUIDMap(lAPIData);
   finally
   finally
     lAPIData.Free;
     lAPIData.Free;

+ 5 - 1
packages/fcl-openapi/src/fpopenapi.generators.pp

@@ -20,7 +20,11 @@ unit fpopenapi.generators;
 interface
 interface
 
 
 uses
 uses
-  Classes, SysUtils, dateutils, contnrs, pascodegen,
+  {$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, System.DateUtils, System.Contnrs, Pascal.CodeGenerator,
+  {$ELSE}
+  Classes, SysUtils, strutils, dateutils,  pascodegen, inifiles,
+  {$ENDIF}
   fpjson.schema.types,
   fpjson.schema.types,
   fpjson.schema.Pascaltypes,
   fpjson.schema.Pascaltypes,
   fpjson.schema.codegen,
   fpjson.schema.codegen,