commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r8547 - gnuradio/branches/developers/eb/mp-sched/dtool


From: eb
Subject: [Commit-gnuradio] r8547 - gnuradio/branches/developers/eb/mp-sched/dtools/bin
Date: Mon, 2 Jun 2008 17:28:17 -0600 (MDT)

Author: eb
Date: 2008-06-02 17:28:15 -0600 (Mon, 02 Jun 2008)
New Revision: 8547

Modified:
   gnuradio/branches/developers/eb/mp-sched/dtools/bin/install-tbb
Log:
work-in-progress

Modified: gnuradio/branches/developers/eb/mp-sched/dtools/bin/install-tbb
===================================================================
--- gnuradio/branches/developers/eb/mp-sched/dtools/bin/install-tbb     
2008-06-02 20:01:09 UTC (rev 8546)
+++ gnuradio/branches/developers/eb/mp-sched/dtools/bin/install-tbb     
2008-06-02 23:28:15 UTC (rev 8547)
@@ -7,8 +7,9 @@
 from optparse import OptionParser
 import os
 import os.path
+import glob
 
-default_prefix="/opt/intel/tbb"
+default_prefix="/usr/local"
 
 pkgconfig_filename = "tbb.pc"
 pkgconfig_file_contents = """\
@@ -25,6 +26,21 @@
 Cflags: -I${includedir}
 """
 
+debug_pkgconfig_filename = "tbb_debug.pc"
+debug_pkgconfig_file_contents = """\
+prefix=%s
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: tbb
+Description: Intel Threading Building Blocks
+Requires: 
+Version: 2.0
+Libs: -L${libdir} -ltbb_debug -ltbbmalloc_debug
+Cflags: -I${includedir}
+"""
+
 def main():
    parser = OptionParser()
    parser.add_option('','--prefix', default=default_prefix,
@@ -36,18 +52,37 @@
 
    prefix = options.prefix
    
+   # are we installing 64-bit libs?
+
+   is_64bit = False
+   files = glob.glob('build/*_em64t_*_release')
+   # print "files: ", files
+   if len(files) != 0:
+      is_64bit = True
+
+   # FIXME add 32 and 64-bit PPC support
+
+   if is_64bit:
+      lib = 'lib64'
+   else:
+      lib = 'lib'
+      
    os.system('install -d ' + os.path.join(prefix, 'include/tbb'))
    os.system('install -d ' + os.path.join(prefix, 'include/tbb/machine'))
-   os.system('install -d ' + os.path.join(prefix, 'lib'))
-   os.system('install -d ' + os.path.join(prefix, 'lib/pkgconfig'))
-   os.system('install -t ' + os.path.join(prefix, 'lib') + ' 
build/linux*release/*.so*')
-   os.system('install -t ' + os.path.join(prefix, 'lib') + ' 
build/linux*debug/*.so*')
+   os.system('install -d ' + os.path.join(prefix, lib))
+   os.system('install -d ' + os.path.join(prefix, lib, 'pkgconfig'))
+   os.system('install -t ' + os.path.join(prefix, lib) + ' 
build/linux*release/*.so*')
+   os.system('install -t ' + os.path.join(prefix, lib) + ' 
build/linux*debug/*.so*')
    os.system('install -t ' + os.path.join(prefix, 'include/tbb') + ' 
include/tbb/*.h')
    os.system('install -t ' + os.path.join(prefix, 'include/tbb/machine') + ' 
include/tbb/machine/*.h')
 
-   f = open(os.path.join(prefix, 'lib/pkgconfig', pkgconfig_filename), 'w')
+   f = open(os.path.join(prefix, lib, 'pkgconfig', pkgconfig_filename), 'w')
    f.write(pkgconfig_file_contents % (prefix,))
    f.close()
    
+   f = open(os.path.join(prefix, lib, 'pkgconfig', debug_pkgconfig_filename), 
'w')
+   f.write(debug_pkgconfig_file_contents % (prefix,))
+   f.close()
+   
 if __name__ == "__main__":
    main()





reply via email to

[Prev in Thread] Current Thread [Next in Thread]