Skip to content

Commit ab526ba

Browse files
pyscripterpyscripter
authored
Merge pull request pyscripter#232 from Embarcadero/syncrepo
Syncrepo
2 parents aa17342 + 57dfcc0 commit ab526ba

File tree

10 files changed

+282
-29
lines changed

10 files changed

+282
-29
lines changed

‎Packages/Delphi/Delphi 10.3-/Python_D.dpk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package Python_D;
2+
23
{$R '..\..\..\Source\PythonEngine.dcr'}
34
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
45
{$ALIGN 8}
@@ -26,6 +27,7 @@ package Python_D;
2627
{$ENDIF IMPLICITBUILDING}
2728
{$DESCRIPTION 'Components for Python'}
2829
{$IMPLICITBUILD OFF}
30+
2931
{$IFDEF VER200}{$LIBSUFFIX '120'} {$ENDIF}
3032
{$IFDEF VER210}{$LIBSUFFIX '140'} {$ENDIF}
3133
{$IFDEF VER220}{$LIBSUFFIX '150'} {$ENDIF}
@@ -52,6 +54,9 @@ requires
5254
contains
5355
MethodCallBack in '..\..\..\Source\MethodCallBack.pas',
5456
PythonEngine in '..\..\..\Source\PythonEngine.pas',
55-
PythonGUIInputOutput in '..\..\..\Source\PythonGUIInputOutput.pas',
56-
WrapDelphi in '..\..\..\Source\WrapDelphi.pas';
57+
WrapDelphi in '..\..\..\Source\WrapDelphi.pas',
58+
PythonReg in '..\..\..\Source\PythonReg.pas',
59+
Vcl.PythonGUIInputOutput in '..\..\..\Source\vcl\Vcl.PythonGUIInputOutput.pas',
60+
Vcl.PythonReg in '..\..\..\Source\vcl\Vcl.PythonReg.pas';
61+
5762
end.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
119119
<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>
120120
<VerInfo_Locale>1033</VerInfo_Locale>
121-
<DCC_UsePackage>rtl;P4DEngine;$(DCC_UsePackage)</DCC_UsePackage>
121+
<DCC_UsePackage>rtl;Python;$(DCC_UsePackage)</DCC_UsePackage>
122122
</PropertyGroup>
123123
<PropertyGroup Condition="'$(Base_Win64)'!=''">
124124
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
@@ -166,7 +166,7 @@
166166
</RcItem>
167167
<RcItem Include="..\..\Resources\TPYTHONINPUTOUTPUT.bmp">
168168
<ResourceType>BITMAP</ResourceType>
169-
<ResourceId>TPythonInputOutputModule</ResourceId>
169+
<ResourceId>TPythonInputOutput</ResourceId>
170170
</RcItem>
171171
<RcItem Include="..\..\Resources\TPYTHONMODULE.bmp">
172172
<ResourceType>BITMAP</ResourceType>

‎Packages/Delphi/Delphi 10.4+/dclPython.dres

-12 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
119119
<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>
120120
<VerInfo_Locale>1033</VerInfo_Locale>
121-
<DCC_UsePackage>rtl;FmxP4DEngine;$(DCC_UsePackage)</DCC_UsePackage>
121+
<DCC_UsePackage>rtl;PythonFmx;$(DCC_UsePackage)</DCC_UsePackage>
122122
</PropertyGroup>
123123
<PropertyGroup Condition="'$(Base_Win64)'!=''">
124124
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@
118118
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
119119
<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>
120120
<VerInfo_Locale>1033</VerInfo_Locale>
121-
<DCC_UsePackage>rtl;VclP4DEngine;$(DCC_UsePackage)</DCC_UsePackage>
121+
<DCC_UsePackage>rtl;vcl;PythonVcl;$(DCC_UsePackage)</DCC_UsePackage>
122122
</PropertyGroup>
123123
<PropertyGroup Condition="'$(Base_Win64)'!=''">
124-
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
124+
<DCC_UsePackage>rtl;vcl;$(DCC_UsePackage)</DCC_UsePackage>
125125
</PropertyGroup>
126126
<PropertyGroup Condition="'$(Cfg_1)'!=''">
127127
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -182,6 +182,12 @@
182182
</Excluded_Packages>
183183
</Delphi.Personality>
184184
<Deployment Version="3">
185+
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclPythonVcl270.bpl" Configuration="Debug" Class="ProjectOutput">
186+
<Platform Name="Win32">
187+
<RemoteName>dclPythonVcl.bpl</RemoteName>
188+
<Overwrite>true</Overwrite>
189+
</Platform>
190+
</DeployFile>
185191
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
186192
<Platform Name="OSX32">
187193
<Overwrite>true</Overwrite>
@@ -197,12 +203,6 @@
197203
<Overwrite>true</Overwrite>
198204
</Platform>
199205
</DeployFile>
200-
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclPythonVcl270.bpl" Configuration="Debug" Class="ProjectOutput">
201-
<Platform Name="Win32">
202-
<RemoteName>dclPythonVcl.bpl</RemoteName>
203-
<Overwrite>true</Overwrite>
204-
</Platform>
205-
</DeployFile>
206206
<DeployClass Name="AdditionalDebugSymbols">
207207
<Platform Name="OSX32">
208208
<Operation>1</Operation>

