From 6238fcb0f5fb8cd4aef9d956414618dbe5aa4072 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Wed, 24 Apr 2002 16:47:04 +0000 Subject: Fix for relative CPPPATH directories in subsidiary SConscript files. (Charles Crain) --- src/CHANGES.txt | 3 +++ src/engine/SCons/Node/__init__.py | 4 ++-- test/CPPPATH.py | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index ce10511..67a0574 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -69,6 +69,9 @@ RELEASE 0.07 - - Make top-relative '#/dir' lookups work like '#dir'. + - Fix for relative CPPPATH directories in subsidiary SConscript files + (broken in 0.06). + From Steven Knight: - Fix so that -c -n does *not* remove the targets! diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py index db52b3e..68e4c73 100644 --- a/src/engine/SCons/Node/__init__.py +++ b/src/engine/SCons/Node/__init__.py @@ -88,8 +88,8 @@ class Node: def generate_build_args(self): dict = copy.copy(self.env.Dictionary()) - if hasattr(self, 'dir'): - auto = self.env.autogenerate(dir = self.dir) + if hasattr(self, 'cwd'): + auto = self.env.autogenerate(dir = self.cwd) else: auto = self.env.autogenerate() dict.update(auto) diff --git a/test/CPPPATH.py b/test/CPPPATH.py index 958cc68..d09ecb8 100644 --- a/test/CPPPATH.py +++ b/test/CPPPATH.py @@ -45,7 +45,7 @@ test.subdir('include', 'subdir', ['subdir', 'include'], 'inc2') test.write('SConstruct', """ env = Environment(CPPPATH = ['include']) -obj = env.Object(target='prog', source='subdir/prog.c') +obj = env.Object(target='foobar/prog', source='subdir/prog.c') env.Program(target='prog', source=obj) SConscript('subdir/SConscript', "env") @@ -164,7 +164,7 @@ test.up_to_date(arguments = args) # Change CPPPATH and make sure we don't rebuild because of it. test.write('SConstruct', """ env = Environment(CPPPATH = 'inc2 include') -obj = env.Object(target='prog', source='subdir/prog.c') +obj = env.Object(target='foobar/prog', source='subdir/prog.c') env.Program(target='prog', source=obj) SConscript('subdir/SConscript', "env") -- cgit v0.12