Skip to content

Commit 07f73c4

Browse files
pyscripterpyscripter
authored
Merge pull request pyscripter#290 from jr2804/inconsistent_project_files
Inconsistencies in project files
2 parents a1ba9b0 + 723abf9 commit 07f73c4

15 files changed

+90
-101
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,21 @@ package Python;
3030
{$IMPLICITBUILD ON}
3131

3232
requires
33-
DesignIDE,
3433
rtl,
35-
vcl;
34+
dbrtl,
35+
FireDAC,
36+
FireDACCommonDriver,
37+
FireDACCommon;
3638

3739
contains
3840
MethodCallBack in '..\..\..\Source\MethodCallBack.pas',
3941
PythonEngine in '..\..\..\Source\PythonEngine.pas',
40-
WrapDelphi in '..\..\..\Source\WrapDelphi.pas';
42+
PythonVersions in '..\..\..\Source\PythonVersions.pas',
43+
VarPyth in '..\..\..\Source\VarPyth.pas',
44+
WrapDelphi in '..\..\..\Source\WrapDelphi.pas',
45+
WrapDelphiClasses in '..\..\..\Source\WrapDelphiClasses.pas',
46+
WrapDelphiTypes in '..\..\..\Source\WrapDelphiTypes.pas',
47+
WrapDelphiWindows in '..\..\..\Source\WrapDelphiWindows.pas',
48+
WrapFireDAC in '..\..\..\Source\WrapFireDAC.pas';
4149

4250
end.

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
4040
<VerInfo_Locale>1033</VerInfo_Locale>
4141
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
42+
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
4243
</PropertyGroup>
4344
<PropertyGroup Condition="'$(Base_Win32)'!=''">
4445
<BT_BuildType>Debug</BT_BuildType>
@@ -59,12 +60,20 @@
5960
<DelphiCompile Include="$(MainSource)">
6061
<MainSource>MainSource</MainSource>
6162
</DelphiCompile>
62-
<DCCReference Include="DesignIDE.dcp"/>
6363
<DCCReference Include="rtl.dcp"/>
64-
<DCCReference Include="vcl.dcp"/>
64+
<DCCReference Include="dbrtl.dcp"/>
65+
<DCCReference Include="FireDAC.dcp"/>
66+
<DCCReference Include="FireDACCommonDriver.dcp"/>
67+
<DCCReference Include="FireDACCommon.dcp"/>
6568
<DCCReference Include="..\..\..\Source\MethodCallBack.pas"/>
6669
<DCCReference Include="..\..\..\Source\PythonEngine.pas"/>
70+
<DCCReference Include="..\..\..\Source\PythonVersions.pas"/>
71+
<DCCReference Include="..\..\..\Source\VarPyth.pas"/>
6772
<DCCReference Include="..\..\..\Source\WrapDelphi.pas"/>
73+
<DCCReference Include="..\..\..\Source\WrapDelphiClasses.pas"/>
74+
<DCCReference Include="..\..\..\Source\WrapDelphiTypes.pas"/>
75+
<DCCReference Include="..\..\..\Source\WrapDelphiWindows.pas"/>
76+
<DCCReference Include="..\..\..\Source\WrapFireDAC.pas"/>
6877
<BuildConfiguration Include="Debug">
6978
<Key>Cfg_2</Key>
7079
<CfgParent>Base</CfgParent>
@@ -86,6 +95,8 @@
8695
<Source Name="MainSource">Python.dpk</Source>
8796
</Source>
8897
<Excluded_Packages>
98+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\Python_D270.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\Python_D270.bpl not found</Excluded_Packages>
99+
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\BPL\Python4Delphi270.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\21.0\BPL\Python4Delphi270.bpl not found</Excluded_Packages>
89100
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
90101
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
91102
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
@@ -97,7 +108,7 @@
97108
<Platform value="Win64">False</Platform>
98109
</Platforms>
99110
<Deployment Version="3">
100-
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\Python270.bpl" Configuration="Debug" Class="ProjectOutput">
111+
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\Python270.bpl" Configuration="Debug" Class="ProjectOutput">
101112
<Platform Name="Win32">
102113
<RemoteName>Python.bpl</RemoteName>
103114
<Overwrite>true</Overwrite>

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,18 @@ requires
3636
Python;
3737