‎Packages/FPC/p4dlaz.lpk

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<Version Value="11"/>
99
<PathDelim Value="\"/>
1010
<SearchPaths>
11-
<IncludeFiles Value="..\..\Source\"/>
12-
<OtherUnitFiles Value="..\..\Source\"/>
11+
<IncludeFiles Value="..\..\Source"/>
12+
<OtherUnitFiles Value="..\..\Source;..\..\Source\lcl"/>
1313
<UnitOutputDirectory Value="FPC_Units\$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/>
1414
</SearchPaths>
1515
<Parsing>
@@ -22,25 +22,22 @@
2222
<Files Count="10">
2323
<Item1>
2424
<Filename Value="..\..\Source\PythonEngine.pas"/>
25-
<HasRegisterProc Value="True"/>
2625
<UnitName Value="PythonEngine"/>
2726
</Item1>
2827
<Item2>
29-
<Filename Value="..\..\Source\PythonGUIInputOutput.pas"/>
30-
<HasRegisterProc Value="True"/>
31-
<UnitName Value="PythonGUIInputOutput"/>
32-
</Item2>
33-
<Item3>
3428
<Filename Value="..\..\Source\MethodCallBack.pas"/>
3529
<UnitName Value="MethodCallBack"/>
36-
</Item3>
37-
<Item4>
30+
</Item2>
31+
<Item3>
3832
<Filename Value="..\..\Source\VarPyth.pas"/>
3933
<UnitName Value="VarPyth"/>
34+
</Item3>
35+
<Item4>
36+
<Filename Value="..\..\Source\lcl\Lcl.PythonGUIInputOutput.pas"/>
37+
<UnitName Value="Lcl.PythonGUIInputOutput"/>
4038
</Item4>
4139
<Item5>
4240
<Filename Value="..\..\Source\WrapDelphi.pas"/>
43-
<HasRegisterProc Value="True"/>
4441
<UnitName Value="WrapDelphi"/>
4542
</Item5>
4643
<Item6>
@@ -61,6 +58,7 @@
6158
</Item9>
6259
<Item10>
6360
<Filename Value="p4dlaz_register.pas"/>
61+
<HasRegisterProc Value="True"/>
6462
<UnitName Value="P4DLaz_register"/>
6563
</Item10>
6664
</Files>

‎Packages/FPC/p4dlaz.pas

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@
88
interface
99

1010
uses
11-
PythonEngine, PythonGUIInputOutput, MethodCallBack, VarPyth, WrapDelphi,
11+
PythonEngine, MethodCallBack, VarPyth, Lcl.PythonGUIInputOutput, WrapDelphi,
1212
WrapDelphiButtons, WrapDelphiClasses, WrapDelphiControls, WrapDelphiTypes,
1313
P4DLaz_register, LazarusPackageIntf;
1414

1515
implementation
1616

1717
procedure Register;
1818
begin
19-
RegisterUnit('PythonEngine', @PythonEngine.Register);
20-
RegisterUnit('PythonGUIInputOutput', @PythonGUIInputOutput.Register);
21-
RegisterUnit('WrapDelphi', @WrapDelphi.Register);
19+
RegisterUnit('P4DLaz_register', @P4DLaz_register.Register);
2220
end;
2321

2422
initialization

‎Packages/FPC/p4dlaz_register.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ implementation
1111

1212
uses
1313
PythonEngine,
14-
PythonGUIInputOutput,
14+
Lcl.PythonGUIInputOutput,
1515
WrapDelphi;
1616

1717
procedure Register;

0 commit comments

Comments
 (0)