Skip to content

Commit c1f1051

Browse files
lmbelolmbelo
committed
Remanufacturing the packages and enabling multiplatform compilation
1 parent 1faef7f commit c1f1051

12 files changed

+1448
-613
lines changed

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

+54-270
Large diffs are not rendered by default.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<ProjectVersion>19.4</ProjectVersion>
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
8-
<Config Condition="'$(Config)'==''">Debug</Config>
9-
<Platform Condition="'$(Platform)'==''">Win64</Platform>
8+
<Config Condition="'$(Config)'==''">Release</Config>
9+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1010
<TargetedPlatforms>168083</TargetedPlatforms>
1111
<AppType>Package</AppType>
1212
</PropertyGroup>

‎Packages/Delphi/Delphi 10.4+/PythonFmx.dpk

+15-15
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ package PythonFmx;
1313
{$LONGSTRINGS ON}
1414
{$OPENSTRINGS ON}
1515
{$OPTIMIZATION OFF}
16-
{$OVERFLOWCHECKS OFF}
17-
{$RANGECHECKS OFF}
16+
{$OVERFLOWCHECKS ON}
17+
{$RANGECHECKS ON}
1818
{$REFERENCEINFO ON}
1919
{$SAFEDIVIDE OFF}
2020
{$STACKFRAMES ON}
@@ -33,32 +33,32 @@ package PythonFmx;
3333
requires
3434
rtl,
3535
fmx,
36-
Python,
37-
bindcompfmx;
36+
bindcompfmx,
37+
python;
3838

3939
contains
4040
FMX.PythonGUIInputOutput in '..\..\..\Source\fmx\FMX.PythonGUIInputOutput.pas',
41+
WrapDelphiFmx in '..\..\..\Source\fmx\WrapDelphiFmx.pas',
4142
WrapFmxActnList in '..\..\..\Source\fmx\WrapFmxActnList.pas',
43+
WrapFmxColors in '..\..\..\Source\fmx\WrapFmxColors.pas',
4244
WrapFmxComCtrls in '..\..\..\Source\fmx\WrapFmxComCtrls.pas',
4345
WrapFmxControls in '..\..\..\Source\fmx\WrapFmxControls.pas',
46+
WrapFmxDataBind in '..\..\..\Source\fmx\WrapFmxDataBind.pas',
4447
WrapFmxDialogs in '..\..\..\Source\fmx\WrapFmxDialogs.pas',
48+
WrapFmxEdit in '..\..\..\Source\fmx\WrapFmxEdit.pas',
4549
WrapFmxForms in '..\..\..\Source\fmx\WrapFmxForms.pas',
4650
WrapFmxGrids in '..\..\..\Source\fmx\WrapFmxGrids.pas',
4751
WrapFmxLayouts in '..\..\..\Source\fmx\WrapFmxLayouts.pas',
48-
WrapFmxScrollBox in '..\..\..\Source\fmx\WrapFmxScrollBox.pas',
49-
WrapFmxShapes in '..\..\..\Source\fmx\WrapFmxShapes.pas',
50-
WrapFmxStdCtrls in '..\..\..\Source\fmx\WrapFmxStdCtrls.pas',
51-
WrapFmxTypes in '..\..\..\Source\fmx\WrapFmxTypes.pas',
52-
WrapDelphiFmx in '..\..\..\Source\fmx\WrapDelphiFmx.pas',
53-
WrapFmxEdit in '..\..\..\Source\fmx\WrapFmxEdit.pas',
5452
WrapFmxListBox in '..\..\..\Source\fmx\WrapFmxListBox.pas',
53+
WrapFmxListView in '..\..\..\Source\fmx\WrapFmxListView.pas',
5554
WrapFmxMedia in '..\..\..\Source\fmx\WrapFmxMedia.pas',
55+
WrapFmxMemo in '..\..\..\Source\fmx\WrapFmxMemo.pas',
5656
WrapFmxMenus in '..\..\..\Source\fmx\WrapFmxMenus.pas',
57+
WrapFmxScrollBox in '..\..\..\Source\fmx\WrapFmxScrollBox.pas',
58+
WrapFmxShapes in '..\..\..\Source\fmx\WrapFmxShapes.pas',
59+
WrapFmxStdActns in '..\..\..\Source\fmx\WrapFmxStdActns.pas',
60+
WrapFmxStdCtrls in '..\..\..\Source\fmx\WrapFmxStdCtrls.pas',
5761
WrapFmxStyles in '..\..\..\Source\fmx\WrapFmxStyles.pas',
58-
WrapFmxMemo in '..\..\..\Source\fmx\WrapFmxMemo.pas',
59-
WrapFmxColors in '..\..\..\Source\fmx\WrapFmxColors.pas',
60-
WrapFmxListView in '..\..\..\Source\fmx\WrapFmxListView.pas',
61-
WrapFmxDataBind in '..\..\..\Source\fmx\WrapFmxDataBind.pas',
62-
WrapFmxStdActns in '..\..\..\Source\fmx\WrapFmxStdActns.pas';
62+
WrapFmxTypes in '..\..\..\Source\fmx\WrapFmxTypes.pas';
6363

