diff --git a/ide/buildlazdialog.lfm b/ide/buildlazdialog.lfm index c3dea24d29..42b5203f7f 100644 --- a/ide/buildlazdialog.lfm +++ b/ide/buildlazdialog.lfm @@ -15,22 +15,22 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg OnDestroy = FormDestroy OnShow = FormShow Position = poScreenCenter - LCLVersion = '0.9.29' + LCLVersion = '0.9.31' object DetailsPanel: TPanel Left = 0 - Height = 491 + Height = 483 Top = 0 Width = 700 Align = alClient - ClientHeight = 491 + ClientHeight = 483 ClientWidth = 700 TabOrder = 0 object BuildProfileLabel: TLabel AnchorSideTop.Control = DetailsPanel Left = 8 - Height = 14 + Height = 18 Top = 12 - Width = 69 + Width = 101 BorderSpacing.Top = 5 BorderSpacing.Around = 6 Caption = 'Profile to Build' @@ -42,7 +42,7 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Side = asrBottom Left = 6 Height = 24 - Top = 36 + Top = 41 Width = 410 DragReorder = False Sections = <> @@ -58,8 +58,8 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = LCLWidgetTypeComboBox Left = 4 - Height = 198 - Top = 60 + Height = 157 + Top = 65 Width = 412 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Bottom = 6 @@ -78,15 +78,15 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = BuildProfileLabel AnchorSideTop.Side = asrCenter AnchorSideRight.Control = BuildProfileButton - Left = 83 - Height = 21 + Left = 115 + Height = 27 Hint = 'Name of the active profile.' - Top = 9 - Width = 566 + Top = 8 + Width = 487 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Right = 6 - ItemHeight = 13 + ItemHeight = 0 OnSelect = BuildProfileComboBoxSelect ParentShowHint = False ShowHint = True @@ -99,11 +99,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = DetailsPanel AnchorSideRight.Side = asrBottom AnchorSideBottom.Side = asrBottom - Left = 655 - Height = 23 + Left = 608 + Height = 27 Hint = 'Manage profiles' Top = 8 - Width = 38 + Width = 85 Anchors = [akTop, akRight] AutoSize = True BorderSpacing.Left = 6 @@ -118,9 +118,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideLeft.Control = LCLWidgetTypeLabel AnchorSideTop.Control = OptionsMemo Left = 6 - Height = 14 - Top = 295 - Width = 38 + Height = 18 + Top = 265 + Width = 55 Alignment = taRightJustify BorderSpacing.Top = 4 Caption = 'Options' @@ -133,11 +133,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = BuildProfileButton AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = TargetDirectoryComboBox - Left = 120 + Left = 151 Height = 56 Hint = 'Options passed to compiler' - Top = 291 - Width = 573 + Top = 261 + Width = 542 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Bottom = 6 Lines.Strings = ( @@ -155,9 +155,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = MakeModeListHeader AnchorSideTop.Side = asrCenter Left = 423 - Height = 14 - Top = 41 - Width = 37 + Height = 18 + Top = 44 + Width = 51 BorderSpacing.Left = 7 Caption = 'Defines' ParentColor = False @@ -171,9 +171,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideBottom.Control = MakeModeListBox AnchorSideBottom.Side = asrBottom Left = 423 - Height = 201 + Height = 158 Hint = 'Defines without -d' - Top = 57 + Top = 64 Width = 270 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 2 @@ -188,9 +188,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = LCLWidgetTypeComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 14 - Top = 267 - Width = 82 + Height = 18 + Top = 232 + Width = 113 BorderSpacing.Left = 5 Caption = 'LCL Widget Type' ParentColor = False @@ -201,14 +201,14 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = OptionsMemo - Left = 120 - Height = 21 - Top = 264 + Left = 151 + Height = 27 + Top = 228 Width = 163 Anchors = [akLeft, akBottom] BorderSpacing.Left = 32 BorderSpacing.Bottom = 6 - ItemHeight = 13 + ItemHeight = 0 Style = csDropDownList TabOrder = 4 end @@ -217,9 +217,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = TargetDirectoryComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 14 - Top = 356 - Width = 80 + Height = 18 + Top = 327 + Width = 112 Alignment = taRightJustify Caption = 'Target Directory' ParentColor = False @@ -229,14 +229,14 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = TargetDirectoryButton AnchorSideBottom.Control = TargetOSComboBox - Left = 120 - Height = 21 - Top = 353 - Width = 529 + Left = 151 + Height = 27 + Top = 323 + Width = 451 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Right = 6 BorderSpacing.Bottom = 6 - ItemHeight = 13 + ItemHeight = 0 TabOrder = 6 end object TargetOSLabel: TLabel @@ -244,9 +244,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = TargetOSComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 14 - Top = 383 - Width = 50 + Height = 18 + Top = 360 + Width = 67 Alignment = taRightJustify Caption = 'Target OS' ParentColor = False @@ -256,9 +256,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = TargetCPUComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 14 - Top = 410 - Width = 56 + Height = 18 + Top = 393 + Width = 75 Alignment = taRightJustify Caption = 'Target CPU' ParentColor = False @@ -269,11 +269,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = CleanAllCheckBox AnchorSideTop.Side = asrCenter AnchorSideBottom.Side = asrBottom - Left = 417 - Height = 17 + Left = 495 + Height = 22 Hint = 'Increment revision? (ToDo: get a better hint)' - Top = 382 - Width = 155 + Top = 358 + Width = 220 BorderSpacing.Left = 12 BorderSpacing.Top = 6 Caption = 'UpdateRevisionIncCheckBox' @@ -287,11 +287,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Control = TargetOSComboBox AnchorSideTop.Side = asrCenter AnchorSideRight.Side = asrBottom - Left = 302 - Height = 17 + Left = 333 + Height = 22 Hint = 'Like "make clean" on cmd line' - Top = 382 - Width = 103 + Top = 358 + Width = 150 BorderSpacing.Left = 19 Caption = 'CleanAllCheckBox' ParentShowHint = False @@ -304,37 +304,22 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = TargetOSComboBox AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = CommonsDividerBevel - Left = 120 - Height = 21 - Top = 407 + Left = 151 + Height = 27 + Top = 389 Width = 163 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Bottom = 6 - ItemHeight = 13 + ItemHeight = 0 TabOrder = 9 end - object WithStaticPackagesCheckBox: TCheckBox - AnchorSideLeft.Control = CleanAllCheckBox - AnchorSideTop.Control = TargetCPUComboBox - AnchorSideTop.Side = asrCenter - AnchorSideBottom.Side = asrBottom - Left = 302 - Height = 17 - Hint = 'Compile selected static packages into Lazarus binary' - Top = 409 - Width = 159 - Caption = 'WithStaticPackagesCheckBox' - ParentShowHint = False - ShowHint = True - TabOrder = 12 - end object CommonsDividerBevel: TDividerBevel AnchorSideLeft.Control = DetailsPanel AnchorSideTop.Side = asrBottom AnchorSideBottom.Control = DefinesButton Left = 8 Height = 17 - Top = 434 + Top = 422 Width = 686 Caption = 'CommonsDividerBevel' Anchors = [akLeft, akRight, akBottom] @@ -348,30 +333,30 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideTop.Side = asrCenter AnchorSideBottom.Side = asrBottom Left = 8 - Height = 17 + Height = 22 Hint = 'Restart Lazarus automatically after building the IDE. Has no effect when building other parts' - Top = 460 - Width = 148 + Top = 447 + Width = 215 BorderSpacing.Top = 4 Caption = 'RestartAfterBuildCheckBox' ParentShowHint = False ShowHint = True - TabOrder = 13 + TabOrder = 12 end object ConfirmBuildCheckBox: TCheckBox AnchorSideLeft.Control = RestartAfterBuildCheckBox AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = RestartAfterBuildCheckBox - Left = 168 - Height = 17 + Left = 235 + Height = 22 Hint = 'Show confirmation dialog when building directly from Tools menu' - Top = 460 - Width = 124 + Top = 447 + Width = 183 BorderSpacing.Left = 12 Caption = 'ConfirmBuildCheckBox' ParentShowHint = False ShowHint = True - TabOrder = 14 + TabOrder = 13 end object DefinesButton: TButton AnchorSideTop.Side = asrBottom @@ -379,11 +364,11 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = DetailsPanel AnchorSideBottom.Side = asrBottom - Left = 610 - Height = 23 + Left = 595 + Height = 27 Hint = 'Edit list of defines which can be used by any profile' - Top = 457 - Width = 83 + Top = 445 + Width = 98 Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Bottom = 10 @@ -391,7 +376,7 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg OnClick = DefinesButtonClick ParentShowHint = False ShowHint = True - TabOrder = 15 + TabOrder = 14 end object TargetDirectoryButton: TButton AnchorSideLeft.Side = asrBottom @@ -400,10 +385,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = DetailsPanel AnchorSideRight.Side = asrBottom AnchorSideBottom.Side = asrBottom - Left = 655 - Height = 23 - Top = 352 - Width = 38 + Left = 608 + Height = 27 + Top = 323 + Width = 85 Anchors = [akTop, akRight] AutoSize = True BorderSpacing.Left = 6 @@ -418,33 +403,33 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = LCLWidgetTypeComboBox AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = TargetCPUComboBox - Left = 120 - Height = 21 - Top = 380 + Left = 151 + Height = 27 + Top = 356 Width = 163 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Bottom = 6 - ItemHeight = 13 + ItemHeight = 0 TabOrder = 8 end end object CBLDBtnPanel: TPanel AnchorSideTop.Side = asrBottom Left = 0 - Height = 38 - Top = 491 + Height = 46 + Top = 483 Width = 700 Align = alBottom AutoSize = True BevelOuter = bvNone - ClientHeight = 38 + ClientHeight = 46 ClientWidth = 700 TabOrder = 1 object CancelButton: TBitBtn - Left = 617 - Height = 26 + Left = 605 + Height = 34 Top = 6 - Width = 77 + Width = 89 Align = alRight AutoSize = True BorderSpacing.Around = 6 @@ -456,10 +441,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg TabOrder = 4 end object SaveSettingsButton: TBitBtn - Left = 520 - Height = 26 + Left = 493 + Height = 34 Top = 6 - Width = 91 + Width = 106 Align = alRight AutoSize = True BorderSpacing.Around = 6 @@ -469,10 +454,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg TabOrder = 3 end object CompileButton: TBitBtn - Left = 331 - Height = 26 + Left = 253 + Height = 34 Top = 6 - Width = 63 + Width = 85 Align = alRight AutoSize = True BorderSpacing.Around = 6 @@ -483,9 +468,9 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg end object HelpButton: TBitBtn Left = 6 - Height = 26 + Height = 34 Top = 6 - Width = 66 + Width = 85 Align = alLeft AutoSize = True BorderSpacing.Around = 6 @@ -496,10 +481,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg TabOrder = 0 end object CompileAdvancedButton: TBitBtn - Left = 400 - Height = 26 + Left = 344 + Height = 34 Top = 6 - Width = 114 + Width = 143 Align = alRight AutoSize = True BorderSpacing.Around = 6 diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index b80ab0c8a8..a165c37302 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -63,11 +63,8 @@ uses type TBuildLazarusFlag = ( - blfWithoutCompilingIDE, // skip compiling stage of IDE - blfWithoutLinkingIDE, // skip linking stage of IDE - blfOnlyIDE, // skip all but IDE + blfOnlyIDE, // skip all but IDE (for example build IDE, but not examples) blfDontClean, // ignore clean up - blfWithStaticPackages, // build with IDE static design time packages blfUseMakeIDECfg, // use idemake.cfg blfReplaceExe // ignore OSLocksExecutables and do not create lazarus.new.exe ); @@ -110,7 +107,6 @@ type TargetOSComboBox: TComboBox; TargetOSLabel: TLabel; UpdateRevisionIncCheckBox: TCheckBox; - WithStaticPackagesCheckBox: TCheckBox; procedure BuildProfileButtonClick(Sender: TObject); procedure BuildProfileComboBoxSelect(Sender: TObject); procedure CompileAdvancedButtonClick(Sender: TObject); @@ -239,10 +235,6 @@ var begin Result:=mrCancel; - if (blfOnlyIDE in Flags) and (blfWithoutLinkingIDE in Flags) - and (blfWithoutCompilingIDE in Flags) then - exit(mrOk); // only IDE, but skip both parts -> nothing to do - Options:=Profiles.Current; if LazarusIDE<>nil then LazarusIDE.MainBarSubTitle:=Options.Name; @@ -299,27 +291,18 @@ begin // calculate make mode CurMakeMode:=Profiles.Current.MakeModes[i]; if (blfOnlyIDE in Flags) then begin - if (MMDef<>Profiles.MakeModeDefs.ItemIDE) then + if MMDef=Profiles.MakeModeDefs.ItemIDE then begin + if CurMakeMode=mmNone then + CurMakeMode:=mmBuild; + end else CurMakeMode:=mmNone; end; - if (MMDef=Profiles.MakeModeDefs.ItemIDE) then - begin - if (blfWithoutCompilingIDE in Flags) and (blfWithoutLinkingIDE in Flags) - then - CurMakeMode:=mmNone - // build the IDE when blfOnlyIDE is set, eg. when installing packages - // even if that build node is disabled in configure build lazarus dialog - else if (blfOnlyIDE in Flags) and (CurMakeMode=mmNone) then - CurMakeMode := mmBuild; - end; - + //debugln(['BuildLazarus Def=',MMDef.Name,' Mode=',ord(CurMakeMode)]); if CurMakeMode=mmNone then continue; if (blfDontClean in Flags) and (CurMakeMode=mmCleanBuild) then CurMakeMode:=mmBuild; Tool.Title:=MMDef.Description; - if (MMDef=Profiles.MakeModeDefs.ItemIDE) and (blfWithoutLinkingIDE in Flags) then - Tool.Title:=lisCompileIDEWithoutLinking; Tool.WorkingDirectory:=WorkingDirectory; Tool.CmdLineParams:=MMDef.Commands[CurMakeMode]; // append extra options @@ -444,10 +427,6 @@ begin AppendExtraOption('@'+MakeIDECfgFilename); end; end; - // check if linking should be skipped - if blfWithoutLinkingIDE in Flags then begin - AppendExtraOption('-Cn'); - end; // set target filename and target directory: // 1. the user has set a target directory @@ -780,7 +759,6 @@ begin TargetDirectoryLabel.Caption := lisLazBuildTargetDirectory; CleanAllCheckBox.Caption := lisLazBuildCleanAll; - WithStaticPackagesCheckBox.Caption := lisLazBuildWithStaticPackages; UpdateRevisionIncCheckBox.Caption := lisLazBuildUpdateRevInc; CommonsDividerBevel.Caption := lisLazBuildCommonSettings; @@ -803,8 +781,6 @@ begin CleanAllCheckBox.Hint := lisLazBuildLikeMakeCleanOnCmdLine; UpdateRevisionIncCheckBox.Hint := lisLazBuildUpdateRevisionInfoInAboutLazarusDialog; - WithStaticPackagesCheckBox.Hint := - lisLazBuildCompileSelectedStaticPackagesIntoLazarusBinary; RestartAfterBuildCheckBox.Hint := lisLazBuildRestartLazarusAutomaticallyAfterBuildingTheIDEHasN; ConfirmBuildCheckBox.Hint := @@ -1037,7 +1013,6 @@ var begin CleanAllCheckBox.Checked :=AProfile.CleanAll; LCLWidgetTypeComboBox.ItemIndex :=ord(AProfile.TargetPlatform); - WithStaticPackagesCheckBox.Checked:=AProfile.WithStaticPackages; UpdateRevisionIncCheckBox.Checked :=AProfile.UpdateRevisionInc; TargetOSComboBox.Text :=AProfile.TargetOS; TargetDirectoryComboBox.Text :=AProfile.TargetDirectory; @@ -1053,7 +1028,6 @@ var begin AProfile.CleanAll :=CleanAllCheckBox.Checked; AProfile.TargetPlatform :=TLCLPlatform(LCLWidgetTypeComboBox.ItemIndex); - AProfile.WithStaticPackages:=WithStaticPackagesCheckBox.Checked; AProfile.UpdateRevisionInc :=UpdateRevisionIncCheckBox.Checked; AProfile.TargetOS :=TargetOSComboBox.Text; AProfile.TargetDirectory :=TargetDirectoryComboBox.Text; diff --git a/ide/buildprofilemanager.pas b/ide/buildprofilemanager.pas index 82b6dff434..208f9969cb 100644 --- a/ide/buildprofilemanager.pas +++ b/ide/buildprofilemanager.pas @@ -109,7 +109,6 @@ type fTargetDirectory: string; fTargetCPU: string; fTargetPlatform: TLCLPlatform; - fWithStaticPackages: boolean; fUpdateRevisionInc: boolean; // User defined options. fOptions: TStringList; @@ -140,7 +139,6 @@ type property TargetDirectory: string read fTargetDirectory write fTargetDirectory; property TargetCPU: string read fTargetCPU write SetTargetCPU; property TargetPlatform: TLCLPlatform read GetTargetPlatform write SetTargetPlatform; - property WithStaticPackages: boolean read fWithStaticPackages write fWithStaticPackages; property UpdateRevisionInc: boolean read fUpdateRevisionInc write fUpdateRevisionInc; property OptionsLines: TStringList read fOptions; property Defines: TStringList read fDefines; @@ -407,7 +405,6 @@ begin fTargetPlatform :=DirNameToLCLPlatform(LCLPlatformStr); FTargetDirectory:=AppendPathDelim(SetDirSeparators( XMLConfig.GetValue(Path+'TargetDirectory/Value', DefaultTargetDirectory))); - FWithStaticPackages:=XMLConfig.GetValue(Path+'WithStaticPackages/Value',true); FUpdateRevisionInc :=XMLConfig.GetValue(Path+'UpdateRevisionInc/Value',true); LoadStringList(XMLConfig,fOptions,Path+'Options/'); if fOptions.Count=0 then // Support a syntax used earlier by profiles. @@ -433,7 +430,6 @@ begin ''); //LCLPlatformDirNames[GetDefaultLCLWidgetType] XMLConfig.SetDeleteValue(Path+'TargetDirectory/Value', FTargetDirectory,DefaultTargetDirectory); - XMLConfig.SetDeleteValue(Path+'WithStaticPackages/Value',FWithStaticPackages,true); XMLConfig.SetDeleteValue(Path+'UpdateRevisionInc/Value',FUpdateRevisionInc,true); SaveStringList(XMLConfig,fOptions,Path+'Options/'); SaveStringList(XMLConfig,fDefines,Path+'Defines/'); @@ -451,7 +447,6 @@ begin TargetDirectory :=Source.TargetDirectory; TargetCPU :=Source.TargetCPU; TargetPlatform :=Source.TargetPlatform; - WithStaticPackages:=Source.WithStaticPackages; UpdateRevisionInc :=Source.UpdateRevisionInc; fOptions.Assign(Source.fOptions); fDefines.Assign(Source.fDefines); @@ -591,7 +586,6 @@ begin with Profile, fOwnerCnt do begin fCleanAll:=False; fTargetPlatform:=Platfrm; - fWithStaticPackages:=False; for i:=0 to fMakeModeDefs.Count-1 do if fMakeModeDefs[i].Description=lisIDE then fMakeModes[i]:=mmBuild @@ -605,7 +599,6 @@ begin with Profile, fOwnerCnt do begin fCleanAll:=False; fTargetPlatform:=Platfrm; - fWithStaticPackages:=True; fUpdateRevisionInc:=True; fOptions.Add('-gw -gl -godwarfsets -gh -gt -Co -Cr -Ci -Sa'); for i:=0 to fMakeModeDefs.Count-1 do @@ -622,7 +615,6 @@ begin with Profile, fOwnerCnt do begin fCleanAll:=False; fTargetPlatform:=Platfrm; - fWithStaticPackages:=True; fUpdateRevisionInc:=True; fOptions.Add('-O2 -g- -Xs'); for i:=0 to fMakeModeDefs.Count-1 do @@ -638,7 +630,6 @@ begin with Profile, fOwnerCnt do begin fCleanAll:=False; fTargetPlatform:=Platfrm; - fWithStaticPackages:=True; fUpdateRevisionInc:=True; for i:=0 to fMakeModeDefs.Count-1 do fMakeModes[i]:=mmCleanBuild; diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index c05c31b135..ae63a94759 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -2820,7 +2820,6 @@ resourcestring lisMakeNotFound = 'Make not found'; lisTheProgramMakeWasNotFoundThisToolIsNeededToBuildLa = 'The program %smake%' +'s was not found.%sThis tool is needed to build lazarus.%s'; - lisCompileIDEWithoutLinking = 'Compile IDE (without linking)'; lisIDE = 'IDE'; lisExamples = 'Examples'; lisConfigureBuildLazarus = 'Configure %sBuild Lazarus%s'; @@ -2835,7 +2834,6 @@ resourcestring lisLazBuildTargetCPU = 'Target CPU:'; lisLazBuildTargetDirectory = 'Target directory:'; lisLazBuildBuildJITForm = 'Build JITForm'; - lisLazBuildWithStaticPackages = 'With packages'; lisLazBuildRestartAfterBuild = 'Restart after building IDE'; lisLazBuildUpdateRevInc = 'Update revision.inc'; lisLazBuildCommonSettings = 'Common Settings'; @@ -2885,8 +2883,6 @@ resourcestring lisLazBuildLikeMakeCleanOnCmdLine = 'Like "make clean" on cmd line'; lisLazBuildUpdateRevisionInfoInAboutLazarusDialog = 'Update revision info ' +'in "About Lazarus" dialog'; - lisLazBuildCompileSelectedStaticPackagesIntoLazarusBinary = 'Compile ' - +'selected static packages into Lazarus binary'; lisLazBuildRestartLazarusAutomaticallyAfterBuildingTheIDEHasN = 'Restart ' +'Lazarus automatically after building the IDE (has no effect when ' +'building other parts)'; diff --git a/ide/main.pp b/ide/main.pp index 38faa7d3a9..9aa1e5e425 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -12047,18 +12047,15 @@ begin // prepare static auto install packages PkgOptions:=''; - if (blfWithStaticPackages in Flags) - or MiscellaneousOptions.BuildLazOpts.WithStaticPackages then begin - // create inherited compiler options - PkgOptions:=PackageGraph.GetIDEInstallPackageOptions( - PackageGraph.FirstAutoInstallDependency,InheritedOptionStrings); + // create inherited compiler options + PkgOptions:=PackageGraph.GetIDEInstallPackageOptions( + PackageGraph.FirstAutoInstallDependency,InheritedOptionStrings); - // check ambiguous units - CodeToolBoss.GetFPCVersionForDirectory( - EnvironmentOptions.LazarusDirectory, - FPCVersion,FPCRelease,FPCPatch); - if (FPCVersion=0) or (FPCRelease=0) or (FPCPatch=0) then ; - end; + // check ambiguous units + CodeToolBoss.GetFPCVersionForDirectory( + EnvironmentOptions.LazarusDirectory, + FPCVersion,FPCRelease,FPCPatch); + if (FPCVersion=0) or (FPCRelease=0) or (FPCPatch=0) then ; // save extra options IDEBuildFlags:=Flags+[blfOnlyIDE]; @@ -12074,7 +12071,6 @@ var InheritedOptionStrings: TInheritedCompOptsStrings; CompiledUnitExt: String; FPCVersion, FPCRelease, FPCPatch: integer; - OnlyBase: boolean; begin if ToolStatus<>itNone then begin MessageDlg(lisNotNow, @@ -12094,55 +12090,32 @@ begin try MainBuildBoss.SetBuildTargetIDE; - // first compile all lazarus components (LCL, SynEdit, CodeTools, ...) - // but not the IDE - SourceEditorManager.ClearErrorLines; - CompileProgress.CreateDialog(OwningComponent, 'Lazarus...', ''); - Result:=BuildLazarus(MiscellaneousOptions.BuildLazProfiles, - ExternalTools,GlobalMacroList, - '',EnvironmentOptions.GetCompilerFilename, - EnvironmentOptions.MakeFilename, - Flags+[blfWithoutCompilingIDE,blfWithoutLinkingIDE]); - if Result<>mrOk then begin - DebugLn('TMainIDE.DoBuildLazarus: Building standard components (package interface, LCL) failed.'); - Result:=mrIgnore; - exit; - end; - - // then compile the 'installed' packages - if (not (blfOnlyIDE in Flags)) + if (blfOnlyIDE in Flags) and (MiscellaneousOptions.BuildLazProfiles.CurrentIdeMode=mmNone) then begin + debugln(['TMainIDE.DoBuildLazarusSub ignore because blfOnlyIDE and CurrentIdeMode=mmNone']); CompileProgress.Ready; Result:=mrIgnore; exit; end; - OnlyBase:=not ((blfWithStaticPackages in Flags) - or MiscellaneousOptions.BuildLazOpts.WithStaticPackages); - // prepare static auto install packages PkgOptions:=''; // compile auto install static packages - Result:=PkgBoss.DoCompileAutoInstallPackages([],OnlyBase); + Result:=PkgBoss.DoCompileAutoInstallPackages([],false); if Result<>mrOk then begin DebugLn('TMainIDE.DoBuildLazarus: Compile AutoInstall Packages failed.'); exit; end; // create uses section addition for lazarus.pp - if not OnlyBase then begin - Result:=PkgBoss.DoSaveAutoInstallConfig; - if Result<>mrOk then begin - DebugLn('TMainIDE.DoBuildLazarus: Save AutoInstall Config failed.'); - exit; - end; + Result:=PkgBoss.DoSaveAutoInstallConfig; + if Result<>mrOk then begin + DebugLn('TMainIDE.DoBuildLazarus: Save AutoInstall Config failed.'); + exit; end; // create inherited compiler options - if OnlyBase then - PkgOptions:='' - else - PkgOptions:=PackageGraph.GetIDEInstallPackageOptions( + PkgOptions:=PackageGraph.GetIDEInstallPackageOptions( PackageGraph.FirstAutoInstallDependency,InheritedOptionStrings); // check ambiguous units @@ -12161,25 +12134,24 @@ begin end; // save extra options - IDEBuildFlags:=Flags+[blfOnlyIDE]; - if not OnlyBase then - begin + IDEBuildFlags:=Flags; + if MiscellaneousOptions.BuildLazProfiles.CurrentIdeMode<>mmNone then begin Result:=SaveIDEMakeOptions(MiscellaneousOptions.BuildLazProfiles, - GlobalMacroList,PkgOptions,IDEBuildFlags); + GlobalMacroList,PkgOptions,IDEBuildFlags-[blfUseMakeIDECfg]); if Result<>mrOk then begin DebugLn('TMainIDE.DoBuildLazarus: Save IDEMake options failed.'); exit; end; + IDEBuildFlags:=IDEBuildFlags+[blfUseMakeIDECfg]; end; - // make ide + // make lazarus ide and/or examples SourceEditorManager.ClearErrorLines; Result:=BuildLazarus(MiscellaneousOptions.BuildLazProfiles, ExternalTools,GlobalMacroList, PkgOptions,EnvironmentOptions.GetCompilerFilename, EnvironmentOptions.MakeFilename, - IDEBuildFlags+[blfUseMakeIDECfg] - ); + IDEBuildFlags); if Result<>mrOk then exit; finally @@ -12207,7 +12179,7 @@ begin if (Result=mrOK) then begin if BuildLazProfiles.RestartAfterBuild and (BuildLazProfiles.Current.TargetDirectory='') - and ((blfWithStaticPackages in Flags) or MainBuildBoss.BuildTargetIDEIsDefault) + and MainBuildBoss.BuildTargetIDEIsDefault then begin CompileProgress.Close; mnuRestartClicked(nil); @@ -12235,7 +12207,7 @@ begin if ProfInd<>-1 then begin // Set current profile temporarily, used by the codetools functions. BuildLazProfiles.CurrentIndex:=ProfInd; -// does not show message: IDEMessagesWindow.AddMsg('Building: '+BuildLazProfiles.Current.Name,'',-1); + // does not show message: IDEMessagesWindow.AddMsg('Building: '+BuildLazProfiles.Current.Name,'',-1); LazSrcTemplate:= CodeToolBoss.DefineTree.FindDefineTemplateByName(StdDefTemplLazarusSources,true); if Assigned(LazSrcTemplate) then begin diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas index 735485ba80..0a90eeb7b5 100644 --- a/packager/pkgmanager.pas +++ b/packager/pkgmanager.pas @@ -173,7 +173,7 @@ type function DoGetUnitRegisterInfo(const AFilename: string; var TheUnitName: string; var HasRegisterProc: boolean; IgnoreErrors: boolean): TModalResult; - procedure SaveAutoInstallDependencies(SetWithStaticPcksFlagForIDE: boolean); + procedure SaveAutoInstallDependencies; procedure LoadStaticCustomPackages; function LoadInstalledPackage(const PackageName: string; AddToAutoInstall: boolean; var Quiet: boolean): TLazPackage; @@ -1159,7 +1159,7 @@ begin // rename package PackageGraph.ChangePackageID(APackage,NewPkgName,APackage.Version, RenameDependencies,true); - SaveAutoInstallDependencies(false); + SaveAutoInstallDependencies; RenamePackageInProject; // clean up old package file to reduce ambiguousities @@ -1326,16 +1326,11 @@ begin Result:=mrOk; end; -procedure TPkgManager.SaveAutoInstallDependencies( - SetWithStaticPcksFlagForIDE: boolean); +procedure TPkgManager.SaveAutoInstallDependencies; var Dependency: TPkgDependency; sl: TStringList; begin - if SetWithStaticPcksFlagForIDE then begin - MiscellaneousOptions.BuildLazProfiles.Current.WithStaticPackages:=True; - end; - sl:=TStringList.Create; Dependency:=PackageGraph.FirstAutoInstallDependency; while Dependency<>nil do begin @@ -3573,11 +3568,11 @@ begin if NeedSaving then begin PackageGraph.SortAutoInstallDependencies; - SaveAutoInstallDependencies(true); + SaveAutoInstallDependencies; end; // save IDE build configs, so user can build IDE on command line - BuildIDEFlags:=[blfWithStaticPackages,blfDontClean,blfOnlyIDE]; + BuildIDEFlags:=[blfDontClean,blfOnlyIDE]; Result:=MainIDE.DoSaveBuildIDEConfigs(BuildIDEFlags); if Result<>mrOk then exit; @@ -3655,11 +3650,11 @@ begin Dependency.Free; PackageGraph.SortAutoInstallDependencies; end; - SaveAutoInstallDependencies(true); + SaveAutoInstallDependencies; end; // save IDE build configs, so user can build IDE on command line - BuildIDEFlags:=[blfWithStaticPackages,blfDontClean,blfOnlyIDE]; + BuildIDEFlags:=[blfDontClean,blfOnlyIDE]; Result:=MainIDE.DoSaveBuildIDEConfigs(BuildIDEFlags); if Result<>mrOk then exit; @@ -3891,11 +3886,10 @@ begin // save package list //debugln('TPkgManager.MainIDEitmPkgEditInstallPkgsClick save package list'); PackageGraph.SortAutoInstallDependencies; - SaveAutoInstallDependencies(true); + SaveAutoInstallDependencies; // save IDE build configs, so user can build IDE on command line - BuildIDEFlags:=[blfWithStaticPackages,blfDontClean,blfOnlyIDE, - blfWithoutCompilingIDE]; + BuildIDEFlags:=[blfDontClean,blfOnlyIDE]; if MainIDE.DoSaveBuildIDEConfigs(BuildIDEFlags)<>mrOk then exit(mrCancel); if piiifRebuildIDE in Flags then @@ -3977,7 +3971,7 @@ begin mrYes: ; mrYesToAll: AutoRemove:=true; else - SaveAutoInstallDependencies(true); + SaveAutoInstallDependencies; exit; end; end; @@ -3985,7 +3979,7 @@ begin OldDependency.Free; end; end; - SaveAutoInstallDependencies(true); + SaveAutoInstallDependencies; // check consistency Result:=CheckPackageGraphForCompilation(nil,Dependencies,