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

IDE: delete not needed project rc file

Browse Source 
git-svn-id: trunk@22851 -
This commit is contained in:
mattias 2009-11-28 14:47:26 +00:00
parent 5fd00cffab
commit 8ca12569f2
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/main.pp
View File

@ -9832,7 +9832,6 @@ var
TargetExeName: String; TargetExeName: String;
err : TFPCErrorType; err : TFPCErrorType;
TargetExeDirectory: String; TargetExeDirectory: String;
TargetOS: String;
begin begin
if Project1.MainUnitInfo=nil then begin if Project1.MainUnitInfo=nil then begin
// this project has not source to compile // this project has not source to compile
@ -9984,12 +9983,10 @@ begin
// create manifest // create manifest
if Project1.Resources.XPManifest.UseManifest and (Project1.MainUnitID>=0) if Project1.Resources.XPManifest.UseManifest and (Project1.MainUnitID>=0)
and Project1.Resources.XPManifest.NeedManifest(Project1.Resources)
then begin then begin
TargetOS:=MainBuildBoss.GetTargetOS(true); Result:=Project1.Resources.XPManifest.CreateManifestFile(TargetExeName);
if (TargetOS='win32') or (TargetOS='win64') then begin if not (Result in [mrOk,mrIgnore]) then exit;
Result:=Project1.Resources.XPManifest.CreateManifestFile(TargetExeName);
if not (Result in [mrOk,mrIgnore]) then exit;
end;
end; end;
// execute compilation tool 'Before' // execute compilation tool 'Before'

6
ide/projectresources.pas
View File

@ -38,7 +38,7 @@ interface
uses uses
Classes, SysUtils, Controls, LCLProc, LResources, FileUtil, Laz_XMLCfg, Classes, SysUtils, Controls, LCLProc, LResources, FileUtil, Laz_XMLCfg,
ProjectIntf, ProjectResourcesIntf, LazarusIDEStrConsts, Dialogs, ProjectIntf, ProjectResourcesIntf, LazarusIDEStrConsts,
W32VersionInfo, W32Manifest, ProjectIcon, IDEProcs, DialogProcs, W32VersionInfo, W32Manifest, ProjectIcon, IDEProcs, DialogProcs,
CodeToolManager, CodeCache; CodeToolManager, CodeCache;
@ -598,7 +598,9 @@ procedure TProjectResources.UpdateCodeBuffers;
begin begin
if HasSystemResources then if HasSystemResources then
UpdateCodeBuffer(rcFileName, FSystemResources.Text); UpdateCodeBuffer(rcFileName, FSystemResources.Text)
else if FilenameIsAbsolute(rcFileName) and FileExistsUTF8(rcFileName) then
DeleteFileInteractive(rcFileName,[mbRetry]);
if FLrsIncludeAllowed and HasLazarusResources then if FLrsIncludeAllowed and HasLazarusResources then
UpdateCodeBuffer(lrsFileName, FLazarusResources.Text); UpdateCodeBuffer(lrsFileName, FLazarusResources.Text);
end; end;

18
ide/w32manifest.pas
View File

@ -53,6 +53,7 @@ type
public public
function UpdateResources(AResources: TAbstractProjectResources; const MainFilename: string): Boolean; override; function UpdateResources(AResources: TAbstractProjectResources; const MainFilename: string): Boolean; override;
function CreateManifestFile(ExeFilename: string): TModalResult; function CreateManifestFile(ExeFilename: string): TModalResult;
function NeedManifest(AResources: TAbstractProjectResources): boolean;
property UseManifest: boolean read FUseManifest write SetUseManifest; property UseManifest: boolean read FUseManifest write SetUseManifest;
property ManifestName: string read FManifestName; property ManifestName: string read FManifestName;
@ -103,7 +104,7 @@ function TProjectXPManifest.UpdateResources(AResources: TAbstractProjectResource
begin begin
Result := True; Result := True;
if not UseManifest then if not NeedManifest(AResources) then
Exit; Exit;
SetFileNames(MainFilename); SetFileNames(MainFilename);
@ -131,6 +132,21 @@ begin
Result:=SaveCodeBuffer(Code); Result:=SaveCodeBuffer(Code);
end; end;
function TProjectXPManifest.NeedManifest(AResources: TAbstractProjectResources
): boolean;
var
TargetOS: String;
begin
Result:=false;
if not UseManifest then exit;
if AResources.Project=nil then exit;
TargetOS:=AResources.Project.LazCompilerOptions.TargetOS;
if (TargetOS='') or (TargetOS='default') then
TargetOS:=GetDefaultTargetOS;
if (TargetOS<>'win32') and (TargetOS<>'win64') then exit;
Result:=true;
end;
end. end.