UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix spacing.

Browse Source
This commit is contained in:
David Anderson 2014-07-24 08:54:52 -04:00
parent fa446f74a1
commit 34e57b77b1
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sourcepawn/compiler/AMBuilder
View File

@ -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 import os
# Build the packing binary garbage. # Build the packing binary garbage.
@ -10,29 +10,29 @@ scpack = builder.Add(scpack)
packed_files = ['sc5', 'sc7'] packed_files = ['sc5', 'sc7']
packed_includes = [] packed_includes = []
for packed_file in packed_files: for packed_file in packed_files:
# The absolute path to sc5-in.scp etc. # The absolute path to sc5-in.scp etc.
in_path = os.path.join(builder.currentSourcePath, '{0}-in.scp'.format(packed_file)) 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. # 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)) out_path = os.path.join(builder.buildFolder, '{0}.scp'.format(packed_file))
# The absolute path to the build folder, i.e. /Users/.../sourcepawn/compiler. # The absolute path to the build folder, i.e. /Users/.../sourcepawn/compiler.
build_folder = os.path.join(builder.buildPath, builder.buildFolder) build_folder = os.path.join(builder.buildPath, builder.buildFolder)
# scpack runs in ./sourcepawn/compiler/scpack/ so we build relative paths # scpack runs in ./sourcepawn/compiler/scpack/ so we build relative paths
# from there. # from there.
scpack_argv = [ scpack_argv = [
os.path.join(builder.buildPath, scpack.binary.path), os.path.join(builder.buildPath, scpack.binary.path),
os.path.relpath(in_path, build_folder), os.path.relpath(in_path, build_folder),
os.path.relpath(os.path.join(builder.buildPath, out_path), build_folder), os.path.relpath(os.path.join(builder.buildPath, out_path), build_folder),
] ]
_, (entry,) = builder.AddCommand( _, (entry,) = builder.AddCommand(
inputs = [scpack.binary, in_path], inputs = [scpack.binary, in_path],
argv = scpack_argv, argv = scpack_argv,
outputs = ['{0}.scp'.format(packed_file)], outputs = ['{0}.scp'.format(packed_file)],
) )
packed_includes += [entry] packed_includes += [entry]
binary = SM.Program(builder, 'spcomp') binary = SM.Program(builder, 'spcomp')
compiler = binary.compiler compiler = binary.compiler
@ -41,7 +41,7 @@ compiler.includes += [
os.path.join(builder.sourcePath, 'public', 'sourcepawn'), os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
os.path.join(builder.sourcePath, 'sourcepawn', 'compiler'), os.path.join(builder.sourcePath, 'sourcepawn', 'compiler'),
os.path.join(builder.buildPath, 'includes'), os.path.join(builder.buildPath, 'includes'),
os.path.join(builder.buildPath, builder.buildFolder), os.path.join(builder.buildPath, builder.buildFolder),
] ]
compiler.sourcedeps += packed_includes compiler.sourcedeps += packed_includes