6464
end.

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

+584-88
Large diffs are not rendered by default.

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

+3-83
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<Base>True</Base>
44
<AppType>Package</AppType>
5-
<Config Condition="'$(Config)'==''">Debug</Config>
5+
<Config Condition="'$(Config)'==''">Release</Config>
66
<FrameworkType>VCL</FrameworkType>
77
<MainSource>PythonVcl.dpk</MainSource>
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -96,6 +96,7 @@
9696
<MainSource>MainSource</MainSource>
9797
</DelphiCompile>
9898
<DCCReference Include="rtl.dcp"/>
99+
<DCCReference Include="vcl.dcp"/>
99100
<DCCReference Include="Python.dcp"/>
100101
<DCCReference Include="VclSmp.dcp"/>
101102
<DCCReference Include="vclimg.dcp"/>
@@ -139,96 +140,15 @@
139140
</Source>
140141
<Excluded_Packages/>
141142
</Delphi.Personality>
142-
<Deployment Version="3">
143-
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\PythonVcl270.bpl" Configuration="Debug" Class="ProjectOutput">
144-
<Platform Name="Win32">
145-
<RemoteName>PythonVcl.bpl</RemoteName>
146-
<Overwrite>true</Overwrite>
147-
</Platform>
148-
</DeployFile>
149-
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\Win64\PythonVcl270.bpl" Configuration="Debug" Class="ProjectOutput">
150-
<Platform Name="Win64">
151-
<RemoteName>PythonVcl.bpl</RemoteName>
152-
<Overwrite>true</Overwrite>
153-
</Platform>
154-
</DeployFile>
155-
<DeployClass Name="AdditionalDebugSymbols">
156-
<Platform Name="Win32">
157-
<Operation>0</Operation>
158-
</Platform>
159-
</DeployClass>
160-
<DeployClass Name="DebugSymbols">
161-
<Platform Name="Win32">
162-
<Operation>0</Operation>
163-
</Platform>
164-
</DeployClass>
165-
<DeployClass Name="DependencyFramework">
166-
<Platform Name="Win32">
167-
<Operation>0</Operation>
168-
</Platform>
169-
</DeployClass>
170-
<DeployClass Name="DependencyModule">
171-
<Platform Name="Win32">
172-
<Operation>0</Operation>
173-
<Extensions>.dll;.bpl</Extensions>
174-
</Platform>
175-
</DeployClass>
176-
<DeployClass Required="true" Name="DependencyPackage">
177-
<Platform Name="Win32">
178-
<Operation>0</Operation>
179-
<Extensions>.bpl</Extensions>
180-
</Platform>
181-
</DeployClass>
182-
<DeployClass Name="File">
183-
<Platform Name="Win32">
184-
<Operation>0</Operation>
185-
</Platform>
186-
</DeployClass>
187-
<DeployClass Required="true" Name="ProjectOutput">
188-
<Platform Name="Win32">
189-
<Operation>0</Operation>
190-
</Platform>
191-
</DeployClass>
192-
<DeployClass Name="ProjectUWPManifest">
193-
<Platform Name="Win32">
194-
<Operation>1</Operation>
195-
</Platform>
196-
<Platform Name="Win64">
197-
<Operation>1</Operation>
198-
</Platform>
199-
</DeployClass>
200-
<DeployClass Name="UWP_DelphiLogo150">
201-
<Platform Name="Win32">
202-
<RemoteDir>Assets</RemoteDir>
203-
<Operation>1</Operation>
204-
</Platform>
205-
<Platform Name="Win64">
206-
<RemoteDir>Assets</RemoteDir>
207-
<Operation>1</Operation>
208-
</Platform>
209-
</DeployClass>
210-
<DeployClass Name="UWP_DelphiLogo44">
211-
<Platform Name="Win32">
212-
<RemoteDir>Assets</RemoteDir>
213-
<Operation>1</Operation>
214-
</Platform>
215-
<Platform Name="Win64">
216-
<RemoteDir>Assets</RemoteDir>
217-
<Operation>1</Operation>
218-
</Platform>
219-
</DeployClass>
220-
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
221-
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
222-
</Deployment>
223143
<Platforms>
224144
<Platform value="Android">False</Platform>
225145
<Platform value="Android64">False</Platform>
146+
<Platform value="iOSDevice64">False</Platform>
226147
<Platform value="Linux64">False</Platform>
227148
<Platform value="OSX64">False</Platform>
228149
<Platform value="OSXARM64">False</Platform>
229150
<Platform value="Win32">True</Platform>
230151
<Platform value="Win64">True</Platform>
231-
<Platform value="iOSDevice64">False</Platform>
232152
</Platforms>
233153
</BorlandProject>
234154
<ProjectFileVersion>12</ProjectFileVersion>

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

