From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** This commit represents a complete reformatting of the LLDB source code *** to conform to clang-format’s LLVM style. This kind of mass change has *** two obvious implications: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- lldb/scripts/swig_bot_lib/local.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lldb/scripts/swig_bot_lib/local.py') diff --git a/lldb/scripts/swig_bot_lib/local.py b/lldb/scripts/swig_bot_lib/local.py index 7cca0b3cabb..b26ea2f53ea 100644 --- a/lldb/scripts/swig_bot_lib/local.py +++ b/lldb/scripts/swig_bot_lib/local.py @@ -26,12 +26,14 @@ import use_lldb_suite # Package imports from lldbsuite.support import fs + class LocalConfig(object): src_root = None target_dir = None languages = None swig_executable = None + def pack_archive(bytes_io, src_root, filters): logging.info("Creating input file package...") zip_file = None @@ -53,9 +55,9 @@ def pack_archive(bytes_io, src_root, filters): candidates = [os.path.normpath(os.path.join(full_path, f)) for f in os.listdir(full_path)] actual = filter( - lambda f : os.path.isfile(f) and os.path.splitext(f)[1] == ext, + lambda f: os.path.isfile(f) and os.path.splitext(f)[1] == ext, candidates) - return (subfolder, map(lambda f : os.path.basename(f), actual)) + return (subfolder, map(lambda f: os.path.basename(f), actual)) archive_entries = map(filter_func, filters) else: for (root, dirs, files) in os.walk(src_root): @@ -77,6 +79,7 @@ def pack_archive(bytes_io, src_root, filters): return zip_file + def unpack_archive(folder, archive_bytes): zip_data = io.BytesIO(archive_bytes) logging.debug("Opening zip archive...") @@ -84,6 +87,7 @@ def unpack_archive(folder, archive_bytes): zip_file.extractall(folder) zip_file.close() + def generate(options): include_folder = os.path.join(options.src_root, "include") in_file = os.path.join(options.src_root, "scripts", "lldb.swig") @@ -128,4 +132,4 @@ def generate(options): logging.error("An error occurred executing swig. returncode={}" .format(e.returncode)) logging.error(e.output) - return (e.returncode, e.output) \ No newline at end of file + return (e.returncode, e.output) -- cgit v1.2.3