From: Andreas H. <ah...@us...> - 2005-03-21 17:55:27
|
Update of /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17780/install/JVCLInstall/Frames Modified Files: FrmConfigPage.dfm FrmConfigPage.pas Log Message: Removed JCL compilation code Index: FrmConfigPage.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmConfigPage.pas,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FrmConfigPage.pas 1 Jan 2005 15:09:45 -0000 1.18 --- FrmConfigPage.pas 21 Mar 2005 17:55:05 -0000 1.19 *************** *** 56,60 **** FrameDirEditBrowseHPP: TFrameDirEditBrowse; LblBCBGuide: TLabel; - CheckBoxCompileJclDcp: TCheckBox; CheckBoxVerbose: TCheckBox; CheckBoxGenerateMapFiles: TCheckBox; --- 56,59 ---- *************** *** 148,152 **** i: Integer; x: Integer; - CommonCompiledJcl, HasBCB: Boolean; begin Inc(FInitializing); --- 147,150 ---- *************** *** 164,169 **** FrameDirEditBrowseHPP.AllowEmpty := True; - CommonCompiledJcl := True; - HasBCB := False; with ComboBoxTargetIDE do begin --- 162,165 ---- *************** *** 176,186 **** if InstallJVCL then begin - if Installer.SelTargets[i].Target.IsBCB then - begin - if not Installer.SelTargets[i].CompiledJCL then - CommonCompiledJcl := False; - HasBCB := True; - end; - Items.AddObject(Target.DisplayName, Installer.SelTargets[i]); AddIconFileToImageList(ImageListTargets, Target.Executable); --- 172,175 ---- *************** *** 201,210 **** ComboBoxTargetIDEChange(ComboBoxTargetIDE); - if not CommonCompiledJcl then - Installer.Data.CompileJclDcp := True; - CheckBoxCompileJclDcp.Checked := Installer.Data.CompileJclDcp; - CheckBoxCompileJclDcp.Enabled := CommonCompiledJcl; - CheckBoxCompileJclDcp.Visible := HasBCB; - CheckBoxVerbose.Checked := Installer.Data.Verbose; CheckBoxIgnoreMakeErrors.Checked := Installer.Data.IgnoreMakeErrors; --- 190,193 ---- *************** *** 269,275 **** if FInitializing > 0 then Exit; ! if Sender = CheckBoxCompileJclDcp then ! Installer.Data.CompileJclDcp := CheckBoxCompileJclDcp.Checked ! else if Sender = CheckBoxVerbose then Installer.Data.Verbose := CheckBoxVerbose.Checked else if Sender = CheckBoxIgnoreMakeErrors then --- 252,256 ---- if FInitializing > 0 then Exit; ! if Sender = CheckBoxVerbose then Installer.Data.Verbose := CheckBoxVerbose.Checked else if Sender = CheckBoxIgnoreMakeErrors then Index: FrmConfigPage.dfm =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmConfigPage.dfm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** FrmConfigPage.dfm 29 Dec 2004 23:57:03 -0000 1.19 --- FrmConfigPage.dfm 21 Mar 2005 17:55:04 -0000 1.20 *************** *** 312,330 **** end end - object CheckBoxCompileJclDcp: TCheckBox - Left = 272 - Top = 248 - Width = 241 - Height = 17 - Hint = - 'Deactivate this option if you do not want the installer to'#13#10'comp' + - 'ile/update the JCL .dcp files that are required for'#13#10'C++Builder ' + - 'installation.' - Caption = 'Co&mpile JCL .dcp files for C++Builder' - ParentShowHint = False - ShowHint = True - TabOrder = 4 - OnClick = CheckBoxCompileJclDcpClick - end object CheckBoxVerbose: TCheckBox Left = 272 --- 312,315 ---- *************** *** 362,366 **** Style = csOwnerDrawFixed ItemHeight = 16 ! TabOrder = 5 OnChange = ComboBoxTargetIDEChange OnDrawItem = ComboBoxTargetIDEDrawItem --- 347,351 ---- Style = csOwnerDrawFixed ItemHeight = 16 ! TabOrder = 4 OnChange = ComboBoxTargetIDEChange OnDrawItem = ComboBoxTargetIDEDrawItem *************** *** 375,379 **** ParentShowHint = False ShowHint = True ! TabOrder = 6 OnClick = BtnEditJvclIncClick end --- 360,364 ---- ParentShowHint = False ShowHint = True ! TabOrder = 5 OnClick = BtnEditJvclIncClick end *************** *** 384,388 **** Height = 22 BevelOuter = bvNone ! TabOrder = 7 object LblOptionsFor: TLabel Left = 8 --- 369,373 ---- Height = 22 BevelOuter = bvNone ! TabOrder = 6 object LblOptionsFor: TLabel Left = 8 |