Skip to content

Commit 734f94c

Browse files
evert777evert777
committed
Python Env
1 parent d1951c1 commit 734f94c

File tree

3 files changed

+22
-67
lines changed

3 files changed

+22
-67
lines changed

‎Demos/Demo09/Demo09.dproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
<MainSource>Demo09.dpr</MainSource>
55
<Config Condition="'$(Config)'==''">Debug</Config>
66
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
7-
<ProjectVersion>19.1</ProjectVersion>
7+
<ProjectVersion>20.1</ProjectVersion>
88
<FrameworkType>VCL</FrameworkType>
99
<Base>True</Base>
1010
<Platform Condition="'$(Platform)'==''">Win64</Platform>
1111
<TargetedPlatforms>3</TargetedPlatforms>
1212
<AppType>Application</AppType>
13+
<ProjectName Condition="'$(ProjectName)'==''">Demo09</ProjectName>
1314
</PropertyGroup>
1415
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1516
<Base>true</Base>
@@ -121,17 +122,17 @@
121122
<DCCReference Include="Unit1.pas">
122123
<Form>Form1</Form>
123124
</DCCReference>
124-
<BuildConfiguration Include="Debug">
125-
<Key>Cfg_2</Key>
126-
<CfgParent>Base</CfgParent>
127-
</BuildConfiguration>
128125
<BuildConfiguration Include="Base">
129126
<Key>Base</Key>
130127
</BuildConfiguration>
131128
<BuildConfiguration Include="Release">
132129
<Key>Cfg_1</Key>
133130
<CfgParent>Base</CfgParent>
134131
</BuildConfiguration>
132+
<BuildConfiguration Include="Debug">
133+
<Key>Cfg_2</Key>
134+
<CfgParent>Base</CfgParent>
135+
</BuildConfiguration>
135136
</ItemGroup>
136137
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
137138
<ProjectExtensions>

‎Demos/Demo09/Unit1.dfm‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ object Form1: TForm1
1313
Font.Name = 'MS Sans Serif'
1414
Font.Pitch = fpVariable
1515
Font.Style = []
16-
OldCreateOrder = True
17-
PixelsPerInch = 96
1816
TextHeight = 13
1917
object Splitter1: TSplitter
2018
Left = 0
@@ -82,20 +80,4 @@ object Form1: TForm1
8280
ParentFont = False
8381
TabOrder = 2
8482
end
85-
object PythonEngine1: TPythonEngine
86-
DllName = 'python37.dll'
87-
APIVersion = 1013
88-
RegVersion = '3.7'
89-
UseLastKnownVersion = False
90-
IO = PythonGUIInputOutput1
91-
Left = 16
92-
Top = 16
93-
end
94-
object PythonGUIInputOutput1: TPythonGUIInputOutput
95-
UnicodeIO = True
96-
RawOutput = False
97-
Output = Memo2
98-
Left = 56
99-
Top = 16
100-
end
10183
end

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

