paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 21:59:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation, changed property name back to ExtraOptions.

Browse Source 
git-svn-id: trunk@28021 -
This commit is contained in:
juha 2010-11-01 08:48:53 +00:00
parent 73922ebfe5
commit 56f3449ae8
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/buildlazdialog.pas
View File

@ -411,7 +411,7 @@ begin
MMDef:=Profiles.MakeModeDefs[ItemIndex]; MMDef:=Profiles.MakeModeDefs[ItemIndex];
// create extra options // create extra options
ExtraOptions:=Options.ExOptions; ExtraOptions:=Options.ExtraOptions;
if MMDef=Profiles.MakeModeDefs.ItemIDE then begin if MMDef=Profiles.MakeModeDefs.ItemIDE then begin
// check for special IDE config file // check for special IDE config file
@ -995,7 +995,7 @@ end;
procedure TConfigureBuildLazarusDlg.CopyProfileToUI(AProfile: TBuildLazarusProfile); procedure TConfigureBuildLazarusDlg.CopyProfileToUI(AProfile: TBuildLazarusProfile);
begin begin
CleanAllCheckBox.Checked :=AProfile.CleanAll; CleanAllCheckBox.Checked :=AProfile.CleanAll;
OptionsMemo.Text :=AProfile.ExOptions; OptionsMemo.Text :=AProfile.ExtraOptions;
LCLInterfaceRadioGroup.ItemIndex :=ord(AProfile.TargetPlatform); LCLInterfaceRadioGroup.ItemIndex :=ord(AProfile.TargetPlatform);
WithStaticPackagesCheckBox.Checked:=AProfile.WithStaticPackages; WithStaticPackagesCheckBox.Checked:=AProfile.WithStaticPackages;
UpdateRevisionIncCheckBox.Checked :=AProfile.UpdateRevisionInc; UpdateRevisionIncCheckBox.Checked :=AProfile.UpdateRevisionInc;
@ -1008,7 +1008,7 @@ end;
procedure TConfigureBuildLazarusDlg.CopyUIToProfile(AProfile: TBuildLazarusProfile); procedure TConfigureBuildLazarusDlg.CopyUIToProfile(AProfile: TBuildLazarusProfile);
begin begin
AProfile.CleanAll :=CleanAllCheckBox.Checked; AProfile.CleanAll :=CleanAllCheckBox.Checked;
AProfile.ExOptions :=OptionsMemo.Text; AProfile.ExtraOptions :=OptionsMemo.Text;
AProfile.TargetPlatform :=TLCLPlatform(LCLInterfaceRadioGroup.ItemIndex); AProfile.TargetPlatform :=TLCLPlatform(LCLInterfaceRadioGroup.ItemIndex);
AProfile.WithStaticPackages:=WithStaticPackagesCheckBox.Checked; AProfile.WithStaticPackages:=WithStaticPackagesCheckBox.Checked;
AProfile.UpdateRevisionInc :=UpdateRevisionIncCheckBox.Checked; AProfile.UpdateRevisionInc :=UpdateRevisionIncCheckBox.Checked;

4
ide/buildmanager.pas
View File

@ -681,7 +681,7 @@ begin
ADefTempl:=CreateLazarusSourceTemplate( ADefTempl:=CreateLazarusSourceTemplate(
'$('+ExternalMacroStart+'LazarusDir)', '$('+ExternalMacroStart+'LazarusDir)',
'$('+ExternalMacroStart+'LCLWidgetType)', '$('+ExternalMacroStart+'LCLWidgetType)',
MiscellaneousOptions.BuildLazOpts.ExOptions,nil); MiscellaneousOptions.BuildLazOpts.ExtraOptions,nil);
AddTemplate(ADefTempl,true, AddTemplate(ADefTempl,true,
lisNOTECouldNotCreateDefineTemplateForLazarusSources); lisNOTECouldNotCreateDefineTemplateForLazarusSources);
end; end;
@ -1366,7 +1366,7 @@ begin
if (MiscellaneousOptions<>nil) if (MiscellaneousOptions<>nil)
and (MiscellaneousOptions.BuildLazOpts<>nil) and (MiscellaneousOptions.BuildLazOpts<>nil)
then then
Result:=MiscellaneousOptions.BuildLazOpts.ExOptions Result:=MiscellaneousOptions.BuildLazOpts.ExtraOptions
else else
Result:=''; Result:='';
end; end;

16
ide/buildprofilemanager.pas
View File

@ -113,7 +113,7 @@ type
fOwnerCnt: TBuildLazarusProfiles; fOwnerCnt: TBuildLazarusProfiles;
fName: string; fName: string;
fCleanAll: boolean; fCleanAll: boolean;
fExOptions: string; fExtraOptions: string;
fTargetOS: string; fTargetOS: string;
fTargetDirectory: string; fTargetDirectory: string;
fTargetCPU: string; fTargetCPU: string;
@ -125,7 +125,7 @@ type
fMakeModes: TMakeModeSettings; fMakeModes: TMakeModeSettings;
function GetTargetPlatform: TLCLPlatform; function GetTargetPlatform: TLCLPlatform;
procedure SetExOptions(const AValue: string); procedure SetExtraOptions(const AValue: string);
procedure SetTargetCPU(const AValue: string); procedure SetTargetCPU(const AValue: string);
procedure SetTargetOS(const AValue: string); procedure SetTargetOS(const AValue: string);
procedure SetTargetPlatform(const AValue: TLCLPlatform); procedure SetTargetPlatform(const AValue: TLCLPlatform);
@ -140,7 +140,7 @@ type
public public
property Name: string read fName; property Name: string read fName;
property CleanAll: boolean read fCleanAll write fCleanAll; property CleanAll: boolean read fCleanAll write fCleanAll;
property ExOptions: string read fExOptions write SetExOptions; property ExtraOptions: string read fExtraOptions write SetExtraOptions;
property TargetOS: string read fTargetOS write SetTargetOS; property TargetOS: string read fTargetOS write SetTargetOS;
property TargetDirectory: string read fTargetDirectory write fTargetDirectory; property TargetDirectory: string read fTargetDirectory write fTargetDirectory;
property TargetCPU: string read fTargetCPU write SetTargetCPU; property TargetCPU: string read fTargetCPU write SetTargetCPU;
@ -418,7 +418,7 @@ begin
Path+'Build'+fMakeModeDefs[i].Name+'/Value', Path+'Build'+fMakeModeDefs[i].Name+'/Value',
MakeModeNames[fMakeModeDefs[i].DefaultMakeMode])); MakeModeNames[fMakeModeDefs[i].DefaultMakeMode]));
FCleanAll :=XMLConfig.GetValue(Path+'CleanAll/Value',false); FCleanAll :=XMLConfig.GetValue(Path+'CleanAll/Value',false);
fExOptions :=XMLConfig.GetValue(Path+'ExtraOptions/Value',''); fExtraOptions :=XMLConfig.GetValue(Path+'ExtraOptions/Value','');
TargetOS :=XMLConfig.GetValue(Path+'TargetOS/Value',''); TargetOS :=XMLConfig.GetValue(Path+'TargetOS/Value','');
TargetCPU :=XMLConfig.GetValue(Path+'TargetCPU/Value',''); TargetCPU :=XMLConfig.GetValue(Path+'TargetCPU/Value','');
LCLPlatformStr :=XMLConfig.GetValue(Path+'LCLPlatform/Value',''); LCLPlatformStr :=XMLConfig.GetValue(Path+'LCLPlatform/Value','');
@ -444,7 +444,7 @@ begin
MakeModeNames[fMakeModeDefs[i].DefaultMakeMode]); MakeModeNames[fMakeModeDefs[i].DefaultMakeMode]);
end; end;
XMLConfig.SetDeleteValue(Path+'CleanAll/Value',FCleanAll,false); XMLConfig.SetDeleteValue(Path+'CleanAll/Value',FCleanAll,false);
XMLConfig.SetDeleteValue(Path+'ExtraOptions/Value',fExOptions,''); XMLConfig.SetDeleteValue(Path+'ExtraOptions/Value',fExtraOptions,'');
XMLConfig.SetDeleteValue(Path+'TargetOS/Value',TargetOS,''); XMLConfig.SetDeleteValue(Path+'TargetOS/Value',TargetOS,'');
XMLConfig.SetDeleteValue(Path+'TargetCPU/Value',TargetCPU,''); XMLConfig.SetDeleteValue(Path+'TargetCPU/Value',TargetCPU,'');
XMLConfig.SetDeleteValue(Path+'LCLPlatform/Value', XMLConfig.SetDeleteValue(Path+'LCLPlatform/Value',
@ -465,7 +465,7 @@ begin
if ACopyName then if ACopyName then
fName :=Source.Name; fName :=Source.Name;
CleanAll :=Source.CleanAll; CleanAll :=Source.CleanAll;
ExOptions :=Source.ExOptions; ExtraOptions :=Source.ExtraOptions;
TargetOS :=Source.TargetOS; TargetOS :=Source.TargetOS;
TargetDirectory :=Source.TargetDirectory; TargetDirectory :=Source.TargetDirectory;
TargetCPU :=Source.TargetCPU; TargetCPU :=Source.TargetCPU;
@ -511,9 +511,9 @@ begin
fTargetPlatform:=AValue; fTargetPlatform:=AValue;
end; end;
procedure TBuildLazarusProfile.SetExOptions(const AValue: string); procedure TBuildLazarusProfile.SetExtraOptions(const AValue: string);
begin begin
fExOptions:=Trim(StringReplace(AValue, sLineBreak, ' ', [rfReplaceAll])); fExtraOptions:=Trim(StringReplace(AValue, sLineBreak, ' ', [rfReplaceAll]));
end; end;

4
ide/main.pp
View File

@ -4266,7 +4266,7 @@ begin
if Assigned(LazSrcDirTemplate) then begin if Assigned(LazSrcDirTemplate) then begin
CmdLineDefines:=CodeToolBoss.DefinePool.CreateFPCCommandLineDefines( CmdLineDefines:=CodeToolBoss.DefinePool.CreateFPCCommandLineDefines(
StdDefTemplLazarusBuildOpts, StdDefTemplLazarusBuildOpts,
MiscellaneousOptions.BuildLazProfiles.Current.ExOptions, MiscellaneousOptions.BuildLazProfiles.Current.ExtraOptions,
true,CodeToolsOpts); true,CodeToolsOpts);
CodeToolBoss.DefineTree.ReplaceChild(LazSrcDirTemplate,CmdLineDefines, CodeToolBoss.DefineTree.ReplaceChild(LazSrcDirTemplate,CmdLineDefines,
StdDefTemplLazarusBuildOpts); StdDefTemplLazarusBuildOpts);
@ -11556,7 +11556,7 @@ begin
if Assigned(LazSrcDirTemplate) then begin if Assigned(LazSrcDirTemplate) then begin
CmdLineDefines:=CodeToolBoss.DefinePool.CreateFPCCommandLineDefines( CmdLineDefines:=CodeToolBoss.DefinePool.CreateFPCCommandLineDefines(
StdDefTemplLazarusBuildOpts, StdDefTemplLazarusBuildOpts,
BuildLazProfiles.Current.ExOptions,true,CodeToolsOpts); BuildLazProfiles.Current.ExtraOptions,true,CodeToolsOpts);
CodeToolBoss.DefineTree.ReplaceChild(LazSrcDirTemplate,CmdLineDefines, CodeToolBoss.DefineTree.ReplaceChild(LazSrcDirTemplate,CmdLineDefines,
StdDefTemplLazarusBuildOpts); StdDefTemplLazarusBuildOpts);
end; end;