3838
contains
39-
FMX.PythonGUIInputOutput in '..\..\..\Source\fmx\FMX.PythonGUIInputOutput.pas';
39+
FMX.PythonGUIInputOutput in '..\..\..\Source\fmx\FMX.PythonGUIInputOutput.pas',
40+
WrapFmxActnList in '..\..\..\Source\fmx\WrapFmxActnList.pas',
41+
WrapFmxComCtrls in '..\..\..\Source\fmx\WrapFmxComCtrls.pas',
42+
WrapFmxControls in '..\..\..\Source\fmx\WrapFmxControls.pas',
43+
WrapFmxDialogs in '..\..\..\Source\fmx\WrapFmxDialogs.pas',
44+
WrapFmxForms in '..\..\..\Source\fmx\WrapFmxForms.pas',
45+
WrapFmxGrids in '..\..\..\Source\fmx\WrapFmxGrids.pas',
46+
WrapFmxLayouts in '..\..\..\Source\fmx\WrapFmxLayouts.pas',
47+
WrapFmxScrollBox in '..\..\..\Source\fmx\WrapFmxScrollBox.pas',
48+
WrapFmxShapes in '..\..\..\Source\fmx\WrapFmxShapes.pas',
49+
WrapFmxStdCtrls in '..\..\..\Source\fmx\WrapFmxStdCtrls.pas',
50+
WrapFmxTypes in '..\..\..\Source\fmx\WrapFmxTypes.pas',
51+
WrapDelphiFmx in '..\..\..\Source\fmx\WrapDelphiFmx.pas';
4052

