Skip to content

Commit 0b9a2ff

Browse files
committed
Changing icons folder, package names and PythonRegistration unit name
2 parents 46de76d + 303c905 commit 0b9a2ff

File tree

7 files changed

+44
-44
lines changed

7 files changed

+44
-44
lines changed

Packages/Delphi/Delphi 10.4+/P4DComponentSuite.groupproj

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<Projects Include="dclPythonVcl.dproj">
1616
<Dependencies>PythonVcl.dproj</Dependencies>
1717
</Projects>
18-
<Projects Include="FmxP4DEngine.dproj">
19-
<Dependencies>P4DEngine.dproj</Dependencies>
18+
<Projects Include="PythonFmx.dproj">
19+
<Dependencies>PythonVcl.dproj</Dependencies>
2020
</Projects>
21-
<Projects Include="dclFmxP4DEngine.dproj">
22-
<Dependencies>FmxP4DEngine.dproj</Dependencies>
21+
<Projects Include="dclPythonFmx.dproj">
22+
<Dependencies>PythonFmx.dproj</Dependencies>
2323
</Projects>
2424
</ItemGroup>
2525
<ProjectExtensions>
@@ -65,32 +65,32 @@
6565
<Target Name="dclPythonVcl:Make" DependsOnTargets="PythonVcl:Make">
6666
<MSBuild Projects="dclPythonVcl.dproj" Targets="Make"/>
6767
</Target>
68-
<Target Name="FmxP4DEngine" DependsOnTargets="P4DEngine">
69-
<MSBuild Projects="FmxP4DEngine.dproj"/>
68+
<Target Name="PythonFmx" DependsOnTargets="PythonVcl">
69+
<MSBuild Projects="PythonFmx.dproj"/>
7070
</Target>
71-
<Target Name="FmxP4DEngine:Clean" DependsOnTargets="P4DEngine:Clean">
72-
<MSBuild Projects="FmxP4DEngine.dproj" Targets="Clean"/>
71+
<Target Name="PythonFmx:Clean" DependsOnTargets="PythonVcl:Clean">
72+
<MSBuild Projects="PythonFmx.dproj" Targets="Clean"/>
7373
</Target>
74-
<Target Name="FmxP4DEngine:Make" DependsOnTargets="P4DEngine:Make">
75-
<MSBuild Projects="FmxP4DEngine.dproj" Targets="Make"/>
74+
<Target Name="PythonFmx:Make" DependsOnTargets="PythonVcl:Make">
75+
<MSBuild Projects="PythonFmx.dproj" Targets="Make"/>
7676
</Target>
77-
<Target Name="dclFmxP4DEngine" DependsOnTargets="FmxP4DEngine">
78-
<MSBuild Projects="dclFmxP4DEngine.dproj"/>
77+
<Target Name="dclPythonFmx" DependsOnTargets="PythonFmx">
78+
<MSBuild Projects="dclPythonFmx.dproj"/>
7979
</Target>
80-
<Target Name="dclFmxP4DEngine:Clean" DependsOnTargets="FmxP4DEngine:Clean">
81-
<MSBuild Projects="dclFmxP4DEngine.dproj" Targets="Clean"/>
80+
<Target Name="dclPythonFmx:Clean" DependsOnTargets="PythonFmx:Clean">
81+
<MSBuild Projects="dclPythonFmx.dproj" Targets="Clean"/>
8282
</Target>
83-
<Target Name="dclFmxP4DEngine:Make" DependsOnTargets="FmxP4DEngine:Make">
84-
<MSBuild Projects="dclFmxP4DEngine.dproj" Targets="Make"/>
83+
<Target Name="dclPythonFmx:Make" DependsOnTargets="PythonFmx:Make">
84+
<MSBuild Projects="dclPythonFmx.dproj" Targets="Make"/>
8585
</Target>
8686
<Target Name="Build">
87-
<CallTarget Targets="Python;dclPython;PythonVcl;dclPythonVcl;FmxP4DEngine;dclFmxP4DEngine"/>
87+
<CallTarget Targets="Python;dclPython;PythonVcl;dclPythonVcl;PythonFmx;dclPythonFmx"/>
8888
</Target>
8989
<Target Name="Clean">
90-
<CallTarget Targets="Python:Clean;dclPython:Clean;PythonVcl:Clean;dclPythonVcl:Clean;FmxP4DEngine:Clean;dclFmxP4DEngine:Clean"/>
90+
<CallTarget Targets="Python:Clean;dclPython:Clean;PythonVcl:Clean;dclPythonVcl:Clean;PythonFmx:Clean;dclPythonFmx:Clean"/>
9191
</Target>
9292
<Target Name="Make">
93-
<CallTarget Targets="Python:Make;dclPython:Make;PythonVcl:Make;dclPythonVcl:Make;FmxP4DEngine:Make;dclFmxP4DEngine:Make"/>
93+
<CallTarget Targets="Python:Make;dclPython:Make;PythonVcl:Make;dclPythonVcl:Make;PythonFmx:Make;dclPythonFmx:Make"/>
9494
</Target>
9595
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
9696
</Project>

