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

IDE: Improve ProductVersion logic in ProjectVersionInfo. Patch from Dmitry D. Chernov.

Browse Source 
git-svn-id: trunk@55977 -
This commit is contained in:
juha 2017-10-05 16:27:53 +00:00
parent 0befe31267
commit 7c6ce88d18
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/w32versioninfo.pas
View File

@ -496,8 +496,6 @@ begin
for i := 0 to Node.Attributes.Length - 1 do for i := 0 to Node.Attributes.Length - 1 do
StringTable[Node.Attributes[i].NodeName] := Node.Attributes[i].NodeValue; StringTable[Node.Attributes[i].NodeName] := Node.Attributes[i].NodeValue;
StringTable.AddRequired; StringTable.AddRequired;
if StringTable['ProductVersion'] = '' then
StringTable['ProductVersion'] := BuildFileVersionString;
end end
else else
begin begin
@ -505,13 +503,13 @@ begin
StringTable['Comments'] := GetValue(Path + 'VersionInfo/Comments/Value', ''); StringTable['Comments'] := GetValue(Path + 'VersionInfo/Comments/Value', '');
StringTable['CompanyName'] := GetValue(Path + 'VersionInfo/CompanyName/Value', ''); StringTable['CompanyName'] := GetValue(Path + 'VersionInfo/CompanyName/Value', '');
StringTable['FileDescription'] := GetValue(Path + 'VersionInfo/FileDescription/Value', ''); StringTable['FileDescription'] := GetValue(Path + 'VersionInfo/FileDescription/Value', '');
StringTable['FileVersion'] := BuildFileVersionString; // StringTable['FileVersion'] := BuildFileVersionString; // not needed due to SetFileVersionFromVersion
StringTable['InternalName'] := GetValue(Path + 'VersionInfo/InternalName/Value', ''); StringTable['InternalName'] := GetValue(Path + 'VersionInfo/InternalName/Value', '');
StringTable['LegalCopyright'] := GetValue(Path + 'VersionInfo/LegalCopyright/Value', ''); StringTable['LegalCopyright'] := GetValue(Path + 'VersionInfo/LegalCopyright/Value', '');
StringTable['LegalTrademarks'] := GetValue(Path + 'VersionInfo/LegalTrademarks/Value', ''); StringTable['LegalTrademarks'] := GetValue(Path + 'VersionInfo/LegalTrademarks/Value', '');
StringTable['OriginalFilename'] := GetValue(Path + 'VersionInfo/OriginalFilename/Value', ''); StringTable['OriginalFilename'] := GetValue(Path + 'VersionInfo/OriginalFilename/Value', '');
StringTable['ProductName'] := GetValue(Path + 'VersionInfo/ProductName/Value', ''); StringTable['ProductName'] := GetValue(Path + 'VersionInfo/ProductName/Value', '');
StringTable['ProductVersion'] := GetValue(Path + 'VersionInfo/ProductVersion/Value', BuildFileVersionString); StringTable['ProductVersion'] := GetValue(Path + 'VersionInfo/ProductVersion/Value', '');
end; end;
SetFileVersionFromVersion; SetFileVersionFromVersion;