From af9e051fadb5e6900ffc8668d6166dd5a1988ee2 Mon Sep 17 00:00:00 2001 From: Pascal Obry Date: Mon, 1 Aug 2011 16:06:47 +0000 Subject: [PATCH] prj-env.adb: Remove /lib/gpr/ project search path. 2011-08-01 Pascal Obry * prj-env.adb: Remove /lib/gpr/ project search path. * gnat_ugn.texi: Add documentation for VERSIONINFO Windows resource. From-SVN: r177058 --- gcc/ada/ChangeLog | 5 +++ gcc/ada/gnat_ugn.texi | 71 ++++++++++++++++++++++++++++++++----------- gcc/ada/prj-env.adb | 4 --- 3 files changed, 59 insertions(+), 21 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index f044856f4e3..591bd6acdc3 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2011-08-01 Pascal Obry + + * prj-env.adb: Remove /lib/gpr/ project search path. + * gnat_ugn.texi: Add documentation for VERSIONINFO Windows resource. + 2011-08-01 Yannick Moy * par-ch4.adb (P_Name): issue a syntax error in SPARK mode on character diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index 3ed62dd0d75..8d0c8a400c1 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -27804,33 +27804,70 @@ Resources are an easy way to add Windows specific objects to your application. The objects that can be added as resources include: @itemize @bullet -@item -menus +@item menus -@item -accelerators +@item accelerators -@item -dialog boxes +@item dialog boxes -@item -string tables +@item string tables -@item -bitmaps +@item bitmaps -@item -cursors +@item cursors -@item -icons +@item icons -@item -fonts +@item fonts + +@item version information @end itemize +For example, a version information resource can be defined as follow and +embedded into an executable or DLL: + +A version information resource can be used to embed information into an +executable or a DLL. These information can be viewed using the file properties +from the Windows Explorer. Here is an example of a version information +resource: + +@smallexample +@group +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904E4" + BEGIN + VALUE "CompanyName", "My Company Name" + VALUE "FileDescription", "My application" + VALUE "FileVersion", "1.0" + VALUE "InternalName", "my_app" + VALUE "LegalCopyright", "My Name" + VALUE "OriginalFilename", "my_app.exe" + VALUE "ProductName", "My App" + VALUE "ProductVersion", "1.0" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x809, 1252 + END +END +@end group +@end smallexample + +The value @code{0809} (langID) is for the U.K English language and +@code{04E4} (charsetID), which is equal to @code{1252} decimal, for +multilingual. + @noindent -This section explains how to build, compile and use resources. +This section explains how to build, compile and use resources. Note that this +section does not cover all resource objects, for a complete description see +the corresponding Microsoft documentation. @node Building Resources @subsection Building Resources diff --git a/gcc/ada/prj-env.adb b/gcc/ada/prj-env.adb index 180d0d0451b..f162bb1bba0 100644 --- a/gcc/ada/prj-env.adb +++ b/gcc/ada/prj-env.adb @@ -1933,10 +1933,6 @@ package body Prj.Env is if Prefix.all /= "" then if Target_Name /= "" then - Add_Str_To_Name_Buffer - (Path_Separator & Prefix.all & - "lib" & Directory_Separator & "gpr" & - Directory_Separator & Target_Name); Add_Str_To_Name_Buffer (Path_Separator & Prefix.all & Target_Name & Directory_Separator & -- 2.30.2