From 810aebcd2eb893bd4f3c012aaa4f8222d29954de Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 2 Aug 2020 16:28:28 +0000
Subject: [PATCH] jvcllaz: Modify PascalInterpreter package such that
 compilation of all packages at 64-bit is not aborted any more.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7594 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../jvpascalinterpreterreg.pas                |  9 ++-
 components/jvcllaz/packages/jvcl_all.lpk      | 74 +++++++++----------
 .../jvcllaz/packages/jvpascalinterpreterd.lpk |  5 +-
 .../run/JvPascalInterpreter/JvInterpreter.pas | 12 ++-
 .../JvPascalInterpreter/JvInterpreterFm.pas   |  8 ++
 .../JvInterpreterParser.pas                   |  9 +++
 6 files changed, 75 insertions(+), 42 deletions(-)

diff --git a/components/jvcllaz/design/JvPascalInterpreter/jvpascalinterpreterreg.pas b/components/jvcllaz/design/JvPascalInterpreter/jvpascalinterpreterreg.pas
index 2a8ffecf3..b6cbfc72b 100644
--- a/components/jvcllaz/design/JvPascalInterpreter/jvpascalinterpreterreg.pas
+++ b/components/jvcllaz/design/JvPascalInterpreter/jvpascalinterpreterreg.pas
@@ -11,6 +11,12 @@ procedure Register;
 
 implementation
 
+{$IFDEF CPU64}
+procedure Register;
+begin
+end;
+{$ELSE}
+
 {$R ..\..\resource\jvpascalinterpreterreg.res}
 
 uses
@@ -18,8 +24,9 @@ uses
 
 procedure Register;
 begin
-  RegisterComponents(RsPaletteJvclNonVisual, [TJvInterpreterProgram]); //, TJvInterpreterFm]);
+  RegisterComponents(RsPaletteJvclNonVisual, [TJvInterpreterProgram]);
 end;
+{$ENDIF}
 
 end.
 
diff --git a/components/jvcllaz/packages/jvcl_all.lpk b/components/jvcllaz/packages/jvcl_all.lpk
index ad34c6227..db5c73f93 100644
--- a/components/jvcllaz/packages/jvcl_all.lpk
+++ b/components/jvcllaz/packages/jvcl_all.lpk
@@ -13,61 +13,61 @@
     </CompilerOptions>
     <Description Value="A meta package for simple installation of all JVCL designtime packages."/>
     <Version Major="1" Release="7"/>
-    <RequiredPkgs Count="18">
-      <Item1>
+    <RequiredPkgs>
+      <Item>
         <PackageName Value="JvPascalInterpreterD"/>
-      </Item1>
-      <Item2>
+      </Item>
+      <Item>
         <PackageName Value="JvTimeFrameworkLazD"/>
-      </Item2>
-      <Item3>
+      </Item>
+      <Item>
         <PackageName Value="JvXPCtrlsLazD"/>
-      </Item3>
-      <Item4>
+      </Item>
+      <Item>
         <PackageName Value="JvWizardLazD"/>
-      </Item4>
-      <Item5>
+      </Item>
+      <Item>
         <PackageName Value="JvValidatorsLazD"/>
-      </Item5>
-      <Item6>
+      </Item>
+      <Item>
         <PackageName Value="JvRuntimeDesignLazD"/>
-      </Item6>
-      <Item7>
+      </Item>
+      <Item>
         <PackageName Value="JvPageCompsD"/>
-      </Item7>
-      <Item8>
+      </Item>
+      <Item>
         <PackageName Value="JvNetLazD"/>
-      </Item8>
-      <Item9>
+      </Item>
+      <Item>
         <PackageName Value="JvMMLazD"/>
-      </Item9>
-      <Item10>
+      </Item>
+      <Item>
         <PackageName Value="JvJansLazD"/>
-      </Item10>
-      <Item11>
+      </Item>
+      <Item>
         <PackageName Value="JvStdCtrlsLazD"/>
