Attributes Library_Fully_Standalone_Supported and
Library_Fully_Standalone_Options have been renamed
Library_Encapsulated_Supported and Library_Encapsulated_Options
respectively.
No change in behavior.
Tested on x86_64-pc-linux-gnu, committed on trunk
2011-12-21 Pascal Obry <o...@adacore.com>
* gnat_ugn.texi, prj.ads, prj-nmsc.adb, prj-attr.adb, projects.texi,
snames.ads-tmpl: Use Encapsulated instead of Fully Standalone library.
Index: gnat_ugn.texi
===================================================================
--- gnat_ugn.texi (revision 182575)
+++ gnat_ugn.texi (working copy)
@@ -16360,26 +16360,26 @@
the binding phase will fail.
@noindent
-It is also possible to build a fully stand-alone library where not only
+It is also possible to build an encapsulated library where not only
the code to elaborate and finalize the library is embedded but also
ensuring that the library is linked only against static
-libraries. So a fully stand-alone library only depends on system
+libraries. So an encapsulated library only depends on system
libraries, all other code, including the GNAT runtime, is embedded. To
-build a fully stand-alone library the attribute
-@code{Library_Standalone} must be set to @code{full}:
+build an encapsulated library the attribute
+@code{Library_Standalone} must be set to @code{encapsulated}:
@smallexample @c projectfile
@group
for Library_Dir use "lib_dir";
for Library_Name use "dummy";
for Library_Interface use ("int1", "int1.child");
- for Library_Standalone use "full";
+ for Library_Standalone use "encapsulated";
@end group
@end smallexample
@noindent
The default value for this attribute is @code{standard} in which case
-a not fully stand-alone library is built.
+a stand-alone library is built.
The attribute @code{Library_Src_Dir} may be specified for a
Stand-Alone Library. @code{Library_Src_Dir} is a simple attribute that has a
Index: prj.ads
===================================================================
--- prj.ads (revision 182577)
+++ prj.ads (working copy)
@@ -1033,7 +1033,7 @@
-- The level of library support. Specified in the configuration. Support
-- is none, static libraries only or both static and shared libraries.
- Lib_Fully_Standalone_Supported : Boolean := False;
+ Lib_Encapsulated_Supported : Boolean := False;
-- True when building fully standalone libraries supported on the target
Archive_Builder : Name_List_Index := No_Name_List;
@@ -1106,7 +1106,7 @@
Resp_File_Format => None,
Resp_File_Options => No_Name_List,
Lib_Support => None,
- Lib_Fully_Standalone_Supported => False,
+ Lib_Encapsulated_Supported => False,
Archive_Builder => No_Name_List,
Archive_Builder_Append_Option => No_Name_List,
Archive_Indexer => No_Name_List,
@@ -1151,7 +1151,7 @@
-- The following record describes a project file representation
- type Standalone is (No, Standard, Full);
+ type Standalone is (No, Standard, Encapsulated);
type Project_Data (Qualifier : Project_Qualifier := Unspecified) is record
Index: prj-nmsc.adb
===================================================================
--- prj-nmsc.adb (revision 182578)
+++ prj-nmsc.adb (working copy)
@@ -2220,12 +2220,12 @@
end;
elsif
- Attribute.Name = Name_Library_Fully_Standalone_Supported
+ Attribute.Name = Name_Library_Encapsulated_Supported
then
declare
pragma Unsuppress (All_Checks);
begin
- Project.Config.Lib_Fully_Standalone_Supported :=
+ Project.Config.Lib_Encapsulated_Supported :=
Boolean'Value (Get_Name_String (Attribute.Value.Value));
exception
when Constraint_Error =>
@@ -2233,7 +2233,7 @@
(Data.Flags,
"invalid value """
& Get_Name_String (Attribute.Value.Value)
- & """ for Library_Fully_Standalone_Supported",
+ & """ for Library_Encapsulated_Supported",
Attribute.Value.Location, Project);
end;
@@ -2955,11 +2955,10 @@
elsif Project.Library_Kind /= Static
and then not Lib_Standalone.Default
- and then Get_Name_String (Lib_Standalone.Value) = "full"
+ and then Get_Name_String (Lib_Standalone.Value) = "encapsulated"
and then Proj.Library_Kind /= Static
then
- -- A fully standalone library must depend only on static
- -- libraries.
+ -- An encapsulated library must depend only on static libraries
Error_Msg_Name_1 := Project.Name;
Error_Msg_Name_2 := Proj.Name;
@@ -2967,16 +2966,17 @@
Error_Msg
(Data.Flags,
Continuation.all &
- "standalone library project %% cannot import shared " &
+ "encapsulated library project %% cannot import shared " &
"library project %%",
Project.Location, Project);
Continuation := Continuation_String'Access;
elsif Project.Library_Kind /= Static
and then Proj.Library_Kind = Static
- and then (Lib_Standalone.Default
- or else
- Get_Name_String (Lib_Standalone.Value) /= "full")
+ and then
+ (Lib_Standalone.Default
+ or else
+ Get_Name_String (Lib_Standalone.Value) /= "encapsulated")
then
Error_Msg_Name_1 := Project.Name;
Error_Msg_Name_2 := Proj.Name;
@@ -4532,8 +4532,8 @@
if Name_Buffer (1 .. Name_Len) = "standard" then
Project.Standalone_Library := Standard;
- elsif Name_Buffer (1 .. Name_Len) = "full" then
- Project.Standalone_Library := Full;
+ elsif Name_Buffer (1 .. Name_Len) = "encapsulated" then
+ Project.Standalone_Library := Encapsulated;
elsif Name_Buffer (1 .. Name_Len) = "no" then
Project.Standalone_Library := No;
Index: prj-attr.adb
===================================================================
--- prj-attr.adb (revision 182573)
+++ prj-attr.adb (working copy)
@@ -106,8 +106,8 @@
"SVlibrary_version#" &
"LVlibrary_interface#" &
"SVlibrary_standalone#" &
- "LVlibrary_fully_standalone_options#" &
- "SVlibrary_fully_standalone_supported#" &
+ "LVlibrary_encapsulated_options#" &
+ "SVlibrary_encapsulated_supported#" &
"SVlibrary_auto_init#" &
"LVleading_library_options#" &
"LVlibrary_options#" &
Index: projects.texi
===================================================================
--- projects.texi (revision 182573)
+++ projects.texi (working copy)
@@ -1781,8 +1781,8 @@
@cindex @code{Library_Standalone}
This attribute defines the kind of standalone library to
build. Values are either @code{standard} (the default), @code{no} or
- @code{full}. When @code{standard} is used the code to elaborate and
- finalize the library is embedded, when @code{full} is used the
+ @code{encapsulated}. When @code{standard} is used the code to elaborate and
+ finalize the library is embedded, when @code{encapsulated} is used the
library can furthermore only depends on static libraries (including
the GNAT runtime). This attribute can be set to @code{no} to make it clear
that the library should not be standalone in which case the
@@ -1793,7 +1793,7 @@
for Library_Dir use "lib";
for Library_Name use "loggin";
for Library_Interface use ("lib1", "lib2"); -- unit names
- for Library_Standalone use "full";
+ for Library_Standalone use "encapsulated";
@end group
@end smallexample
Index: snames.ads-tmpl
===================================================================
--- snames.ads-tmpl (revision 182577)
+++ snames.ads-tmpl (working copy)
@@ -1160,8 +1160,8 @@
Name_Library_Partial_Linker : constant Name_Id := N + $;
Name_Library_Reference_Symbol_File : constant Name_Id := N + $;
Name_Library_Standalone : constant Name_Id := N + $;
- Name_Library_Fully_Standalone_Options : constant Name_Id := N + $;
- Name_Library_Fully_Standalone_Supported : constant Name_Id := N + $; -- GB
+ Name_Library_Encapsulated_Options : constant Name_Id := N + $;
+ Name_Library_Encapsulated_Supported : constant Name_Id := N + $; -- GB
Name_Library_Src_Dir : constant Name_Id := N + $;
Name_Library_Support : constant Name_Id := N + $;
Name_Library_Symbol_File : constant Name_Id := N + $;
