Skip to content

Commit 9017677

Browse files
pyscripterpyscripter
authored
Merge pull request #165 from ReinierNL/update_demo09
Updated Demo09: set default platform to Win64; made sure Python versions are the same for DLL and app; added project group
2 parents 85c981d + 0557614 commit 9017677

File tree

7 files changed

+394
-209
lines changed

7 files changed

+394
-209
lines changed

‎Demos/Demo09/Project1.dproj‎

Lines changed: 186 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,186 @@
1-
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<PropertyGroup>
3-
<ProjectGuid>{A9EE3C80-927A-458F-83F8-5388BD57BAF3}</ProjectGuid>
4-
<MainSource>Project1.dpr</MainSource>
5-
<Config Condition="'$(Config)'==''">Debug</Config>
6-
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
7-
<ProjectVersion>12.0</ProjectVersion>
8-
</PropertyGroup>
9-
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
10-
<Base>true</Base>
11-
</PropertyGroup>
12-
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
13-
<Cfg_1>true</Cfg_1>
14-
<CfgParent>Base</CfgParent>
15-
<Base>true</Base>
16-
</PropertyGroup>
17-
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
18-
<Cfg_2>true</Cfg_2>
19-
<CfgParent>Base</CfgParent>
20-
<Base>true</Base>
21-
</PropertyGroup>
22-
<PropertyGroup Condition="'$(Base)'!=''">
23-
<DCC_DependencyCheckOutputName>Project1.exe</DCC_DependencyCheckOutputName>
24-
<DCC_ImageBase>00400000</DCC_ImageBase>
25-
<DCC_Platform>x86</DCC_Platform>
26-
</PropertyGroup>
27-
<PropertyGroup Condition="'$(Cfg_1)'!=''">
28-
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
29-
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
30-
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
31-
<DCC_DebugInformation>false</DCC_DebugInformation>
32-
</PropertyGroup>
33-
<PropertyGroup Condition="'$(Cfg_2)'!=''">
34-
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<DelphiCompile Include="Project1.dpr">
38-
<MainSource>MainSource</MainSource>
39-
</DelphiCompile>
40-
<DCCReference Include="Unit1.pas">
41-
<Form>Form1</Form>
42-
</DCCReference>
43-
<BuildConfiguration Include="Base">
44-
<Key>Base</Key>
45-
</BuildConfiguration>
46-
<BuildConfiguration Include="Debug">
47-
<Key>Cfg_2</Key>
48-
<CfgParent>Base</CfgParent>
49-
</BuildConfiguration>
50-
<BuildConfiguration Include="Release">
51-
<Key>Cfg_1</Key>
52-
<CfgParent>Base</CfgParent>
53-
</BuildConfiguration>
54-
</ItemGroup>
55-
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
56-
<ProjectExtensions>
57-
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
58-
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
59-
<BorlandProject>
60-
<Delphi.Personality>
61-
<Source>
62-
<Source Name="MainSource">Project1.dpr</Source>
63-
</Source>
64-
<Parameters>
65-
<Parameters Name="UseLauncher">False</Parameters>
66-
<Parameters Name="LoadAllSymbols">True</Parameters>
67-
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
68-
</Parameters>
69-
<VersionInfo>
70-
<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
71-
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
72-
<VersionInfo Name="MajorVer">1</VersionInfo>
73-
<VersionInfo Name="MinorVer">0</VersionInfo>
74-
<VersionInfo Name="Release">0</VersionInfo>
75-
<VersionInfo Name="Build">0</VersionInfo>
76-
<VersionInfo Name="Debug">False</VersionInfo>
77-
<VersionInfo Name="PreRelease">False</VersionInfo>
78-
<VersionInfo Name="Special">False</VersionInfo>
79-
<VersionInfo Name="Private">False</VersionInfo>
80-
<VersionInfo Name="DLL">False</VersionInfo>
81-
<VersionInfo Name="Locale">1033</VersionInfo>
82-
<VersionInfo Name="CodePage">1252</VersionInfo>
83-
</VersionInfo>
84-
<VersionInfoKeys>
85-
<VersionInfoKeys Name="CompanyName"/>
86-
<VersionInfoKeys Name="FileDescription"/>
87-
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
88-
<VersionInfoKeys Name="InternalName"/>
89-
<VersionInfoKeys Name="LegalCopyright"/>
90-
<VersionInfoKeys Name="LegalTrademarks"/>
91-
<VersionInfoKeys Name="OriginalFilename"/>
92-
<VersionInfoKeys Name="ProductName"/>
93-
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
94-
<VersionInfoKeys Name="Comments"/>
95-
</VersionInfoKeys>
96-
</Delphi.Personality>
97-
</BorlandProject>
98-
<ProjectFileVersion>12</ProjectFileVersion>
99-
</ProjectExtensions>
100-
</Project>
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<ProjectGuid>{A9EE3C80-927A-458F-83F8-5388BD57BAF3}</ProjectGuid>
4+
<MainSource>Project1.dpr</MainSource>
5+
<Config Condition="'$(Config)'==''">Debug</Config>
6+
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
7+
<ProjectVersion>19.1</ProjectVersion>
8+
<FrameworkType>VCL</FrameworkType>
9+
<Base>True</Base>
10+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
11+
<TargetedPlatforms>3</TargetedPlatforms>
12+
<AppType>Application</AppType>
13+
</PropertyGroup>
14+
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
15+
<Base>true</Base>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
18+
<Base_Win32>true</Base_Win32>
19+
<CfgParent>Base</CfgParent>
20+
<Base>true</Base>
21+
</PropertyGroup>
22+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
23+
<Base_Win64>true</Base_Win64>
24+
<CfgParent>Base</CfgParent>
25+
<Base>true</Base>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
28+
<Cfg_1>true</Cfg_1>
29+
<CfgParent>Base</CfgParent>
30+
<Base>true</Base>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
33+
<Cfg_1_Win32>true</Cfg_1_Win32>
34+
<CfgParent>Cfg_1</CfgParent>
35+
<Cfg_1>true</Cfg_1>
36+
<Base>true</Base>
37+
</PropertyGroup>
38+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
39+
<Cfg_1_Win64>true</Cfg_1_Win64>
40+
<CfgParent>Cfg_1</CfgParent>
41+
<Cfg_1>true</Cfg_1>
42+
<Base>true</Base>
43+
</PropertyGroup>
44+
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
45+
<Cfg_2>true</Cfg_2>
46+
<CfgParent>Base</CfgParent>
47+
<Base>true</Base>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
50+
<Cfg_2_Win32>true</Cfg_2_Win32>
51+
<CfgParent>Cfg_2</CfgParent>
52+
<Cfg_2>true</Cfg_2>
53+
<Base>true</Base>
54+
</PropertyGroup>
55+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
56+
<Cfg_2_Win64>true</Cfg_2_Win64>
57+
<CfgParent>Cfg_2</CfgParent>
58+
<Cfg_2>true</Cfg_2>
59+
<Base>true</Base>
60+
</PropertyGroup>
61+
<PropertyGroup Condition="'$(Base)'!=''">
62+
<DCC_DependencyCheckOutputName>Project1.exe</DCC_DependencyCheckOutputName>
63+
<DCC_ImageBase>00400000</DCC_ImageBase>
64+
<DCC_Platform>x86</DCC_Platform>
65+
<SanitizedProjectName>Project1</SanitizedProjectName>
66+
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
67+
<VerInfo_Locale>1033</VerInfo_Locale>
68+
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
69+
</PropertyGroup>
70+
<PropertyGroup Condition="'$(Base_Win32)'!=''">
71+
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
72+
<BT_BuildType>Debug</BT_BuildType>
73+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
74+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
75+
<VerInfo_Locale>1033</VerInfo_Locale>
76+
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
77+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
78+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
79+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
80+
</PropertyGroup>
81+
<PropertyGroup Condition="'$(Base_Win64)'!=''">
82+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
83+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
84+
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
85+
<BT_BuildType>Debug</BT_BuildType>
86+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
87+
<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>
88+
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
89+
</PropertyGroup>
90+
<PropertyGroup Condition="'$(Cfg_1)'!=''">
91+
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
92+
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
93+
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
94+
<DCC_DebugInformation>0</DCC_DebugInformation>
95+
</PropertyGroup>
96+
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
97+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
98+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
99+
</PropertyGroup>
100+
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
101+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
102+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
103+
</PropertyGroup>
104+
<PropertyGroup Condition="'$(Cfg_2)'!=''">
105+
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
106+
</PropertyGroup>
107+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
108+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
109+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
110+
</PropertyGroup>
111+
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
112+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
113+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
114+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
115+
<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>
116+
</PropertyGroup>
117+
<ItemGroup>
118+
<DelphiCompile Include="$(MainSource)">
119+
<MainSource>MainSource</MainSource>
120+
</DelphiCompile>
121+
<DCCReference Include="Unit1.pas">
122+
<Form>Form1</Form>
123+
</DCCReference>
124+
<BuildConfiguration Include="Debug">
125+
<Key>Cfg_2</Key>
126+
<CfgParent>Base</CfgParent>
127+
</BuildConfiguration>
128+
<BuildConfiguration Include="Base">
129+
<Key>Base</Key>
130+
</BuildConfiguration>
131+
<BuildConfiguration Include="Release">
132+
<Key>Cfg_1</Key>
133+
<CfgParent>Base</CfgParent>
134+
</BuildConfiguration>
135+
</ItemGroup>
136+
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
137+
<ProjectExtensions>
138+
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
139+
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
140+
<BorlandProject>
141+
<Delphi.Personality>
142+
<Source>
143+
<Source Name="MainSource">Project1.dpr</Source>
144+
</Source>
145+
<Parameters>
146+
<Parameters Name="UseLauncher">False</Parameters>
147+
<Parameters Name="LoadAllSymbols">True</Parameters>
148+
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
149+
</Parameters>
150+
<VersionInfo>
151+
<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
152+
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
153+
<VersionInfo Name="MajorVer">1</VersionInfo>
154+
<VersionInfo Name="MinorVer">0</VersionInfo>
155+
<VersionInfo Name="Release">0</VersionInfo>
156+
<VersionInfo Name="Build">0</VersionInfo>
157+
<VersionInfo Name="Debug">False</VersionInfo>
158+
<VersionInfo Name="PreRelease">False</VersionInfo>
159+
<VersionInfo Name="Special">False</VersionInfo>
160+
<VersionInfo Name="Private">False</VersionInfo>
161+
<VersionInfo Name="DLL">False</VersionInfo>
162+
<VersionInfo Name="Locale">1033</VersionInfo>
163+
<VersionInfo Name="CodePage">1252</VersionInfo>
164+
</VersionInfo>
165+
<VersionInfoKeys>
166+
<VersionInfoKeys Name="CompanyName"/>
167+
<VersionInfoKeys Name="FileDescription"/>
168+
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
169+
<VersionInfoKeys Name="InternalName"/>
170+
<VersionInfoKeys Name="LegalCopyright"/>
171+
<VersionInfoKeys Name="LegalTrademarks"/>
172+
<VersionInfoKeys Name="OriginalFilename"/>
173+
<VersionInfoKeys Name="ProductName"/>
174+
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
175+
<VersionInfoKeys Name="Comments"/>
176+
</VersionInfoKeys>
177+
</Delphi.Personality>
178+
<Platforms>
179+
<Platform value="Win32">True</Platform>
180+
<Platform value="Win64">True</Platform>
181+
</Platforms>
182+
</BorlandProject>
183+
<ProjectFileVersion>12</ProjectFileVersion>
184+
</ProjectExtensions>
185+
<Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
186+
</Project>

