diff options
| -rw-r--r-- | QMTest/TestSCons.py | 2 | ||||
| -rw-r--r-- | README | 40 | ||||
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | doc/user/misc.xml | 2 | ||||
| -rw-r--r-- | doc/user/output.xml | 4 | ||||
| -rw-r--r-- | doc/user/troubleshoot.xml | 42 | ||||
| -rw-r--r-- | src/CHANGES.txt | 16 | ||||
| -rw-r--r-- | src/RELEASE.txt | 31 |
8 files changed, 102 insertions, 39 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 4597022..a76c8b4 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -42,7 +42,7 @@ from TestCommon import __all__ # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '1.1.0' +default_version = '1.2.0' copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008' @@ -83,11 +83,11 @@ In this case, your options are: -- (Optional.) Install from a pre-packaged SCons package that does not require distutils: - Red Hat Linux scons-1.1.0.noarch.rpm + Red Hat Linux scons-1.2.0.noarch.rpm Debian GNU/Linux use apt-get to get the official package - Windows scons-1.1.0.win32.exe + Windows scons-1.2.0.win32.exe -- (Recommended.) Download the latest distutils package from the following URL: @@ -159,7 +159,7 @@ And on Windows: By default, the above commands will do the following: - -- Install the version-numbered "scons-1.1.0" and "sconsign-1.1.0" + -- Install the version-numbered "scons-1.2.0" and "sconsign-1.2.0" scripts in the default system script directory (/usr/bin or C:\Python*\Scripts, for example). This can be disabled by specifying the "--no-version-script" option on the command @@ -173,24 +173,24 @@ By default, the above commands will do the following: making it the default on your system. On UNIX or Linux systems, you can have the "scons" and "sconsign" - scripts be hard links or symbolic links to the "scons-1.1.0" and - "sconsign-1.1.0" scripts by specifying the "--hardlink-scons" or + scripts be hard links or symbolic links to the "scons-1.2.0" and + "sconsign-1.2.0" scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on the command line. - -- Install "scons-1.1.0.bat" and "scons.bat" wrapper scripts in the + -- Install "scons-1.2.0.bat" and "scons.bat" wrapper scripts in the Python prefix directory on Windows (C:\Python*, for example). This can be disabled by specifying the "--no-install-bat" option on the command line. On UNIX or Linux systems, the "--install-bat" option may be - specified to have "scons-1.1.0.bat" and "scons.bat" files installed + specified to have "scons-1.2.0.bat" and "scons.bat" files installed in the default system script directory, which is useful if you want to install SCons in a shared file system directory that can be used to execute SCons from both UNIX/Linux and Windows systems. -- Install the SCons build engine (a Python module) in an appropriate version-numbered SCons library directory - (/usr/lib/scons-1.1.0 or C:\Python*\scons-1.1.0, for example). + (/usr/lib/scons-1.2.0 or C:\Python*\scons-1.2.0, for example). See below for more options related to installing the build engine library. @@ -527,18 +527,18 @@ On Windows: Depending on the utilities installed on your system, any or all of the following packages will be built: - build/dist/scons-1.1.0-1.noarch.rpm - build/dist/scons-1.1.0-1.src.rpm - build/dist/scons-1.1.0.linux-i686.tar.gz - build/dist/scons-1.1.0.tar.gz - build/dist/scons-1.1.0.win32.exe - build/dist/scons-1.1.0.zip - build/dist/scons-doc-1.1.0.tar.gz - build/dist/scons-local-1.1.0.tar.gz - build/dist/scons-local-1.1.0.zip - build/dist/scons-src-1.1.0.tar.gz - build/dist/scons-src-1.1.0.zip - build/dist/scons_1.1.0-1_all.deb + build/dist/scons-1.2.0-1.noarch.rpm + build/dist/scons-1.2.0-1.src.rpm + build/dist/scons-1.2.0.linux-i686.tar.gz + build/dist/scons-1.2.0.tar.gz + build/dist/scons-1.2.0.win32.exe + build/dist/scons-1.2.0.zip + build/dist/scons-doc-1.2.0.tar.gz + build/dist/scons-local-1.2.0.tar.gz + build/dist/scons-local-1.2.0.zip + build/dist/scons-src-1.2.0.tar.gz + build/dist/scons-src-1.2.0.zip + build/dist/scons_1.2.0-1_all.deb The SConstruct file is supposed to be smart enough to avoid trying to build packages for which you don't have the proper utilities installed. @@ -9,7 +9,7 @@ copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008' # This gets inserted into the man pages to reflect the month of release. -month_year = 'October 2008' +month_year = 'December 2008' # # __COPYRIGHT__ @@ -45,7 +45,7 @@ import sys import tempfile project = 'scons' -default_version = '1.1.0' +default_version = '1.2.0' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years SConsignFile() diff --git a/doc/user/misc.xml b/doc/user/misc.xml index cd09274..f6dec57 100644 --- a/doc/user/misc.xml +++ b/doc/user/misc.xml @@ -350,7 +350,7 @@ % <userinput>scons -Q</userinput> None derived - scons: *** Source `leaf' not found, needed by target `derived'. Stop. + scons: *** [derived] Source `leaf' not found, needed by target `derived'. </screen> <programlisting> diff --git a/doc/user/output.xml b/doc/user/output.xml index d42457a..08d28d1 100644 --- a/doc/user/output.xml +++ b/doc/user/output.xml @@ -683,9 +683,9 @@ scons: `.' is up to date. Build succeeded. % <userinput>scons -Q fail=1</userinput> - scons: *** Source `source' not found, needed by target `target'. Stop. + scons: *** [target] Source `source' not found, needed by target `target'. FAILED!!!! - Failed building Source `source' not found, needed by target `target'. + Failed building target: Source `source' not found, needed by target `target'. </screen> </section> diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml index 75079d9..5171638 100644 --- a/doc/user/troubleshoot.xml +++ b/doc/user/troubleshoot.xml @@ -1096,7 +1096,7 @@ <screen> % <userinput>scons -Q</userinput> - scons: *** Source `prog.c' not found, needed by target `prog.o'. Stop. + scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'. </screen> <para> @@ -1114,12 +1114,12 @@ <screen> % <userinput>scons -Q --debug=stacktrace</userinput> - scons: *** Source `prog.c' not found, needed by target `prog.o'. Stop. + scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'. scons: internal stack trace: File "bootstrap/src/engine/SCons/Job.py", line 197, in start File "bootstrap/src/engine/SCons/Script/Main.py", line 167, in prepare - File "bootstrap/src/engine/SCons/Taskmaster.py", line 182, in prepare - File "bootstrap/src/engine/SCons/Executor.py", line 171, in prepare + File "bootstrap/src/engine/SCons/Taskmaster.py", line 188, in prepare + File "bootstrap/src/engine/SCons/Executor.py", line 175, in prepare </screen> <para> @@ -1178,31 +1178,59 @@ Taskmaster: Looking for a node to evaluate Taskmaster: Considering node <no_state 0 'prog'> and its children: Taskmaster: <no_state 0 'prog.o'> - Taskmaster: adjusting ref count: <pending 1 'prog'> + Taskmaster: adjusted ref count: <pending 1 'prog'>, child 'prog.o' Taskmaster: Considering node <no_state 0 'prog.o'> and its children: Taskmaster: <no_state 0 'prog.c'> Taskmaster: <no_state 0 'inc.h'> - Taskmaster: adjusting ref count: <pending 1 'prog.o'> - Taskmaster: adjusting ref count: <pending 2 'prog.o'> + Taskmaster: adjusted ref count: <pending 1 'prog.o'>, child 'prog.c' + Taskmaster: adjusted ref count: <pending 2 'prog.o'>, child 'inc.h' Taskmaster: Considering node <no_state 0 'prog.c'> and its children: Taskmaster: Evaluating <pending 0 'prog.c'> + Task.make_ready_current(): node <pending 0 'prog.c'> + Task.prepare(): node <up_to_date 0 'prog.c'> + Task.executed_with_callbacks(): node <up_to_date 0 'prog.c'> + Task.postprocess(): node <up_to_date 0 'prog.c'> + Task.postprocess(): removing <up_to_date 0 'prog.c'> + Task.postprocess(): adjusted parent ref count <pending 1 'prog.o'> + Taskmaster: Looking for a node to evaluate Taskmaster: Considering node <no_state 0 'inc.h'> and its children: Taskmaster: Evaluating <pending 0 'inc.h'> + Task.make_ready_current(): node <pending 0 'inc.h'> + Task.prepare(): node <up_to_date 0 'inc.h'> + Task.executed_with_callbacks(): node <up_to_date 0 'inc.h'> + Task.postprocess(): node <up_to_date 0 'inc.h'> + Task.postprocess(): removing <up_to_date 0 'inc.h'> + Task.postprocess(): adjusted parent ref count <pending 0 'prog.o'> + Taskmaster: Looking for a node to evaluate Taskmaster: Considering node <pending 0 'prog.o'> and its children: Taskmaster: <up_to_date 0 'prog.c'> Taskmaster: <up_to_date 0 'inc.h'> Taskmaster: Evaluating <pending 0 'prog.o'> + + Task.make_ready_current(): node <pending 0 'prog.o'> + Task.prepare(): node <executing 0 'prog.o'> + Task.execute(): node <executing 0 'prog.o'> cc -o prog.o -c -I. prog.c + Task.executed_with_callbacks(): node <executing 0 'prog.o'> + Task.postprocess(): node <executed 0 'prog.o'> + Task.postprocess(): removing <executed 0 'prog.o'> + Task.postprocess(): adjusted parent ref count <pending 0 'prog'> Taskmaster: Looking for a node to evaluate Taskmaster: Considering node <pending 0 'prog'> and its children: Taskmaster: <executed 0 'prog.o'> Taskmaster: Evaluating <pending 0 'prog'> + + Task.make_ready_current(): node <pending 0 'prog'> + Task.prepare(): node <executing 0 'prog'> + Task.execute(): node <executing 0 'prog'> cc -o prog prog.o + Task.executed_with_callbacks(): node <executing 0 'prog'> + Task.postprocess(): node <executed 0 'prog'> Taskmaster: Looking for a node to evaluate Taskmaster: No candidate anymore. diff --git a/src/CHANGES.txt b/src/CHANGES.txt index fb44ad7..1f182b4 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -18,10 +18,6 @@ RELEASE 1.X - XXX - Add a --warn=future-deprecated option for advance warnings about deprecated features that still have warnings hidden by default. - - Don't fail if can't import a _subprocess module on Windows. - - - Add warnings for use of the deprecated Options object. - From Greg Spencer: - Support implicit dependency scanning of files encoded in utf-8 @@ -34,7 +30,17 @@ RELEASE 1.X - XXX -RELEASE 1.X - XXX +RELEASE 1.2.0 - Sat, 20 Dec 2008 22:47:29 -0800 + + From Steven Knight: + + - Don't fail if can't import a _subprocess module on Windows. + + - Add warnings for use of the deprecated Options object. + + + +RELEASE 1.1.0.d20081207 - Sun, 07 Dec 2008 19:17:23 -0800 From Benoit Belley: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 223beb1..0a8b14a 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -20,7 +20,7 @@ more effectively, please sign up for the scons-users mailing list at: -RELEASE XXX - +RELEASE 1.2.0 - Sat, 20 Dec 2008 22:47:29 -0800 Please consult the CHANGES.txt file for a list of specific changes since last release. @@ -46,6 +46,35 @@ RELEASE XXX - to ensure that the configuration continues to work with future versions of SCons. + -- THE Options OBJECT AND RELATED FUNCTIONS NOW GENERATE WARNINGS + + Use of the Options object, and related functions BoolOption(), + EnumOption(), ListOption(), PackageOption() and PathOption() + were announced as deprecated in release 0.98.1. Since then, + however, no warning messages were ever implemented for the + use of these deprecated functions. + + By default, release 1.2.0 prints warning messages when these + deprecated features are used. Warnings about all deprecated + features may be suppressed by using the --warn=no-deprecated + command-line option: + + $ scons --warn=no-deprecated + + Or by using the appropriate SetOption() call in any SConscript + file: + + SetOption('warn', 'no-deprecated') + + You may optionally disable just warnings about the deprecation + of the Options object and its related functions as follows: + + SetOption('warn', 'no-deprecated-options') + + The current plan is for these warnings to become mandatory + (non-suppressible) in release 1.3.0, and for the use of Options + and its related functions to generate errors in release 2.0. + Please note the following important changes since release 0.98.4: -- scons.bat NOW RETURNS THE REAL SCONS EXIT STATUS |