diff options
| -rw-r--r-- | Construct | 35 | ||||
| -rw-r--r-- | HOWTO/release.txt | 24 | ||||
| -rw-r--r-- | doc/man/scons.1 | 2 | ||||
| -rw-r--r-- | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/README.txt | 3 | ||||
| -rw-r--r-- | src/RELEASE.txt | 31 | ||||
| -rw-r--r-- | src/setup.py | 3 |
7 files changed, 68 insertions, 32 deletions
@@ -87,15 +87,21 @@ $revision = $ARG{version}; chomp($revision = `$aesub '\$version' 2>/dev/null`) if $aesub && ! $revision; $revision = '0.02' if ! $revision; -$change = $ARG{change}; -chomp($change = `$aesub '\$change' 2>/dev/null`) if $aesub && ! $change; - @arr = split(/\./, $revision); @arr = ($arr[0], map {length($_) == 1 ? "0$_" : $_} @arr[1 .. $#arr]); $revision = join('.', @arr); -pop @arr if $#arr >= 2; -map {s/^[CD]//, s/^0*(\d\d)$/$1/} @arr; -$version = join('.', @arr); + +# Here's how we'd turn the calculated $revision into our package $version. +# This makes it difficult to coordinate with other files (debian/changelog +# and rpm/scons.spec) that hard-code the version number, so just go with +# the flow for now. +#pop @arr if $#arr >= 2; +#map {s/^[CD]//, s/^0*(\d\d)$/$1/} @arr; +#$version = join('.', @arr); +$version = '0.02'; + +$change = $ARG{change}; +chomp($change = `$aesub '\$change' 2>/dev/null`) if $aesub && ! $change; chomp($python_ver = `python -c "import sys; print sys.version[0:3]"`); @@ -379,8 +385,20 @@ for $p ($scons) { $rpm = "$RPMSdir/$pkg-$version-1.noarch.rpm"; $src_rpm = "$SRPMSdir/$pkg-$version-1.src.rpm"; - $env->InstallAs($specfile, "rpm/$pkg.spec"); - $env->InstallAs($sourcefile, $archive); + # We'd like to use the following here: + # + # $env->InstallAs($specfile, "rpm/$pkg.spec"); + # $env->InstallAs($sourcefile, $archive); + # + # but it looks like InstallAs doesn't propogate the + # signatures correctly, which means that the RPM file + # wouldn't always get rebuilt when it should. Work + # around it. + use File::Copy; + $env->Command($specfile, "rpm/$pkg.spec", + "[perl] File::Copy::copy('%<', '%>')"); + $env->Command($sourcefile, $archive, + "[perl] File::Copy::copy('%<', '%>')"); if (! -d $BUILDdir) { $cmd = "mkdir -p $BUILDdir; "; @@ -400,7 +418,6 @@ for $p ($scons) { # need to add the .debs to the install_targets. my $deb = "build/dist/${pkg}_$version-1_all.deb"; $env->Command($deb, @build_src_files, qq( - rm -f %> fakeroot make -f debian/rules VERSION=%VERSION DH_COMPAT=$DH_COMPAT ENVOKED_BY_CONSTRUCT=1 binary-$pkg env DH_COMPAT=$DH_COMPAT dh_clean)); $env->Depends($deb, @{$p->{'debian_deps'}}); diff --git a/HOWTO/release.txt b/HOWTO/release.txt index 81f8f120..48496fae 100644 --- a/HOWTO/release.txt +++ b/HOWTO/release.txt @@ -1,12 +1,6 @@ Things to do to release a version of SCons: - Prepare CHANGES text - - Prepare RELEASE notes - - Read through the README.txt file for any updates - - Build candidate packages + Build and test candidate packages test on Linux @@ -26,6 +20,22 @@ Things to do to release a version of SCons: cd scons-src-{version} python runtest.py -a -x C:\Python15\scons.bat + Read through the README.txt file for any updates + + Prepare 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 + + date -R the latest release + + Can probably keep a lot of the existing text, read + it through to make sure it's okay and edit appropriately. + END THE BRANCH (need more info) diff --git a/doc/man/scons.1 b/doc/man/scons.1 index 15712776..100710fc 100644 --- a/doc/man/scons.1 +++ b/doc/man/scons.1 @@ -19,6 +19,8 @@ .\" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION .\" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .\" +.\" __FILE__ __REVISION__ __DATE__ __DEVELOPER__ +.\" .TH SCONS 1 "December 2001" .SH NAME scons \- software constructor diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 36d84bfc..f24435bf 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -8,7 +8,7 @@ -RELEASE 0.02 - +RELEASE 0.02 - Sun, 23 Dec 2001 19:05:09 -0600 From Charles Crain: diff --git a/src/README.txt b/src/README.txt index e8aaf55e..53f338f6 100644 --- a/src/README.txt +++ b/src/README.txt @@ -51,7 +51,8 @@ See the RELEASE.txt file for notes about this specific release, including known problems. See the CHANGES.txt file for a list of changes since the previous release. -The scons.1 man page is included in this package. +The scons.1 man page is included in this package, and contains a section +of small examples for getting started using SCons. Additional documentation for SCons is available at: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 1c20e26b..168bcecf 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -20,23 +20,27 @@ more effectively, please sign up for the scons-users mailing list at: -RELEASE 0.01 - Thu Dec 13 19:25:23 CST 2001 +RELEASE 0.02 - Sun, 23 Dec 2001 19:05:19 -0600 - This is the initial alpha release of SCons. This release contains a - lot of functionality, and owing to an extensive test suite, the SCons - team believes that this release is of sufficient quality that you can - use it for real work. + This is the second alpha release of SCons. Please consult the + CHANGES.txt file for a list of specific changes since last release. + + Owing to an extensive test suite, the SCons team believes that this + release is of sufficient quality that you can use it for real work, + despite the "alpha" label. Nevertheless, because this is an alpha release, heed the following disclaimers: - - Expect bugs. Please report any bugs or other problems that you - find to our bug tracker at our SourceForge project page: + - Do not be surprised if there are bugs. Please report any bugs + or other problems that you find to our bug tracker at our + SourceForge project page: http://sourceforge.net/tracker/?func=add&group_id=30337&atid=398971 We have a reliable bug-fixing methodology already in place and - expect to respond to problems relatively quickly. + expect to respond to problems relatively quickly. (We have fixed + 9 out of 10 reported bugs in the eight days since release 0.01.) - It is possible that interfaces will change in future releases. We will strive to hold this to a minimum, but you may need to modify @@ -53,6 +57,14 @@ RELEASE 0.01 - Thu Dec 13 19:25:23 CST 2001 portions of the interface as we figured out what worked and what didn't during implementation.L + - There may be performance issues. If you find the performance + unacceptable, we would like to hear from you and learn more + about your configuration so we can optimize the right things. + + - Error messages don't always exist where they'd be helpful. + Please let us know about any errors you ran into that would + have benefitted from a (more) descriptive message. + KNOWN PROBLEMS IN THIS RELEASE: - Support for parallel builds (-j) does not work on WIN32 systems @@ -77,9 +89,6 @@ RELEASE 0.01 - Thu Dec 13 19:25:23 CST 2001 - No support yet for the following future features: - - Separate build directories (BuildDir(), a.k.a. "Link" in - Cons classic) - - Repository search paths (-Y) - Configurable signature calculation diff --git a/src/setup.py b/src/setup.py index c0d15100..e79a32c0 100644 --- a/src/setup.py +++ b/src/setup.py @@ -60,12 +60,9 @@ class my_install_lib(install_lib): self.install_dir = os.path.join(head, tail) return -keywords = "scons, cons, make, build tool, make tool, software build tool, software construction tool" - arguments = { 'name' : "scons", 'version' : "__VERSION__", - 'keywords' : keywords, 'packages' : ["SCons", "SCons.Node", "SCons.Scanner", |