diff options
Diffstat (limited to 'dtools')
| -rw-r--r-- | dtools/README | 10 | ||||
| -rwxr-xr-x | dtools/bin/check-config-files | 72 | ||||
| -rwxr-xr-x | dtools/bin/check-imports | 2 | ||||
| -rwxr-xr-x | dtools/bin/get-config-files | 6 | ||||
| -rwxr-xr-x | dtools/bin/install-tbb | 12 | ||||
| -rwxr-xr-x | dtools/bin/remove-whitespace | 3 | ||||
| -rwxr-xr-x | dtools/bin/update_fsf_address | 16 | ||||
| -rw-r--r-- | dtools/microblaze/mb-gcc-4.1.1-gr-1.patch | 47 | ||||
| -rw-r--r-- | dtools/release-checklist | 11 |
9 files changed, 23 insertions, 156 deletions
diff --git a/dtools/README b/dtools/README index 938ef6dd5..280b19bbd 100644 --- a/dtools/README +++ b/dtools/README @@ -1,23 +1,23 @@ # # Copyright 2006 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# This is a collection of tools that are useful for building tarball distributions of GNU Radio. They're probably not of general interest. diff --git a/dtools/bin/check-config-files b/dtools/bin/check-config-files deleted file mode 100755 index 7111c951d..000000000 --- a/dtools/bin/check-config-files +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python -# usage: takes list of directories on command line - -import sys -import os -import os.path -from itertools import ifilter, ifilterfalse, imap, izip -import md5 -from pprint import pprint -from sets import Set - -class info(object): - def __init__(self, dir, name, md5sum): - self.dir = dir - self.name = name - self.md5sum = md5sum - def __repr__(self): - return '<%r, %r, %r>' % (self.dir, self.name, self.md5sum) - - -def md5sum_file(filename): - f = open(filename, 'r') - m = md5.new(f.read()) - return m.hexdigest() - -def process_dir(dir): - files = list(ifilterfalse(lambda s: s.endswith('~'), - _filter(os.listdir(dir), ('CVS','Makefile', 'Makefile.in', '.svn')))) - return [info(dir, f, md5sum_file(os.path.join(dir, f))) for f in files] - - -# Return a copy with items that occur in skip removed. -# -def _filter(flist, skip): - return list(ifilterfalse(skip.__contains__, flist)) - -def main(): - dirs = sys.argv[1:] - r = [] - for d in dirs: - r += process_dir(d) - - names = Set([x.name for x in r]) - #pprint(names) - - # check for missing files across the union of names - for d in dirs: - names_in_dir = Set([x.name for x in r if x.dir == d]) - diff = names.difference(names_in_dir) - if len(diff) != 0: - print "%s is missing %r" % (d, diff) - - # check for different versions of files - name_list = [n for n in names] - name_list.sort() - - for name in name_list: - vers = {} - pairs = [(x.dir, x.md5sum) for x in r if x.name == name] - for (dir, sum) in pairs: - if vers.has_key(sum): - vers[sum].append(dir) - else: - vers[sum] = [ dir ] - if len(vers) != 1: # multiple versions - print "Multiple versions of %s:" % (name,) - pprint(vers) - - # pprint(r) - -if __name__ == '__main__': - main() diff --git a/dtools/bin/check-imports b/dtools/bin/check-imports index 75ca547d6..fe4bf2302 100755 --- a/dtools/bin/check-imports +++ b/dtools/bin/check-imports @@ -1,4 +1,4 @@ #!/bin/bash -find . -name '*.py' | xargs grep -h -E '^(from|import)' | sort -u +find . -name '*.py' | xargs grep -h -E '^(from|import)' | sort -u diff --git a/dtools/bin/get-config-files b/dtools/bin/get-config-files deleted file mode 100755 index 343bca26b..000000000 --- a/dtools/bin/get-config-files +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# fetch latest config.guess and config.sub - -wget -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' -wget -O config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' diff --git a/dtools/bin/install-tbb b/dtools/bin/install-tbb index 95ffbedd7..8ff216da4 100755 --- a/dtools/bin/install-tbb +++ b/dtools/bin/install-tbb @@ -20,7 +20,7 @@ includedir=${prefix}/include Name: tbb Description: Intel Threading Building Blocks -Requires: +Requires: Version: 2.0 Libs: -L${libdir} -ltbb -ltbbmalloc Cflags: -I${includedir} @@ -35,7 +35,7 @@ includedir=${prefix}/include Name: tbb Description: Intel Threading Building Blocks -Requires: +Requires: Version: 2.0 Libs: -L${libdir} -ltbb_debug -ltbbmalloc_debug Cflags: -I${includedir} @@ -51,7 +51,7 @@ def main(): raise SystemExit, 1 prefix = options.prefix - + # are we installing 64-bit libs? is_64bit = False @@ -66,7 +66,7 @@ def main(): 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)) @@ -79,10 +79,10 @@ def main(): 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/remove-whitespace b/dtools/bin/remove-whitespace new file mode 100755 index 000000000..9f011be3b --- /dev/null +++ b/dtools/bin/remove-whitespace @@ -0,0 +1,3 @@ +#!/bin/bash + +sed -i -e 's/\s\+$//g' $(find . -type f | grep -v '.git' | grep -v 'png' | grep -v 'eps')
\ No newline at end of file diff --git a/dtools/bin/update_fsf_address b/dtools/bin/update_fsf_address index ec67ef076..608ba0a8e 100755 --- a/dtools/bin/update_fsf_address +++ b/dtools/bin/update_fsf_address @@ -1,19 +1,19 @@ #!/usr/bin/env python # # Copyright 2006 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -108,7 +108,7 @@ 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, @@ -120,7 +120,7 @@ def main(): dry_run = options.dry_run if options.dry_run: options.list_modified_files = True - + for file_or_dir in args: handle_file_or_dir(file_or_dir) @@ -128,7 +128,7 @@ def main(): for f in modified_files: sys.stdout.write(f + '\n') - + if __name__ == '__main__': main() - + diff --git a/dtools/microblaze/mb-gcc-4.1.1-gr-1.patch b/dtools/microblaze/mb-gcc-4.1.1-gr-1.patch deleted file mode 100644 index fe7d18d9f..000000000 --- a/dtools/microblaze/mb-gcc-4.1.1-gr-1.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- orig/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14.0_libgloss.patch 2008-01-29 15:42:56.000000000 -0800 -+++ new/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14.0_libgloss.patch 2008-10-05 08:47:12.000000000 -0700 -@@ -232,7 +232,7 @@ - +all: ${CRT} ${OBJS}
-
- install: ${CRT}
-- @for crt in ${CRT}; do\
-+ @for crt in ${CRT}; do \
- diff -urNp --exclude '*.swp' newlib-orig/libgloss/microblaze/open.c newlib/libgloss/microblaze/open.c
- --- newlib-orig/libgloss/microblaze/open.c 1969-12-31 16:00:00.000000000 -0800
- +++ newlib/libgloss/microblaze/open.c 2007-05-07 19:07:04.000000000 -0700
-diff -urN orig/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14.0_libgloss_more_funcs.patch new/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14.0_libgloss_more_funcs.patch ---- orig/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14.0_libgloss_more_funcs.patch 2008-01-29 15:42:56.000000000 -0800 -+++ new/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14.0_libgloss_more_funcs.patch 2008-10-05 08:47:12.000000000 -0700 -@@ -1007,7 +1007,7 @@ - @@ -71,7 +71,7 @@ all: ${CRT} ${LIB} - - install: ${CRT} ${LIB} -- @for crt in ${CRT}; do\ -+ @for crt in ${CRT}; do \ - - $(INSTALL_PROGRAM) $${crt} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${crt}; \ - + $(INSTALL_PROGRAM) $${crt} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${crt}; \ - done -diff -urN orig/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14.0_libmb.patch new/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14.0_libmb.patch ---- orig/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14.0_libmb.patch 2008-01-29 15:42:56.000000000 -0800 -+++ new/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14.0_libmb.patch 2008-10-05 08:47:12.000000000 -0700 -@@ -25,7 +25,7 @@ -
- -install: ${CRT}
- +install: ${CRT} ${LIB}
-- @for crt in ${CRT}; do\
-+ @for crt in ${CRT}; do \
- $(INSTALL_PROGRAM) $${crt} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${crt}; \
- done
- + $(INSTALL_PROGRAM) ${LIB} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-diff -urN orig/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14_crt.patch new/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14_crt.patch ---- orig/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14_crt.patch 2008-01-29 15:42:56.000000000 -0800 -+++ new/Xilinx_EDK_GNU_10.1i/mb/srcs/newlib-1.14_crt.patch 2008-10-05 08:47:12.000000000 -0700 -@@ -619,7 +619,7 @@ - +all: ${CRT} - + - +install: ${CRT} --+ @for crt in ${CRT}; do\ -++ @for crt in ${CRT}; do \ - + $(INSTALL_PROGRAM) $${crt} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${crt}; \ - + done - + diff --git a/dtools/release-checklist b/dtools/release-checklist deleted file mode 100644 index 9e2e37706..000000000 --- a/dtools/release-checklist +++ /dev/null @@ -1,11 +0,0 @@ -Caveats: - -* gr-howto-write-a-block must be checked out into it's own top-level - working copy for build, otherwise automake will grab the depcomp, - install-sh, etc. files from the parent directory, and not put them - in the distribution tarball. - -* Ubuntu's automake (at least) will copy config.guess and config.sub from - Ubuntu's system directory, even if there is already one in the directory. - You need to 'svn revert config.guess config.sub' after running bootstrap - and before running configure.
\ No newline at end of file |