Packages/Delphi/Delphi 10.4+/FmxP4DEngine.dpk renamed to Packages/Delphi/Delphi 10.4+/PythonFmx.dpk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package FmxP4DEngine;
1+
package PythonFmx;
22

33
{$R *.res}
44
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
@@ -32,8 +32,8 @@ package FmxP4DEngine;
3232

3333
requires
3434
rtl,
35-
P4DEngine,
36-
fmx;
35+
fmx,
36+
Python;
3737

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

Packages/Delphi/Delphi 10.4+/FmxP4DEngine.dproj renamed to Packages/Delphi/Delphi 10.4+/PythonFmx.dproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<ProjectGuid>{6C9FBAC1-1024-4A46-96EE-2CADEFE347AA}</ProjectGuid>
4-
<MainSource>FmxP4DEngine.dpk</MainSource>
4+
<MainSource>PythonFmx.dpk</MainSource>
55
<ProjectVersion>19.1</ProjectVersion>
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
@@ -66,7 +66,7 @@
6666
<GenPackage>true</GenPackage>
6767
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
6868
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
69-
<SanitizedProjectName>FmxP4DEngine</SanitizedProjectName>
69+
<SanitizedProjectName>PythonFmx</SanitizedProjectName>
7070
<VerInfo_Locale>1033</VerInfo_Locale>
7171
<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>
7272
<DCC_Description>Python4Delphi - Run-time Engine Package for FMX</DCC_Description>
@@ -118,8 +118,8 @@
118118
<MainSource>MainSource</MainSource>
119119
</DelphiCompile>
120120
<DCCReference Include="rtl.dcp"/>
121-
<DCCReference Include="P4DEngine.dcp"/>
122121
<DCCReference Include="fmx.dcp"/>
122+
<DCCReference Include="Python.dcp"/>
123123
<DCCReference Include="..\..\..\Source\fmx\FMX.PythonGUIInputOutput.pas"/>
124124
<BuildConfiguration Include="Release">
125125
<Key>Cfg_2</Key>
@@ -139,7 +139,7 @@
139139
<BorlandProject>
140140
<Delphi.Personality>
141141
<Source>
142-
<Source Name="MainSource">FmxP4DEngine.dpk</Source>
142+
<Source Name="MainSource">PythonFmx.dpk</Source>
143143
</Source>
144144
<Excluded_Packages>
145145
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
@@ -149,6 +149,12 @@
149149
</Excluded_Packages>
150150
</Delphi.Personality>
151151
<Deployment Version="3">
152+
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\PythonFmx270.bpl" Configuration="Debug" Class="ProjectOutput">
153+
<Platform Name="Win32">
154+
<RemoteName>PythonFmx.bpl</RemoteName>
155+
<Overwrite>true</Overwrite>
156+
</Platform>
157+
</DeployFile>
152158
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
153159
<Platform Name="OSX32">
154160
<Overwrite>true</Overwrite>
@@ -164,12 +170,6 @@
164170
<Overwrite>true</Overwrite>
165171
</Platform>
166172
</DeployFile>
167-
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\FmxP4DEngine270.bpl" Configuration="Debug" Class="ProjectOutput">
168-
<Platform Name="Win32">
169-
<RemoteName>FmxP4DEngine.bpl</RemoteName>
170-
<Overwrite>true</Overwrite>
171-
</Platform>
172-
</DeployFile>
173173
<DeployClass Name="AdditionalDebugSymbols">
174174
<Platform Name="OSX32">
175175
<Operation>1</Operation>

