Skip to content

Syncrepo #232

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 4 commits into from
Dec 2, 2020
Merged

Syncrepo #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1e3c6f
Synchronizing Lazarus project
lmbelo Nov 26, 2020
208dd41
Separating TPythonGUIInputOutput from VCL and FMX after Delphi XE 2
lmbelo Dec 2, 2020
d93d568
Referencing to new Vcl.PythonGUIInputOutput.
lmbelo Dec 2, 2020
57dfcc0
Fixing TPythonInputOutput component icon
lmbelo Dec 2, 2020
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
9 changes: 7 additions & 2 deletions Packages/Delphi/Delphi 10.3-/Python_D.dpk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package Python_D;

{$R '..\..\..\Source\PythonEngine.dcr'}
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
{$ALIGN 8}
Expand Down Expand Up @@ -26,6 +27,7 @@ package Python_D;
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'Components for Python'}
{$IMPLICITBUILD OFF}

{$IFDEF VER200}{$LIBSUFFIX '120'} {$ENDIF}
{$IFDEF VER210}{$LIBSUFFIX '140'} {$ENDIF}
{$IFDEF VER220}{$LIBSUFFIX '150'} {$ENDIF}
Expand All @@ -52,6 +54,9 @@ requires
contains
MethodCallBack in '..\..\..\Source\MethodCallBack.pas',
PythonEngine in '..\..\..\Source\PythonEngine.pas',
PythonGUIInputOutput in '..\..\..\Source\PythonGUIInputOutput.pas',
WrapDelphi in '..\..\..\Source\WrapDelphi.pas';
WrapDelphi in '..\..\..\Source\WrapDelphi.pas',
PythonReg in '..\..\..\Source\PythonReg.pas',
Vcl.PythonGUIInputOutput in '..\..\..\Source\vcl\Vcl.PythonGUIInputOutput.pas',
Vcl.PythonReg in '..\..\..\Source\vcl\Vcl.PythonReg.pas';

end.
4 changes: 2 additions & 2 deletions Packages/Delphi/Delphi 10.4+/dclPython.dproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<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>
<VerInfo_Locale>1033</VerInfo_Locale>
<DCC_UsePackage>rtl;P4DEngine;$(DCC_UsePackage)</DCC_UsePackage>
<DCC_UsePackage>rtl;Python;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
Expand Down Expand Up @@ -166,7 +166,7 @@
</RcItem>
<RcItem Include="..\..\Resources\TPYTHONINPUTOUTPUT.bmp">
<ResourceType>BITMAP</ResourceType>
<ResourceId>TPythonInputOutputModule</ResourceId>
<ResourceId>TPythonInputOutput</ResourceId>
</RcItem>
<RcItem Include="..\..\Resources\TPYTHONMODULE.bmp">
<ResourceType>BITMAP</ResourceType>
Expand Down
Binary file modified Packages/Delphi/Delphi 10.4+/dclPython.dres
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Packages/Delphi/Delphi 10.4+/dclPythonFmx.dproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<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>
<VerInfo_Locale>1033</VerInfo_Locale>
<DCC_UsePackage>rtl;FmxP4DEngine;$(DCC_UsePackage)</DCC_UsePackage>
<DCC_UsePackage>rtl;PythonFmx;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
Expand Down
16 changes: 8 additions & 8 deletions Packages/Delphi/Delphi 10.4+/dclPythonVcl.dproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<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>
<VerInfo_Locale>1033</VerInfo_Locale>
<DCC_UsePackage>rtl;VclP4DEngine;$(DCC_UsePackage)</DCC_UsePackage>
<DCC_UsePackage>rtl;vcl;PythonVcl;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
<DCC_UsePackage>rtl;vcl;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
Expand Down Expand Up @@ -182,6 +182,12 @@
</Excluded_Packages>
</Delphi.Personality>
<Deployment Version="3">
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclPythonVcl270.bpl" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>dclPythonVcl.bpl</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
<Platform Name="OSX32">
<Overwrite>true</Overwrite>
Expand All @@ -197,12 +203,6 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclPythonVcl270.bpl" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>dclPythonVcl.bpl</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployClass Name="AdditionalDebugSymbols">
<Platform Name="OSX32">
<Operation>1</Operation>
Expand Down
20 changes: 9 additions & 11 deletions Packages/FPC/p4dlaz.lpk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Version Value="11"/>
<PathDelim Value="\"/>
<SearchPaths>
<IncludeFiles Value="..\..\Source\"/>
<OtherUnitFiles Value="..\..\Source\"/>
<IncludeFiles Value="..\..\Source"/>
<OtherUnitFiles Value="..\..\Source;..\..\Source\lcl"/>
<UnitOutputDirectory Value="FPC_Units\$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/>
</SearchPaths>
<Parsing>
Expand All @@ -22,25 +22,22 @@
<Files Count="10">
<Item1>
<Filename Value="..\..\Source\PythonEngine.pas"/>
<HasRegisterProc Value="True"/>
<UnitName Value="PythonEngine"/>
</Item1>
<Item2>
<Filename Value="..\..\Source\PythonGUIInputOutput.pas"/>
<HasRegisterProc Value="True"/>
<UnitName Value="PythonGUIInputOutput"/>
</Item2>
<Item3>
<Filename Value="..\..\Source\MethodCallBack.pas"/>
<UnitName Value="MethodCallBack"/>
</Item3>
<Item4>
</Item2>
<Item3>
<Filename Value="..\..\Source\VarPyth.pas"/>
<UnitName Value="VarPyth"/>
</Item3>
<Item4>
<Filename Value="..\..\Source\lcl\Lcl.PythonGUIInputOutput.pas"/>
<UnitName Value="Lcl.PythonGUIInputOutput"/>
</Item4>
<Item5>
<Filename Value="..\..\Source\WrapDelphi.pas"/>
<HasRegisterProc Value="True"/>
<UnitName Value="WrapDelphi"/>
</Item5>
<Item6>
Expand All @@ -61,6 +58,7 @@
</Item9>
<Item10>
<Filename Value="p4dlaz_register.pas"/>
<HasRegisterProc Value="True"/>
<UnitName Value="P4DLaz_register"/>
</Item10>
</Files>
Expand Down
6 changes: 2 additions & 4 deletions Packages/FPC/p4dlaz.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@
interface

uses
PythonEngine, PythonGUIInputOutput, MethodCallBack, VarPyth, WrapDelphi,
PythonEngine, MethodCallBack, VarPyth, Lcl.PythonGUIInputOutput, WrapDelphi,
WrapDelphiButtons, WrapDelphiClasses, WrapDelphiControls, WrapDelphiTypes,
P4DLaz_register, LazarusPackageIntf;

implementation

procedure Register;
begin
RegisterUnit('PythonEngine', @PythonEngine.Register);
RegisterUnit('PythonGUIInputOutput', @PythonGUIInputOutput.Register);
RegisterUnit('WrapDelphi', @WrapDelphi.Register);
RegisterUnit('P4DLaz_register', @P4DLaz_register.Register);
end;

initialization
Expand Down
2 changes: 1 addition & 1 deletion Packages/FPC/p4dlaz_register.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ implementation

uses
PythonEngine,
PythonGUIInputOutput,
Lcl.PythonGUIInputOutput,
WrapDelphi;

procedure Register;
Expand Down
Loading