Skip to content

Inconsistencies in project files #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2021
Merged

Inconsistencies in project files #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions Packages/Delphi/Delphi 10.4+/Python.dpk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,21 @@ package Python;
{$IMPLICITBUILD ON}

requires
DesignIDE,
rtl,
vcl;
dbrtl,
FireDAC,
FireDACCommonDriver,
FireDACCommon;

contains
MethodCallBack in '..\..\..\Source\MethodCallBack.pas',
PythonEngine in '..\..\..\Source\PythonEngine.pas',
WrapDelphi in '..\..\..\Source\WrapDelphi.pas';
PythonVersions in '..\..\..\Source\PythonVersions.pas',
VarPyth in '..\..\..\Source\VarPyth.pas',
WrapDelphi in '..\..\..\Source\WrapDelphi.pas',
WrapDelphiClasses in '..\..\..\Source\WrapDelphiClasses.pas',
WrapDelphiTypes in '..\..\..\Source\WrapDelphiTypes.pas',
WrapDelphiWindows in '..\..\..\Source\WrapDelphiWindows.pas',
WrapFireDAC in '..\..\..\Source\WrapFireDAC.pas';

end.
17 changes: 14 additions & 3 deletions Packages/Delphi/Delphi 10.4+/Python.dproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
<VerInfo_Locale>1033</VerInfo_Locale>
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<BT_BuildType>Debug</BT_BuildType>
Expand All @@ -59,12 +60,20 @@
<DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="DesignIDE.dcp"/>
<DCCReference Include="rtl.dcp"/>
<DCCReference Include="vcl.dcp"/>
<DCCReference Include="dbrtl.dcp"/>
<DCCReference Include="FireDAC.dcp"/>
<DCCReference Include="FireDACCommonDriver.dcp"/>
<DCCReference Include="FireDACCommon.dcp"/>
<DCCReference Include="..\..\..\Source\MethodCallBack.pas"/>
<DCCReference Include="..\..\..\Source\PythonEngine.pas"/>
<DCCReference Include="..\..\..\Source\PythonVersions.pas"/>
<DCCReference Include="..\..\..\Source\VarPyth.pas"/>
<DCCReference Include="..\..\..\Source\WrapDelphi.pas"/>
<DCCReference Include="..\..\..\Source\WrapDelphiClasses.pas"/>
<DCCReference Include="..\..\..\Source\WrapDelphiTypes.pas"/>
<DCCReference Include="..\..\..\Source\WrapDelphiWindows.pas"/>
<DCCReference Include="..\..\..\Source\WrapFireDAC.pas"/>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
Expand All @@ -86,6 +95,8 @@
<Source Name="MainSource">Python.dpk</Source>
</Source>
<Excluded_Packages>
<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>
<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>
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
Expand All @@ -97,7 +108,7 @@
<Platform value="Win64">False</Platform>
</Platforms>
<Deployment Version="3">
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\Python270.bpl" Configuration="Debug" Class="ProjectOutput">
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\Python270.bpl" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>Python.bpl</RemoteName>
<Overwrite>true</Overwrite>
Expand Down
14 changes: 13 additions & 1 deletion Packages/Delphi/Delphi 10.4+/PythonFmx.dpk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ requires
Python;

contains
FMX.PythonGUIInputOutput in '..\..\..\Source\fmx\FMX.PythonGUIInputOutput.pas';
FMX.PythonGUIInputOutput in '..\..\..\Source\fmx\FMX.PythonGUIInputOutput.pas',
WrapFmxActnList in '..\..\..\Source\fmx\WrapFmxActnList.pas',
WrapFmxComCtrls in '..\..\..\Source\fmx\WrapFmxComCtrls.pas',
WrapFmxControls in '..\..\..\Source\fmx\WrapFmxControls.pas',
WrapFmxDialogs in '..\..\..\Source\fmx\WrapFmxDialogs.pas',
WrapFmxForms in '..\..\..\Source\fmx\WrapFmxForms.pas',
WrapFmxGrids in '..\..\..\Source\fmx\WrapFmxGrids.pas',
WrapFmxLayouts in '..\..\..\Source\fmx\WrapFmxLayouts.pas',
WrapFmxScrollBox in '..\..\..\Source\fmx\WrapFmxScrollBox.pas',
WrapFmxShapes in '..\..\..\Source\fmx\WrapFmxShapes.pas',
WrapFmxStdCtrls in '..\..\..\Source\fmx\WrapFmxStdCtrls.pas',
WrapFmxTypes in '..\..\..\Source\fmx\WrapFmxTypes.pas',
WrapDelphiFmx in '..\..\..\Source\fmx\WrapDelphiFmx.pas';

