Rename CTS "build" Python module to "ctsbuild"

This avoid name conflicts with a popular Python module that may be
installed in the system.

VK-GL-CTS issue: 4162
VK-GL-CTS public issue: 334
Components: Framework

Change-Id: Ic89cbf59e0f9bc00c0a94fb303f3c2051332365f

diff --git a/external/fetch_kc_cts.py b/external/fetch_kc_cts.py
index affb843..1d1fb57 100644 (file)
--- a/external/fetch_kc_cts.py
+++ b/external/fetch_kc_cts.py
@@ -29,7 +29,7 @@ import subprocess
 from fetch_sources import *
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
 
-from build.common import *
+from ctsbuild.common import *
 
 EXTERNAL_DIR   = os.path.realpath(os.path.normpath(os.path.dirname(__file__)))
 SHA1 = "3059c07a20ac64f636296a7ef200dadc1ce7d37a"

diff --git a/external/fetch_sources.py b/external/fetch_sources.py
index 817c62e..72be2af 100644 (file)
--- a/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@ -32,7 +32,7 @@ import stat
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
 
-from build.common import *
+from ctsbuild.common import *
 
 EXTERNAL_DIR   = os.path.realpath(os.path.normpath(os.path.dirname(__file__)))
 

diff --git a/external/openglcts/scripts/build_caselists.py b/external/openglcts/scripts/build_caselists.py
index 68bbde1..7f92232 100644 (file)
--- a/external/openglcts/scripts/build_caselists.py
+++ b/external/openglcts/scripts/build_caselists.py
@@ -29,9 +29,9 @@ import shutil
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
 
-from build.common import *
-from build.config import *
-from build.build import *
+from ctsbuild.common import *
+from ctsbuild.config import *
+from ctsbuild.build import *
 
 
 class Module:

diff --git a/external/openglcts/scripts/build_mustpass.py b/external/openglcts/scripts/build_mustpass.py
index ed612d6..a15af89 100644 (file)
--- a/external/openglcts/scripts/build_mustpass.py
+++ b/external/openglcts/scripts/build_mustpass.py
@@ -29,8 +29,8 @@ from mustpass import Project, Package, Mustpass, Configuration, include, exclude
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
 
