Skip to content

Commit 726438e

Browse files
author
Frank Semmling
committed
DelphiXE: Compilierbare Version
1 parent 41d0f5f commit 726438e

File tree

4 files changed

+135
-2
lines changed

4 files changed

+135
-2
lines changed
Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<ProjectGuid>{0E8E26DF-AEAD-437D-9B90-C3AD0416250B}</ProjectGuid>
4+
<MainSource>Python_D.dpk</MainSource>
5+
<Basis>True</Basis>
6+
<Config Condition="'$(Config)'==''">Debug</Config>
7+
<Platform>Win32</Platform>
8+
<AppType>Package</AppType>
9+
<FrameworkType>VCL</FrameworkType>
10+
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
11+
<ProjectVersion>12.3</ProjectVersion>
12+
</PropertyGroup>
13+
<PropertyGroup Condition="'$(Config)'=='Basis' or '$(Base)'!=''">
14+
<Base>true</Base>
15+
</PropertyGroup>
16+
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
17+
<Cfg_1>true</Cfg_1>
18+
<CfgParent>Base</CfgParent>
19+
<Base>true</Base>
20+
</PropertyGroup>
21+
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
22+
<Cfg_2>true</Cfg_2>
23+
<CfgParent>Base</CfgParent>
24+
<Base>true</Base>
25+
</PropertyGroup>
26+
<PropertyGroup Condition="'$(Base)'!=''">
27+
<DllSuffix>150</DllSuffix>
28+
<DCC_F>false</DCC_F>
29+
<GenPackage>true</GenPackage>
30+
<DCC_K>false</DCC_K>
31+
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
32+
<DCC_DcuOutput>S:\Prodat2005\_dcu</DCC_DcuOutput>
33+
<DCC_HppOutput>S:\Prodat2005\_dcp</DCC_HppOutput>
34+
<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias)</DCC_UnitAlias>
35+
<DCC_E>false</DCC_E>
36+
<DCC_Description>Components for Python</DCC_Description>
37+
<DCC_N>false</DCC_N>
38+
<GenDll>true</GenDll>
39+
<DCC_MapFile>3</DCC_MapFile>
40+
<DCC_ImageBase>00400000</DCC_ImageBase>
41+
<DCC_S>false</DCC_S>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Cfg_1)'!=''">
44+
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
45+
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
46+
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
47+
<DCC_DebugInformation>false</DCC_DebugInformation>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Cfg_2)'!=''">
50+
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
51+
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
52+
<DCC_Optimize>false</DCC_Optimize>
53+
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
54+
</PropertyGroup>
55+
<ItemGroup>
56+
<DelphiCompile Include="Python_D.dpk">
57+
<MainSource>MainSource</MainSource>
58+
</DelphiCompile>
59+
<DCCReference Include="..\..\..\Source\PythonEngine.dcr"/>
60+
<DCCReference Include="DesignIDE.dcp"/>
61+
<DCCReference Include="rtl.dcp"/>
62+
<DCCReference Include="vcl.dcp"/>
63+
<DCCReference Include="..\..\..\Source\MethodCallBack.pas"/>
64+
<DCCReference Include="..\..\..\Source\PythonEngine.pas"/>
65+
<DCCReference Include="..\..\..\Source\WrapDelphi.pas"/>
66+
<DCCReference Include="..\..\..\Source\PythonReg.pas"/>
67+
<DCCReference Include="..\..\..\Source\vcl\Vcl.PythonGUIInputOutput.pas"/>
68+
<DCCReference Include="..\..\..\Source\vcl\Vcl.PythonReg.pas"/>
69+
<BuildConfiguration Include="Debug">
70+
<Key>Cfg_2</Key>
71+
<CfgParent>Base</CfgParent>
72+
</BuildConfiguration>
73+
<BuildConfiguration Include="Basis">
74+
<Key>Base</Key>
75+
</BuildConfiguration>
76+
<BuildConfiguration Include="Release">
77+
<Key>Cfg_1</Key>
78+
<CfgParent>Base</CfgParent>
79+
</BuildConfiguration>
80+
</ItemGroup>
81+
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
82+
<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
83+
<ProjectExtensions>
84+
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
85+
<Borland.ProjectType>Package</Borland.ProjectType>
86+
<BorlandProject>
87+
<Delphi.Personality>
88+
<Source>
89+
<Source Name="MainSource">Python_D.dpk</Source>
90+
</Source>
91+
<VersionInfo>
92+
<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
93+
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
94+
<VersionInfo Name="MajorVer">1</VersionInfo>
95+
<VersionInfo Name="MinorVer">0</VersionInfo>
96+
<VersionInfo Name="Release">0</VersionInfo>
97+
<VersionInfo Name="Build">0</VersionInfo>
98+
<VersionInfo Name="Debug">False</VersionInfo>
99+
<VersionInfo Name="PreRelease">False</VersionInfo>
100+
<VersionInfo Name="Special">False</VersionInfo>
101+
<VersionInfo Name="Private">False</VersionInfo>
102+
<VersionInfo Name="DLL">False</VersionInfo>
103+
<VersionInfo Name="Locale">1031</VersionInfo>
104+
<VersionInfo Name="CodePage">1252</VersionInfo>
105+
</VersionInfo>
106+
<VersionInfoKeys>
107+
<VersionInfoKeys Name="CompanyName"/>
108+
<VersionInfoKeys Name="FileDescription"/>
109+
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
110+
<VersionInfoKeys Name="InternalName"/>
111+
<VersionInfoKeys Name="LegalCopyright"/>
112+
<VersionInfoKeys Name="LegalTrademarks"/>
113+
<VersionInfoKeys Name="OriginalFilename"/>
114+
<VersionInfoKeys Name="ProductName"/>
115+
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
116+
<VersionInfoKeys Name="Comments"/>
117+
</VersionInfoKeys>
118+
<Excluded_Packages>
119+
<Excluded_Packages Name="$(BDSBIN)\dcltee9150.bpl">TeeChart Standard 9 Components</Excluded_Packages>
120+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k150.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
121+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp150.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
122+
</Excluded_Packages>
123+
</Delphi.Personality>
124+
<Platforms>
125+
<Platform value="Win32">True</Platform>
126+
</Platforms>
127+
</BorlandProject>
128+
<ProjectFileVersion>12</ProjectFileVersion>
129+
</ProjectExtensions>
130+
</Project>
89.8 KB
Binary file not shown.

