From: Andreas H. <ah...@us...> - 2004-12-29 23:40:55
|
Update of /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29386/install/JVCLInstall/Frames Modified Files: FrmInstall.pas Log Message: Make.exe from D5, C5, D6, C6 and D7 do not work properly with long paths in PATH. Now the Installer uses ExtractShortPathName for the PATH paths The Installer and build.exe support Environment macros like $(JCL). The Installer blocks a Delphi version when the CJCLxx.bpl file is missing. Index: FrmInstall.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmInstall.pas,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FrmInstall.pas 26 Dec 2004 17:24:37 -0000 1.18 --- FrmInstall.pas 29 Dec 2004 23:40:46 -0000 1.19 *************** *** 69,73 **** procedure EvCaptureLine(const Text: string; var Aborted: Boolean); procedure EvIdle(Sender: TObject); - procedure EvMainFormActivate(Sender: TObject); public class function Build(Installer: TInstaller; Client: TWinControl): TFrameInstall; --- 69,72 ---- *************** *** 325,329 **** FormCompile := TFormCompile.Create(Self); try ! Application.MainForm.OnActivate := EvMainFormActivate; FormCompile.Position := poDesigned; Pt := RichEditLog.ClientToScreen(Point((RichEditLog.Width - BtnDetails.Width) div 2, 0)); --- 324,328 ---- FormCompile := TFormCompile.Create(Self); try ! SetWindowLong(FormCompile.Handle, GWL_HWNDPARENT, Integer(Handle)); FormCompile.Position := poDesigned; Pt := RichEditLog.ClientToScreen(Point((RichEditLog.Width - BtnDetails.Width) div 2, 0)); *************** *** 355,358 **** --- 354,358 ---- Compiler.Free; end; + SetWindowLong(FormCompile.Handle, GWL_HWNDPARENT, 0); if Success and Installer.Data.IgnoreMakeErrors then *************** *** 376,380 **** end; finally - Application.MainForm.OnActivate := nil; FormCompile.Free; end; --- 376,379 ---- *************** *** 413,421 **** end; - procedure TFrameInstall.EvMainFormActivate(Sender: TObject); - begin - if Assigned(FormCompile) then - FormCompile.BringToFront; - end; - end. --- 412,414 ---- |