Start libc++ python cleanup and consolidation.
Libc++ frequently creates and uses utilities written in python.
Currently there are python modules under both libcxx/test and
libcxx/util. My goal with these changes is to consolidate them
into a single package under libcxx/utils/libcxx.
llvm-svn: 294644
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 0b37f209bf2aaf9b06276a0c40d1c29b5d6bfe89
diff --git a/utils/gen_link_script/gen_link_script.py b/utils/gen_link_script.py
similarity index 100%
rename from utils/gen_link_script/gen_link_script.py
rename to utils/gen_link_script.py
diff --git a/utils/libcxx/__init__.py b/utils/libcxx/__init__.py
new file mode 100644
index 0000000..7523a3d
--- /dev/null
+++ b/utils/libcxx/__init__.py
@@ -0,0 +1,17 @@
+#===----------------------------------------------------------------------===##
+#
+# The LLVM Compiler Infrastructure
+#
+# This file is dual licensed under the MIT and the University of Illinois Open
+# Source Licenses. See LICENSE.TXT for details.
+#
+#===----------------------------------------------------------------------===##
+
+"""libcxx python utilities"""
+
+__author__ = 'Eric Fiselier'
+__email__ = 'eric@efcs.ca'
+__versioninfo__ = (0, 1, 0)
+__version__ = ' '.join(str(v) for v in __versioninfo__) + 'dev'
+
+__all__ = []
diff --git a/utils/sym_check/sym_check/__init__.py b/utils/libcxx/sym_check/__init__.py
similarity index 100%
rename from utils/sym_check/sym_check/__init__.py
rename to utils/libcxx/sym_check/__init__.py
diff --git a/utils/sym_check/sym_check/diff.py b/utils/libcxx/sym_check/diff.py
similarity index 98%
rename from utils/sym_check/sym_check/diff.py
rename to utils/libcxx/sym_check/diff.py
index c89c4ef..55443bd 100644
--- a/utils/sym_check/sym_check/diff.py
+++ b/utils/libcxx/sym_check/diff.py
@@ -11,7 +11,7 @@
diff - A set of functions for diff-ing two symbol lists.
"""
-from sym_check import util
+from libcxx.sym_check import util
def _symbol_difference(lhs, rhs):
diff --git a/utils/sym_check/sym_check/extract.py b/utils/libcxx/sym_check/extract.py
similarity index 99%
rename from utils/sym_check/sym_check/extract.py
rename to utils/libcxx/sym_check/extract.py
index d132e22..596302b 100644
--- a/utils/sym_check/sym_check/extract.py
+++ b/utils/libcxx/sym_check/extract.py
@@ -14,7 +14,7 @@
import sys
import re
-from sym_check import util
+from libcxx.sym_check import util
extract_ignore_names = ['_init', '_fini']
diff --git a/utils/sym_check/sym_check/match.py b/utils/libcxx/sym_check/match.py
similarity index 100%
rename from utils/sym_check/sym_check/match.py
rename to utils/libcxx/sym_check/match.py
diff --git a/utils/sym_check/sym_check/util.py b/utils/libcxx/sym_check/util.py
similarity index 98%
rename from utils/sym_check/sym_check/util.py
rename to utils/libcxx/sym_check/util.py
index 32055d8..58e0b95 100644
--- a/utils/sym_check/sym_check/util.py
+++ b/utils/libcxx/sym_check/util.py
@@ -152,9 +152,9 @@
def extract_or_load(filename):
- import sym_check.extract
+ import libcxx.sym_check.extract
if is_library_file(filename):
- return sym_check.extract.extract_symbols(filename)
+ return libcxx.sym_check.extract.extract_symbols(filename)
return read_syms_from_file(filename)
def adjust_mangled_name(name):
diff --git a/utils/not/not.py b/utils/not.py
similarity index 100%
rename from utils/not/not.py
rename to utils/not.py
diff --git a/utils/sym_check/sym_diff.py b/utils/sym_diff.py
similarity index 98%
rename from utils/sym_check/sym_diff.py
rename to utils/sym_diff.py
index 631f9c6..c01f71c 100755
--- a/utils/sym_check/sym_diff.py
+++ b/utils/sym_diff.py
@@ -13,7 +13,7 @@
from argparse import ArgumentParser
import sys
-from sym_check import diff, util
+from libcxx.sym_check import diff, util
def main():
diff --git a/utils/sym_check/sym_extract.py b/utils/sym_extract.py
similarity index 97%
rename from utils/sym_check/sym_extract.py
rename to utils/sym_extract.py
index 2776567..0d9d2ee 100755
--- a/utils/sym_check/sym_extract.py
+++ b/utils/sym_extract.py
@@ -11,7 +11,7 @@
sym_extract - Extract and output a list of symbols from a shared library.
"""
from argparse import ArgumentParser
-from sym_check import extract, util
+from libcxx.sym_check import extract, util
def main():
diff --git a/utils/sym_check/sym_match.py b/utils/sym_match.py
similarity index 96%
rename from utils/sym_check/sym_match.py
rename to utils/sym_match.py
index 231bdc8..48582ce 100755
--- a/utils/sym_check/sym_match.py
+++ b/utils/sym_match.py
@@ -13,7 +13,7 @@
"""
from argparse import ArgumentParser
import sys
-from sym_check import util, match, extract
+from libcxx.sym_check import util, match, extract
def main():
diff --git a/utils/sym_check/linux_blacklist.txt b/utils/symcheck-blacklists/linux_blacklist.txt
similarity index 100%
rename from utils/sym_check/linux_blacklist.txt
rename to utils/symcheck-blacklists/linux_blacklist.txt
diff --git a/utils/sym_check/osx_blacklist.txt b/utils/symcheck-blacklists/osx_blacklist.txt
similarity index 100%
rename from utils/sym_check/osx_blacklist.txt
rename to utils/symcheck-blacklists/osx_blacklist.txt