[JVCL-Checkins] dev/JVCL3/install/JVCLInstall Compile.pas,1.59,1.60 Intf.pas,1.6,1.7 JVCLData.pas,1.40,1.41 - Added JclLibDir to allow compiling and linking following the

[Olivier S. <ob...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31531/dev/JVCL3/install/JVCLInstall

Modified Files:
	Compile.pas Intf.pas JVCLData.pas 
Log Message:
Added JclLibDir to allow compiling and linking following the change of default location of the DCP and BPI files from the JCL.


Index: Intf.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Intf.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Intf.pas	23 Dec 2004 00:25:12 -0000	1.6
--- Intf.pas	9 Feb 2006 11:47:31 -0000	1.7
***************
*** 70,73 ****
--- 70,74 ----
      function GetUnitOutDir: string;
      function GetJCLDir: string;
+     function GetJCLLibDir: string;
      function GetHppDir: string;
      function GetBplDir: string;
***************
*** 88,91 ****
--- 89,93 ----
      property UnitOutDir: string read GetUnitOutDir;
      property JCLDir: string read GetJCLDir;
+     property JCLLibDir: string read GetJCLLibDir;
      property HppDir: string read GetHppDir;
      property BplDir: string read GetBplDir;

Index: Compile.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Compile.pas,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** Compile.pas	26 Jan 2006 23:24:38 -0000	1.59
--- Compile.pas	9 Feb 2006 11:47:31 -0000	1.60
***************
*** 828,831 ****
--- 828,835 ----
      end;
  
+     // Add the JCL Lib directory to the extra DcpDirs, this is where the JCL
+     // places its dcp files, starting from February 2006.
+     ExtraDcpDirs := ExtraDcpDirs + ';' + ProjectGroup.TargetConfig.JCLLibDir;
+ 
      { Removed until we have a non-make.exe-bug harmed build process.
      if TargetConfig.Target.Version > 6 then // Overcome make.exe "command line too long" bug
***************
*** 871,874 ****
--- 875,879 ----
      SetEnvironmentVariable('HPPDIR', Pointer(TargetConfig.HppDir)); // for BCB personality
      SetEnvironmentVariable('BPILIBDIR', Pointer(TargetConfig.DcpDir)); // for BCB personality
+     SetEnvironmentVariable('JCLLIBDIR', Pointer(TargetConfig.JclLibDir)); // for BCB personality
  
      SetEnvironmentVariable('EXTRAUNITDIRS', PChar(ExtraDcpDirs));
***************
*** 1059,1067 ****
  
      // for JCL .dcp files
!     Lines.Add(Format('.path.dcp = "%s";"%s";"%s";"%s"',
        [ExtractShortPathName(ProjectGroup.TargetConfig.BplDir),
         ExtractShortPathName(ProjectGroup.TargetConfig.DcpDir),
         ExtractShortPathName(ProjectGroup.Target.BplDir),
!        ExtractShortPathName(ProjectGroup.Target.DcpDir)]));
  
      if AutoDepend then
--- 1064,1073 ----
  
      // for JCL .dcp files
!     Lines.Add(Format('.path.dcp = "%s";"%s";"%s";"%s";"%s"',
        [ExtractShortPathName(ProjectGroup.TargetConfig.BplDir),
         ExtractShortPathName(ProjectGroup.TargetConfig.DcpDir),
         ExtractShortPathName(ProjectGroup.Target.BplDir),
!        ExtractShortPathName(ProjectGroup.Target.DcpDir),
!        ExtractShortPathName(ProjectGroup.TargetConfig.JCLLibDir)]));
  
      if AutoDepend then

Index: JVCLData.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/JVCLData.pas,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** JVCLData.pas	26 Jan 2006 23:43:48 -0000	1.40
--- JVCLData.pas	9 Feb 2006 11:47:31 -0000	1.41
***************
*** 107,110 ****
--- 107,111 ----
      function GetTarget: TCompileTarget;
      function GetJCLDir: string;
+     function GetJCLLibDir: string;
      function GetHppDir: string;
      function GetBplDir: string;
***************
*** 227,230 ****
--- 228,234 ----
        // JCLDir specifies the directory where the JCL is.
  
+     property JCLLibDir: string read GetJCLLibDir;
+       // JCLDir specifies the directory where the JCL Library files are, depending on the target.
+ 
      property HppDir: string read GetHppDir write FHppDir;
        // HppDir: (for BCB installation) specifies where the generated .hpp files
***************
*** 1028,1031 ****
--- 1032,1043 ----
  end;
  
+ function TTargetConfig.GetJCLLibDir: string;
+ begin
+   // Note: if the JCL changes its naming convention, a table of equivalences
+   // would need to be built. Right now (2006/02/09), this is not necessary
+   // as the format is always %type%version.
+   Result := JCLDir + Format('\lib\%s%d', [Target.TargetType, Target.Version]);
+ end;
+ 
  function TTargetConfig.GetHppDir: string;
  begin