paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-08 09:38:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Use again the blfOnlyIDE flag which was removed earlier. Fixes building Lazarus (?)

Browse Source 
git-svn-id: trunk@32866 -
This commit is contained in:
juha 2011-10-13 06:43:43 +00:00
parent 7d8796f113
commit 92e8c1695c
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/buildlazdialog.pas
View File

@ -64,6 +64,7 @@ type
TBuildLazarusFlag = ( TBuildLazarusFlag = (
blfDontBuild, // skip all building, only cleaning blfDontBuild, // skip all building, only cleaning
blfOnlyIDE, // skip all but IDE (for example build IDE, but not examples)
blfDontCleanAll, // ignore clean up blfDontCleanAll, // ignore clean up
blfUseMakeIDECfg, // append @idemake.cfg blfUseMakeIDECfg, // append @idemake.cfg
blfReplaceExe // ignore OSLocksExecutables and do not create lazarus.new.exe blfReplaceExe // ignore OSLocksExecutables and do not create lazarus.new.exe
@ -235,8 +236,7 @@ begin
Tool.ScanOutputForMakeMessages:=true; Tool.ScanOutputForMakeMessages:=true;
// clean up // clean up
if Options.CleanAll if Options.CleanAll and ([blfDontCleanAll,blfOnlyIDE]*Flags=[]) then begin
and ([blfDontCleanAll]*Flags=[]) then begin
WorkingDirectory:=EnvironmentOptions.LazarusDirectory; WorkingDirectory:=EnvironmentOptions.LazarusDirectory;
if not CheckDirectoryWritable(WorkingDirectory) then exit(mrCancel); if not CheckDirectoryWritable(WorkingDirectory) then exit(mrCancel);
@ -256,7 +256,7 @@ begin
// build every item // build every item
if not (blfDontBuild in Flags) then begin if not (blfDontBuild in Flags) then begin
WorkingDirectory:=TrimFilename(EnvironmentOptions.LazarusDirectory+PathDelim); WorkingDirectory:=EnvironmentOptions.LazarusDirectory;
if (blfDontCleanAll in Flags) and (Options.IdeBuildMode=bmCleanBuild) then if (blfDontCleanAll in Flags) and (Options.IdeBuildMode=bmCleanBuild) then
Options.IdeBuildMode:=bmBuild; Options.IdeBuildMode:=bmBuild;
Tool.Title:=lisIDE; Tool.Title:=lisIDE;

7
ide/main.pp
View File

@ -12154,7 +12154,7 @@ begin
// save extra options // save extra options
Result:=SaveIDEMakeOptions(MiscellaneousOptions.BuildLazProfiles, Result:=SaveIDEMakeOptions(MiscellaneousOptions.BuildLazProfiles,
GlobalMacroList,PkgOptions,Flags); GlobalMacroList,PkgOptions,Flags+[blfOnlyIDE]);
if Result<>mrOk then exit; if Result<>mrOk then exit;
end; end;
@ -12222,9 +12222,8 @@ begin
PackageGraph.FirstAutoInstallDependency,InheritedOptionStrings); PackageGraph.FirstAutoInstallDependency,InheritedOptionStrings);
// check ambiguous units // check ambiguous units
CodeToolBoss.GetFPCVersionForDirectory( CodeToolBoss.GetFPCVersionForDirectory(EnvironmentOptions.LazarusDirectory,
EnvironmentOptions.LazarusDirectory, FPCVersion,FPCRelease,FPCPatch);
FPCVersion,FPCRelease,FPCPatch);
if FPCPatch=0 then ; if FPCPatch=0 then ;
CompiledUnitExt:=GetDefaultCompiledUnitExt(FPCVersion,FPCRelease); CompiledUnitExt:=GetDefaultCompiledUnitExt(FPCVersion,FPCRelease);
Result:=MainBuildBoss.CheckUnitPathForAmbiguousPascalFiles( Result:=MainBuildBoss.CheckUnitPathForAmbiguousPascalFiles(

6
packager/pkgmanager.pas
View File

@ -3604,7 +3604,7 @@ begin
end; end;
// save IDE build configs, so user can build IDE on command line // save IDE build configs, so user can build IDE on command line
BuildIDEFlags:=[blfDontCleanAll]; BuildIDEFlags:=[blfDontCleanAll,blfOnlyIDE];
Result:=MainIDE.DoSaveBuildIDEConfigs(BuildIDEFlags); Result:=MainIDE.DoSaveBuildIDEConfigs(BuildIDEFlags);
if Result<>mrOk then exit; if Result<>mrOk then exit;
@ -3685,7 +3685,7 @@ begin
end; end;
// save IDE build configs, so user can build IDE on command line // save IDE build configs, so user can build IDE on command line
BuildIDEFlags:=[blfDontCleanAll]; BuildIDEFlags:=[blfDontCleanAll,blfOnlyIDE];
Result:=MainIDE.DoSaveBuildIDEConfigs(BuildIDEFlags); Result:=MainIDE.DoSaveBuildIDEConfigs(BuildIDEFlags);
if Result<>mrOk then exit; if Result<>mrOk then exit;
@ -3920,7 +3920,7 @@ begin
SaveAutoInstallDependencies; SaveAutoInstallDependencies;
// save IDE build configs, so user can build IDE on command line // save IDE build configs, so user can build IDE on command line
BuildIDEFlags:=[blfDontCleanAll]; BuildIDEFlags:=[blfDontCleanAll,blfOnlyIDE];
if MainIDE.DoSaveBuildIDEConfigs(BuildIDEFlags)<>mrOk then exit(mrCancel); if MainIDE.DoSaveBuildIDEConfigs(BuildIDEFlags)<>mrOk then exit(mrCancel);
if piiifRebuildIDE in Flags then // rebuild Lazarus if piiifRebuildIDE in Flags then // rebuild Lazarus