mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-23 05:39:29 +02:00
IDE: don't build examples from Build Lazarus dialog. Fixes issue #20261 (TrackBar Demo is started instead of Lazarus)
git-svn-id: trunk@32811 -
This commit is contained in:
parent
6cb5b7f6ec
commit
3add81398b
@ -9,7 +9,7 @@ object BuildProfileManagerForm: TBuildProfileManagerForm
|
||||
OnCreate = FormCreate
|
||||
OnDestroy = FormDestroy
|
||||
Position = poScreenCenter
|
||||
LCLVersion = '0.9.29'
|
||||
LCLVersion = '0.9.31'
|
||||
object ProfilesPanel: TPanel
|
||||
Left = 0
|
||||
Height = 459
|
||||
@ -41,21 +41,21 @@ object BuildProfileManagerForm: TBuildProfileManagerForm
|
||||
OnClick = MoveDownButtonClick
|
||||
end
|
||||
object MoveUpButton: TToolButton
|
||||
Left = 201
|
||||
Left = 252
|
||||
Top = 0
|
||||
Caption = 'MoveUpButton'
|
||||
ImageIndex = 3
|
||||
OnClick = MoveUpButtonClick
|
||||
end
|
||||
object EditButton: TToolButton
|
||||
Left = 139
|
||||
Left = 173
|
||||
Top = 0
|
||||
Caption = 'EditButton'
|
||||
ImageIndex = 2
|
||||
OnClick = EditButtonClick
|
||||
end
|
||||
object RemoveButton: TToolButton
|
||||
Left = 60
|
||||
Left = 75
|
||||
Top = 0
|
||||
Caption = 'RemoveButton'
|
||||
ImageIndex = 1
|
||||
@ -69,9 +69,9 @@ object BuildProfileManagerForm: TBuildProfileManagerForm
|
||||
OnClick = AddButtonClick
|
||||
end
|
||||
object tbSeparator: TToolButton
|
||||
Left = 197
|
||||
Left = 247
|
||||
Top = 0
|
||||
Width = 4
|
||||
Width = 5
|
||||
Caption = 'tbSeparator'
|
||||
Style = tbsDivider
|
||||
end
|
||||
@ -84,7 +84,9 @@ object BuildProfileManagerForm: TBuildProfileManagerForm
|
||||
Align = alClient
|
||||
ItemHeight = 0
|
||||
OnClick = ProfilesListboxClick
|
||||
ScrollWidth = 354
|
||||
TabOrder = 0
|
||||
TopIndex = -1
|
||||
end
|
||||
object ButtonPanel: TButtonPanel
|
||||
Left = 7
|
||||
@ -92,11 +94,15 @@ object BuildProfileManagerForm: TBuildProfileManagerForm
|
||||
Top = 426
|
||||
Width = 346
|
||||
OKButton.Name = 'OKButton'
|
||||
OKButton.DefaultCaption = True
|
||||
HelpButton.Name = 'HelpButton'
|
||||
HelpButton.DefaultCaption = True
|
||||
HelpButton.OnClick = HelpButtonClick
|
||||
CloseButton.Name = 'CloseButton'
|
||||
CloseButton.DefaultCaption = True
|
||||
CloseButton.Enabled = False
|
||||
CancelButton.Name = 'CancelButton'
|
||||
CancelButton.DefaultCaption = True
|
||||
TabOrder = 2
|
||||
ShowButtons = [pbOK, pbCancel, pbHelp]
|
||||
ShowBevel = False
|
||||
|
@ -80,7 +80,6 @@ type
|
||||
TMakeModeDefs = class(TObjectList)
|
||||
private
|
||||
fItemIDE: TMakeModeDef;
|
||||
fItemExamples: TMakeModeDef;
|
||||
fItemIDEIndex: integer;
|
||||
function GetItems(Index: integer): TMakeModeDef;
|
||||
public
|
||||
@ -92,7 +91,6 @@ type
|
||||
function FindName(const Name: string): TMakeModeDef;
|
||||
public
|
||||
property ItemIDE: TMakeModeDef read fItemIDE;
|
||||
property ItemExamples: TMakeModeDef read fItemExamples;
|
||||
property Items[Index: integer]: TMakeModeDef read GetItems; default;
|
||||
end;
|
||||
|
||||
@ -226,7 +224,7 @@ implementation
|
||||
{$R *.lfm}
|
||||
|
||||
uses
|
||||
AddProfileDialog; // , BuildLazDialog
|
||||
AddProfileDialog;
|
||||
|
||||
const
|
||||
DefaultTargetDirectory = ''; // empty will be replaced by '$(ConfDir)/bin';
|
||||
@ -307,15 +305,11 @@ end;
|
||||
constructor TMakeModeDefs.Create;
|
||||
begin
|
||||
inherited Create;
|
||||
// Hard-coded build values.
|
||||
// IDE
|
||||
// Hard-coded build values = IDE
|
||||
FItemIDE:=TMakeModeDef.Create('IDE',lisIDE,'',mmBuild);
|
||||
FItemIDE.Commands[mmBuild]:='ide';
|
||||
FItemIDE.Commands[mmCleanBuild]:='cleanide ide';
|
||||
fItemIDEIndex:=Add(FItemIDE);
|
||||
// Examples
|
||||
FItemExamples:=TMakeModeDef.Create('Examples',lisExamples,'examples',mmBuild);
|
||||
Add(FItemExamples);
|
||||
end;
|
||||
|
||||
destructor TMakeModeDefs.Destroy;
|
||||
@ -326,7 +320,6 @@ end;
|
||||
procedure TMakeModeDefs.Clear;
|
||||
begin
|
||||
FItemIDE:=nil;
|
||||
FItemExamples:=nil;
|
||||
inherited Clear; // Items are freed here, too.
|
||||
end;
|
||||
|
||||
@ -342,8 +335,7 @@ begin
|
||||
NewItem.Assign(SrcItem);
|
||||
Add(NewItem);
|
||||
end;
|
||||
fItemIDE :=FindName('IDE');
|
||||
fItemExamples:=FindName('Examples');
|
||||
fItemIDE:=FindName('IDE');
|
||||
fItemIDEIndex:=Source.fItemIDEIndex;
|
||||
end;
|
||||
|
||||
|
@ -1955,8 +1955,7 @@ resourcestring
|
||||
dlgCCOTestMissingPPU = 'Test: Checking missing fpc ppu ...';
|
||||
dlgCCOTestCompilerDate = 'Test: Checking compiler date ...';
|
||||
lisCCOErrorCaption = 'Error';
|
||||
lisCompilerDoesNotSupportTarget = 'Compiler "%s" does not support target %'
|
||||
+'s-%s';
|
||||
lisCompilerDoesNotSupportTarget = 'Compiler "%s" does not support target %s-%s';
|
||||
lisInvalidMode = 'Invalid mode %s';
|
||||
lisTheProjectCompilerOptionsAndTheDirectivesInTheMain = 'The project '
|
||||
+'compiler options and the directives in the main source differ. For the '
|
||||
@ -2014,8 +2013,7 @@ resourcestring
|
||||
lisTheOutputDirectoryOfIsListedInTheUnitSearchPathOf = 'The output '
|
||||
+'directory of %s is listed in the unit search path of %s.';
|
||||
lisTheOutputDirectoryShouldBeASeparateDirectoryAndNot = ' The output '
|
||||
+'directory should be a separate directory and not contain any source '
|
||||
+'files.';
|
||||
+'directory should be a separate directory and not contain any source files.';
|
||||
lisTheOutputDirectoryOfIsListedInTheIncludeSearchPath = 'The output '
|
||||
+'directory of %s is listed in the include search path of %s.';
|
||||
lisTheOutputDirectoryOfIsListedInTheInheritedUnitSear = 'The output '
|
||||
@ -2842,7 +2840,6 @@ resourcestring
|
||||
lisTheProgramMakeWasNotFoundThisToolIsNeededToBuildLa = 'The program %smake%'
|
||||
+'s was not found.%sThis tool is needed to build lazarus.%s';
|
||||
lisIDE = 'IDE';
|
||||
lisExamples = 'Examples';
|
||||
lisConfigureBuildLazarus = 'Configure %sBuild Lazarus%s';
|
||||
lisLazBuildCleanAll = 'Clean all';
|
||||
lisLazBuildBuildComponentsSynEditCodeTools = 'Build components (SynEdit, CodeTools)';
|
||||
|
Loading…
Reference in New Issue
Block a user