Skip to content

Commit a91e803

Browse files
lmbelolmbelo
committed
Moved TPythonGUIInputOutput component registration from run-time package to design-time package
1 parent c7dd436 commit a91e803

File tree

4 files changed

+31
-8
lines changed

4 files changed

+31
-8
lines changed

‎Packages/Delphi/Delphi 10.4+/dclP4DEngine.dproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,26 @@
3333
<CfgParent>Base</CfgParent>
3434
<Base>true</Base>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="('$(Platform)'=='Linux64' and '$(Base)'=='true') or '$(Base_Linux64)'!=''">
37+
<Base_Linux64>true</Base_Linux64>
38+
<CfgParent>Base</CfgParent>
39+
<Base>true</Base>
40+
</PropertyGroup>
41+
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Base)'=='true') or '$(Base_OSX64)'!=''">
42+
<Base_OSX64>true</Base_OSX64>
43+
<CfgParent>Base</CfgParent>
44+
<Base>true</Base>
45+
</PropertyGroup>
3646
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
3747
<Base_Win32>true</Base_Win32>
3848
<CfgParent>Base</CfgParent>
3949
<Base>true</Base>
4050
</PropertyGroup>
51+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
52+
<Base_Win64>true</Base_Win64>
53+
<CfgParent>Base</CfgParent>
54+
<Base>true</Base>
55+
</PropertyGroup>
4156
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
4257
<Cfg_1>true</Cfg_1>
4358
<CfgParent>Base</CfgParent>
@@ -76,23 +91,37 @@
7691
<PropertyGroup Condition="'$(Base_Android)'!=''">
7792
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
7893
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
94+
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
7995
</PropertyGroup>
8096
<PropertyGroup Condition="'$(Base_Android64)'!=''">
8197
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
8298
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
99+
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
83100
</PropertyGroup>
84101
<PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
85102
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
103+
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
86104
</PropertyGroup>
87105
<PropertyGroup Condition="'$(Base_iOSSimulator)'!=''">
88106
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
107+
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
108+
</PropertyGroup>
109+
<PropertyGroup Condition="'$(Base_Linux64)'!=''">
110+
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
111+
</PropertyGroup>
112+
<PropertyGroup Condition="'$(Base_OSX64)'!=''">
113+
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
89114
</PropertyGroup>
90115
<PropertyGroup Condition="'$(Base_Win32)'!=''">
91116
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
92117
<BT_BuildType>Debug</BT_BuildType>
93118
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
94119
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
95120
<VerInfo_Locale>1033</VerInfo_Locale>
121+
<DCC_UsePackage>rtl;P4DEngine;$(DCC_UsePackage)</DCC_UsePackage>
122+
</PropertyGroup>
123+
<PropertyGroup Condition="'$(Base_Win64)'!=''">
124+
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
96125
</PropertyGroup>
97126
<PropertyGroup Condition="'$(Cfg_1)'!=''">
98127
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>

‎Packages/Delphi/Delphi 10.4+/dclP4DEngine.dres‎

3.11 KB
Binary file not shown.

‎Source/PythonGUIInputOutput.pas‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ TPythonGUIInputOutput = class(TPythonInputOutput)
9292
property Output : TCustomMemo read FCustomMemo write FCustomMemo;
9393
end;
9494

95-
procedure Register;
96-
9795
implementation
9896

9997
{$IFDEF FPC}
@@ -247,9 +245,5 @@ procedure TPythonGUIInputOutput.DisplayString( const str : string );
247245
end;
248246

249247
{------------------------------------------------------------------------------}
250-
procedure Register;
251-
begin
252-
RegisterComponents('Python', [TPythonGUIInputOutput]);
253-
end;
254248

255249
end.

‎Source/PythonRegistration.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ procedure Register();
77
implementation
88

99
uses
10-
Classes, PythonEngine, WrapDelphi;
10+
Classes, PythonEngine, WrapDelphi, PythonGUIInputOutput;
1111

1212
procedure Register();
1313
begin
1414
RegisterComponents('Python', [TPythonEngine, TPythonType, TPythonModule,
1515
TPythonDelphiVar, TPythonInputOutput,
16-
TPyDelphiWrapper]);
16+
TPyDelphiWrapper, TPythonGUIInputOutput]);
1717
end;
1818

1919
end.

0 commit comments

Comments
 (0)