4153
end.

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

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ProjectGuid>{6C9FBAC1-1024-4A46-96EE-2CADEFE347AA}</ProjectGuid>
44
<MainSource>PythonFmx.dpk</MainSource>
55
<ProjectVersion>19.1</ProjectVersion>
6-
<FrameworkType>None</FrameworkType>
6+
<FrameworkType>FMX</FrameworkType>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Debug</Config>
99
<Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -13,26 +13,6 @@
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1414
<Base>true</Base>
1515
</PropertyGroup>
16-
<PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
17-
<Base_Android>true</Base_Android>
18-
<CfgParent>Base</CfgParent>
19-
<Base>true</Base>
20-
</PropertyGroup>
21-
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
22-
<Base_Android64>true</Base_Android64>
23-
<CfgParent>Base</CfgParent>
24-
<Base>true</Base>
25-
</PropertyGroup>
26-
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
27-
<Base_iOSDevice64>true</Base_iOSDevice64>
28-
<CfgParent>Base</CfgParent>
29-
<Base>true</Base>
30-
</PropertyGroup>
31-
<PropertyGroup Condition="('$(Platform)'=='iOSSimulator' and '$(Base)'=='true') or '$(Base_iOSSimulator)'!=''">
32-
<Base_iOSSimulator>true</Base_iOSSimulator>
33-
<CfgParent>Base</CfgParent>
34-
<Base>true</Base>
35-
</PropertyGroup>
3616
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
3717
<Base_Win32>true</Base_Win32>
3818
<CfgParent>Base</CfgParent>
@@ -73,20 +53,6 @@
7353
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
7454
<DllSuffix>$(Auto)</DllSuffix>
7555
</PropertyGroup>
76-
<PropertyGroup Condition="'$(Base_Android)'!=''">
77-
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
78-
<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>
79-
</PropertyGroup>
80-
<PropertyGroup Condition="'$(Base_Android64)'!=''">
81-
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
82-
<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>
83-
</PropertyGroup>
84-
<PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
85-
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
86-
</PropertyGroup>
87-
<PropertyGroup Condition="'$(Base_iOSSimulator)'!=''">
88-
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
89-
</PropertyGroup>
9056
<PropertyGroup Condition="'$(Base_Win32)'!=''">
9157
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
9258
<BT_BuildType>Debug</BT_BuildType>
@@ -121,6 +87,18 @@
12187
<DCCReference Include="fmx.dcp"/>
12288
<DCCReference Include="Python.dcp"/>
12389
<DCCReference Include="..\..\..\Source\fmx\FMX.PythonGUIInputOutput.pas"/>
90+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxActnList.pas"/>
91+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxComCtrls.pas"/>
92+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxControls.pas"/>
93+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxDialogs.pas"/>
94+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxForms.pas"/>
95+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxGrids.pas"/>
96+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxLayouts.pas"/>
97+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxScrollBox.pas"/>
98+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxShapes.pas"/>
99+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxStdCtrls.pas"/>
100+
<DCCReference Include="..\..\..\Source\fmx\WrapFmxTypes.pas"/>
101+
<DCCReference Include="..\..\..\Source\fmx\WrapDelphiFmx.pas"/>
124102
<BuildConfiguration Include="Release">
125103
<Key>Cfg_2</Key>
126104
<CfgParent>Base</CfgParent>
@@ -149,7 +127,7 @@
149127
</Excluded_Packages>
150128
</Delphi.Personality>
151129
<Deployment Version="3">
152-
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\PythonFmx270.bpl" Configuration="Debug" Class="ProjectOutput">
130+
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\PythonFmx270.bpl" Configuration="Debug" Class="ProjectOutput">
153131
<Platform Name="Win32">
154132
<RemoteName>PythonFmx.bpl</RemoteName>
155133
<Overwrite>true</Overwrite>
@@ -854,12 +832,6 @@
854832
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
855833
</Deployment>
856834
<Platforms>
857-
<Platform value="Android">False</Platform>
858-
<Platform value="Android64">False</Platform>
859-
<Platform value="iOSDevice64">False</Platform>
860-
<Platform value="iOSSimulator">False</Platform>
861-
<Platform value="Linux64">False</Platform>
862-
<Platform value="OSX64">False</Platform>
863835
<Platform value="Win32">True</Platform>
864836
<Platform value="Win64">False</Platform>
865837
</Platforms>

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,22 @@ package PythonVcl;
3333
requires
3434
rtl,
3535
vcl,
36-
Python;
36+
Python,
37+
VclSmp;
3738

3839
contains
39-
Vcl.PythonGUIInputOutput in '..\..\..\Source\vcl\Vcl.PythonGUIInputOutput.pas';
40+
Vcl.PythonGUIInputOutput in '..\..\..\Source\vcl\Vcl.PythonGUIInputOutput.pas',
41+
WrapDelphiActnList in '..\..\..\Source\WrapDelphiActnList.pas',
42+
WrapDelphiButtons in '..\..\..\Source\WrapDelphiButtons.pas',
43+
WrapDelphiComCtrls in '..\..\..\Source\WrapDelphiComCtrls.pas',
44+
WrapDelphiControls in '..\..\..\Source\WrapDelphiControls.pas',
45+
WrapDelphiDialogs in '..\..\..\Source\WrapDelphiDialogs.pas',
46+
WrapDelphiExtCtrls in '..\..\..\Source\WrapDelphiExtCtrls.pas',
47+
WrapDelphiForms in '..\..\..\Source\WrapDelphiForms.pas',
48+
WrapDelphiGraphics in '..\..\..\Source\WrapDelphiGraphics.pas',
49+
WrapDelphiGrids in '..\..\..\Source\WrapDelphiGrids.pas',
50+
WrapDelphiSamplesSpin in '..\..\..\Source\WrapDelphiSamplesSpin.pas',
51+
WrapDelphiStdCtrls in '..\..\..\Source\WrapDelphiStdCtrls.pas',
52+
WrapDelphiVCL in '..\..\..\Source\WrapDelphiVCL.pas';
4053

4154
end.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy