reactos/ninja
1
0
Fork 0
mirror of https://github.com/reactos/ninja.git synced 2024-11-23 11:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename the build-file variable $sourcedir to $root

Browse Source 
Confusingly, $sourcedir is the path to the root of the repository,
*not* the path to the src/ directory.
This commit is contained in:
Evan Martin 2015-11-17 14:26:18 -08:00
parent 3be9710589
commit 4243257288
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.py
View File

@ -265,11 +265,11 @@ if platform.is_msvc():
objext = '.obj' objext = '.obj'
def src(filename): def src(filename):
return os.path.join('$sourcedir', 'src', filename) return os.path.join('$root', 'src', filename)
def built(filename): def built(filename):
return os.path.join('$builddir', filename) return os.path.join('$builddir', filename)
def doc(filename): def doc(filename):
return os.path.join('$sourcedir', 'doc', filename) return os.path.join('$root', 'doc', filename)
def cc(name, **kwargs): def cc(name, **kwargs):
return n.build(built(name + objext), 'cxx', src(name + '.c'), **kwargs) return n.build(built(name + objext), 'cxx', src(name + '.c'), **kwargs)
def cxx(name, **kwargs): def cxx(name, **kwargs):
@ -281,7 +281,7 @@ def binary(name):
return exe return exe
return name return name
n.variable('sourcedir', sourcedir) n.variable('root', sourcedir)
n.variable('builddir', 'build') n.variable('builddir', 'build')
n.variable('cxx', CXX) n.variable('cxx', CXX)
if platform.is_msvc(): if platform.is_msvc():
@ -624,12 +624,12 @@ n.newline()
if not host.is_mingw(): if not host.is_mingw():
n.comment('Regenerate build files if build script changes.') n.comment('Regenerate build files if build script changes.')
n.rule('configure', n.rule('configure',
command='${configure_env}%s $sourcedir/configure.py $configure_args' % command='${configure_env}%s $root/configure.py $configure_args' %
options.with_python, options.with_python,
generator=True) generator=True)
n.build('build.ninja', 'configure', n.build('build.ninja', 'configure',
implicit=['$sourcedir/configure.py', implicit=['$root/configure.py',
os.path.normpath('$sourcedir/misc/ninja_syntax.py')]) os.path.normpath('$root/misc/ninja_syntax.py')])
n.newline() n.newline()
n.default(ninja) n.default(ninja)