[Mesa-dev] [PATCHv2 1/2] scons: whitespace cleanup
Giuseppe Bilotta
giuseppe.bilotta at gmail.com
Wed May 25 07:12:14 UTC 2016
This text transformation was done automatically via the following shell
command:
$ find -name SCons\* -exec sed -i s/\\s\\+$// '{}' \;
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
---
SConstruct | 14 +++++++-------
src/compiler/SConscript.glsl | 2 +-
src/gallium/SConscript | 2 +-
src/gallium/auxiliary/SConscript | 10 +++++-----
src/gallium/drivers/svga/SConscript | 2 +-
src/gallium/state_trackers/wgl/SConscript | 2 +-
src/gallium/targets/libgl-gdi/SConscript | 2 +-
src/gallium/tests/graw/SConscript | 2 +-
src/glx/SConscript | 4 ++--
src/mapi/shared-glapi/SConscript | 2 +-
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/SConstruct b/SConstruct
index e2e49fc..696718c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,7 +1,7 @@
#######################################################################
# Top-level SConstruct
#
-# For example, invoke scons as
+# For example, invoke scons as
#
# scons build=debug llvm=yes machine=x86
#
@@ -12,13 +12,13 @@
# build='debug'
# llvm=True
# machine='x86'
-#
+#
# Invoke
#
# scons -h
#
# to get the full list of options. See scons manpage for more info.
-#
+#
import os
import os.path
@@ -36,7 +36,7 @@ common.AddOptions(opts)
env = Environment(
options = opts,
tools = ['gallium'],
- toolpath = ['#scons'],
+ toolpath = ['#scons'],
ENV = os.environ,
)
@@ -53,7 +53,7 @@ else:
print 'scons: warning: targets option is deprecated; pass the targets on their own such as'
print
print ' scons %s' % ' '.join(targets)
- print
+ print
COMMAND_LINE_TARGETS.append(targets)
@@ -90,8 +90,8 @@ env.AlwaysBuild(check)
#######################################################################
-# Invoke host SConscripts
-#
+# Invoke host SConscripts
+#
# For things that are meant to be run on the native host build machine, instead
# of the target machine.
#
diff --git a/src/compiler/SConscript.glsl b/src/compiler/SConscript.glsl
index 43a11d1..73abaf1 100644
--- a/src/compiler/SConscript.glsl
+++ b/src/compiler/SConscript.glsl
@@ -51,7 +51,7 @@ glsl_sources = [
glcpp_parser[0],
glsl_lexer,
glsl_parser[0],
-]
+]
# parse Makefile.sources
source_lists = env.ParseSourceList('Makefile.sources')
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 0c3a374..f98268f 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,6 +1,6 @@
Import('env')
-#
+#
# Auxiliary modules
#
diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index 3d83d44..bdd9a1b 100644
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -13,15 +13,15 @@ env = env.Clone()
env.MSVC2013Compat()
env.CodeGenerate(
- target = 'indices/u_indices_gen.c',
- script = 'indices/u_indices_gen.py',
+ target = 'indices/u_indices_gen.c',
+ script = 'indices/u_indices_gen.py',
source = [],
command = python_cmd + ' $SCRIPT > $TARGET'
)
env.CodeGenerate(
- target = 'indices/u_unfilled_gen.c',
- script = 'indices/u_unfilled_gen.py',
+ target = 'indices/u_unfilled_gen.c',
+ script = 'indices/u_unfilled_gen.py',
source = [],
command = python_cmd + ' $SCRIPT > $TARGET'
)
@@ -35,7 +35,7 @@ env.CodeGenerate(
env.Depends('util/u_format_table.c', [
'#src/gallium/auxiliary/util/u_format_parse.py',
- 'util/u_format_pack.py',
+ 'util/u_format_pack.py',
])
source = env.ParseSourceList('Makefile.sources', [
diff --git a/src/gallium/drivers/svga/SConscript b/src/gallium/drivers/svga/SConscript
index aee337f..2d60ceb 100644
--- a/src/gallium/drivers/svga/SConscript
+++ b/src/gallium/drivers/svga/SConscript
@@ -11,7 +11,7 @@ if env['suncc']:
env.Append(CPPDEFINES = [
'HAVE_STDINT_H',
])
-
+
env.Prepend(CPPPATH = [
'include',
])
diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript
index 6c604a0..a7fbb07 100644
--- a/src/gallium/state_trackers/wgl/SConscript
+++ b/src/gallium/state_trackers/wgl/SConscript
@@ -12,7 +12,7 @@ env.Append(CPPPATH = [
env.AppendUnique(CPPDEFINES = [
'_GDI32_', # prevent wgl* being declared __declspec(dllimport)
- 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
+ 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
])
if not env['gles']:
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 53284e5..2a52363 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -36,7 +36,7 @@ if env['gcc'] and env['machine'] != 'x86_64':
sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
else:
sources += ['#src/gallium/state_trackers/wgl/opengl32.def']
-
+
drivers += [trace, rbug]
env['no_import_lib'] = 1
diff --git a/src/gallium/tests/graw/SConscript b/src/gallium/tests/graw/SConscript
index c5fa3fe..d9d480e 100644
--- a/src/gallium/tests/graw/SConscript
+++ b/src/gallium/tests/graw/SConscript
@@ -6,7 +6,7 @@ env.Prepend(LIBS = [mesautil, gallium])
env.Prepend(LIBPATH = [graw.dir])
env.Prepend(LIBS = ['graw'])
-
+
if env['platform'] in ('freebsd8', 'sunos'):
env.Append(LIBS = ['m'])
diff --git a/src/glx/SConscript b/src/glx/SConscript
index 3bb8460..9727803 100644
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -109,14 +109,14 @@ env.CodeGenerate(
)
env.CodeGenerate(
- target = 'indirect_size.c',
+ target = 'indirect_size.c',
script = GLAPI + 'gen/glX_proto_size.py',
source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE -m size_c --only-set > $TARGET'
)
env.CodeGenerate(
- target = 'indirect_init.c',
+ target = 'indirect_init.c',
script = GLAPI + 'gen/glX_proto_send.py',
source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE -m init_c > $TARGET'
diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript
index 26bfe7e..fc51c3a 100644
--- a/src/mapi/shared-glapi/SConscript
+++ b/src/mapi/shared-glapi/SConscript
@@ -40,7 +40,7 @@ def mapi_objects(env, printer, mode):
'#/src',
'#/src/mapi',
]
-
+
cppdefines = mapi_defines[mode] + [
'MAPI_ABI_HEADER=\\"%s\\"' % (header_name),
]
--
2.8.1.372.g9612035
More information about the mesa-dev
mailing list