Skip to content

Commit 1c3377d

Browse files
pyscripterpyscripter
authored
Merge pull request #219 from Embarcadero/fmxpackages
Fmxpackages
2 parents c4fdbff + 0b9a2ff commit 1c3377d

32 files changed

+2193
-80
lines changed

‎Packages/Delphi/Delphi 10.4+/P4DComponentSuite.groupproj‎

Lines changed: 58 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,23 @@
33
<ProjectGuid>{8BE1193B-E609-445D-9BA3-F57DBEA042F5}</ProjectGuid>
44
</PropertyGroup>
55
<ItemGroup>
6-
<Projects Include="P4DEngine.dproj">
6+
<Projects Include="Python.dproj">
77
<Dependencies/>
88
</Projects>
9-
<Projects Include="dclP4DEngine.dproj">
10-
<Dependencies>P4DEngine.dproj</Dependencies>
9+
<Projects Include="dclPython.dproj">
10+
<Dependencies>Python.dproj</Dependencies>
1111
</Projects>
12-
<Projects Include="VclP4DEngine.dproj">
13-
<Dependencies>P4DEngine.dproj</Dependencies>
12+
<Projects Include="PythonVcl.dproj">
13+
<Dependencies>Python.dproj</Dependencies>
1414
</Projects>
15-
<Projects Include="dclVclP4DEngine.dproj">
16-
<Dependencies>VclP4DEngine.dproj</Dependencies>
15+
<Projects Include="dclPythonVcl.dproj">
16+
<Dependencies>PythonVcl.dproj</Dependencies>
17+
</Projects>
18+
<Projects Include="PythonFmx.dproj">
19+
<Dependencies>PythonVcl.dproj</Dependencies>
20+
</Projects>
21+
<Projects Include="dclPythonFmx.dproj">
22+
<Dependencies>PythonFmx.dproj</Dependencies>
1723
</Projects>
1824
</ItemGroup>
1925
<ProjectExtensions>
@@ -23,50 +29,68 @@
2329
<Default.Personality/>
2430
</BorlandProject>
2531
</ProjectExtensions>
26-
<Target Name="P4DEngine">
27-
<MSBuild Projects="P4DEngine.dproj"/>
32+
<Target Name="Python">
33+
<MSBuild Projects="Python.dproj"/>
34+
</Target>
35+
<Target Name="Python:Clean">
36+
<MSBuild Projects="Python.dproj" Targets="Clean"/>
37+
</Target>
38+
<Target Name="Python:Make">
39+
<MSBuild Projects="Python.dproj" Targets="Make"/>
40+
</Target>
41+
<Target Name="dclPython" DependsOnTargets="Python">
42+
<MSBuild Projects="dclPython.dproj"/>
43+
</Target>
44+
<Target Name="dclPython:Clean" DependsOnTargets="Python:Clean">
45+
<MSBuild Projects="dclPython.dproj" Targets="Clean"/>
46+
</Target>
47+
<Target Name="dclPython:Make" DependsOnTargets="Python:Make">
48+
<MSBuild Projects="dclPython.dproj" Targets="Make"/>
49+
</Target>
50+
<Target Name="PythonVcl" DependsOnTargets="Python">
51+
<MSBuild Projects="PythonVcl.dproj"/>
2852
</Target>
29-
<Target Name="P4DEngine:Clean">
30-
<MSBuild Projects="P4DEngine.dproj" Targets="Clean"/>
53+
<Target Name="PythonVcl:Clean" DependsOnTargets="Python:Clean">
54+
<MSBuild Projects="PythonVcl.dproj" Targets="Clean"/>
3155
</Target>
32-
<Target Name="P4DEngine:Make">
33-
<MSBuild Projects="P4DEngine.dproj" Targets="Make"/>
56+
<Target Name="PythonVcl:Make" DependsOnTargets="Python:Make">
57+
<MSBuild Projects="PythonVcl.dproj" Targets="Make"/>
3458
</Target>
35-
<Target Name="dclP4DEngine" DependsOnTargets="P4DEngine">
36-
<MSBuild Projects="dclP4DEngine.dproj"/>
59+
<Target Name="dclPythonVcl" DependsOnTargets="PythonVcl">
60+
<MSBuild Projects="dclPythonVcl.dproj"/>
3761
</Target>
38-
<Target Name="dclP4DEngine:Clean" DependsOnTargets="P4DEngine:Clean">
39-
<MSBuild Projects="dclP4DEngine.dproj" Targets="Clean"/>
62+
<Target Name="dclPythonVcl:Clean" DependsOnTargets="PythonVcl:Clean">
63+
<MSBuild Projects="dclPythonVcl.dproj" Targets="Clean"/>
4064
</Target>
41-
<Target Name="dclP4DEngine:Make" DependsOnTargets="P4DEngine:Make">
42-
<MSBuild Projects="dclP4DEngine.dproj" Targets="Make"/>
65+
<Target Name="dclPythonVcl:Make" DependsOnTargets="PythonVcl:Make">
66+
<MSBuild Projects="dclPythonVcl.dproj" Targets="Make"/>
4367
</Target>
44-
<Target Name="VclP4DEngine" DependsOnTargets="P4DEngine">
45-
<MSBuild Projects="VclP4DEngine.dproj"/>
68+
<Target Name="PythonFmx" DependsOnTargets="PythonVcl">
69+
<MSBuild Projects="PythonFmx.dproj"/>
4670
</Target>
47-
<Target Name="VclP4DEngine:Clean" DependsOnTargets="P4DEngine:Clean">
48-
<MSBuild Projects="VclP4DEngine.dproj" Targets="Clean"/>
71+
<Target Name="PythonFmx:Clean" DependsOnTargets="PythonVcl:Clean">
72+
<MSBuild Projects="PythonFmx.dproj" Targets="Clean"/>
4973
</Target>
50-
<Target Name="VclP4DEngine:Make" DependsOnTargets="P4DEngine:Make">
51-
<MSBuild Projects="VclP4DEngine.dproj" Targets="Make"/>
74+
<Target Name="PythonFmx:Make" DependsOnTargets="PythonVcl:Make">
75+
<MSBuild Projects="PythonFmx.dproj" Targets="Make"/>
5276
</Target>
53-
<Target Name="dclVclP4DEngine" DependsOnTargets="VclP4DEngine">
54-
<MSBuild Projects="dclVclP4DEngine.dproj"/>
77+
<Target Name="dclPythonFmx" DependsOnTargets="PythonFmx">
78+
<MSBuild Projects="dclPythonFmx.dproj"/>
5579
</Target>
56-
<Target Name="dclVclP4DEngine:Clean" DependsOnTargets="VclP4DEngine:Clean">
57-
<MSBuild Projects="dclVclP4DEngine.dproj" Targets="Clean"/>
80+
<Target Name="dclPythonFmx:Clean" DependsOnTargets="PythonFmx:Clean">
81+
<MSBuild Projects="dclPythonFmx.dproj" Targets="Clean"/>
5882
</Target>
59-
<Target Name="dclVclP4DEngine:Make" DependsOnTargets="VclP4DEngine:Make">
60-
<MSBuild Projects="dclVclP4DEngine.dproj" Targets="Make"/>
83+
<Target Name="dclPythonFmx:Make" DependsOnTargets="PythonFmx:Make">
84+
<MSBuild Projects="dclPythonFmx.dproj" Targets="Make"/>
6185
</Target>
6286
<Target Name="Build">
63-
<CallTarget Targets="P4DEngine;dclP4DEngine;VclP4DEngine;dclVclP4DEngine"/>
87+
<CallTarget Targets="Python;dclPython;PythonVcl;dclPythonVcl;PythonFmx;dclPythonFmx"/>
6488
</Target>
6589
<Target Name="Clean">
66-
<CallTarget Targets="P4DEngine:Clean;dclP4DEngine:Clean;VclP4DEngine:Clean;dclVclP4DEngine:Clean"/>
90+
<CallTarget Targets="Python:Clean;dclPython:Clean;PythonVcl:Clean;dclPythonVcl:Clean;PythonFmx:Clean;dclPythonFmx:Clean"/>
6791
</Target>
6892
<Target Name="Make">
69-
<CallTarget Targets="P4DEngine:Make;dclP4DEngine:Make;VclP4DEngine:Make;dclVclP4DEngine:Make"/>
93+
<CallTarget Targets="Python:Make;dclPython:Make;PythonVcl:Make;dclPythonVcl:Make;PythonFmx:Make;dclPythonFmx:Make"/>
7094
</Target>
7195
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
7296
</Project>