Source/Definition.Inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
{$ENDIF FPC}
204204

205205
{$IFDEF DELPHIXE_OR_HIGHER}
206-
{$DEFINE EXTENDED_RTTI}
206+
//{$DEFINE EXTENDED_RTTI}
207207
{$ENDIF DELPHIXE_OR_HIGHER}
208208

209209
{$IFDEF DELPHIXE4_OR_HIGHER}

Source/PythonEngine.pas

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1351,6 +1351,7 @@ TPythonInterface=class(TDynamicDll)
13511351
Py_BuildValue: TPy_BuildValue;
13521352

13531353
Py_Initialize: procedure; cdecl;
1354+
Py_InitializeEx: procedure(initsigs: Integer); cdecl;
13541355
Py_Exit: procedure( RetVal: Integer); cdecl;
13551356
PyEval_GetBuiltins: function: PPyObject; cdecl;
13561357
PyDict_Copy: function(mp: PPyObject):PPyObject; cdecl;
@@ -3322,6 +3323,7 @@ procedure TPythonInterface.MapDll;
33223323
PyArg_ParseTupleAndKeywords := Import('PyArg_ParseTupleAndKeywords');
33233324
Py_BuildValue := Import('Py_BuildValue');
33243325
Py_Initialize := Import('Py_Initialize');
3326+
Py_InitializeEx := Import('Py_InitializeEx');
33253327
PyModule_GetDict := Import('PyModule_GetDict');
33263328
PyObject_Str := Import('PyObject_Str');
33273329
PyRun_String := Import('PyRun_String');
@@ -4191,7 +4193,8 @@ procedure TPythonEngine.Initialize;
41914193
AssignPyFlags;
41924194
if FPythonHome <> '' then
41934195
Py_SetPythonHome(PWideChar(FPythonHome));
4194-
Py_Initialize;
4196+
//Py_Initialize;
4197+
Py_InitializeEx(0);
41954198
if Assigned(Py_IsInitialized) then
41964199
FInitialized := Py_IsInitialized() <> 0
41974200
else

0 commit comments

Comments
 (0)