From 34e57b77b10d17a869fa226fd03d3f6ebbcfb126 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 24 Jul 2014 08:54:52 -0400 Subject: [PATCH] Fix spacing. --- sourcepawn/compiler/AMBuilder | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/sourcepawn/compiler/AMBuilder b/sourcepawn/compiler/AMBuilder index ddb0685b..d9dfb0a2 100644 --- a/sourcepawn/compiler/AMBuilder +++ b/sourcepawn/compiler/AMBuilder @@ -1,4 +1,4 @@ -# vim: set ts=2 sw=2 tw=99 noet ft=python: +# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os # Build the packing binary garbage. @@ -10,29 +10,29 @@ scpack = builder.Add(scpack) packed_files = ['sc5', 'sc7'] packed_includes = [] for packed_file in packed_files: - # The absolute path to sc5-in.scp etc. - in_path = os.path.join(builder.currentSourcePath, '{0}-in.scp'.format(packed_file)) + # The absolute path to sc5-in.scp etc. + in_path = os.path.join(builder.currentSourcePath, '{0}-in.scp'.format(packed_file)) - # The output file relative to the output folder, i.e. sourcepawn/compiler/sc5.scp. - out_path = os.path.join(builder.buildFolder, '{0}.scp'.format(packed_file)) + # The output file relative to the output folder, i.e. sourcepawn/compiler/sc5.scp. + out_path = os.path.join(builder.buildFolder, '{0}.scp'.format(packed_file)) - # The absolute path to the build folder, i.e. /Users/.../sourcepawn/compiler. - build_folder = os.path.join(builder.buildPath, builder.buildFolder) + # The absolute path to the build folder, i.e. /Users/.../sourcepawn/compiler. + build_folder = os.path.join(builder.buildPath, builder.buildFolder) - # scpack runs in ./sourcepawn/compiler/scpack/ so we build relative paths - # from there. - scpack_argv = [ - os.path.join(builder.buildPath, scpack.binary.path), - os.path.relpath(in_path, build_folder), - os.path.relpath(os.path.join(builder.buildPath, out_path), build_folder), - ] + # scpack runs in ./sourcepawn/compiler/scpack/ so we build relative paths + # from there. + scpack_argv = [ + os.path.join(builder.buildPath, scpack.binary.path), + os.path.relpath(in_path, build_folder), + os.path.relpath(os.path.join(builder.buildPath, out_path), build_folder), + ] - _, (entry,) = builder.AddCommand( - inputs = [scpack.binary, in_path], - argv = scpack_argv, - outputs = ['{0}.scp'.format(packed_file)], - ) - packed_includes += [entry] + _, (entry,) = builder.AddCommand( + inputs = [scpack.binary, in_path], + argv = scpack_argv, + outputs = ['{0}.scp'.format(packed_file)], + ) + packed_includes += [entry] binary = SM.Program(builder, 'spcomp') compiler = binary.compiler @@ -41,7 +41,7 @@ compiler.includes += [ os.path.join(builder.sourcePath, 'public', 'sourcepawn'), os.path.join(builder.sourcePath, 'sourcepawn', 'compiler'), os.path.join(builder.buildPath, 'includes'), - os.path.join(builder.buildPath, builder.buildFolder), + os.path.join(builder.buildPath, builder.buildFolder), ] compiler.sourcedeps += packed_includes