Lines changed: 16 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
<Config Condition="'$(Config)'==''">Release</Config>
66
<FrameworkType>VCL</FrameworkType>
77
<MainSource>Python.dpk</MainSource>
8-
<Platform Condition="'$(Platform)'==''">Win32</Platform>
8+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
99
<ProjectGuid>{018AAA56-F5BD-4A04-BCCA-A0043EAAA5CE}</ProjectGuid>
10-
<ProjectVersion>19.5</ProjectVersion>
11-
<TargetedPlatforms>168083</TargetedPlatforms>
10+
<ProjectVersion>20.1</ProjectVersion>
11+
<TargetedPlatforms>32787</TargetedPlatforms>
12+
<ProjectName Condition="'$(ProjectName)'==''">Python</ProjectName>
1213
</PropertyGroup>
1314
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1415
<Base>true</Base>
@@ -23,16 +24,6 @@
2324
<CfgParent>Base</CfgParent>
2425
<Base>true</Base>
2526
</PropertyGroup>
26-
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Base)'=='true') or '$(Base_OSX64)'!=''">
27-
<Base_OSX64>true</Base_OSX64>
28-
<CfgParent>Base</CfgParent>
29-
<Base>true</Base>
30-
</PropertyGroup>
31-
<PropertyGroup Condition="('$(Platform)'=='OSXARM64' and '$(Base)'=='true') or '$(Base_OSXARM64)'!=''">
32-
<Base_OSXARM64>true</Base_OSXARM64>
33-
<CfgParent>Base</CfgParent>
34-
<Base>true</Base>
35-
</PropertyGroup>
3627
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
3728
<Base_Win32>true</Base_Win32>
3829
<CfgParent>Base</CfgParent>
@@ -43,6 +34,11 @@
4334
<CfgParent>Base</CfgParent>
4435
<Base>true</Base>
4536
</PropertyGroup>
37+
<PropertyGroup Condition="('$(Platform)'=='Win64x' and '$(Base)'=='true') or '$(Base_Win64x)'!=''">
38+
<Base_Win64x>true</Base_Win64x>
39+
<CfgParent>Base</CfgParent>
40+
<Base>true</Base>
41+
</PropertyGroup>
4642
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
4743
<Cfg_1>true</Cfg_1>
4844
<CfgParent>Base</CfgParent>
@@ -71,18 +67,6 @@
7167
<Cfg_2>true</Cfg_2>
7268
<Base>true</Base>
7369
</PropertyGroup>
74-
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
75-
<Cfg_2_OSX64>true</Cfg_2_OSX64>
76-
<CfgParent>Cfg_2</CfgParent>
77-
<Cfg_2>true</Cfg_2>
78-
<Base>true</Base>
79-
</PropertyGroup>
80-
<PropertyGroup Condition="('$(Platform)'=='OSXARM64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSXARM64)'!=''">
81-
<Cfg_2_OSXARM64>true</Cfg_2_OSXARM64>
82-
<CfgParent>Cfg_2</CfgParent>
83-
<Cfg_2>true</Cfg_2>
84-
<Base>true</Base>
85-
</PropertyGroup>
8670
<PropertyGroup Condition="'$(Base)'!=''">
8771
<SanitizedProjectName>Python</SanitizedProjectName>
8872
<DCC_DcuOutput>..\..\..\lib\$(Platform)\$(Config)</DCC_DcuOutput>
@@ -107,14 +91,6 @@
10791
<VerInfo_Build>1</VerInfo_Build>
10892
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
10993
</PropertyGroup>
110-
<PropertyGroup Condition="'$(Base_OSX64)'!=''">
111-
<BT_BuildType>Debug</BT_BuildType>
112-
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers;ITSAppUsesNonExemptEncryption=false</VerInfo_Keys>
113-
</PropertyGroup>
114-
<PropertyGroup Condition="'$(Base_OSXARM64)'!=''">
115-
<BT_BuildType>Debug</BT_BuildType>
116-
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers;ITSAppUsesNonExemptEncryption=false</VerInfo_Keys>
117-
</PropertyGroup>
11894
<PropertyGroup Condition="'$(Base_Win32)'!=''">
11995
<BT_BuildType>Debug</BT_BuildType>
12096
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -125,6 +101,12 @@
125101
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
126102
<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>
127103
</PropertyGroup>
104+
<PropertyGroup Condition="'$(Base_Win64x)'!=''">
105+
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
106+
<BT_BuildType>Debug</BT_BuildType>
107+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
108+
<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>
109+
</PropertyGroup>
128110
<PropertyGroup Condition="'$(Cfg_1)'!=''">
129111
<DCC_DebugInformation>0</DCC_DebugInformation>
130112
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
@@ -149,12 +131,6 @@
149131
<VerInfo_Build>1</VerInfo_Build>
150132
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
151133
</PropertyGroup>
152-
<PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
153-
<DCC_RemoteDebug>true</DCC_RemoteDebug>
154-
</PropertyGroup>
155-
<PropertyGroup Condition="'$(Cfg_2_OSXARM64)'!=''">
156-
<DCC_RemoteDebug>true</DCC_RemoteDebug>
157-
</PropertyGroup>
158134
<ItemGroup>
159135
<DelphiCompile Include="$(MainSource)">
160136
<MainSource>MainSource</MainSource>
@@ -204,13 +180,9 @@
204180
<Platforms>
205181
<Platform value="Android">True</Platform>
206182
<Platform value="Android64">True</Platform>
207-
<Platform value="Linux64">True</Platform>
208-
<Platform value="OSX64">True</Platform>
209-
<Platform value="OSXARM64">True</Platform>
210183
<Platform value="Win32">True</Platform>
211184
<Platform value="Win64">True</Platform>
212-
<Platform value="iOSDevice64">False</Platform>
213-
<Platform value="iOSSimARM64">False</Platform>
185+
<Platform value="Win64x">False</Platform>
214186
</Platforms>
215187
</BorlandProject>
216188
<ProjectFileVersion>12</ProjectFileVersion>

0 commit comments

Comments
 (0)