Portability fixes.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@724 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/HOWTO/release.txt b/HOWTO/release.txt
index 283c4abbf1280257759f6000bc8612eb5f8eaaea..b72adc92268691826e486ffd00dd38c39dfdfcbf 100644 (file)
--- a/HOWTO/release.txt
+++ b/HOWTO/release.txt
@@ -35,51 +35,118 @@ Things to do to release a new version of SCons:
                           cd scons-src-{version}
                           python runtest.py -a -x C:\temporary_directory\scons.py
 
+                Checkin any changes necessary to make everything work
 
-       Read through the README and src/README.txt files for any updates
+       END THE CURRENT DEVELOPMENT BRANCH
 
-       Prepare src/CHANGES.txt
+               ae_p scons.0
 
-               date -R the latest release
+               aede {15}
 
-               should be current if this has been updated as each
-               change went in.
+               aerpass {15}
 
-       Prepare src/RELEASE.txt
+               aeib {15}
 
-               date -R the latest release
+               aeb
 
-               Read through to make sure it's okay and edit appropriately.
+               aet
 
-               Can probably keep most of the existing text
+               aet -reg
 
-               Add any new known problems
+               aed
 
-       Prepare debian/changelog
+               aeipass
 
-               date -R the latest release
+       START THE NEW BRANCH FOR RELEASE
 
+               aenbr -p scons.0 {90}
 
+               aenc -p scons.0.{90}
 
-       END THE BRANCH
+                        Call it something like,
+                        "Initialize the new branch for release."
+                        Cause = internal_enhancement.
+                        Exempt it from all tests (*_exempt = true).
 
-               ae_p scons.0
+               ae_p scons.0.{90}
 
-               aede {15}
+               aedb 100
 
-               aerpass {15}
+               aecd
 
-               aeib {15}
+               # Change the hard-coded package version numbers
+               # in the following files.
+               aecp README
+               vi README
 
-               aeb
+                aecp SConstruct
+                vi SConstruct
 
-               aet
+                aecp debian/changelog
+                vi debian/changelog
+
+                aecp rpm/scons.spec.in
+                vi rpm/scons.spec.in
+
+                aecp src/setupTests.py
+                vi src/setupTests.py
+
+               # Optionally, do the same in the following:
+               [optional] aecp HOWTO/change.txt
+               [optional] vi HOWTO/change.txt
+
+               [optional] aecp HOWTO/release.txt
+               [optional] vi HOWTO/release.txt
+
+               # Prep the following files to track the changes
+               # made during the next development cycle
+               aecp src/CHANGES.txt src/RELEASE.txt
+               vi src/CHANGES.txt src/RELEASE.txt
+
+                # Read through and update the README files if necessary
+               [optional] aecp README
+               [optional] vi README
+
+               [optional] aecp src/README.txt
+               [optional] vi src/README.txt
+
+                # Prepare src/CHANGES.txt
+               aecp src/CHANGES.txt
+               vi src/CHANGES.txt
+
+                       date -R the latest release
+
+                       should be current if this has been updated
+                        as each change went in.
+
+               # Prepare src/RELEASE.txt
+                aecp src/RELEASE.txt
+                vi src/RELEASE.txt
+
+                       date -R the latest release
+
+                       Read through and edit appropriately.
+
+                       Can probably keep most of the existing text
+
+                       Add any new known problems
+
+               # Prepare debian/changelog
+                aecp debian/changelog
+                vi debian/changelog
+
+                       date -R the latest release
+
+                # Now build and prepare the release itself.
+                aeb
 
                aet -reg
 
                aed
 
-               aeipass
+               aede
+
+               etc.
 
 
 
@@ -94,16 +161,16 @@ Things to do to release a new version of SCons:
                <your email>
                cd incoming
                bin