end.
56 changes: 14 additions & 42 deletions Packages/Delphi/Delphi 10.4+/PythonFmx.dproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ProjectGuid>{6C9FBAC1-1024-4A46-96EE-2CADEFE347AA}</ProjectGuid>
<MainSource>PythonFmx.dpk</MainSource>
<ProjectVersion>19.1</ProjectVersion>
<FrameworkType>None</FrameworkType>
<FrameworkType>FMX</FrameworkType>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
Expand All @@ -13,26 +13,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
<Base_Android>true</Base_Android>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
<Base_Android64>true</Base_Android64>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
<Base_iOSDevice64>true</Base_iOSDevice64>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSSimulator' and '$(Base)'=='true') or '$(Base_iOSSimulator)'!=''">
<Base_iOSSimulator>true</Base_iOSSimulator>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
Expand Down Expand Up @@ -73,20 +53,6 @@
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
<DllSuffix>$(Auto)</DllSuffix>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Android)'!=''">
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
<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>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Android64)'!=''">
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
<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>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_iOSSimulator)'!=''">
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<BT_BuildType>Debug</BT_BuildType>
Expand Down Expand Up @@ -121,6 +87,18 @@
<DCCReference Include="fmx.dcp"/>
<DCCReference Include="Python.dcp"/>
<DCCReference Include="..\..\..\Source\fmx\FMX.PythonGUIInputOutput.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxActnList.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxComCtrls.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxControls.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxDialogs.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxForms.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxGrids.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxLayouts.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxScrollBox.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxShapes.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxStdCtrls.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapFmxTypes.pas"/>
<DCCReference Include="..\..\..\Source\fmx\WrapDelphiFmx.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
Expand Down Expand Up @@ -149,7 +127,7 @@
</Excluded_Packages>
</Delphi.Personality>
<Deployment Version="3">
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\PythonFmx270.bpl" Configuration="Debug" Class="ProjectOutput">
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\PythonFmx270.bpl" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>PythonFmx.bpl</RemoteName>
<Overwrite>true</Overwrite>
Expand Down Expand Up @@ -854,12 +832,6 @@
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
</Deployment>
<Platforms>
<Platform value="Android">False</Platform>
<Platform value="Android64">False</Platform>
<Platform value="iOSDevice64">False</Platform>
<Platform value="iOSSimulator">False</Platform>
<Platform value="Linux64">False</Platform>
<Platform value="OSX64">False</Platform>
<Platform value="Win32">True</Platform>
<Platform value="Win64">False</Platform>
</Platforms>
Expand Down
17 changes: 15 additions & 2 deletions Packages/Delphi/Delphi 10.4+/PythonVcl.dpk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,22 @@ package PythonVcl;
requires
rtl,
vcl,
Python;
Python,
VclSmp;

contains
Vcl.PythonGUIInputOutput in '..\..\..\Source\vcl\Vcl.PythonGUIInputOutput.pas';
Vcl.PythonGUIInputOutput in '..\..\..\Source\vcl\Vcl.PythonGUIInputOutput.pas',
WrapDelphiActnList in '..\..\..\Source\WrapDelphiActnList.pas',
WrapDelphiButtons in '..\..\..\Source\WrapDelphiButtons.pas',
WrapDelphiComCtrls in '..\..\..\Source\WrapDelphiComCtrls.pas',
WrapDelphiControls in '..\..\..\Source\WrapDelphiControls.pas',
WrapDelphiDialogs in '..\..\..\Source\WrapDelphiDialogs.pas',
WrapDelphiExtCtrls in '..\..\..\Source\WrapDelphiExtCtrls.pas',
WrapDelphiForms in '..\..\..\Source\WrapDelphiForms.pas',
WrapDelphiGraphics in '..\..\..\Source\WrapDelphiGraphics.pas',
WrapDelphiGrids in '..\..\..\Source\WrapDelphiGrids.pas',
WrapDelphiSamplesSpin in '..\..\..\Source\WrapDelphiSamplesSpin.pas',
WrapDelphiStdCtrls in '..\..\..\Source\WrapDelphiStdCtrls.pas',
WrapDelphiVCL in '..\..\..\Source\WrapDelphiVCL.pas';

end.
Loading