Skip to content

Commit 3a0aff3

Browse files
- New Setup for automatic Installation of Components - Fixed some Tests for 64Bit platform - Added support for Delphi 12.2 - Fixed Demos for 64 Bit - Added possibility to not trim strings (using IO_DISABLE_STRING_TRIM)
1 parent 229b255 commit 3a0aff3

File tree

516 files changed

+11368
-11137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

516 files changed

+11368
-11137
lines changed

Demos/ConsoleApp/IOConsoleDemo.dpr

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,19 @@ begin
7171

7272
for i := 0 to 100 do
7373
begin
74-
WriteLn('Storing Object.');
7574
SimpleClass := TSimpleClass.Create;
7675
Try
7776
SimpleClass.StringProperty := IntToStr(Random(MaxInt));
7877
SimpleClass.Store;
7978
Id := SimpleClass.Id;
79+
WriteLn(Format('Stoed Object: Id="%s"', [Id]));
8080
Finally
8181
SimpleClass.Free;
8282
End;
8383

84-
WriteLn('Retrieving and changing Object.');
8584
SimpleClass := TSimpleClass.Retrieve(Id);
8685
Try
86+
WriteLn(Format('Retrieving and changing Object: Id="%s"', [Id]));
8787
SimpleClass.StringProperty := IntToStr(Random(MaxInt));
8888
SimpleClass.Store;
8989
Finally
@@ -101,6 +101,9 @@ begin
101101
end;
102102
WriteLn('Disconnecting from Database.');
103103
Connector.Disconnect;
104+
105+
WriteLn('Console Demo ended. Press "Enter" to exit.');
106+
readLn;
104107
Finally
105108
Connector.Free;
106109
Connection.Free;

Demos/ConsoleApp/IOConsoleDemo.dproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@
7373
<Cfg_2>true</Cfg_2>
7474
<Base>true</Base>
7575
</PropertyGroup>
76+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
77+
<Cfg_2_Win32>true</Cfg_2_Win32>
78+
<CfgParent>Cfg_2</CfgParent>
79+
<Cfg_2>true</Cfg_2>
80+
<Base>true</Base>
81+
</PropertyGroup>
7682
<PropertyGroup Condition="'$(Base)'!=''">
7783
<DCC_E>false</DCC_E>
7884
<DCC_F>false</DCC_F>
@@ -92,6 +98,7 @@
9298
<VerInfo_Keys>CompanyName=CiBiSoft.com;FileDescription=Global Selling Network;FileVersion=1.0.0.0;InternalName=GSN;LegalCopyright=Copyright © 2005 CiBiSoft.com;LegalTrademarks=;OriginalFilename=;ProductName=Global Selling Network;ProductVersion=1.0;Comments=</VerInfo_Keys>
9399
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
94100
<Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
101+
<DCC_Define>IO_CONSOLE;$(DCC_Define)</DCC_Define>
95102
</PropertyGroup>
96103
<PropertyGroup Condition="'$(Base_Android)'!=''">
97104
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
@@ -167,6 +174,12 @@
167174
<PropertyGroup Condition="'$(Cfg_2_OSXARM64)'!=''">
168175
<BT_BuildType>Debug</BT_BuildType>
169176
</PropertyGroup>
177+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
178+
<VerInfo_Locale>1033</VerInfo_Locale>
179+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
180+
<Manifest_File>(None)</Manifest_File>
181+
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
182+
</PropertyGroup>
170183
<ItemGroup>
171184
<DelphiCompile Include="$(MainSource)">
172185
<MainSource>MainSource</MainSource>
@@ -192,6 +205,8 @@
192205
<Source>
193206
<Source Name="MainSource">IOConsoleDemo.dpr</Source>
194207
</Source>
208+
<Excluded_Packages>
209+
</Excluded_Packages>
195210
</Delphi.Personality>
196211
<Platforms>
197212
<Platform value="Android">False</Platform>

Demos/ConsoleApp/Model.pas

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,17 @@
22

33
interface
44

5+
{$IFDEF LINUX64}
6+
{$I '../InstantDefines.inc'}
7+
{$ELSE}
8+
{$I '..\InstantDefines.inc'}
9+
{$ENDIF}
10+
511
uses
6-
InstantPersistence;
12+
System.Classes,
13+
InstantPersistence,
14+
InstantTypes,
15+
InstantClasses;
716

817
type
918
TSimpleClass = class(TInstantObject)
@@ -13,6 +22,12 @@ TSimpleClass = class(TInstantObject)
1322
private
1423
function GetStringProperty: string;
1524
procedure SetStringProperty(const Value: string);
25+
public
26+
{$IFDEF WINLINUX64}
27+
class function Retrieve(const AObjectId: string; CreateIfMissing: Boolean = False;
28+
ARefresh: Boolean = False; AConnector: TComponent = nil;
29+
const AObjectData: TInstantAbstractObjectData = nil): TSimpleClass; reintroduce; virtual;
30+
{$ENDIF}
1631
published
1732
property StringProperty: string read GetStringProperty write SetStringProperty;
1833
end;
@@ -22,7 +37,7 @@ procedure CreateInstantModel;
2237
implementation
2338

2439
uses
25-
InstantMetadata, InstantTypes;
40+
InstantMetadata;
2641

2742
procedure CreateInstantModel;
2843
var
@@ -66,6 +81,16 @@ procedure CreateInstantModel;
6681

6782
{ TSimpleClass }
6883

84+
{$IFDEF WINLINUX64}
85+
class function TSimpleClass.Retrieve(const AObjectId: string; CreateIfMissing: Boolean = False;
86+
ARefresh: Boolean = False; AConnector: TComponent = nil;
87+
const AObjectData: TInstantAbstractObjectData = nil): TSimpleClass;
88+
begin
89+
Result := inherited Retrieve(AObjectId,
90+
CreateIfMissing, ARefresh, AConnector, AObjectData) as TSimpleClass;
91+
end;
92+
{$ENDIF}
93+
6994
function TSimpleClass.GetStringProperty: string;
7095
begin
7196
Result := _StringProperty.Value;

Demos/EvolveTest/EvolveTest.cfg

Lines changed: 0 additions & 41 deletions
This file was deleted.

Demos/EvolveTest/EvolveTest.dpr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
program EvolveTest;
22

33
uses
4-
Forms,
4+
Vcl.Forms,
55
FMainEvolveTest in 'FMainEvolveTest.pas' {EvolverTestForm},
66
Model in 'Model.pas';
77

@@ -10,6 +10,6 @@ uses
1010

1111
begin
1212
Application.Initialize;
13-
Application.CreateForm(TEvolverTestForm, EvolverTestForm);
14-
Application.Run;
13+
Application.CreateForm(TEvolverTestForm, EvolverTestForm);
14+
Application.Run;
1515
end.

0 commit comments

Comments
 (0)