-               put scons-0.15-1.noarch.rpm
-               put scons-0.15-1.src.rpm
-               put scons-0.15.tar.gz
-               put scons-0.15.win32.exe
-               put scons-0.15.zip
-               put scons-local-0.15.tar.gz
-               put scons-local-0.15.zip
-               put scons-src-0.15.tar.gz
-               put scons-src-0.15.zip
-               put scons_0.15-1_all.deb
+               put scons-0.90-1.noarch.rpm
+               put scons-0.90-1.src.rpm
+               put scons-0.90.tar.gz
+               put scons-0.90.win32.exe
+               put scons-0.90.zip
+               put scons-local-0.90.tar.gz
+               put scons-local-0.90.zip
+               put scons-src-0.90.tar.gz
+               put scons-src-0.90.zip
+               put scons_0.90-1_all.deb
 
        Create the new release at the SourceForge project page:
 
@@ -115,7 +182,7 @@ Things to do to release a new version of SCons:
 
                => Add Release
 
-               New release name:  0.15
+               New release name:  0.90
 
                Cut-and-paste or upload the RELEASE.txt file.
 
@@ -132,12 +199,12 @@ Things to do to release a new version of SCons:
 
                Edit the file info:
 
-                       scons-0.15-1.noarch.rpm         Any     .rpm
-                       scons-0.15-1.src.rpm            Any     Source .rpm
-                       scons-0.15.tar.gz               Any     .gz
-                       scons-0.15.win32.exe            i386    .exe (32-bit Windows)
-                       scons-0.15.zip                  Any     .zip
-                       scons_0.15-1_all.deb            Any     .deb
+                       scons-0.90-1.noarch.rpm         Any     .rpm
+                       scons-0.90-1.src.rpm            Any     Source .rpm
+                       scons-0.90.tar.gz               Any     .gz
+                       scons-0.90.win32.exe            i386    .exe (32-bit Windows)
+                       scons-0.90.zip                  Any     .zip
+                       scons_0.90-1_all.deb            Any     .deb
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -154,7 +221,7 @@ Things to do to release a new version of SCons:
 
                => Add Release
 
-               New release name:  0.15
+               New release name:  0.90
 
                Cut-and-paste or upload the RELEASE.txt file.
 
@@ -171,8 +238,8 @@ Things to do to release a new version of SCons:
 
                Edit the file info:
 
-                       scons-local-0.15.tar.gz         Any     .gz
-                       scons-local-0.15.zip            Any     .zip
+                       scons-local-0.90.tar.gz         Any     .gz
+                       scons-local-0.90.zip            Any     .zip
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -189,7 +256,7 @@ Things to do to release a new version of SCons:
 
                => Add Release
 
-               New release name:  0.15
+               New release name:  0.90
 
                Cut-and-paste or upload the RELEASE.txt file.
 
@@ -206,8 +273,8 @@ Things to do to release a new version of SCons:
 
                Edit the file info:
 
-                       scons-src-0.15.tar.gz           Any     .gz
-                       scons-src-0.15.zip              Any     .zip
+                       scons-src-0.90.tar.gz           Any     .gz
+                       scons-src-0.90.zip              Any     .zip
 
                 Click "Update/Refresh" for each file; this must be done
                 one at a time.
@@ -270,7 +337,7 @@ Things to do to release a new version of SCons:
 
 
 
-       In the Bugs Tracker, add a Group for the new release (0.15)
+       In the Bugs Tracker, add a Group for the new release (0.90)
 
 
 
@@ -358,56 +425,11 @@ Things to do to release a new version of SCons:
 
 
 
