Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 799185
Collapse All | Expand All

(-)file_not_specified_in_diff (-19 / +19 lines)
Line  Link Here
0
-- lazarus/ide/frames/compiler_compilation_options.pas
0
++ lazarus/ide/frames/compiler_compilation_options.pas
Lines 384-428 Link Here
384
  end;
384
  end;
385
385
386
var
386
var
387
  Options: TBaseCompilerOptions absolute AOptions;
387
  CompOptions: TBaseCompilerOptions absolute AOptions;
388
begin
388
begin
389
  Options.CreateMakefileOnBuild := chkCreateMakefile.Checked;
389
  CompOptions.CreateMakefileOnBuild := chkCreateMakefile.Checked;
390
390
391
  // execute before
391
  // execute before
392
  Options.ExecuteBefore.Command := ExecuteBeforeCommandComboBox.Text;
392
  CompOptions.ExecuteBefore.Command := ExecuteBeforeCommandComboBox.Text;
393
  with InputHistories.HistoryLists.GetList('BuildExecBefore',true,rltCaseSensitive) do begin
393
  with InputHistories.HistoryLists.GetList('BuildExecBefore',true,rltCaseSensitive) do begin
394
    Assign(ExecuteBeforeCommandComboBox.Items);
394
    Assign(ExecuteBeforeCommandComboBox.Items);
395
    Push(Options.ExecuteBefore.Command);
395
    Push(CompOptions.ExecuteBefore.Command);
396
  end;
396
  end;
397
397
398
  WriteSettingsParsers(Options.ExecuteBefore,ExecBeforeParsersCheckListBox);
398
  WriteSettingsParsers(CompOptions.ExecuteBefore,ExecBeforeParsersCheckListBox);
399
399
400
  if Options.ExecuteBefore is TProjectCompilationToolOptions then
400
  if CompOptions.ExecuteBefore is TProjectCompilationToolOptions then
401
    Options.ExecuteBefore.CompileReasons :=
401
    CompOptions.ExecuteBefore.CompileReasons :=
402
      MakeCompileReasons(chkExecBeforeCompile, chkExecBeforeBuild, chkExecBeforeRun);
402
      MakeCompileReasons(chkExecBeforeCompile, chkExecBeforeBuild, chkExecBeforeRun);
403
403
404
  // compiler path
404
  // compiler path
405
  Options.CompilerPath := cobCompiler.Text;
405
  CompOptions.CompilerPath := cobCompiler.Text;
406
  EnvironmentOptions.CompilerFileHistory.Assign(cobCompiler.Items);
406
  EnvironmentOptions.CompilerFileHistory.Assign(cobCompiler.Items);
407
  AddToRecentList(Options.CompilerPath,EnvironmentOptions.CompilerFileHistory,30,rltFile);
407
  AddToRecentList(CompOptions.CompilerPath,EnvironmentOptions.CompilerFileHistory,30,rltFile);
408
408
409
  if Options is TProjectCompilerOptions then
409
  if CompOptions is TProjectCompilerOptions then
410
  begin
410
  begin
411
    TProjectCompilerOptions(Options).CompileReasons :=
411
    TProjectCompilerOptions(CompOptions).CompileReasons :=
412
      MakeCompileReasons(chkCompilerCompile, chkCompilerBuild, chkCompilerRun);
412
      MakeCompileReasons(chkCompilerCompile, chkCompilerBuild, chkCompilerRun);
413
  end
413
  end
414
  else if Options is TPkgCompilerOptions then
414
  else if CompOptions is TPkgCompilerOptions then
415
    TPkgCompilerOptions(Options).SkipCompiler := chkCompilerCompile.Checked;
415
    TPkgCompilerOptions(CompOptions).SkipCompiler := chkCompilerCompile.Checked;
416
416
417
  // execute after
417
  // execute after
418
  Options.ExecuteAfter.Command := ExecuteAfterCommandComboBox.Text;
418
  CompOptions.ExecuteAfter.Command := ExecuteAfterCommandComboBox.Text;
419
  with InputHistories.HistoryLists.GetList('BuildExecAfter',true,rltCaseSensitive) do begin
419
  with InputHistories.HistoryLists.GetList('BuildExecAfter',true,rltCaseSensitive) do begin
420
    Assign(ExecuteAfterCommandComboBox.Items);
420
    Assign(ExecuteAfterCommandComboBox.Items);
421
    Push(Options.ExecuteAfter.Command);
421
    Push(CompOptions.ExecuteAfter.Command);
422
  end;
422
  end;
423
  WriteSettingsParsers(Options.ExecuteAfter,ExecAfterParsersCheckListBox);
423
  WriteSettingsParsers(CompOptions.ExecuteAfter,ExecAfterParsersCheckListBox);
424
  if Options.ExecuteAfter is TProjectCompilationToolOptions then
424
  if CompOptions.ExecuteAfter is TProjectCompilationToolOptions then
425
    Options.ExecuteAfter.CompileReasons :=
425
    CompOptions.ExecuteAfter.CompileReasons :=
426
      MakeCompileReasons(chkExecAfterCompile, chkExecAfterBuild, chkExecAfterRun);
426
      MakeCompileReasons(chkExecAfterCompile, chkExecAfterBuild, chkExecAfterRun);
427
end;
427
end;
428
428

Return to bug 799185