[cfe-commits] [libclc] r157821 - in /libclc/trunk: build/metabuild.py configure.py

[Peter Collingbourne]

Author: pcc
Date: Fri Jun  1 12:29:59 2012
New Revision: 157821

URL: http://llvm.org/viewvc/llvm-project?rev=157821&view=rev
Log:
configure.py: Add an install rule.

Modified:
    libclc/trunk/build/metabuild.py
    libclc/trunk/configure.py

Modified: libclc/trunk/build/metabuild.py
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/build/metabuild.py?rev=157821&r1=157820&r2=157821&view=diff
==============================================================================
--- libclc/trunk/build/metabuild.py (original)
+++ libclc/trunk/build/metabuild.py Fri Jun  1 12:29:59 2012
@@ -9,6 +9,7 @@
     self.rules = {}
     self.rule_text = ''
     self.all_targets = []
+    self.default_targets = []
     self.clean_files = []
     self.distclean_files = []
     self.output.write("""all::
@@ -68,8 +69,11 @@
       return input
     return [input]
 
+  def default(self, paths):
+    self.default_targets += self._as_list(paths)
+
   def finish(self):
-    self.output.write('all:: %s\n\n' % ' '.join(self.all_targets))
+    self.output.write('all:: %s\n\n' % ' '.join(self.default_targets or self.all_targets))
     self.output.write('clean: \n\trm -f %s\n\n' % ' '.join(self.clean_files))
     self.output.write('distclean: clean\n\trm -f %s\n' % ' '.join(self.distclean_files))
 

Modified: libclc/trunk/configure.py
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/configure.py?rev=157821&r1=157820&r2=157821&view=diff
==============================================================================
--- libclc/trunk/configure.py (original)
+++ libclc/trunk/configure.py Fri Jun  1 12:29:59 2012
@@ -17,6 +17,8 @@
 p = OptionParser()
 p.add_option('--with-llvm-config', metavar='PATH',
              help='use given llvm-config script')
+p.add_option('--prefix', metavar='PATH',
+             help='install to given prefix')
 p.add_option('-g', metavar='GENERATOR', default='make',
              help='use given generator (default: make)')
 (options, args) = p.parse_args()
@@ -70,6 +72,9 @@
 manifest_deps = set([sys.argv[0], os.path.join(srcdir, 'build', 'metabuild.py'),
                      os.path.join(srcdir, 'build', 'ninja_syntax.py')])
 
+install_files = []
+install_deps = []
+
 for target in targets:
   (t_arch, t_vendor, t_os) = target.split('-')
   archs = [t_arch]
@@ -83,12 +88,13 @@
     subdirs.append("%s-%s" % (arch, t_os))
     subdirs.append(arch)
 
-  subdirs = [subdir for subdir in subdirs
-             if os.path.isdir(os.path.join(srcdir, subdir, 'include')) or
-                os.path.isfile(os.path.join(srcdir, subdir, 'lib', 'SOURCES'))]
+  incdirs = filter(os.path.isdir,
+               [os.path.join(srcdir, subdir, 'include') for subdir in subdirs])
+  libdirs = filter(lambda d: os.path.isfile(os.path.join(d, 'SOURCES')),
+                   [os.path.join(srcdir, subdir, 'lib') for subdir in subdirs])
 
-  clang_cl_includes = ' '.join(["-I%s" % os.path.join(srcdir, subdir, 'include')
-                                for subdir in subdirs])
+  clang_cl_includes = ' '.join(["-I%s" % incdir for incdir in incdirs])
+  install_files += [(incdir, incdir[len(srcdir)+1:]) for incdir in incdirs]
 
   # The rule for building a .bc file for the specified architecture using clang.
   clang_bc_flags = "-ccc-host-triple %s -I`dirname $in` %s " \
@@ -101,11 +107,8 @@
   objects = []
   sources_seen = set()
 
-  for subdir in subdirs:
-    src_libdir = os.path.join(srcdir, subdir, 'lib')
-    if not os.path.isdir(src_libdir):
-      continue
-    subdir_list_file = os.path.join(src_libdir, 'SOURCES')
+  for libdir in libdirs:
+    subdir_list_file = os.path.join(libdir, 'SOURCES')
     manifest_deps.add(subdir_list_file)
     for src in open(subdir_list_file).readlines():
       src = src.rstrip()
@@ -113,7 +116,7 @@
         sources_seen.add(src)
         obj = os.path.join(target, 'lib', src + '.bc')
         objects.append(obj)
-        src_file = os.path.join(src_libdir, src)
+        src_file = os.path.join(libdir, src)
         ext = os.path.splitext(src)[1]
         if ext == '.ll':
           b.build(obj, 'LLVM_AS', src_file)
@@ -126,6 +129,18 @@
   b.build(builtins_link_bc, "LLVM_LINK", objects)
   b.build(builtins_opt_bc, "OPT", builtins_link_bc)
   b.build(builtins_bc, "PREPARE_BUILTINS", builtins_opt_bc, prepare_builtins)
+  install_files.append((builtins_bc, builtins_bc))
+  install_deps.append(builtins_bc)
+  b.default(builtins_bc)
+
+if options.prefix:
+  install_cmd = ' && '.join(['mkdir -p %(dst)s && cp -r %(src)s %(dst)s' % 
+                             {'src': file,
+                              'dst': os.path.join(options.prefix,
+                                                  os.path.dirname(dest))}
+                             for (file, dest) in install_files])
+  b.rule('install', command = install_cmd, description = 'INSTALL')
+  b.build('install', 'install', install_deps)
 
 b.rule("configure", command = ' '.join(sys.argv), description = 'CONFIGURE',
        generator = True)