‎Packages/Delphi/Delphi 10.4+/P4DEngine.dpk‎ renamed to ‎Packages/Delphi/Delphi 10.4+/Python.dpk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package P4DEngine;
1+
package Python;
22
{$R *.res}
33
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
44
{$ALIGN 8}

‎Packages/Delphi/Delphi 10.4+/P4DEngine.dproj‎ renamed to ‎Packages/Delphi/Delphi 10.4+/Python.dproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AppType>Package</AppType>
55
<Config Condition="'$(Config)'==''">Debug</Config>
66
<FrameworkType>VCL</FrameworkType>
7-
<MainSource>P4DEngine.dpk</MainSource>
7+
<MainSource>Python.dpk</MainSource>
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{018AAA56-F5BD-4A04-BCCA-A0043EAAA5CE}</ProjectGuid>
1010
<ProjectVersion>19.1</ProjectVersion>
@@ -29,7 +29,7 @@
2929
<Base>true</Base>
3030
</PropertyGroup>
3131
<PropertyGroup Condition="'$(Base)'!=''">
32-
<SanitizedProjectName>P4DEngine</SanitizedProjectName>
32+
<SanitizedProjectName>Python</SanitizedProjectName>
3333
<DCC_Description>Python4Delphi - Run-time Engine Package</DCC_Description>
3434
<DCC_ImageBase>00400000</DCC_ImageBase>
3535
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;DUnitX.Loggers.GUI;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
@@ -83,7 +83,7 @@
8383
<BorlandProject>
8484
<Delphi.Personality>
8585
<Source>
86-
<Source Name="MainSource">P4DEngine.dpk</Source>
86+
<Source Name="MainSource">Python.dpk</Source>
8787
</Source>
8888
<Excluded_Packages>
8989
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
@@ -97,9 +97,9 @@
9797
<Platform value="Win64">False</Platform>
9898
</Platforms>
9999
<Deployment Version="3">
100-
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\P4DEngine270.bpl" Configuration="Debug" Class="ProjectOutput">
100+
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\Python270.bpl" Configuration="Debug" Class="ProjectOutput">
101101
<Platform Name="Win32">
102-
<RemoteName>P4DEngine.bpl</RemoteName>
102+
<RemoteName>Python.bpl</RemoteName>
103103
<Overwrite>true</Overwrite>
104104
</Platform>
105105
</DeployFile>

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package PythonFmx;
2+
3+
{$R *.res}
4+
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5+
{$ALIGN 8}
6+
{$ASSERTIONS ON}
7+
{$BOOLEVAL OFF}
8+
{$DEBUGINFO OFF}
9+
{$EXTENDEDSYNTAX ON}
10+
{$IMPORTEDDATA ON}
11+
{$IOCHECKS ON}
12+
{$LOCALSYMBOLS ON}
13+
{$LONGSTRINGS ON}
14+
{$OPENSTRINGS ON}
15+
{$OPTIMIZATION OFF}
16+
{$OVERFLOWCHECKS OFF}
17+
{$RANGECHECKS OFF}
18+
{$REFERENCEINFO ON}
19+
{$SAFEDIVIDE OFF}
20+
{$STACKFRAMES ON}
21+
{$TYPEDADDRESS OFF}
22+
{$VARSTRINGCHECKS ON}
23+
{$WRITEABLECONST OFF}
24+
{$MINENUMSIZE 1}
25+
{$IMAGEBASE $400000}
26+
{$DEFINE DEBUG}
27+
{$ENDIF IMPLICITBUILDING}
28+
{$DESCRIPTION 'Python4Delphi - Run-time Engine Package for FMX'}
29+
{$LIBSUFFIX AUTO}
30+
{$RUNONLY}
31+
{$IMPLICITBUILD ON}
32+
33+
requires
34+
rtl,
35+
fmx,
36+
Python;
37+
38+
contains
39+
FMX.PythonGUIInputOutput in '..\..\..\Source\fmx\FMX.PythonGUIInputOutput.pas';
40+
41+
end.

0 commit comments

Comments
 (0)