mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-12 07:55:58 +02:00
fixed changing menuitem separator and normal
git-svn-id: trunk@2977 -
This commit is contained in:
parent
c1b5795a39
commit
76ef25f6a6
56
ide/main.pp
56
ide/main.pp
@ -5678,33 +5678,38 @@ var
|
|||||||
begin
|
begin
|
||||||
// first compile all lazarus components (LCL, SynEdit, CodeTools, ...)
|
// first compile all lazarus components (LCL, SynEdit, CodeTools, ...)
|
||||||
SourceNotebook.ClearErrorLines;
|
SourceNotebook.ClearErrorLines;
|
||||||
Result:=BuildLazarus(MiscellaneousOptions.BuildLazOpts,
|
try
|
||||||
EnvironmentOptions.ExternalTools,MacroList,
|
Result:=BuildLazarus(MiscellaneousOptions.BuildLazOpts,
|
||||||
'',Flags+[blfWithoutIDE]);
|
EnvironmentOptions.ExternalTools,MacroList,
|
||||||
|
'',Flags+[blfWithoutIDE]);
|
||||||
|
if Result<>mrOk then exit;
|
||||||
|
|
||||||
// prepare static auto install packages
|
// prepare static auto install packages
|
||||||
PkgOptions:='';
|
PkgOptions:='';
|
||||||
{$IFDEF EnablePkgs}
|
{$IFDEF EnablePkgs}
|
||||||
if (blfWithStaticPackages in Flags)
|
if (blfWithStaticPackages in Flags)
|
||||||
or MiscellaneousOptions.BuildLazOpts.WithStaticPackages then begin
|
or MiscellaneousOptions.BuildLazOpts.WithStaticPackages then begin
|
||||||
// compile auto install static packages
|
// compile auto install static packages
|
||||||
Result:=PkgBoss.DoCompileAutoInstallPackages([]);
|
Result:=PkgBoss.DoCompileAutoInstallPackages([]);
|
||||||
|
if Result<>mrOk then exit;
|
||||||
|
|
||||||
|
// create uses addition for IDE
|
||||||
|
Result:=PkgBoss.DoSaveAutoInstallConfig;
|
||||||
|
if Result<>mrOk then exit;
|
||||||
|
|
||||||
|
// create inherited compiler options
|
||||||
|
PkgOptions:=PkgBoss.DoGetIDEInstallPackageOptions;
|
||||||
|
end;
|
||||||
|
{$ENDIF}
|
||||||
|
|
||||||
|
SourceNotebook.ClearErrorLines;
|
||||||
|
Result:=BuildLazarus(MiscellaneousOptions.BuildLazOpts,
|
||||||
|
EnvironmentOptions.ExternalTools,MacroList,
|
||||||
|
PkgOptions,Flags+[blfOnlyIDE]);
|
||||||
if Result<>mrOk then exit;
|
if Result<>mrOk then exit;
|
||||||
|
finally
|
||||||
// create uses addition for IDE
|
DoCheckFilesOnDisk;
|
||||||
Result:=PkgBoss.DoSaveAutoInstallConfig;
|
|
||||||
if Result<>mrOk then exit;
|
|
||||||
|
|
||||||
// create inherited compiler options
|
|
||||||
PkgOptions:=PkgBoss.DoGetIDEInstallPackageOptions;
|
|
||||||
end;
|
end;
|
||||||
{$ENDIF}
|
|
||||||
|
|
||||||
SourceNotebook.ClearErrorLines;
|
|
||||||
Result:=BuildLazarus(MiscellaneousOptions.BuildLazOpts,
|
|
||||||
EnvironmentOptions.ExternalTools,MacroList,
|
|
||||||
PkgOptions,Flags+[blfOnlyIDE]);
|
|
||||||
DoCheckFilesOnDisk;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TMainIDE.DoConvertDFMtoLFM: TModalResult;
|
function TMainIDE.DoConvertDFMtoLFM: TModalResult;
|
||||||
@ -8632,6 +8637,9 @@ end.
|
|||||||
|
|
||||||
{ =============================================================================
|
{ =============================================================================
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.548 2003/05/01 11:44:03 mattias
|
||||||
|
fixed changing menuitem separator and normal
|
||||||
|
|
||||||
Revision 1.547 2003/05/01 10:40:06 mattias
|
Revision 1.547 2003/05/01 10:40:06 mattias
|
||||||
open special files for lpi files
|
open special files for lpi files
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user