summaryrefslogtreecommitdiff
path: root/common.py
diff options
context:
space:
mode:
authorVinson Lee <vlee@freedesktop.org>2015-03-14 01:45:03 -0700
committerVinson Lee <vlee@freedesktop.org>2015-03-16 22:55:08 -0700
commit60f77b22b1e3bbef7e4d1f10012acf830d81ed7b (patch)
tree1bcbd4fdf2f83c861e4f1cc4c7a5e1101a6b50b4 /common.py
parent2372275d2fc9e4d3785b34a5aeb7b6126e8cc402 (diff)
common.py: Fix PEP 8 issues.
Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'common.py')
-rw-r--r--common.py97
1 files changed, 53 insertions, 44 deletions
diff --git a/common.py b/common.py
index 1d2d586a86..7a939417e2 100644
--- a/common.py
+++ b/common.py
@@ -26,28 +26,28 @@ else:
target_platform = host_platform
_machine_map = {
- 'x86': 'x86',
- 'i386': 'x86',
- 'i486': 'x86',
- 'i586': 'x86',
- 'i686': 'x86',
- 'BePC': 'x86',
- 'Intel': 'x86',
- 'ppc' : 'ppc',
- 'BeBox': 'ppc',
- 'BeMac': 'ppc',
- 'AMD64': 'x86_64',
- 'x86_64': 'x86_64',
- 'sparc': 'sparc',
- 'sun4u': 'sparc',
+ 'x86': 'x86',
+ 'i386': 'x86',
+ 'i486': 'x86',
+ 'i586': 'x86',
+ 'i686': 'x86',
+ 'BePC': 'x86',
+ 'Intel': 'x86',
+ 'ppc': 'ppc',
+ 'BeBox': 'ppc',
+ 'BeMac': 'ppc',
+ 'AMD64': 'x86_64',
+ 'x86_64': 'x86_64',
+ 'sparc': 'sparc',
+ 'sun4u': 'sparc',
}
# find host_machine value
if 'PROCESSOR_ARCHITECTURE' in os.environ:
- host_machine = os.environ['PROCESSOR_ARCHITECTURE']
+ host_machine = os.environ['PROCESSOR_ARCHITECTURE']
else:
- host_machine = _platform.machine()
+ host_machine = _platform.machine()
host_machine = _machine_map.get(host_machine, 'generic')
default_machine = host_machine
@@ -65,7 +65,8 @@ else:
default_llvm = 'no'
try:
if target_platform != 'windows' and \
- subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
+ subprocess.call(['llvm-config', '--version'],
+ stdout=subprocess.PIPE) == 0:
default_llvm = 'yes'
except:
pass
@@ -75,30 +76,38 @@ else:
# Common options
def AddOptions(opts):
- try:
- from SCons.Variables.BoolVariable import BoolVariable as BoolOption
- except ImportError:
- from SCons.Options.BoolOption import BoolOption
- try:
- from SCons.Variables.EnumVariable import EnumVariable as EnumOption
- except ImportError:
- from SCons.Options.EnumOption import EnumOption
- opts.Add(EnumOption('build', 'build type', 'debug',
- allowed_values=('debug', 'checked', 'profile', 'release')))
- opts.Add(BoolOption('verbose', 'verbose output', 'no'))
- opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
- allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
- opts.Add(EnumOption('platform', 'target platform', host_platform,
- allowed_values=('cygwin', 'darwin', 'freebsd', 'haiku', 'linux', 'sunos', 'windows')))
- opts.Add(BoolOption('embedded', 'embedded build', 'no'))
- opts.Add(BoolOption('analyze', 'enable static code analysis where available', 'no'))
- opts.Add('toolchain', 'compiler toolchain', default_toolchain)
- opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))
- opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
- opts.Add(BoolOption('openmp', 'EXPERIMENTAL: compile with openmp (swrast)', 'no'))
- opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
- opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
- opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
- opts.Add(BoolOption('texture_float', 'enable floating-point textures and renderbuffers', 'no'))
- if host_platform == 'windows':
- opts.Add('MSVC_VERSION', 'Microsoft Visual C/C++ version')
+ try:
+ from SCons.Variables.BoolVariable import BoolVariable as BoolOption
+ except ImportError:
+ from SCons.Options.BoolOption import BoolOption
+ try:
+ from SCons.Variables.EnumVariable import EnumVariable as EnumOption
+ except ImportError:
+ from SCons.Options.EnumOption import EnumOption
+ opts.Add(EnumOption('build', 'build type', 'debug',
+ allowed_values=('debug', 'checked', 'profile',
+ 'release')))
+ opts.Add(BoolOption('verbose', 'verbose output', 'no'))
+ opts.Add(EnumOption('machine', 'use machine-specific assembly code',
+ default_machine,
+ allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
+ opts.Add(EnumOption('platform', 'target platform', host_platform,
+ allowed_values=('cygwin', 'darwin', 'freebsd', 'haiku',
+ 'linux', 'sunos', 'windows')))
+ opts.Add(BoolOption('embedded', 'embedded build', 'no'))
+ opts.Add(BoolOption('analyze',
+ 'enable static code analysis where available', 'no'))
+ opts.Add('toolchain', 'compiler toolchain', default_toolchain)
+ opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support',
+ 'no'))
+ opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
+ opts.Add(BoolOption('openmp', 'EXPERIMENTAL: compile with openmp (swrast)',
+ 'no'))
+ opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
+ opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
+ opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
+ opts.Add(BoolOption('texture_float',
+ 'enable floating-point textures and renderbuffers',
+ 'no'))
+ if host_platform == 'windows':
+ opts.Add('MSVC_VERSION', 'Microsoft Visual C/C++ version')