Packages/Delphi/Delphi 10.4+/dclFmxP4DEngine.dpk renamed to Packages/Delphi/Delphi 10.4+/dclPythonFmx.dpk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dclFmxP4DEngine;
1+
package dclPythonFmx;
22

33
{$R *.res}
44
{$R *.dres}
@@ -33,9 +33,9 @@ package dclFmxP4DEngine;
3333

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

3838
contains
39-
FMX.PythonRegistration in '..\..\..\Source\fmx\FMX.PythonRegistration.pas';
39+
FMX.PythonReg in '..\..\..\Source\fmx\FMX.PythonReg.pas';
4040

4141
end.

Packages/Delphi/Delphi 10.4+/dclFmxP4DEngine.dproj renamed to Packages/Delphi/Delphi 10.4+/dclPythonFmx.dproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<ProjectGuid>{E057921E-25DB-426E-8090-FE3F428894FF}</ProjectGuid>
4-
<MainSource>dclFmxP4DEngine.dpk</MainSource>
4+
<MainSource>dclPythonFmx.dpk</MainSource>
55
<ProjectVersion>19.1</ProjectVersion>
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
@@ -81,7 +81,7 @@
8181
<GenPackage>true</GenPackage>
8282
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
8383
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
84-
<SanitizedProjectName>dclFmxP4DEngine</SanitizedProjectName>
84+
<SanitizedProjectName>dclPythonFmx</SanitizedProjectName>
8585
<VerInfo_Locale>1033</VerInfo_Locale>
8686
<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>
8787
<DCC_Description>Python4Delphi - Design-time Engine Package for FMX</DCC_Description>
@@ -147,9 +147,9 @@
147147
<MainSource>MainSource</MainSource>
148148
</DelphiCompile>
149149
<DCCReference Include="rtl.dcp"/>
150-
<DCCReference Include="FmxP4DEngine.dcp"/>
151-
<DCCReference Include="..\..\..\Source\fmx\FMX.PythonRegistration.pas"/>
152-
<RcItem Include="..\..\..\Images\TPYTHONGUIINPUTOUTPUT.bmp">
150+
<DCCReference Include="PythonFmx.dcp"/>
151+
<DCCReference Include="..\..\..\Source\fmx\FMX.PythonReg.pas"/>
152+
<RcItem Include="..\..\Resources\TPYTHONGUIINPUTOUTPUT.bmp">
153153
<ResourceType>BITMAP</ResourceType>
154154
<ResourceId>TPythonGUIInputOutput</ResourceId>
155155
</RcItem>
@@ -171,7 +171,7 @@
171171
<BorlandProject>
172172
<Delphi.Personality>
173173
<Source>
174-
<Source Name="MainSource">dclFmxP4DEngine.dpk</Source>
174+
<Source Name="MainSource">dclPythonFmx.dpk</Source>
175175
</Source>
176176
<Excluded_Packages>
177177
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
@@ -196,9 +196,9 @@
196196
<Overwrite>true</Overwrite>
197197
</Platform>
198198
</DeployFile>
199-
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclFmxP4DEngine270.bpl" Configuration="Debug" Class="ProjectOutput">
199+
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclPythonFmx270.bpl" Configuration="Debug" Class="ProjectOutput">
200200
<Platform Name="Win32">
201-
<RemoteName>dclFmxP4DEngine.bpl</RemoteName>
201+
<RemoteName>dclPythonFmx.bpl</RemoteName>
202202
<Overwrite>true</Overwrite>
203203
</Platform>
204204
</DeployFile>
496 Bytes
Binary file not shown.

Source/fmx/FMX.PythonRegistration.pas renamed to Source/fmx/FMX.PythonReg.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
unit FMX.PythonRegistration;
1+
unit FMX.PythonReg;
22

33
interface
44

0 commit comments

Comments
 (0)