From 424325728862347298013c1e39761e51e0e79e9d Mon Sep 17 00:00:00 2001 From: Evan Martin Date: Tue, 17 Nov 2015 14:26:18 -0800 Subject: [PATCH] rename the build-file variable $sourcedir to $root Confusingly, $sourcedir is the path to the root of the repository, *not* the path to the src/ directory. --- configure.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.py b/configure.py index 7584a3f..845b046 100755 --- a/configure.py +++ b/configure.py @@ -265,11 +265,11 @@ if platform.is_msvc(): objext = '.obj' def src(filename): - return os.path.join('$sourcedir', 'src', filename) + return os.path.join('$root', 'src', filename) def built(filename): return os.path.join('$builddir', filename) def doc(filename): - return os.path.join('$sourcedir', 'doc', filename) + return os.path.join('$root', 'doc', filename) def cc(name, **kwargs): return n.build(built(name + objext), 'cxx', src(name + '.c'), **kwargs) def cxx(name, **kwargs): @@ -281,7 +281,7 @@ def binary(name): return exe return name -n.variable('sourcedir', sourcedir) +n.variable('root', sourcedir) n.variable('builddir', 'build') n.variable('cxx', CXX) if platform.is_msvc(): @@ -624,12 +624,12 @@ n.newline() if not host.is_mingw(): n.comment('Regenerate build files if build script changes.') n.rule('configure', - command='${configure_env}%s $sourcedir/configure.py $configure_args' % + command='${configure_env}%s $root/configure.py $configure_args' % options.with_python, generator=True) n.build('build.ninja', 'configure', - implicit=['$sourcedir/configure.py', - os.path.normpath('$sourcedir/misc/ninja_syntax.py')]) + implicit=['$root/configure.py', + os.path.normpath('$root/misc/ninja_syntax.py')]) n.newline() n.default(ninja)