‎Demos/Demo09/Project1.res‎

109 KB
Binary file not shown.

‎Demos/Demo09/Unit1.dfm‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,26 @@ object Form1: TForm1
2929
Left = 0
3030
Top = 132
3131
Width = 528
32-
Height = 164
32+
Height = 163
3333
Align = alClient
34+
Font.Charset = DEFAULT_CHARSET
35+
Font.Color = clWindowText
36+
Font.Height = -13
37+
Font.Name = 'Consolas'
38+
Font.Pitch = fpVariable
39+
Font.Style = []
3440
Lines.Strings = (
3541
'import sys'
3642
'print (sys.version_info)'
3743
'import demodll'
3844
'print (dir(demodll))'
3945
'print (demodll.add( 2, 2 ))')
46+
ParentFont = False
4047
TabOrder = 1
4148
end
4249
object Panel1: TPanel
4350
Left = 0
44-
Top = 296
51+
Top = 295
4552
Width = 528
4653
Height = 41
4754
Align = alBottom
@@ -64,14 +71,21 @@ object Form1: TForm1
6471
Width = 528
6572
Height = 129
6673
Align = alTop
74+
Font.Charset = DEFAULT_CHARSET
75+
Font.Color = clWindowText
76+
Font.Height = -13
77+
Font.Name = 'Consolas'
78+
Font.Pitch = fpVariable
79+
Font.Style = []
6780
Lines.Strings = (
6881
'')
82+
ParentFont = False
6983
TabOrder = 2
7084
end
7185
object PythonEngine1: TPythonEngine
72-
DllName = 'python32.dll'
86+
DllName = 'python37.dll'
7387
APIVersion = 1013
74-
RegVersion = '3.2'
88+
RegVersion = '3.7'
7589
UseLastKnownVersion = False
7690
IO = PythonGUIInputOutput1
7791
Left = 16

‎Demos/Demo09/Unit1.pas‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ TForm1 = class(TForm)
2020
PythonGUIInputOutput1: TPythonGUIInputOutput;
2121
Memo2: TMemo;
2222
procedure Button1Click(Sender: TObject);
23-
private
24-
public
2523
end;
2624

2725
var

0 commit comments

Comments
 (0)