pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

jvcllaz: Modify PascalInterpreter package such that compilation of all packages at 64-bit is not aborted any more.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7594 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-08-02 16:28:28 +00:00
parent b977a4e676
commit 810aebcd2e
6 changed files with 75 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/jvcllaz/design/JvPascalInterpreter/jvpascalinterpreterreg.pas
View File

@ -11,6 +11,12 @@ procedure Register;
implementation implementation
{$IFDEF CPU64}
procedure Register;
begin
end;
{$ELSE}
{$R ..\..\resource\jvpascalinterpreterreg.res} {$R ..\..\resource\jvpascalinterpreterreg.res}
uses uses
@ -18,8 +24,9 @@ uses
procedure Register; procedure Register;
begin begin
RegisterComponents(RsPaletteJvclNonVisual, [TJvInterpreterProgram]); //, TJvInterpreterFm]); RegisterComponents(RsPaletteJvclNonVisual, [TJvInterpreterProgram]);
end; end;
{$ENDIF}
end. end.

74
components/jvcllaz/packages/jvcl_all.lpk
View File

@ -13,61 +13,61 @@
</CompilerOptions> </CompilerOptions>
<Description Value="A meta package for simple installation of all JVCL designtime packages."/> <Description Value="A meta package for simple installation of all JVCL designtime packages."/>
<Version Major="1" Release="7"/> <Version Major="1" Release="7"/>
<RequiredPkgs Count="18"> <RequiredPkgs>
<Item1> <Item>
<PackageName Value="JvPascalInterpreterD"/> <PackageName Value="JvPascalInterpreterD"/>
</Item1> </Item>
<Item2> <Item>
<PackageName Value="JvTimeFrameworkLazD"/> <PackageName Value="JvTimeFrameworkLazD"/>
</Item2> </Item>
<Item3> <Item>
<PackageName Value="JvXPCtrlsLazD"/> <PackageName Value="JvXPCtrlsLazD"/>
</Item3> </Item>
<Item4> <Item>
<PackageName Value="JvWizardLazD"/> <PackageName Value="JvWizardLazD"/>
</Item4> </Item>
<Item5> <Item>
<PackageName Value="JvValidatorsLazD"/> <PackageName Value="JvValidatorsLazD"/>
</Item5> </Item>
<Item6> <Item>
<PackageName Value="JvRuntimeDesignLazD"/> <PackageName Value="JvRuntimeDesignLazD"/>
</Item6> </Item>
<Item7> <Item>
<PackageName Value="JvPageCompsD"/> <PackageName Value="JvPageCompsD"/>
</Item7> </Item>
<Item8> <Item>
<PackageName Value="JvNetLazD"/> <PackageName Value="JvNetLazD"/>
</Item8> </Item>
<Item9> <Item>
<PackageName Value="JvMMLazD"/> <PackageName Value="JvMMLazD"/>
</Item9> </Item>
<Item10> <Item>
<PackageName Value="JvJansLazD"/> <PackageName Value="JvJansLazD"/>
</Item10> </Item>
<Item11> <Item>
<PackageName Value="JvStdCtrlsLazD"/> <PackageName Value="JvStdCtrlsLazD"/>
</Item11> </Item>
<Item12> <Item>
<PackageName Value="JvHMILazD"/> <PackageName Value="JvHMILazD"/>
</Item12> </Item>
<Item13> <Item>
<PackageName Value="JvDBLazD"/> <PackageName Value="JvDBLazD"/>
</Item13> </Item>
<Item14> <Item>
<PackageName Value="JvCustomLazD"/> <PackageName Value="JvCustomLazD"/>
</Item14> </Item>
<Item15> <Item>
<PackageName Value="JvCtrlsLazD"/> <PackageName Value="JvCtrlsLazD"/>
</Item15> </Item>
<Item16> <Item>
<PackageName Value="JvAppFrmLazD"/> <PackageName Value="JvAppFrmLazD"/>
</Item16> </Item>
<Item17> <Item>
<PackageName Value="JvCmpD"/> <PackageName Value="JvCmpD"/>
</Item17> </Item>
<Item18> <Item>
<PackageName Value="JvCoreLazD"/> <PackageName Value="JvCoreLazD"/>
</Item18> </Item>
</RequiredPkgs> </RequiredPkgs>
<UsageOptions> <UsageOptions>
<UnitPath Value="$(PkgOutDir)"/> <UnitPath Value="$(PkgOutDir)"/>

5
components/jvcllaz/packages/jvpascalinterpreterd.lpk
View File

@ -13,8 +13,7 @@
<UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\design\JvPascalInterpreter"/> <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\design\JvPascalInterpreter"/>
</SearchPaths> </SearchPaths>
</CompilerOptions> </CompilerOptions>
<Description Value="Pascal scripting engine of the JVCL library (https://sourceforge.net/projects/jvcl/) (designime code) <Description Value="Pascal scripting engine of the JVCL library (https://sourceforge.net/projects/jvcl/) (designime code)."/>
"/>
<License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/> <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/>
<Version Major="1" Release="6"/> <Version Major="1" Release="6"/>
<Files Count="1"> <Files Count="1">
@ -29,7 +28,7 @@
<PackageName Value="JvCoreLazD"/> <PackageName Value="JvCoreLazD"/>
</Item1> </Item1>
<Item2> <Item2>
<PackageName Value="jvpascalinterpreterr"/> <PackageName Value="JvPascalInterpreterR"/>
</Item2> </Item2>
</RequiredPkgs> </RequiredPkgs>
<UsageOptions> <UsageOptions>

12
components/jvcllaz/run/JvPascalInterpreter/JvInterpreter.pas
View File

@ -179,7 +179,16 @@ unit JvInterpreter;
{.$DEFINE JvInterpreter_DEBUG} {.$DEFINE JvInterpreter_DEBUG}
{$IFDEF CPUX64}THIS PACKAGE WAS NOT PORTED FOR 64-bit CPU{$ENDIF} //{$IFDEF CPUX64}THIS PACKAGE WAS NOT PORTED FOR 64-bit CPU{$ENDIF}
{$IFDEF CPU64}
{$warning This package cannot be used for CPU64 and is omitted.}
interface
implementation
end.
{$ELSE}
interface interface
@ -8752,3 +8761,4 @@ finalization
Finit; Finit;
end. end.
{$ENDIF}

8
components/jvcllaz/run/JvPascalInterpreter/JvInterpreterFm.pas
View File

@ -53,6 +53,13 @@ unit JvInterpreterFm;
{$mode Delphi} {$mode Delphi}
{$IFDEF CPU64}
interface
implementation
end.
{$ELSE}
interface interface
uses uses
@ -734,3 +741,4 @@ begin
end; end;
end. end.
{$ENDIF}

9
components/jvcllaz/run/JvPascalInterpreter/JvInterpreterParser.pas
View File

@ -35,6 +35,14 @@ unit JvInterpreterParser;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
{$IFDEF CPU64}
interface
implementation
end.
{$ELSE}
interface interface
uses uses
@ -790,3 +798,4 @@ end;
end. end.
{$ENDIF}