summaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2015-11-17 22:26:18 (GMT)
committerEvan Martin <martine@danga.com>2015-11-17 22:42:12 (GMT)
commit424325728862347298013c1e39761e51e0e79e9d (patch)
treea5a3058317793b889ee80c9cb986200f5c77ff1f /configure.py
parent3be9710589405634cf65732eb5ded0a0210614a3 (diff)
downloadNinja-424325728862347298013c1e39761e51e0e79e9d.zip
Ninja-424325728862347298013c1e39761e51e0e79e9d.tar.gz
Ninja-424325728862347298013c1e39761e51e0e79e9d.tar.bz2
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.
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py12
1 files 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)