-      </Item11>
-      <Item12>
+      </Item>
+      <Item>
         <PackageName Value="JvHMILazD"/>
-      </Item12>
-      <Item13>
+      </Item>
+      <Item>
         <PackageName Value="JvDBLazD"/>
-      </Item13>
-      <Item14>
+      </Item>
+      <Item>
         <PackageName Value="JvCustomLazD"/>
-      </Item14>
-      <Item15>
+      </Item>
+      <Item>
         <PackageName Value="JvCtrlsLazD"/>
-      </Item15>
-      <Item16>
+      </Item>
+      <Item>
         <PackageName Value="JvAppFrmLazD"/>
-      </Item16>
-      <Item17>
+      </Item>
+      <Item>
         <PackageName Value="JvCmpD"/>
-      </Item17>
-      <Item18>
+      </Item>
+      <Item>
         <PackageName Value="JvCoreLazD"/>
-      </Item18>
+      </Item>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>
diff --git a/components/jvcllaz/packages/jvpascalinterpreterd.lpk b/components/jvcllaz/packages/jvpascalinterpreterd.lpk
index 070458c37..4e8778f88 100644
--- a/components/jvcllaz/packages/jvpascalinterpreterd.lpk
+++ b/components/jvcllaz/packages/jvpascalinterpreterd.lpk
@@ -13,8 +13,7 @@
         <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\design\JvPascalInterpreter"/>
       </SearchPaths>
     </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. "/>
     <Version Major="1" Release="6"/>
     <Files Count="1">
@@ -29,7 +28,7 @@
         <PackageName Value="JvCoreLazD"/>
       </Item1>
       <Item2>
-        <PackageName Value="jvpascalinterpreterr"/>
+        <PackageName Value="JvPascalInterpreterR"/>
       </Item2>
     </RequiredPkgs>
     <UsageOptions>
diff --git a/components/jvcllaz/run/JvPascalInterpreter/JvInterpreter.pas b/components/jvcllaz/run/JvPascalInterpreter/JvInterpreter.pas
index 894bf54d2..0a01e4302 100644
--- a/components/jvcllaz/run/JvPascalInterpreter/JvInterpreter.pas
+++ b/components/jvcllaz/run/JvPascalInterpreter/JvInterpreter.pas
@@ -179,7 +179,16 @@ unit JvInterpreter;
 
 {.$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
 
@@ -8752,3 +8761,4 @@ finalization
   Finit;
 
 end.
+{$ENDIF}
diff --git a/components/jvcllaz/run/JvPascalInterpreter/JvInterpreterFm.pas b/components/jvcllaz/run/JvPascalInterpreter/JvInterpreterFm.pas
index 304a9016e..f47724434 100644
--- a/components/jvcllaz/run/JvPascalInterpreter/JvInterpreterFm.pas
+++ b/components/jvcllaz/run/JvPascalInterpreter/JvInterpreterFm.pas
@@ -53,6 +53,13 @@ unit JvInterpreterFm;
 
 {$mode Delphi}
 
+{$IFDEF CPU64}
+
+interface
+implementation
+end.
+
+{$ELSE}
 interface
 
 uses
@@ -734,3 +741,4 @@ begin
 end;
 
 end.
+{$ENDIF}
diff --git a/components/jvcllaz/run/JvPascalInterpreter/JvInterpreterParser.pas b/components/jvcllaz/run/JvPascalInterpreter/JvInterpreterParser.pas
index 205b18a51..c71534381 100644
--- a/components/jvcllaz/run/JvPascalInterpreter/JvInterpreterParser.pas
+++ b/components/jvcllaz/run/JvPascalInterpreter/JvInterpreterParser.pas
@@ -35,6 +35,14 @@ unit JvInterpreterParser;
 
 {$mode objfpc}{$H+}
 
+{$IFDEF CPU64}
+
+interface
+implementation
+end.
+
+{$ELSE}
+
 interface
 
 uses
@@ -790,3 +798,4 @@ end;
 
 
 end.
+{$ENDIF}