osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

delete_includes.py: Python 3 compatibility 

While improving python 3 compatibility, fix whitespaces and remove the
useless try/except block as these modules are part of core.

Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3 (with "make"
replaced by "true" and by comparing stdout).

Change-Id: I9c585da89aef76f01672c8f7320ac4a13c6cc7d7
Reviewed-on: https://code.wireshark.org/review/7790
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
This commit is contained in:
Peter Wu 2015-03-22 11:40:11 +01:00 committed by Martin Mathieson
parent 7a90a6b834
commit 355e913f91
1 changed files with 40 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
tools/delete_includes.py
View File

@ -23,18 +23,14 @@
# #
try: import subprocess
import subprocess import os
import os import sys
import sys import shutil
import shutil
except:
print 'Missing modules!'
exit (-1)
def show_usage(): def show_usage():
print 'Usage: ./delete_includes.py <dissectors | wsutil | wiretap | ui | qt | plugins > [start_file] [stop_file]' print('Usage: ./delete_includes.py <dissectors | wsutil | wiretap | ui | qt | plugins > [start_file] [stop_file]')
# Work out wireshark folder based upon CWD. Assume run in wireshark folder # Work out wireshark folder based upon CWD. Assume run in wireshark folder
# or from tools folder... # or from tools folder...
@ -45,46 +41,46 @@ if lastdir == 'tools':
# Make command depends upon platform. # Make command depends upon platform.
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
default_make_command = ['nmake', '-f', 'Makefile.nmake'] default_make_command = ['nmake', '-f', 'Makefile.nmake']
else: else:
default_make_command = ['make'] default_make_command = ['make']
# Set parameters based upon string passed as argument. # Set parameters based upon string passed as argument.
if len(sys.argv) > 1: if len(sys.argv) > 1:
if sys.argv[1] == 'dissectors': if sys.argv[1] == 'dissectors':
print 'dissectors target chosen!' print('dissectors target chosen!')
test_folder = os.path.join(wireshark_root, 'epan', 'dissectors') test_folder = os.path.join(wireshark_root, 'epan', 'dissectors')
run_folder = test_folder run_folder = test_folder
make_command = default_make_command make_command = default_make_command
elif sys.argv[1] == 'wsutil': elif sys.argv[1] == 'wsutil':
print 'wsutils target chosen!' print('wsutils target chosen!')
test_folder = os.path.join(wireshark_root, 'wsutil') test_folder = os.path.join(wireshark_root, 'wsutil')
run_folder = test_folder run_folder = test_folder
make_command = default_make_command make_command = default_make_command
elif sys.argv[1] == 'wiretap': elif sys.argv[1] == 'wiretap':
print 'wiretap target chosen!' print('wiretap target chosen!')
test_folder = os.path.join(wireshark_root, 'wiretap') test_folder = os.path.join(wireshark_root, 'wiretap')
run_folder = test_folder run_folder = test_folder
make_command = default_make_command make_command = default_make_command
elif sys.argv[1] == 'ui': elif sys.argv[1] == 'ui':
print 'ui target chosen!' print('ui target chosen!')
test_folder = os.path.join(wireshark_root, 'ui') test_folder = os.path.join(wireshark_root, 'ui')
run_folder = wireshark_root run_folder = wireshark_root
make_command = default_make_command make_command = default_make_command
elif sys.argv[1] == 'qt': elif sys.argv[1] == 'qt':
print 'qt target chosen!' print('qt target chosen!')
test_folder = os.path.join(wireshark_root, 'ui', 'qt') test_folder = os.path.join(wireshark_root, 'ui', 'qt')
run_folder = wireshark_root run_folder = wireshark_root
default_make_command.append('qt') default_make_command.append('qt')
make_command = default_make_command make_command = default_make_command
elif sys.argv[1] == 'plugins': elif sys.argv[1] == 'plugins':
print 'plugins target chosen!' print('plugins target chosen!')
test_folder = os.path.join(wireshark_root, 'plugins') test_folder = os.path.join(wireshark_root, 'plugins')
run_folder = os.path.join(wireshark_root, 'plugins') run_folder = os.path.join(wireshark_root, 'plugins')
make_command = default_make_command make_command = default_make_command
else: else:
print 'Unrecognised command line option ', sys.argv[1] print('Unrecognised command line option %s' % sys.argv[1])
show_usage() show_usage()
sys.exit() sys.exit()
else: else:
@ -197,16 +193,16 @@ def test_file_is_built(root, filename):
# At the end, only those that appear to be needed will be left. # At the end, only those that appear to be needed will be left.
def test_file(root, filename): def test_file(root, filename):
print '' print('')
print '------------------------------' print('------------------------------')
print 'Testing ', filename print('Testing %s' % filename)
temp_filename = filename + '.tmp' temp_filename = filename + '.tmp'
# Test if file seems to be part of the build. # Test if file seems to be part of the build.
is_built = test_file_is_built(root, filename) is_built = test_file_is_built(root, filename)
if not is_built: if not is_built:
print '***** File not used in build, so ignore!!!!' print('***** File not used in build, so ignore!!!!')
global files_not_built global files_not_built
global files_not_built_list global files_not_built_list
files_not_built = files_not_built + 1 files_not_built = files_not_built + 1
@ -214,7 +210,7 @@ def test_file(root, filename):
files_not_built_list.append(filename) files_not_built_list.append(filename)
return return
else: else:
print 'This file is part of the build' print('This file is part of the build')
# OK, we are going to test removing includes from this file. # OK, we are going to test removing includes from this file.
tested_line_number = 0 tested_line_number = 0
@ -253,7 +249,7 @@ def test_file(root, filename):
hash_if_level = hash_if_level - 1 hash_if_level = hash_if_level - 1
# Consider deleting this line have haven't already reached. # Consider deleting this line have haven't already reached.
if (not have_deleted_line and (tested_line_number < this_line_number)): if (not have_deleted_line and (tested_line_number < this_line_number)):
# Test line for starting with #include, and eligible for deletion. # Test line for starting with #include, and eligible for deletion.
if line.startswith('#include ') and hash_if_level == 0 and line.find(module_header) == -1: if line.startswith('#include ') and hash_if_level == 0 and line.find(module_header) == -1:
@ -266,7 +262,7 @@ def test_file(root, filename):
global includes_to_keep_kept global includes_to_keep_kept
includes_to_keep_kept = includes_to_keep_kept + 1 includes_to_keep_kept = includes_to_keep_kept + 1
continue continue
if allowed_to_delete: if allowed_to_delete:
# OK, actually doing it. # OK, actually doing it.
have_deleted_line = True have_deleted_line = True
@ -292,7 +288,7 @@ def test_file(root, filename):
os.chdir(run_folder) os.chdir(run_folder)
result = subprocess.call(make_command) result = subprocess.call(make_command)
if result == 0: if result == 0:
print '***** Good build' print('***** Good build')
# Line was eliminated so decrement line counter # Line was eliminated so decrement line counter
tested_line_number = tested_line_number - 1 tested_line_number = tested_line_number - 1
# Inc successes counter # Inc successes counter
@ -305,7 +301,7 @@ def test_file(root, filename):
if sys.argv[1] == 'dissectors': if sys.argv[1] == 'dissectors':
os.remove(os.path.join(run_folder, 'vc100.pdb')) os.remove(os.path.join(run_folder, 'vc100.pdb'))
else: else:
print '***** Bad build' print('***** Bad build')
# Never mind, go back to previous building version # Never mind, go back to previous building version
os.chdir(root) os.chdir(root)
shutil.copy(temp_filename, filename) shutil.copy(temp_filename, filename)
@ -362,12 +358,12 @@ def generated_file(filename):
###################################################################################### ######################################################################################
# First, confirm that the build is currently passing, if not give up now. # First, confirm that the build is currently passing, if not give up now.
print 'chdir into ', run_folder print('chdir into %s' % run_folder)
os.chdir(run_folder) os.chdir(run_folder)
print '***** Doing an initial build to check we have a stable base.' print('***** Doing an initial build to check we have a stable base.')
result = subprocess.call(make_command) result = subprocess.call(make_command)
if result != 0: if result != 0:
print '***** Initial build failed - give up now!!!!' print('***** Initial build failed - give up now!!!!')
exit (-1) exit (-1)
# OK, loop over files in test_folder and see what can be removed from each one # OK, loop over files in test_folder and see what can be removed from each one
@ -405,22 +401,22 @@ for root, subFolders, files in os.walk(test_folder):
if not first_file_found: if not first_file_found:
reason = 'not seen starting file', first_file_to_test, 'yet' reason = 'not seen starting file', first_file_to_test, 'yet'
skipped_before_first = skipped_before_first + 1 skipped_before_first = skipped_before_first + 1
print 'Ignoring ', filename, ':', reason print('Ignoring %s: %s' % (filename, reason))
# Show summary stats of run # Show summary stats of run
print '\n\n' print('\n\n')
print 'Summary' print('Summary')
print '=========' print('=========')
print 'files examined: ', files_examined print('files examined: %d' % files_examined)
print 'includes tested: ', includes_tested print('includes tested: %d' % includes_tested)
print 'includes deleted: ', includes_deleted print('includes deleted: %d' % includes_deleted)
print 'files not built: ', files_not_built print('files not built: %d' % files_not_built)
for abandoned_file in files_not_built_list: for abandoned_file in files_not_built_list:
print ' ', abandoned_file print(' %s' % abandoned_file)
print len(generated_files_ignored), 'generated files not tested:' print('%d generated files not tested:' % len(generated_files_ignored))
for generated_file in generated_files_ignored: for generated_file in generated_files_ignored:
print ' ', generated_file print(' %s' % generated_file)
print 'includes kept as not safe to remove: ', includes_to_keep_kept print('includes kept as not safe to remove: %d' % includes_to_keep_kept)
print 'skipped before first:', skipped_before_first print('skipped before first: %d' % skipped_before_first)