diff options
| -rw-r--r-- | src/RELEASE.txt | 7 | ||||
| -rw-r--r-- | test/scan-once.py | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/RELEASE.txt b/src/RELEASE.txt index b943cef..d8f2144 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -34,6 +34,13 @@ RELEASE 0.14 - XXX have been deprecated. The new names are TargetSignatures() and SourceSignatures(). + - The Export() function and the exported variables argument of + SConscript() now search for variables using the same rules as + Python: local first, then global. If you are calling Export() or + SConscript() from a module imported directly into an SConscript + file, you may need to modify the module to make the previously + global variables available to your Export() or SConscript() call. + Please note the following important changes since release 0.11: - The default behavior of SCons is now to change to the directory in diff --git a/test/scan-once.py b/test/scan-once.py index ffd379b..ba147cf 100644 --- a/test/scan-once.py +++ b/test/scan-once.py @@ -160,7 +160,7 @@ Mylib.AddLibDirs(env, "/via/Mylib.AddLibPath") env.Append(LIBPATH = [e["EXPORT_LIB"]]) env.Append(LIBPATH = [e["REF_LIB"]]) -Mylib.Subdirs("src") +Mylib.Subdirs(env, "src") """ % test.workpath('SLF')) test.write(['SLF', 'Mylib.py'], """\ @@ -170,7 +170,7 @@ import re import SCons.Environment import SCons.Script.SConscript -def Subdirs(dirlist): +def Subdirs(env, dirlist): for file in _subconf_list(dirlist): SCons.Script.SConscript.SConscript(file, "env") @@ -262,8 +262,8 @@ Import("env") #env = env.Copy() # Yes, clobber intentionally #Make environment changes, such as: Mylib.AddCFlags(env, "-g -D_TEST") -#Mylib.Subdirs("lib_a lib_b lib_mergej prog_x") -Mylib.Subdirs("lib_geng") +#Mylib.Subdirs(env, "lib_a lib_b lib_mergej prog_x") +Mylib.Subdirs(env, "lib_geng") env = env.Copy() # Yes, clobber intentionally # --- End SConscript boilerplate --- @@ -279,7 +279,7 @@ Import("env") #env = env.Copy() # Yes, clobber intentionally #Make environment changes, such as: Mylib.AddCFlags(env, "-g -D_TEST") -#Mylib.Subdirs("foo_dir") +#Mylib.Subdirs(env, "foo_dir") env = env.Copy() # Yes, clobber intentionally # --- End SConscript boilerplate --- |