From 1cd4b77593a95bb57b42d2e893a77520986766f6 Mon Sep 17 00:00:00 2001 From: mattias Date: Wed, 27 Oct 2010 22:53:32 +0000 Subject: [PATCH] IDE: auto fix case of IDE target cpu/os, bug #17734 git-svn-id: trunk@27912 - --- ide/buildlazdialog.pas | 9 +++++---- ide/buildprofilemanager.pas | 12 +++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index b49f68d0ec..414a56ed6a 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -46,7 +46,8 @@ interface uses Classes, SysUtils, LCLProc, LConvEncoding, Forms, Controls, LCLType, LCLIntf, Graphics, GraphType, StdCtrls, ExtCtrls, Buttons, FileUtil, Dialogs, Types, - Laz_XMLCfg, InterfaceBase, Themes, ComCtrls, + InterfaceBase, Themes, ComCtrls, + DefineTemplates, Laz_XMLCfg, LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs, DialogProcs, IDEMsgIntf, IDEContextHelpEdit, IDEImagesIntf, InputHistory, ExtToolDialog, ExtToolEditDlg, EnvironmentOpts, @@ -999,14 +1000,14 @@ procedure TConfigureBuildLazarusDlg.CopyUIToProfile(AProfile: TBuildLazarusProfi begin AProfile.CleanAll :=CleanAllCheckBox.Checked; AProfile.ExtraOptions :=OptionsEdit.Text; - AProfile.TargetPlatform :=TLCLPlatform(LCLInterfaceRadioGroup.ItemIndex); + AProfile.TargetPlatform :=TLCLPlatform(LCLInterfaceRadioGroup.ItemIndex); AProfile.WithStaticPackages:=WithStaticPackagesCheckBox.Checked; AProfile.UpdateRevisionInc :=UpdateRevisionIncCheckBox.Checked; AProfile.RestartAfterBuild :=RestartAfterBuildCheckBox.Checked; AProfile.ConfirmBuild :=ConfirmBuildCheckBox.Checked; - AProfile.TargetOS :=TargetOSComboBox.Text; + AProfile.TargetOS :=GetFPCTargetOS(TargetOSComboBox.Text); AProfile.TargetDirectory :=TargetDirectoryComboBox.Text; - AProfile.TargetCPU :=TargetCPUComboBox.Text; + AProfile.TargetCPU :=GetFPCTargetCPU(TargetCPUComboBox.Text); end; procedure TConfigureBuildLazarusDlg.UpdateProfileNamesUI; diff --git a/ide/buildprofilemanager.pas b/ide/buildprofilemanager.pas index dd9a9d53c9..1efa0faf5f 100644 --- a/ide/buildprofilemanager.pas +++ b/ide/buildprofilemanager.pas @@ -32,9 +32,11 @@ interface uses Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, - ExtCtrls, Buttons, StdCtrls, ComCtrls, Contnrs, - LazarusIDEStrConsts, LazConf, Laz_XMLCfg, InterfaceBase, IDEProcs, - IDEMsgIntf, IDEContextHelpEdit, IDEImagesIntf, CompilerOptions, ButtonPanel; + ExtCtrls, Buttons, StdCtrls, ComCtrls, Contnrs, ButtonPanel, + Laz_XMLCfg, DefineTemplates, + IDEImagesIntf, IDEMsgIntf, + LazarusIDEStrConsts, LazConf, InterfaceBase, IDEProcs, + IDEContextHelpEdit, CompilerOptions; type @@ -438,8 +440,8 @@ begin MakeModeNames[fMakeModeDefs[i].DefaultMakeMode])); FCleanAll :=XMLConfig.GetValue(Path+'CleanAll/Value',false); FExtraOptions :=XMLConfig.GetValue(Path+'ExtraOptions/Value',''); - TargetOS :=XMLConfig.GetValue(Path+'TargetOS/Value',''); - TargetCPU :=XMLConfig.GetValue(Path+'TargetCPU/Value',''); + TargetOS :=GetFPCTargetOS(XMLConfig.GetValue(Path+'TargetOS/Value','')); + TargetCPU :=GetFPCTargetCPU(XMLConfig.GetValue(Path+'TargetCPU/Value','')); LCLPlatformStr :=XMLConfig.GetValue(Path+'LCLPlatform/Value',''); if LCLPlatformStr='' then fTargetPlatform :=GetDefaultLCLWidgetType