diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-04-13 18:36:53 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-04-13 18:36:53 -0400 |
| commit | f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 (patch) | |
| tree | 7e846386b9eb1676f9a93fc4a1e55916b9accc97 /dtools | |
| parent | 6a1e9783fec6ed827f49db27c171591d30f32933 (diff) | |
Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future.
The sed script was provided by Moritz Fischer.
Diffstat (limited to 'dtools')
| -rw-r--r-- | dtools/README | 10 | ||||
| -rwxr-xr-x | dtools/bin/check-imports | 2 | ||||
| -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 |
5 files changed, 23 insertions, 20 deletions
diff --git a/dtools/README b/dtools/README index 938ef6dd58..280b19bbd3 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-imports b/dtools/bin/check-imports index 75ca547d6d..fe4bf23027 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/install-tbb b/dtools/bin/install-tbb index 95ffbedd7c..8ff216da4c 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 0000000000..9f011be3bc --- /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 ec67ef0766..608ba0a8e2 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() - + |