summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-03-28 07:17:58 (GMT)
committerSteven Knight <knight@baldmt.com>2003-03-28 07:17:58 (GMT)
commit4ffdf4ec07e36786269b5551c15486b6b31a19c6 (patch)
tree676849b026ffeb3cb24d0424bc38f6225eb3fdb2
parente94e7726d2602503cd6ea7ba1acb37558821827e (diff)
downloadSCons-4ffdf4ec07e36786269b5551c15486b6b31a19c6.zip
SCons-4ffdf4ec07e36786269b5551c15486b6b31a19c6.tar.gz
SCons-4ffdf4ec07e36786269b5551c15486b6b31a19c6.tar.bz2
Prepare for release, more doc patches, one portability fix.
-rw-r--r--debian/changelog2
-rw-r--r--doc/man/scons.113
-rw-r--r--src/CHANGES.txt2
-rw-r--r--src/RELEASE.txt10
-rw-r--r--src/engine/SCons/Node/FSTests.py8
5 files changed, 29 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 0e98077..8c301c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ scons (0.12-1) unstable; urgency=low
* Sixth post-official-Debian build cycle
- -- Steven Knight <knight@baldmt.com> Tue, 11 Feb 2003 05:24:33 -0600
+ -- Steven Knight <knight@baldmt.com> Thu, 27 Mar 2003 23:52:09 -0600
scons (0.11-1) unstable; urgency=low
diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 367cc37..e40036b 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -867,11 +867,22 @@ msvc
nasm
pdflatex
pdftex
+sgiar
+sgias
+sgicc
+sgif77
+sgilink
tar
tex
yacc
+zip
.EE
+Additionally, there is a "tool" named
+.B default
+which configures the
+environment with a default set of tools for the current platform.
+
On posix and cygwin platforms
the GNU tools (e.g. gcc) are preferred by SCons,
on win32 the Microsoft tools (e.g. msvc)
@@ -4678,7 +4689,7 @@ Bar.cpp:
SConstruct:
.ES
env=Environment()
-env['PCHSTOP'] = StdAfx.h
+env['PCHSTOP'] = 'StdAfx.h'
env['PCH'] = env.PCH('StdAfx.cpp')[0]
env.Program('MyApp', ['Foo.cpp', 'Bar.cpp'])
.EE
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 14db4fb..71f32cb 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,7 +8,7 @@
-RELEASE 0.12 - XXX
+RELEASE 0.12 - Thu, 27 Mar 2003 23:52:09 -0600
From Charles Crain:
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 8ae7dfb..b5e5776 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 0.12 - XXX
+RELEASE 0.12 - Thu, 27 Mar 2003 23:52:09 -0600
This is the twelfth alpha release of SCons. Please consult the
CHANGES.txt file for a list of specific changes since last release.
@@ -184,6 +184,14 @@ RELEASE 0.12 - XXX
- The -c option does not clean up .sconsign files or directories
created as part of the build.
+ - Switching content signatures from "MD5" to "timestamp" and back
+ again can cause unusual errors. These errors can be cleared up by
+ removing all .sconsign files.
+
+ - On Win32, SCons does not recognize that a target specified as
+ (for example) \some\target is the same as X:\some\target (for your
+ current volume X:).
+
- No support yet for the following planned command-line options:
-d -e -l --list-actions --list-derived --list-where
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index dd04fe4..0bba0ed 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -285,7 +285,9 @@ class BuildDirTestCase(unittest.TestCase):
f11 = fs.File('src/file11')
t, m = f11.alter_targets()
bdt = map(lambda n: n.path, t)
- assert bdt == ['build/var1/file11', 'build/var2/file11'], bdt
+ var1_file11 = os.path.normpath('build/var1/file11')
+ var2_file11 = os.path.normpath('build/var2/file11')
+ assert bdt == [var1_file11, var2_file11], bdt
f12 = fs.File('src/file12')
f12.builder = 1
@@ -295,7 +297,9 @@ class BuildDirTestCase(unittest.TestCase):
d13 = fs.Dir('src/new_dir')
t, m = d13.alter_targets()
bdt = map(lambda n: n.path, t)
- assert bdt == ['build/var1/new_dir', 'build/var2/new_dir'], bdt
+ var1_new_dir = os.path.normpath('build/var1/new_dir')
+ var2_new_dir = os.path.normpath('build/var2/new_dir')
+ assert bdt == [var1_new_dir, var2_new_dir], bdt
save_Mkdir = SCons.Node.FS.Mkdir
dir_made = []