-from build.common import DEQP_DIR
-from build.config import ANY_GENERATOR, BuildConfig
+from ctsbuild.common import DEQP_DIR
+from ctsbuild.config import ANY_GENERATOR, BuildConfig
 
 
 COPYRIGHT_DECLARATION = """\

diff --git a/external/openglcts/scripts/mustpass.py b/external/openglcts/scripts/mustpass.py
index b0fd963..07335dc 100644 (file)
--- a/external/openglcts/scripts/mustpass.py
+++ b/external/openglcts/scripts/mustpass.py
@@ -29,9 +29,9 @@ from build_caselists import Module, getModuleByName, getBuildConfig, genCaseList
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
 
-from build.common import *
-from build.config import ANY_GENERATOR
-from build.build import build
+from ctsbuild.common import *
+from ctsbuild.config import ANY_GENERATOR
+from ctsbuild.build import build
 from fnmatch import fnmatch
 from copy import copy
 

diff --git a/external/openglcts/scripts/verify_kc_cts_rev.py b/external/openglcts/scripts/verify_kc_cts_rev.py
index 0d58e0e..04e68eb 100644 (file)
--- a/external/openglcts/scripts/verify_kc_cts_rev.py
+++ b/external/openglcts/scripts/verify_kc_cts_rev.py
@@ -30,7 +30,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 from fetch_kc_cts import SHA1
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
-from build.common import *
+from ctsbuild.common import *
 
 
 EXTERNAL_DIR    = os.path.realpath(os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")))

diff --git a/external/vulkancts/scripts/amber_verify.py b/external/vulkancts/scripts/amber_verify.py
index eecb0d2..dfd0788 100644 (file)
--- a/external/vulkancts/scripts/amber_verify.py
+++ b/external/vulkancts/scripts/amber_verify.py
@@ -27,9 +27,9 @@ import tempfile
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
 
-from build.common import *
-from build.config import *
-from build.build import *
+from ctsbuild.common import *
+from ctsbuild.config import *
+from ctsbuild.build import *
 
 class Module:
        def __init__ (self, name, dirName, binName):

diff --git a/external/vulkancts/scripts/build_mustpass.py b/external/vulkancts/scripts/build_mustpass.py
index 4d9ace7..09b3d74 100644 (file)
--- a/external/vulkancts/scripts/build_mustpass.py
+++ b/external/vulkancts/scripts/build_mustpass.py
@@ -25,8 +25,8 @@ import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
 
-from build.common import DEQP_DIR
-from build.config import ANY_GENERATOR
+from ctsbuild.common import DEQP_DIR
+from ctsbuild.config import ANY_GENERATOR
 from build_caselists import Module, getModuleByName, getBuildConfig, DEFAULT_BUILD_DIR, DEFAULT_TARGET
 from mustpass import Project, Package, Mustpass, Configuration, include, exclude, genMustpassLists, parseBuildConfigFromCmdLineArgs
 
@@ -77,4 +77,4 @@ MUSTPASS_LISTS                = [
        ]
 
 if __name__ == "__main__":
-       genMustpassLists(MUSTPASS_LISTS, ANY_GENERATOR, parseBuildConfigFromCmdLineArgs())
\ No newline at end of file
+       genMustpassLists(MUSTPASS_LISTS, ANY_GENERATOR, parseBuildConfigFromCmdLineArgs())

diff --git a/external/vulkancts/scripts/build_spirv_binaries.py b/external/vulkancts/scripts/build_spirv_binaries.py
index f048228..328a800 100644 (file)
--- a/external/vulkancts/scripts/build_spirv_binaries.py
+++ b/external/vulkancts/scripts/build_spirv_binaries.py
@@ -30,9 +30,9 @@ import fnmatch
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
 
-from build.common import *
-from build.config import *
-from build.build import *
+from ctsbuild.common import *
+from ctsbuild.config import *
+from ctsbuild.build import *
 
 class Module:
        def __init__ (self, name, dirName, binName):

diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py
index ef1270f..9afa9e5 100755 (executable)
--- a/external/vulkancts/scripts/gen_framework.py
+++ b/external/vulkancts/scripts/gen_framework.py
@@ -33,7 +33,7 @@ from collections import OrderedDict
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
 
-from build.common import DEQP_DIR, execute
+from ctsbuild.common import DEQP_DIR, execute
 from khr_util.format import indentLines, writeInlFile
 
 VULKAN_XML_DIR                         = os.path.join(os.path.dirname(__file__), "..", "..", "vulkan-docs", "src", "xml")

diff --git a/external/vulkancts/scripts/gen_framework_c.py b/external/vulkancts/scripts/gen_framework_c.py
index fa27d30..dfe799d 100644 (file)
--- a/external/vulkancts/scripts/gen_framework_c.py
+++ b/external/vulkancts/scripts/gen_framework_c.py
@@ -27,7 +27,7 @@ import re
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
 
-from build.common import DEQP_DIR, execute
+from ctsbuild.common import DEQP_DIR, execute
 from khr_util.format import writeInlFile
 
 VULKAN_HEADERS_INCLUDE_DIR       = os.path.join(os.path.dirname(__file__), "..", "..", "vulkan-docs", "src", "include")

diff --git a/external/vulkancts/scripts/gen_framework_sc.py b/external/vulkancts/scripts/gen_framework_sc.py
index dc7dc98..d736114 100644 (file)
--- a/external/vulkancts/scripts/gen_framework_sc.py
+++ b/external/vulkancts/scripts/gen_framework_sc.py
@@ -32,7 +32,7 @@ from collections import OrderedDict
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
 
-from build.common import DEQP_DIR, execute
+from ctsbuild.common import DEQP_DIR, execute
 from khr_util.format import indentLines, writeInlFile
 
 VULKAN_HEADERS_INCLUDE_DIR     = os.path.join(os.path.dirname(__file__), "..", "..", "vulkan-docs", "src", "include")

diff --git a/scripts/android/build_apk.py b/scripts/android/build_apk.py
index 6fc2859..ef7d6ae 100644 (file)
--- a/scripts/android/build_apk.py
+++ b/scripts/android/build_apk.py
@@ -39,9 +39,9 @@ import xml.etree.ElementTree
 # Import from <root>/scripts
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
 
-from build.common import *
-from build.config import *
-from build.build import *
+from ctsbuild.common import *
+from ctsbuild.config import *
+from ctsbuild.build import *
 
 class SDKEnv:
        def __init__(self, path):

diff --git a/scripts/android/install_apk.py b/scripts/android/install_apk.py
index 1076dc8..372d197 100644 (file)
--- a/scripts/android/install_apk.py
+++ b/scripts/android/install_apk.py
@@ -36,7 +36,7 @@ from build_apk import parsePackageName
 # Import from <root>/scripts
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
 
-from build.common import *
+from ctsbuild.common import *
 
 class Device:
        def __init__(self, serial, product, model, device):

diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 1aa28bf..63136e1 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -20,8 +20,8 @@
 #
 #-------------------------------------------------------------------------
 
-from build.common import DEQP_DIR
-from build.config import ANY_GENERATOR
+from ctsbuild.common import DEQP_DIR
+from ctsbuild.config import ANY_GENERATOR
 from build_caselists import Module, getModuleByName, getBuildConfig, DEFAULT_BUILD_DIR, DEFAULT_TARGET
 from mustpass import Project, Package, Mustpass, Configuration, include, exclude, genMustpassLists, parseBuildConfigFromCmdLineArgs
 

diff --git a/scripts/build_caselists.py b/scripts/build_caselists.py
index e2edec5..9ba2fe0 100644 (file)
--- a/scripts/build_caselists.py
+++ b/scripts/build_caselists.py
@@ -20,9 +20,9 @@
 #
 #-------------------------------------------------------------------------
 
-from build.common import *
-from build.config import *
-from build.build import *
+from ctsbuild.common import *
+from ctsbuild.config import *
+from ctsbuild.build import *
 
 import os
 import sys

diff --git a/scripts/check_build_sanity.py b/scripts/check_build_sanity.py
index d53aaa9..5af43dc 100644 (file)
--- a/scripts/check_build_sanity.py
+++ b/scripts/check_build_sanity.py
@@ -25,8 +25,8 @@ import argparse
 import tempfile
 import sys
 
-from build.common import *
-from build.build import *
+from ctsbuild.common import *
+from ctsbuild.build import *
 
 pythonExecutable = sys.executable or "python"
 

diff --git a/scripts/build/__init__.py b/scripts/ctsbuild/__init__.py
similarity index 100%
rename from scripts/build/__init__.py
rename to scripts/ctsbuild/__init__.py

diff --git a/scripts/build/build.py b/scripts/ctsbuild/build.py
similarity index 100%
rename from scripts/build/build.py
rename to scripts/ctsbuild/build.py

diff --git a/scripts/build/common.py b/scripts/ctsbuild/common.py
similarity index 100%
rename from scripts/build/common.py
rename to scripts/ctsbuild/common.py

diff --git a/scripts/build/config.py b/scripts/ctsbuild/config.py
similarity index 100%
rename from scripts/build/config.py
rename to scripts/ctsbuild/config.py

diff --git a/scripts/gen_android_mk.py b/scripts/gen_android_mk.py
index 0871749..6f7a1dd 100644 (file)
--- a/scripts/gen_android_mk.py
+++ b/scripts/gen_android_mk.py
@@ -24,7 +24,7 @@ import os
 import posixpath
 from fnmatch import fnmatch
 
-from build.common import DEQP_DIR, writeFile
+from ctsbuild.common import DEQP_DIR, writeFile
 
 SRC_ROOTS = [
        "execserver",

diff --git a/scripts/khr_util/registry_cache.py b/scripts/khr_util/registry_cache.py
index 9c61a04..aae6f5b 100644 (file)
--- a/scripts/khr_util/registry_cache.py
+++ b/scripts/khr_util/registry_cache.py
@@ -28,7 +28,7 @@ from . import registry
 
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
 
-from build.common import *
+from ctsbuild.common import *
 
 BASE_URL = ""
 

diff --git a/scripts/launchcontrol_build.py b/scripts/launchcontrol_build.py
index 95a0ff8..c8a0c07 100644 (file)
--- a/scripts/launchcontrol_build.py
+++ b/scripts/launchcontrol_build.py
@@ -21,8 +21,8 @@
 #-------------------------------------------------------------------------
 
 import os
-from build.common import *
-from build.build import *
+from ctsbuild.common import *
+from ctsbuild.build import *
 from argparse import ArgumentParser
 import multiprocessing
 from build_android_mustpass import *

diff --git a/scripts/make_release.py b/scripts/make_release.py
index 3dd253d..3a0b12e 100644 (file)
--- a/scripts/make_release.py
+++ b/scripts/make_release.py
@@ -37,9 +37,9 @@ import tempfile
 import posixpath
 import subprocess
 
-from build.common import *
-from build.config import *
-from build.build import *
+from ctsbuild.common import *
+from ctsbuild.config import *
+from ctsbuild.build import *
 
 pythonExecutable = sys.executable or "python"
 

diff --git a/scripts/mustpass.py b/scripts/mustpass.py
index b46a6a8..c27d37f 100644 (file)
--- a/scripts/mustpass.py
+++ b/scripts/mustpass.py
@@ -20,9 +20,9 @@
 #
 #-------------------------------------------------------------------------
 
-from build.common import *
-from build.config import ANY_GENERATOR
-from build.build import build
+from ctsbuild.common import *
+from ctsbuild.config import ANY_GENERATOR
+from ctsbuild.build import build
 from build_caselists import Module, getModuleByName, getBuildConfig, genCaseList, getCaseListPath, DEFAULT_BUILD_DIR, DEFAULT_TARGET
 from fnmatch import fnmatch
 from copy import copy

diff --git a/scripts/run_nightly.py b/scripts/run_nightly.py
index 9397828..42e6a4e 100644 (file)
--- a/scripts/run_nightly.py
+++ b/scripts/run_nightly.py
@@ -20,9 +20,9 @@
 #
 #-------------------------------------------------------------------------
 
-from build.common import *
-from build.config import *
-from build.build import *
+from ctsbuild.common import *
+from ctsbuild.config import *
+from ctsbuild.build import *
 
 import os
 import sys