-       START THE NEW BRANCH
-
-               aenbr -p scons.0 {16}
-
-               aenc -p scons.0.{16}
-
-                        Call it something like, "Initialize the new
-                        branch."  Cause = internal_enhancement.  Exempt
-                        it from all tests (*_exempt = true).
-
-               ae_p scons.0.{16}
-
-               aedb 100
-
-               aecd
-
-               # Change the hard-coded package version numbers
-               # in the following files.
-               aecp README SConstruct debian/changelog rpm/scons.spec.in src/setupTests.py
-               vi README SConstruct debian/changelog rpm/scons.spec.in src/setupTests.py
-
-               # Optionally, do the same in the following:
-               [optional] aecp HOWTO/change.txt
-               [optional] aecp HOWTO/release.txt
-
-               [optional] vi HOWTO/change.txt
-               [optional] vi HOWTO/release.txt
-
-               # Prep the following files to track the changes
-               # made during the next development cycle
-               aecp src/CHANGES.txt src/RELEASE.txt
-               vi src/CHANGES.txt src/RELEASE.txt
-
-               aeb
-
-               aet -reg
-
-               aed
-
-               aede
-
-               etc.
-
-
-
 
 =======================
 Template describe-the-release section:
 
-IMPORTANT:  Release 0.15 contains the following interface changes:
+IMPORTANT:  Release 0.90 contains the following interface changes:
   - XXX
 
   See the release notes for more information about these changes.
@@ -431,7 +453,7 @@ Template scons-devel announcement:
 
 SConspirators--
 
-SCons alpha release 0.15 is now available for download.
+SCons alpha release 0.90 is now available for download.
 
 XXX Template describe-the-release section goes here XXX
 
@@ -442,7 +464,7 @@ release.
 =======================
 Template scons-users + scons-announce announcement:
 
-Version 0.15 of SCons has been released and is available for download
+Version 0.90 of SCons has been released and is available for download
 from the SCons web site:
 
        http://www.scons.org/
@@ -475,7 +497,7 @@ SCons is a software construction tool (build tool, or make tool) written
 in Python.  It is based on the design which won the Software Carpentry
 build tool competition in August 2000.
 
-Version 0.15 of SCons has been released and is available for download
+Version 0.90 of SCons has been released and is available for download
 from the SCons web site:
 
        http://www.scons.org/

diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py
index bf003b4d3fd6ba49e35a2729cad46a2a5532db2d..65c84b948e257fd4747c4a1686d8bb96106a542a 100644 (file)
--- a/src/engine/SCons/SConfTests.py
+++ b/src/engine/SCons/SConfTests.py
@@ -321,7 +321,7 @@ int main() {
             return (res1, res2)
 
         def TypeChecks(sconf):
-            res1 = sconf.CheckType('u_int', '#include <sys/types.h>\n')
+            res1 = sconf.CheckType('off_t', '#include <sys/types.h>\n')
             res2 = sconf.CheckType('hopefullynotypedef_not')
             return (res1, res2)
 

diff --git a/src/engine/SCons/Tool/m4.py b/src/engine/SCons/Tool/m4.py
index 530e7138079efcb5fa4037abcaf3f2d04ba10b94..35f323ca212679a7966c021bf90938259d224f39 100644 (file)
--- a/src/engine/SCons/Tool/m4.py
+++ b/src/engine/SCons/Tool/m4.py
@@ -48,7 +48,7 @@ def generate(env):
     # file.cpp.m4 -> file.cpp etc.
     env['M4']      = 'm4'
     env['M4FLAGS'] = '-E'
-    env['M4COM']   = 'cd ${SOURCE.srcdir} ; $M4 $M4FLAGS < ${SOURCE.file} > ${TARGET.abspath}'
+    env['M4COM']   = 'cd ${SOURCE.srcdir} && $M4 $M4FLAGS < ${SOURCE.file} > ${TARGET.abspath}'
 
 def exists(env):
     return env.Detect('m4')

diff --git a/test/M4.py b/test/M4.py
index f268174c7c75972dd5d94922b0648fc75c0f725f..0e7e809a55c88e648cb244e118a7e9558f44c7cc 100644 (file)
--- a/test/M4.py
+++ b/test/M4.py
@@ -61,7 +61,7 @@ line 3
 
 test.run()
 
-test.fail_test(test.read(test.workpath('aaa.x')) != "line 1\nmym4.py\nline 3\n")
+test.fail_test(test.read(test.workpath('aaa.x'), 'r') != "line 1\nmym4.py\nline 3\n")