2 files changed, 13 insertions, 101 deletions
diff --git a/dtools/bin/install-tbb b/dtools/bin/install-tbb
deleted file mode 100755
index 8ff216da4c..0000000000
--- a/dtools/bin/install-tbb
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Install the release and debug libs and includes under --prefix
-"""
-
-from optparse import OptionParser
-import os
-import os.path
-import glob
-
-default_prefix="/usr/local"
-
-pkgconfig_filename = "tbb.pc"
-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 -ltbbmalloc
-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,
-                     help="install architecture-independent files in PREFIX [default=%default]")
-   (options, args) = parser.parse_args()
-   if len(args) != 0:
-      parser.print_help()
-      raise SystemExit, 1
-
-   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 -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.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()
diff --git a/dtools/bin/update_fsf_address b/dtools/bin/update_fsf_address
index 608ba0a8e2..0017fa11a9 100755
--- a/dtools/bin/update_fsf_address
+++ b/dtools/bin/update_fsf_address
@@ -23,7 +23,7 @@ import re
 import os
 import os.path
 import sys
-from optparse import OptionParser
+from argparse import ArgumentParser
 
 dry_run = False
 modified_files = []
@@ -109,22 +109,22 @@ def handle_file_or_dir(file_or_dir):
 def main():
     global dry_run
 
-    usage = '%prog: [options] [file_or_dir...]'
-    parser = OptionParser (usage=usage)
-    parser.add_option('-l', '--list-modified-files', action='store_true', default=False,
-                      help='List modified files to stdout [default=%default]')
-    parser.add_option('', '--dry-run', action='store_true', default=False,
-                      help="Don't modify any files, just report what would be modified [default=%default]")
-    (options, args) = parser.parse_args()
+    parser = ArgumentParser()
+    parser.add_argument('-l', '--list-modified-files', action='store_true',
+                      help='List modified files to stdout')
+    parser.add_argument('--dry-run', action='store_true',
+                      help="Don't modify any files, just report what would be modified")
+    parser.add_argument('file_or_dir', metavar='FILE-OR-DIR', nargs='*')
+    args = parser.parse_args()
 
-    dry_run = options.dry_run
-    if options.dry_run:
-        options.list_modified_files = True
+    dry_run = args.dry_run
+    if args.dry_run:
+        args.list_modified_files = True
 
-    for file_or_dir in args:
+    for file_or_dir in args.file_or_dir:
         handle_file_or_dir(file_or_dir)
 
-    if options.list_modified_files:
+    if args.list_modified_files:
         for f in modified_files:
             sys.stdout.write(f + '\n')