[llvm-commits] [llvm] r156838 - in /llvm/trunk: docs/LLVMBuild.html tools/llvm-config/llvm-config.cpp utils/llvm-build/llvmbuild/componentinfo.py utils/llvm-build/llvmbuild/main.py utils/unittest/LLVMBuild.txt
Daniel Dunbar
daniel at zuster.org
Tue May 15 11:44:17 PDT 2012
Author: ddunbar
Date: Tue May 15 13:44:17 2012
New Revision: 156838
URL: http://llvm.org/viewvc/llvm-project?rev=156838&view=rev
Log:
llvm-build: Add support for non-installed libraries (e.g., gtest).
- These libraries are only reported by llvm-config when run from a development
tree.
Modified:
llvm/trunk/docs/LLVMBuild.html
llvm/trunk/tools/llvm-config/llvm-config.cpp
llvm/trunk/utils/llvm-build/llvmbuild/componentinfo.py
llvm/trunk/utils/llvm-build/llvmbuild/main.py
llvm/trunk/utils/unittest/LLVMBuild.txt
Modified: llvm/trunk/docs/LLVMBuild.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LLVMBuild.html?rev=156838&r1=156837&r2=156838&view=diff
==============================================================================
--- llvm/trunk/docs/LLVMBuild.html (original)
+++ llvm/trunk/docs/LLVMBuild.html Tue May 15 13:44:17 2012
@@ -272,6 +272,11 @@
components. For example, the <i>X86</i> target might define a library
group for all of the <i>X86</i> components. That library group might
then be included in the <i>all-targets</i> library group.</p></li>
+
+ <li><i>installed</i> <b>[optional]</b> <b>[boolean]</b>
+ <p>Whether this library is installed. Libraries that are not installed
+ are only reported by <tt>llvm-config</tt> when it is run as part of a
+ development directory.</p></li>
</ul>
</li>
Modified: llvm/trunk/tools/llvm-config/llvm-config.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/llvm-config.cpp?rev=156838&r1=156837&r2=156838&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-config/llvm-config.cpp (original)
+++ llvm/trunk/tools/llvm-config/llvm-config.cpp Tue May 15 13:44:17 2012
@@ -54,7 +54,8 @@
static void VisitComponent(StringRef Name,
const StringMap<AvailableComponent*> &ComponentMap,
std::set<AvailableComponent*> &VisitedComponents,
- std::vector<StringRef> &RequiredLibs) {
+ std::vector<StringRef> &RequiredLibs,
+ bool IncludeNonInstalled) {
// Lookup the component.
AvailableComponent *AC = ComponentMap.lookup(Name);
assert(AC && "Invalid component name!");
@@ -65,10 +66,14 @@
return;
}
+ // Only include non-installed components if requested.
+ if (!AC->IsInstalled && !IncludeNonInstalled)
+ return;
+
// Otherwise, visit all the dependencies.
for (unsigned i = 0; AC->RequiredLibraries[i]; ++i) {
VisitComponent(AC->RequiredLibraries[i], ComponentMap, VisitedComponents,
- RequiredLibs);
+ RequiredLibs, IncludeNonInstalled);
}
// Add to the required library list.
@@ -83,8 +88,11 @@
/// \param Components - The names of the components to find libraries for.
/// \param RequiredLibs [out] - On return, the ordered list of libraries that
/// are required to link the given components.
+/// \param IncludeNonInstalled - Whether non-installed components should be
+/// reported.
void ComputeLibsForComponents(const std::vector<StringRef> &Components,
- std::vector<StringRef> &RequiredLibs) {
+ std::vector<StringRef> &RequiredLibs,
+ bool IncludeNonInstalled) {
std::set<AvailableComponent*> VisitedComponents;
// Build a map of component names to information.
@@ -107,7 +115,7 @@
}
VisitComponent(ComponentLower, ComponentMap, VisitedComponents,
- RequiredLibs);
+ RequiredLibs, IncludeNonInstalled);
}
// The list is now ordered with leafs first, we want the libraries to printed
@@ -278,6 +286,10 @@
PrintLibFiles = true;
} else if (Arg == "--components") {
for (unsigned j = 0; j != array_lengthof(AvailableComponents); ++j) {
+ // Only include non-installed components when in a development tree.
+ if (!AvailableComponents[j].IsInstalled && !IsInDevelopmentTree)
+ continue;
+
OS << ' ';
OS << AvailableComponents[j].Name;
}
@@ -310,7 +322,8 @@
// Construct the list of all the required libraries.
std::vector<StringRef> RequiredLibs;
- ComputeLibsForComponents(Components, RequiredLibs);
+ ComputeLibsForComponents(Components, RequiredLibs,
+ /*IncludeNonInstalled=*/IsInDevelopmentTree);
for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) {
StringRef Lib = RequiredLibs[i];
Modified: llvm/trunk/utils/llvm-build/llvmbuild/componentinfo.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/llvm-build/llvmbuild/componentinfo.py?rev=156838&r1=156837&r2=156838&view=diff
==============================================================================
--- llvm/trunk/utils/llvm-build/llvmbuild/componentinfo.py (original)
+++ llvm/trunk/utils/llvm-build/llvmbuild/componentinfo.py Tue May 15 13:44:17 2012
@@ -116,6 +116,7 @@
kwargs['required_libraries'] = items.get_list('required_libraries')
kwargs['add_to_library_groups'] = items.get_list(
'add_to_library_groups')
+ kwargs['installed'] = items.get_optional_bool('installed', True)
return kwargs
@staticmethod
@@ -124,7 +125,7 @@
return LibraryComponentInfo(subpath, **kwargs)
def __init__(self, subpath, name, dependencies, parent, library_name,
- required_libraries, add_to_library_groups):
+ required_libraries, add_to_library_groups, installed):
ComponentInfo.__init__(self, subpath, name, dependencies, parent)
# If given, the name to use for the library instead of deriving it from
@@ -139,6 +140,9 @@
# considered part of.
self.add_to_library_groups = list(add_to_library_groups)
+ # Whether or not this library is installed.
+ self.installed = installed
+
def get_component_references(self):
for r in ComponentInfo.get_component_references(self):
yield r
@@ -160,6 +164,8 @@
if self.add_to_library_groups:
print >>result, 'add_to_library_groups = %s' % ' '.join(
self.add_to_library_groups)
+ if not self.installed:
+ print >>result, 'installed = 0'
return result.getvalue()
def get_library_name(self):
@@ -194,10 +200,10 @@
return OptionalLibraryComponentInfo(subpath, **kwargs)
def __init__(self, subpath, name, dependencies, parent, library_name,
- required_libraries, add_to_library_groups):
+ required_libraries, add_to_library_groups, installed):
LibraryComponentInfo.__init__(self, subpath, name, dependencies, parent,
library_name, required_libraries,
- add_to_library_groups)
+ add_to_library_groups, installed)
class LibraryGroupComponentInfo(ComponentInfo):
type_name = 'LibraryGroup'
Modified: llvm/trunk/utils/llvm-build/llvmbuild/main.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/llvm-build/llvmbuild/main.py?rev=156838&r1=156837&r2=156838&view=diff
==============================================================================
--- llvm/trunk/utils/llvm-build/llvmbuild/main.py (original)
+++ llvm/trunk/utils/llvm-build/llvmbuild/main.py Tue May 15 13:44:17 2012
@@ -341,8 +341,10 @@
# Get the library name, or None for LibraryGroups.
if c.type_name == 'Library' or c.type_name == 'OptionalLibrary':
library_name = c.get_prefixed_library_name()
+ is_installed = c.installed
else:
library_name = None
+ is_installed = True
# Get the component names of all the required libraries.
required_llvmconfig_component_names = [
@@ -355,7 +357,8 @@
# Add the entry.
entries[c.name] = (llvmconfig_component_name, library_name,
- required_llvmconfig_component_names)
+ required_llvmconfig_component_names,
+ is_installed)
# Convert to a list of entries and sort by name.
entries = entries.values()
@@ -363,16 +366,16 @@
# Create an 'all' pseudo component. We keep the dependency list small by
# only listing entries that have no other dependents.
root_entries = set(e[0] for e in entries)
- for _,_,deps in entries:
+ for _,_,deps,_ in entries:
root_entries -= set(deps)
- entries.append(('all', None, root_entries))
+ entries.append(('all', None, root_entries, True))
entries.sort()
# Compute the maximum number of required libraries, plus one so there is
# always a sentinel.
max_required_libraries = max(len(deps)
- for _,_,deps in entries) + 1
+ for _,_,deps,_ in entries) + 1
# Write out the library table.
make_install_dir(os.path.dirname(output_path))
@@ -393,18 +396,21 @@
print >>f, ' /// The name of the library for this component (or NULL).'
print >>f, ' const char *Library;'
print >>f, ''
+ print >>f, ' /// Whether the component is installed.'
+ print >>f, ' bool IsInstalled;'
+ print >>f, ''
print >>f, '\
/// The list of libraries required when linking this component.'
print >>f, ' const char *RequiredLibraries[%d];' % (
max_required_libraries)
print >>f, '} AvailableComponents[%d] = {' % len(entries)
- for name,library_name,required_names in entries:
+ for name,library_name,required_names,is_installed in entries:
if library_name is None:
library_name_as_cstr = '0'
else:
library_name_as_cstr = '"lib%s.a"' % library_name
- print >>f, ' { "%s", %s, { %s } },' % (
- name, library_name_as_cstr,
+ print >>f, ' { "%s", %s, %d, { %s } },' % (
+ name, library_name_as_cstr, is_installed,
', '.join('"%s"' % dep
for dep in required_names))
print >>f, '};'
Modified: llvm/trunk/utils/unittest/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/LLVMBuild.txt?rev=156838&r1=156837&r2=156838&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/LLVMBuild.txt (original)
+++ llvm/trunk/utils/unittest/LLVMBuild.txt Tue May 15 13:44:17 2012
@@ -20,9 +20,11 @@
name = gtest
parent = Libraries
required_libraries = Support
+installed = 0
[component_1]
type = Library
name = gtest_main
parent = Libraries
required_libraries = gtest
+installed = 0
More information about the llvm-commits
mailing list