+2-65
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<Base>True</Base>
44
<AppType>Package</AppType>
5-
<Config Condition="'$(Config)'==''">Debug</Config>
5+
<Config Condition="'$(Config)'==''">Release</Config>
66
<FrameworkType>None</FrameworkType>
77
<MainSource>dclPython.dpk</MainSource>
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -141,78 +141,15 @@
141141
</Source>
142142
<Excluded_Packages/>
143143
</Delphi.Personality>
144-
<Deployment Version="3">
145-
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclPython270.bpl" Configuration="Debug" Class="ProjectOutput">
146-
<Platform Name="Win32">
147-
<RemoteName>dclPython.bpl</RemoteName>
148-
<Overwrite>true</Overwrite>
149-
</Platform>
150-
</DeployFile>
151-
<DeployClass Name="AdditionalDebugSymbols">
152-
<Platform Name="Win32">
153-
<Operation>0</Operation>
154-
</Platform>
155-
</DeployClass>
156-
<DeployClass Name="DebugSymbols">
157-
<Platform Name="Win32">
158-
<Operation>0</Operation>
159-
</Platform>
160-
</DeployClass>
161-
<DeployClass Name="DependencyFramework">
162-
<Platform Name="Win32">
163-
<Operation>0</Operation>
164-
</Platform>
165-
</DeployClass>
166-
<DeployClass Name="DependencyModule">
167-
<Platform Name="Win32">
168-
<Operation>0</Operation>
169-
<Extensions>.dll;.bpl</Extensions>
170-
</Platform>
171-
</DeployClass>
172-
<DeployClass Required="true" Name="DependencyPackage">
173-
<Platform Name="Win32">
174-
<Operation>0</Operation>
175-
<Extensions>.bpl</Extensions>
176-
</Platform>
177-
</DeployClass>
178-
<DeployClass Name="File">
179-
<Platform Name="Win32">
180-
<Operation>0</Operation>
181-
</Platform>
182-
</DeployClass>
183-
<DeployClass Required="true" Name="ProjectOutput">
184-
<Platform Name="Win32">
185-
<Operation>0</Operation>
186-
</Platform>
187-
</DeployClass>
188-
<DeployClass Name="ProjectUWPManifest">
189-
<Platform Name="Win32">
190-
<Operation>1</Operation>
191-
</Platform>
192-
</DeployClass>
193-
<DeployClass Name="UWP_DelphiLogo150">
194-
<Platform Name="Win32">
195-
<RemoteDir>Assets</RemoteDir>
196-
<Operation>1</Operation>
197-
</Platform>
198-
</DeployClass>
199-
<DeployClass Name="UWP_DelphiLogo44">
200-
<Platform Name="Win32">
201-
<RemoteDir>Assets</RemoteDir>
202-
<Operation>1</Operation>
203-
</Platform>
204-
</DeployClass>
205-
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
206-
</Deployment>
207144
<Platforms>
208145
<Platform value="Android">False</Platform>
209146
<Platform value="Android64">False</Platform>
147+
<Platform value="iOSDevice64">False</Platform>
210148
<Platform value="Linux64">False</Platform>
211149
<Platform value="OSX64">False</Platform>
212150
<Platform value="OSXARM64">False</Platform>
213151
<Platform value="Win32">True</Platform>
214152
<Platform value="Win64">False</Platform>
215-
<Platform value="iOSDevice64">False</Platform>
216153
</Platforms>
217154
</BorlandProject>
218155
<ProjectFileVersion>12</ProjectFileVersion>

‎Packages/Delphi/Delphi 10.4+/dclPythonFmx.dpk

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package dclPythonFmx;
3333

3434
requires
3535
rtl,
36-
PythonFmx;
36+
pythonfmx;
3737

3838
contains
3939
FMX.PythonReg in '..\..\..\Source\fmx\FMX.PythonReg.pas';

0 commit comments

Comments
 (0)