diff --git a/README.md b/README.md
index 595c86b26..ef7326fed 100644
--- a/README.md
+++ b/README.md
@@ -239,7 +239,16 @@ end;
- Fixed! [issue232](https://github.com/danieleteti/delphimvcframework/issues/232) (Thanks to Thank you to [João Antônio Duarte](https://github.com/joaoduarte19))
-- New Installation procedure! Just open the project group, build all and install the design-time package (which is `dmvcframeworkDT`)
+- New Installation procedure!
+
+ - Open the project group (select the correct one from the following table)
+ - Build all
+ - Install the design-time package (`dmvcframeworkDT`)
+ - Add the following paths in the Delphi Library Path (here, `C:\DEV\dmvcframework` is the `dmvcframework` main folder)
+ - `C:\DEV\dmvcframework\sources`
+ - `C:\DEV\dmvcframework\lib\loggerpro`
+ - `C:\DEV\dmvcframework\lib\swagdoc\Source`
+ - `C:\DEV\dmvcframework\lib\dmustache`
|Delphi Version|Project Group|
|---|---|
diff --git a/lib/loggerpro/packages/d100/loggerproRT.dproj b/lib/loggerpro/packages/d100/loggerproRT.dproj
index 4f1fa8c9e..48cbad8a8 100644
--- a/lib/loggerpro/packages/d100/loggerproRT.dproj
+++ b/lib/loggerpro/packages/d100/loggerproRT.dproj
@@ -2,7 +2,7 @@
{1611FBE6-5266-48FE-BDF5-E46EEAA922BE}
loggerproRT.dpk
- 18.6
+ 18.7
None
True
Debug
@@ -232,6 +232,12 @@
1
+
+
+ res\values
+ 1
+
+
res\drawable
@@ -268,6 +274,36 @@
1
+
+
+ res\drawable-mdpi
+ 1
+
+
+
+
+ res\drawable-hdpi
+ 1
+
+
+
+
+ res\drawable-xhdpi
+ 1
+
+
+
+
+ res\drawable-xxhdpi
+ 1
+
+
+
+
+ res\drawable-xxxhdpi
+ 1
+
+
res\drawable-small
@@ -292,6 +328,12 @@
1
+
+
+ res\values
+ 1
+
+
1
@@ -390,6 +432,17 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -401,6 +454,39 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -412,6 +498,61 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -423,6 +564,116 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -456,6 +707,28 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
diff --git a/lib/loggerpro/packages/d101/loggerproRT.dproj b/lib/loggerpro/packages/d101/loggerproRT.dproj
index 97985fa3c..1c1f32567 100644
--- a/lib/loggerpro/packages/d101/loggerproRT.dproj
+++ b/lib/loggerpro/packages/d101/loggerproRT.dproj
@@ -2,7 +2,7 @@
{1611FBE6-5266-48FE-BDF5-E46EEAA922BE}
loggerproRT.dpk
- 18.5
+ 18.7
None
True
Debug
@@ -233,6 +233,12 @@
1
+
+
+ res\values
+ 1
+
+
res\drawable
@@ -269,6 +275,36 @@
1
+
+
+ res\drawable-mdpi
+ 1
+
+
+
+
+ res\drawable-hdpi
+ 1
+
+
+
+
+ res\drawable-xhdpi
+ 1
+
+
+
+
+ res\drawable-xxhdpi
+ 1
+
+
+
+
+ res\drawable-xxxhdpi
+ 1
+
+
res\drawable-small
@@ -293,6 +329,12 @@
1
+
+
+ res\values
+ 1
+
+
1
@@ -391,6 +433,17 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -402,6 +455,39 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -413,6 +499,61 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -424,6 +565,116 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -457,6 +708,28 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
diff --git a/lib/swagdoc/Source/SwagDoc.dproj b/lib/swagdoc/Source/SwagDoc.dproj
index 5e99d38e8..c84456db8 100644
--- a/lib/swagdoc/Source/SwagDoc.dproj
+++ b/lib/swagdoc/Source/SwagDoc.dproj
@@ -55,7 +55,7 @@
true
- ..\Lib
+ .\$(Platform)\$(Config)
.\$(Platform)\$(Config)
false
false
@@ -67,8 +67,6 @@
System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)
All
SwagDoc
- ..\Lib
- ..\Lib
true
3
1046
@@ -165,8 +163,10 @@
- Microsoft Office 2000 Sample Automation Server Wrapper Components
- Microsoft Office XP Sample Automation Server Wrapper Components
+ Embarcadero C++Builder Office 2000 Servers Package
+ Embarcadero C++Builder Office XP Servers Package
+ Microsoft Office 2000 Sample Automation Server Wrapper Components
+ Microsoft Office XP Sample Automation Server Wrapper Components
SwagDoc.dpk
diff --git a/packages/d100/dmvcframeworkDT.dproj b/packages/d100/dmvcframeworkDT.dproj
index 25b4c4824..342d64912 100644
--- a/packages/d100/dmvcframeworkDT.dproj
+++ b/packages/d100/dmvcframeworkDT.dproj
@@ -2,7 +2,7 @@
{84344511-1DC2-41BA-8689-9F36C1D475BE}
dmvcframeworkDT.dpk
- 18.6
+ 18.7
None
True
Debug
@@ -105,6 +105,7 @@
true
1033
100
+ false
false
@@ -190,12 +191,6 @@
true
-
-
- dmvcframeworkDT.bpl
- true
-
-
true
@@ -221,6 +216,12 @@
true
+
+
+ dmvcframeworkDT.bpl
+ true
+
+
1
@@ -283,6 +284,12 @@
1
+
+
+ res\values
+ 1
+
+
res\drawable
@@ -319,6 +326,36 @@
1
+
+
+ res\drawable-mdpi
+ 1
+
+
+
+
+ res\drawable-hdpi
+ 1
+
+
+
+
+ res\drawable-xhdpi
+ 1
+
+
+
+
+ res\drawable-xxhdpi
+ 1
+
+
+
+
+ res\drawable-xxxhdpi
+ 1
+
+
res\drawable-small
@@ -343,6 +380,12 @@
1
+
+
+ res\values
+ 1
+
+
1
@@ -441,6 +484,17 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -452,6 +506,39 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -463,6 +550,61 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -474,6 +616,116 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -507,6 +759,28 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
diff --git a/packages/d100/dmvcframeworkRT.dpk b/packages/d100/dmvcframeworkRT.dpk
index 649a81b76..949b81d6e 100644
--- a/packages/d100/dmvcframeworkRT.dpk
+++ b/packages/d100/dmvcframeworkRT.dpk
@@ -40,7 +40,9 @@ requires
IndyProtocols,
FireDACIBDriver,
FireDACMySQLDriver,
- loggerproRT;
+ loggerproRT,
+ FireDACPgDriver,
+ SwagDoc;
contains
Web.ApacheConst,
@@ -94,7 +96,12 @@ contains
MVCFramework.SysControllers in '..\..\sources\MVCFramework.SysControllers.pas',
MVCFramework.SystemJSONUtils in '..\..\sources\MVCFramework.SystemJSONUtils.pas',
MVCFramework.View.Cache in '..\..\sources\MVCFramework.View.Cache.pas',
- MVCFramework.Controllers.Register in '..\..\sources\MVCFramework.Controllers.Register.pas';
+ MVCFramework.Controllers.Register in '..\..\sources\MVCFramework.Controllers.Register.pas',
+ MVCFramework.Swagger.Commons in '..\..\sources\MVCFramework.Swagger.Commons.pas',
+ MVCFramework.SQLGenerators.Interbase in '..\..\sources\MVCFramework.SQLGenerators.Interbase.pas',
+ MVCFramework.SQLGenerators.PostgreSQL in '..\..\sources\MVCFramework.SQLGenerators.PostgreSQL.pas',
+ MVCFramework.SQLGenerators.Sqlite in '..\..\sources\MVCFramework.SQLGenerators.Sqlite.pas',
+ MVCFramework.RQL.AST2SQLite in '..\..\sources\MVCFramework.RQL.AST2SQLite.pas';
end.
diff --git a/packages/d100/dmvcframeworkRT.dproj b/packages/d100/dmvcframeworkRT.dproj
index 2b731f6ba..d1958b844 100644
--- a/packages/d100/dmvcframeworkRT.dproj
+++ b/packages/d100/dmvcframeworkRT.dproj
@@ -2,7 +2,7 @@
{96D17257-AF74-48CB-9893-7BCCB56A069D}
dmvcframeworkRT.dpk
- 18.6
+ 18.7
None
True
Debug
@@ -80,6 +80,7 @@
3
DMVCFramework 3.x
100
+ false
false
@@ -101,6 +102,8 @@
+
+
@@ -148,6 +151,11 @@
+
+
+
+
+
Cfg_2
Base
@@ -274,6 +282,12 @@
1
+
+
+ res\values
+ 1
+
+
res\drawable
@@ -310,6 +324,36 @@
1
+
+
+ res\drawable-mdpi
+ 1
+
+
+
+
+ res\drawable-hdpi
+ 1
+
+
+
+
+ res\drawable-xhdpi
+ 1
+
+
+
+
+ res\drawable-xxhdpi
+ 1
+
+
+
+
+ res\drawable-xxxhdpi
+ 1
+
+
res\drawable-small
@@ -334,6 +378,12 @@
1
+
+
+ res\values
+ 1
+
+
1
@@ -432,6 +482,17 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -443,6 +504,39 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -454,6 +548,61 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -465,6 +614,116 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -498,6 +757,28 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
diff --git a/packages/d100/dmvcframework_group.groupproj b/packages/d100/dmvcframework_group.groupproj
index 569e00ba5..8a8294ded 100644
--- a/packages/d100/dmvcframework_group.groupproj
+++ b/packages/d100/dmvcframework_group.groupproj
@@ -6,6 +6,9 @@
+
+
+
..\..\lib\loggerpro\packages\d100\loggerproRT.dproj
@@ -29,6 +32,15 @@
+
+
+
+
+
+
+
+
+
@@ -48,13 +60,13 @@
-
+
-
+
-
+
diff --git a/packages/d101/dmvcframeworkDT.dproj b/packages/d101/dmvcframeworkDT.dproj
index 940fb6402..15cb05367 100644
--- a/packages/d101/dmvcframeworkDT.dproj
+++ b/packages/d101/dmvcframeworkDT.dproj
@@ -2,7 +2,7 @@
{84344511-1DC2-41BA-8689-9F36C1D475BE}
dmvcframeworkDT.dpk
- 18.6
+ 18.7
None
True
Debug
@@ -105,6 +105,7 @@
true
1033
101
+ false
false
@@ -178,11 +179,10 @@
dmvcframeworkDT.dpk
- TurboPack LockBox Delphi FMX designtime package
- DBExpress Enterprise Data Explorer Integration
+ Embarcadero C++Builder Office 2000 Servers Package
+ Embarcadero C++Builder Office XP Servers Package
Microsoft Office 2000 Sample Automation Server Wrapper Components
Microsoft Office XP Sample Automation Server Wrapper Components
- FastReport 6.0 Tee Components
@@ -284,6 +284,12 @@
1
+
+
+ res\values
+ 1
+
+
res\drawable
@@ -320,6 +326,36 @@
1
+
+
+ res\drawable-mdpi
+ 1
+
+
+
+
+ res\drawable-hdpi
+ 1
+
+
+
+
+ res\drawable-xhdpi
+ 1
+
+
+
+
+ res\drawable-xxhdpi
+ 1
+
+
+
+
+ res\drawable-xxxhdpi
+ 1
+
+
res\drawable-small
@@ -344,6 +380,12 @@
1
+
+
+ res\values
+ 1
+
+
1
@@ -442,6 +484,17 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -453,6 +506,39 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -464,6 +550,61 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -475,6 +616,116 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -508,6 +759,28 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
diff --git a/packages/d101/dmvcframeworkRT.dpk b/packages/d101/dmvcframeworkRT.dpk
index 4198848a3..73691d041 100644
--- a/packages/d101/dmvcframeworkRT.dpk
+++ b/packages/d101/dmvcframeworkRT.dpk
@@ -40,7 +40,9 @@ requires
IndyProtocols,
FireDACIBDriver,
FireDACMySQLDriver,
- loggerproRT;
+ loggerproRT,
+ FireDACPgDriver,
+ SwagDoc;
contains
Web.ApacheConst,
@@ -89,12 +91,17 @@ contains
MVCFramework.Serializer.JsonDataObjects.CustomTypes in '..\..\sources\MVCFramework.Serializer.JsonDataObjects.CustomTypes.pas',
MVCFramework.Serializer.JsonDataObjects in '..\..\sources\MVCFramework.Serializer.JsonDataObjects.pas',
MVCFramework.Session in '..\..\sources\MVCFramework.Session.pas',
- MVCFramework.SQLGenerators.Firebird in '..\..\sources\MVCFramework.SQLGenerators.Firebird.pas',
- MVCFramework.SQLGenerators.MySQL in '..\..\sources\MVCFramework.SQLGenerators.MySQL.pas',
MVCFramework.SysControllers in '..\..\sources\MVCFramework.SysControllers.pas',
MVCFramework.SystemJSONUtils in '..\..\sources\MVCFramework.SystemJSONUtils.pas',
MVCFramework.View.Cache in '..\..\sources\MVCFramework.View.Cache.pas',
- MVCFramework.Controllers.Register in '..\..\sources\MVCFramework.Controllers.Register.pas';
+ MVCFramework.Controllers.Register in '..\..\sources\MVCFramework.Controllers.Register.pas',
+ MVCFramework.Swagger.Commons in '..\..\sources\MVCFramework.Swagger.Commons.pas',
+ MVCFramework.RQL.AST2SQLite in '..\..\sources\MVCFramework.RQL.AST2SQLite.pas',
+ MVCFramework.SQLGenerators.Firebird in '..\..\sources\MVCFramework.SQLGenerators.Firebird.pas',
+ MVCFramework.SQLGenerators.Interbase in '..\..\sources\MVCFramework.SQLGenerators.Interbase.pas',
+ MVCFramework.SQLGenerators.MySQL in '..\..\sources\MVCFramework.SQLGenerators.MySQL.pas',
+ MVCFramework.SQLGenerators.PostgreSQL in '..\..\sources\MVCFramework.SQLGenerators.PostgreSQL.pas',
+ MVCFramework.SQLGenerators.Sqlite in '..\..\sources\MVCFramework.SQLGenerators.Sqlite.pas';
end.
diff --git a/packages/d101/dmvcframeworkRT.dproj b/packages/d101/dmvcframeworkRT.dproj
index 57b8796d0..18f81dfc0 100644
--- a/packages/d101/dmvcframeworkRT.dproj
+++ b/packages/d101/dmvcframeworkRT.dproj
@@ -2,7 +2,7 @@
{96D17257-AF74-48CB-9893-7BCCB56A069D}
dmvcframeworkRT.dpk
- 18.6
+ 18.7
None
True
Debug
@@ -80,6 +80,7 @@
3
DMVCFramework 3.x
101
+ false
false
@@ -101,6 +102,8 @@
+
+
@@ -142,12 +145,17 @@
-
-
+
+
+
+
+
+
+
Cfg_2
Base
@@ -169,11 +177,10 @@
dmvcframeworkRT.dpk
- TurboPack LockBox Delphi FMX designtime package
- DBExpress Enterprise Data Explorer Integration
+ Embarcadero C++Builder Office 2000 Servers Package
+ Embarcadero C++Builder Office XP Servers Package
Microsoft Office 2000 Sample Automation Server Wrapper Components
Microsoft Office XP Sample Automation Server Wrapper Components
- FastReport 6.0 Tee Components
@@ -275,6 +282,12 @@
1
+
+
+ res\values
+ 1
+
+
res\drawable
@@ -311,6 +324,36 @@
1
+
+
+ res\drawable-mdpi
+ 1
+
+
+
+
+ res\drawable-hdpi
+ 1
+
+
+
+
+ res\drawable-xhdpi
+ 1
+
+
+
+
+ res\drawable-xxhdpi
+ 1
+
+
+
+
+ res\drawable-xxxhdpi
+ 1
+
+
res\drawable-small
@@ -335,6 +378,12 @@
1
+
+
+ res\values
+ 1
+
+
1
@@ -433,6 +482,17 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -444,6 +504,39 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -455,6 +548,61 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -466,6 +614,116 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -499,6 +757,28 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
diff --git a/packages/d101/dmvcframework_group.groupproj b/packages/d101/dmvcframework_group.groupproj
index 951ce8878..f1bd91bb5 100644
--- a/packages/d101/dmvcframework_group.groupproj
+++ b/packages/d101/dmvcframework_group.groupproj
@@ -6,6 +6,9 @@
+
+
+
@@ -29,6 +32,15 @@
+
+
+
+
+
+
+
+
+
@@ -48,13 +60,13 @@
-
+
-
+
-
+
diff --git a/packages/d102/dmvcframeworkDT.dproj b/packages/d102/dmvcframeworkDT.dproj
index c55e346be..e82e98bd0 100644
--- a/packages/d102/dmvcframeworkDT.dproj
+++ b/packages/d102/dmvcframeworkDT.dproj
@@ -2,7 +2,7 @@
{84344511-1DC2-41BA-8689-9F36C1D475BE}
dmvcframeworkDT.dpk
- 18.6
+ 18.7
None
True
Debug
@@ -105,6 +105,7 @@
true
1033
102
+ false
false
@@ -179,10 +180,10 @@
dmvcframeworkDT.dpk
- Microsoft Office 2000 Sample Automation Server Wrapper Components
- Microsoft Office XP Sample Automation Server Wrapper Components
- Embarcadero C++Builder Office 2000 Servers Package
- Embarcadero C++Builder Office XP Servers Package
+ Embarcadero C++Builder Office 2000 Servers Package
+ Embarcadero C++Builder Office XP Servers Package
+ Microsoft Office 2000 Sample Automation Server Wrapper Components
+ Microsoft Office XP Sample Automation Server Wrapper Components
@@ -191,12 +192,6 @@
true
-
-
- dmvcframeworkDT.bpl
- true
-
-
true
@@ -222,6 +217,12 @@
true
+
+
+ dmvcframeworkDT.bpl
+ true
+
+
1
@@ -284,6 +285,12 @@
1
+
+
+ res\values
+ 1
+
+
res\drawable
@@ -320,6 +327,36 @@
1
+
+
+ res\drawable-mdpi
+ 1
+
+
+
+
+ res\drawable-hdpi
+ 1
+
+
+
+
+ res\drawable-xhdpi
+ 1
+
+
+
+
+ res\drawable-xxhdpi
+ 1
+
+
+
+
+ res\drawable-xxxhdpi
+ 1
+
+
res\drawable-small
@@ -344,6 +381,12 @@
1
+
+
+ res\values
+ 1
+
+
1
@@ -442,6 +485,17 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -453,6 +507,39 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -464,6 +551,61 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -475,6 +617,116 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -508,6 +760,28 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
diff --git a/packages/d102/dmvcframeworkRT.dpk b/packages/d102/dmvcframeworkRT.dpk
index ef906c292..c0083c6cc 100644
--- a/packages/d102/dmvcframeworkRT.dpk
+++ b/packages/d102/dmvcframeworkRT.dpk
@@ -40,7 +40,9 @@ requires
IndyProtocols,
FireDACIBDriver,
FireDACMySQLDriver,
- loggerproRT;
+ loggerproRT,
+ FireDACPgDriver,
+ SwagDoc;
contains
Web.ApacheConst,
@@ -89,11 +91,16 @@ contains
MVCFramework.Serializer.JsonDataObjects.CustomTypes in '..\..\sources\MVCFramework.Serializer.JsonDataObjects.CustomTypes.pas',
MVCFramework.Serializer.JsonDataObjects in '..\..\sources\MVCFramework.Serializer.JsonDataObjects.pas',
MVCFramework.Session in '..\..\sources\MVCFramework.Session.pas',
- MVCFramework.SQLGenerators.Firebird in '..\..\sources\MVCFramework.SQLGenerators.Firebird.pas',
- MVCFramework.SQLGenerators.MySQL in '..\..\sources\MVCFramework.SQLGenerators.MySQL.pas',
MVCFramework.SysControllers in '..\..\sources\MVCFramework.SysControllers.pas',
MVCFramework.SystemJSONUtils in '..\..\sources\MVCFramework.SystemJSONUtils.pas',
- MVCFramework.View.Cache in '..\..\sources\MVCFramework.View.Cache.pas';
+ MVCFramework.View.Cache in '..\..\sources\MVCFramework.View.Cache.pas',
+ MVCFramework.Swagger.Commons in '..\..\sources\MVCFramework.Swagger.Commons.pas',
+ MVCFramework.RQL.AST2SQLite in '..\..\sources\MVCFramework.RQL.AST2SQLite.pas',
+ MVCFramework.SQLGenerators.Firebird in '..\..\sources\MVCFramework.SQLGenerators.Firebird.pas',
+ MVCFramework.SQLGenerators.Interbase in '..\..\sources\MVCFramework.SQLGenerators.Interbase.pas',
+ MVCFramework.SQLGenerators.MySQL in '..\..\sources\MVCFramework.SQLGenerators.MySQL.pas',
+ MVCFramework.SQLGenerators.PostgreSQL in '..\..\sources\MVCFramework.SQLGenerators.PostgreSQL.pas',
+ MVCFramework.SQLGenerators.Sqlite in '..\..\sources\MVCFramework.SQLGenerators.Sqlite.pas';
end.
diff --git a/packages/d102/dmvcframeworkRT.dproj b/packages/d102/dmvcframeworkRT.dproj
index 73bfd9823..772d68e4d 100644
--- a/packages/d102/dmvcframeworkRT.dproj
+++ b/packages/d102/dmvcframeworkRT.dproj
@@ -2,7 +2,7 @@
{96D17257-AF74-48CB-9893-7BCCB56A069D}
dmvcframeworkRT.dpk
- 18.6
+ 18.7
None
True
Debug
@@ -80,6 +80,7 @@
3
DMVCFramework 3.x
102
+ false
false
@@ -101,6 +102,8 @@
+
+
@@ -142,11 +145,16 @@
-
-
+
+
+
+
+
+
+
Cfg_2
Base
@@ -168,10 +176,10 @@
dmvcframeworkRT.dpk
- Microsoft Office 2000 Sample Automation Server Wrapper Components
- Microsoft Office XP Sample Automation Server Wrapper Components
- Embarcadero C++Builder Office 2000 Servers Package
- Embarcadero C++Builder Office XP Servers Package
+ Embarcadero C++Builder Office 2000 Servers Package
+ Embarcadero C++Builder Office XP Servers Package
+ Microsoft Office 2000 Sample Automation Server Wrapper Components
+ Microsoft Office XP Sample Automation Server Wrapper Components
@@ -205,7 +213,7 @@
true
-
+
dmvcframeworkRT.bpl
true
@@ -273,6 +281,12 @@
1
+
+
+ res\values
+ 1
+
+
res\drawable
@@ -309,6 +323,36 @@
1
+
+
+ res\drawable-mdpi
+ 1
+
+
+
+
+ res\drawable-hdpi
+ 1
+
+
+
+
+ res\drawable-xhdpi
+ 1
+
+
+
+
+ res\drawable-xxhdpi
+ 1
+
+
+
+
+ res\drawable-xxxhdpi
+ 1
+
+
res\drawable-small
@@ -333,6 +377,12 @@
1
+
+
+ res\values
+ 1
+
+
1
@@ -431,6 +481,17 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -442,6 +503,39 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -453,6 +547,61 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -464,6 +613,116 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
@@ -497,6 +756,28 @@
1
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
1
diff --git a/packages/d102/dmvcframework_group.groupproj b/packages/d102/dmvcframework_group.groupproj
index bb70a31e2..1e325c162 100644
--- a/packages/d102/dmvcframework_group.groupproj
+++ b/packages/d102/dmvcframework_group.groupproj
@@ -6,6 +6,9 @@
+
+
+
@@ -29,6 +32,15 @@
+
+
+
+
+
+
+
+
+
@@ -48,13 +60,13 @@
-
+
-
+
-
+
diff --git a/packages/d103/dmvcframeworkDT.dproj b/packages/d103/dmvcframeworkDT.dproj
index 10757cf9f..4f8eb892f 100644
--- a/packages/d103/dmvcframeworkDT.dproj
+++ b/packages/d103/dmvcframeworkDT.dproj
@@ -104,6 +104,7 @@
true
1033
103
+ false
false
diff --git a/packages/d103/dmvcframeworkRT.dpk b/packages/d103/dmvcframeworkRT.dpk
index 6b176b079..b39e952db 100644
--- a/packages/d103/dmvcframeworkRT.dpk
+++ b/packages/d103/dmvcframeworkRT.dpk
@@ -45,10 +45,10 @@ requires
FireDACPgDriver;
contains
- Web.ApacheConst,
- Web.Win.IsapiHTTP,
- Web.ApacheHTTP,
- Web.HTTPDMethods,
+ Web.ApacheConst in 'c:\program files (x86)\embarcadero\studio\20.0\source\Internet\Web.ApacheConst.pas',
+ Web.Win.IsapiHTTP in 'c:\program files (x86)\embarcadero\studio\20.0\source\Internet\Web.Win.IsapiHTTP.pas',
+ Web.ApacheHTTP in 'c:\program files (x86)\embarcadero\studio\20.0\source\Internet\Web.ApacheHTTP.pas',
+ Web.HTTPDMethods in 'c:\program files (x86)\embarcadero\studio\20.0\source\Internet\Web.HTTPDMethods.pas',
Web.HTTPDImpl,
JsonDataObjects in '..\..\sources\JsonDataObjects.pas',
MVCFramework.ActiveRecord in '..\..\sources\MVCFramework.ActiveRecord.pas',
diff --git a/packages/d103/dmvcframeworkRT.dproj b/packages/d103/dmvcframeworkRT.dproj
index 2dfe1ee18..5c4df310a 100644
--- a/packages/d103/dmvcframeworkRT.dproj
+++ b/packages/d103/dmvcframeworkRT.dproj
@@ -100,6 +100,7 @@
103
true
DMS_DEBUG=true;DMS_HOME=C:\DEV\dmscontainer3\bin\;$(Debugger_EnvVars)
+ false
false
diff --git a/tasks.py b/tasks.py
index 3088a8a6d..d73a720e1 100644
--- a/tasks.py
+++ b/tasks.py
@@ -3,7 +3,7 @@
import subprocess
from colorama import *
import glob
-from shutil import copy2, rmtree
+from shutil import copy2, rmtree, copytree
from datetime import datetime
import pathlib
@@ -96,11 +96,9 @@ def copy_sources():
copy2(file, g_output_folder + "\\sources\\")
# copying tools
- # print("Copying tools binaries...")
- # src = glob.glob("tools\\bin\\*.*")
- # for file in src:
- # print("Copying " + file + " to " + g_output_folder + "\\tools")
- # copy2(file, g_output_folder + "\\tools\\")
+ print("Copying tools...")
+ copytree('tools\\entitygenerator', g_output_folder + "\\tools\\entitygenerator")
+ copytree('tools\\rql2sql', g_output_folder + "\\tools\\rql2sql")
# copying ideexperts
print("Copying DMVCFramework IDEExpert...")
@@ -139,6 +137,14 @@ def copy_sources():
def copy_libs(ctx):
global g_output_folder
+
+ # swagdoc
+ print("Copying libraries: SwagDoc...")
+ curr_folder = g_output_folder + "\\lib\\swagdoc"
+ os.makedirs(curr_folder, exist_ok=True)
+ if not ctx.run(rf"xcopy lib\swagdoc\*.* {curr_folder}\*.* /E /Y /R /V /F"):
+ raise Exception("Cannot copy SwagDoc")
+
# loggerpro
print("Copying libraries: LoggerPro...")
curr_folder = g_output_folder + "\\lib\\loggerpro"
@@ -146,6 +152,7 @@ def copy_libs(ctx):
if not ctx.run(rf"xcopy lib\loggerpro\*.* {curr_folder}\*.* /E /Y /R /V /F"):
raise Exception("Cannot copy loggerpro")
+ # dmustache
print("Copying libraries: dmustache...")
curr_folder = g_output_folder + "\\lib\\dmustache"
os.makedirs(curr_folder, exist_ok=True)
@@ -203,6 +210,7 @@ def init_build(version):
copy2("README.md", g_output_folder)
copy2("3_0_0_breaking_changes.md", g_output_folder)
copy2("3_1_0_breaking_changes.md", g_output_folder)
+ copy2("3_2_0_breaking_changes.md", g_output_folder)
copy2("License.txt", g_output_folder)
@@ -269,8 +277,12 @@ def clean(ctx):
rmtree(g_output_folder + r"\lib\loggerpro\packages\d103\__history", True)
rmtree(g_output_folder + r"\lib\loggerpro\packages\d103\Win32\Debug", True)
rmtree(g_output_folder + r"\lib\dmustache\.git", True)
+ rmtree(g_output_folder + r"\lib\swagdoc\lib", True)
+ rmtree(g_output_folder + r"\lib\swagdoc\deploy", True)
+ rmtree(g_output_folder + r"\lib\swagdoc\demos", True)
to_delete = []
+ to_delete += glob.glob(g_output_folder + r"\**\*.exe", recursive=True)
to_delete += glob.glob(g_output_folder + r"\**\*.dcu", recursive=True)
to_delete += glob.glob(g_output_folder + r"\**\*.stat", recursive=True)
to_delete += glob.glob(g_output_folder + r"\**\*.res", recursive=True)
@@ -295,6 +307,7 @@ def release(ctx, version="DEBUG", delphi_version=DEFAULT_DELPHI_VERSION, skip_bu
delphi_projects = get_delphi_projects_to_build('', delphi_version)
if not build_delphi_project_list(ctx, delphi_projects, version, '', delphi_version):
return False #fails build
+ print(Fore.RESET)
copy_sources()
copy_libs(ctx)
clean(ctx)
diff --git a/unittests/common/MVCFramework.Tests.Serializer.Entities.pas b/unittests/common/MVCFramework.Tests.Serializer.Entities.pas
index fb0fb972d..7ca8af9d7 100644
--- a/unittests/common/MVCFramework.Tests.Serializer.Entities.pas
+++ b/unittests/common/MVCFramework.Tests.Serializer.Entities.pas
@@ -367,6 +367,21 @@ TGenericEntity = class
property Items: TObjectList read FItems write FItems;
end;
+ TMultipleGenericEntity = class
+ private
+ FCode: Integer;
+ FItems: TObjectList;
+ FItems2: TObjectList;
+ FDescription: string;
+ public
+ constructor Create;
+ destructor Destroy; override;
+ property Code: Integer read FCode write FCode;
+ property Description: string read FDescription write FDescription;
+ property Items: TObjectList read FItems write FItems;
+ property Items2: TObjectList read FItems2 write FItems2;
+ end;
+
implementation
@@ -520,4 +535,19 @@ destructor TGenericEntity.Destroy;
inherited Destroy;
end;
+constructor TMultipleGenericEntity.Create;
+begin
+ inherited Create;
+ FItems := TObjectList.Create;
+ FItems2 := TObjectList.Create;
+end;
+
+destructor TMultipleGenericEntity.Destroy;
+begin
+ FItems.Free;
+ FItems2.Free;
+ inherited Destroy;
+end;
+
+
end.