Initialize the new branch.

8 files changed, 58 insertions, 40 deletions

diff --git a/HOWTO/change.txt b/HOWTO/change.txt
index b3fc48c..216cfb6 100644
--- a/HOWTO/change.txt
+++ b/HOWTO/change.txt
@@ -30,28 +30,28 @@ Handling a change set:
 
     --	Distribute the change to scons-aedist:
 
-		aedist -s -p scons.0.5 {cnum} > scons.0.5.C{cnum}.ae
-		pine -attach scons.0.5.C{cnum}.ae scons-aedist@lists.sourceforge.net
-			Subject: scons.0.5 - {SUMMARY}
-			Body:  aegis -l -p scons.0.5 -c {cnum} cd
+		aedist -s -p scons.0.6 {cnum} > scons.0.6.C{cnum}.ae
+		pine -attach scons.0.6.C{cnum}.ae scons-aedist@lists.sourceforge.net
+			Subject: scons.0.6 - {SUMMARY}
+			Body:  aegis -l -p scons.0.6 -c {cnum} cd
 
-		rm scons.0.5.C{cnum}.ae
+		rm scons.0.6.C{cnum}.ae
 
 	[This will eventually be automated.]
 
     --	Update the aedist baseline on the web site:
 
-		aedist -s -bl -p scons.0.5 > scons.0.5.ae
-		scp scons.0.5.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.5.ae
-		rm scons.0.5.ae
+		aedist -s -bl -p scons.0.6 > scons.0.6.ae
+		scp scons.0.6.ae stevenknight@scons.sourceforge.net:/home/groups/s/sc/scons/htdocs/scons.0.6.ae
+		rm scons.0.6.ae
 
 	[This will eventually be automated.]
 
     --	Distribute the change to CVS:
 
 		export CVS_RSH=ssh
-    		ae2cvs -n -aegis -p scons.0.5 -c {cnum} -u ~/SCons/scons
-    		ae2cvs -X -aegis -p scons.0.5 -c {cnum} -u ~/SCons/scons
+    		ae2cvs -n -aegis -p scons.0.6 -c {cnum} -u ~/SCons/scons
+    		ae2cvs -X -aegis -p scons.0.6 -c {cnum} -u ~/SCons/scons
 
         If you need the "ae2cvs" Perl script, you can find a copy
         checked in to the bin/subdirectory.
diff --git a/HOWTO/release.txt b/HOWTO/release.txt
index ca8bbed..e668be2 100644
--- a/HOWTO/release.txt
+++ b/HOWTO/release.txt
@@ -49,11 +49,11 @@ Things to do to release a new version of SCons:
 
 		ae_p scons.0
 
-		aede {5}
+		aede {6}
 
-		aerpass {5}
+		aerpass {6}
 
-		aeib {5}
+		aeib {6}
 
 		aeb
 
@@ -67,15 +67,15 @@ Things to do to release a new version of SCons:
 
 	START THE NEW BRANCH
 
-		aenbr -p scons.0 {6}
+		aenbr -p scons.0 {7}
 
-		aenc -p scons.0.{6}
+		aenc -p scons.0.{7}
 
                         Call it something like, "Initialize the new
                         branch."  Cause = internal_enhancement.  Exempt
                         it from all tests (*_exempt = true).
 
-		ae_p scons.0.{6}
+		ae_p scons.0.{7}
 
 		aedb 100
 
@@ -119,12 +119,12 @@ Things to do to release a new version of SCons:
 		<your email>
 		cd incoming
 		bin
-		put scons-0.05-1.noarch.rpm
-		put scons-0.05-1.src.rpm
-		put scons-0.05.tar.gz
-		put scons-0.05.win32.exe
-		put scons-src-0.05.tar.gz
-		put scons_0.05-1_all.deb
+		put scons-0.06-1.noarch.rpm
+		put scons-0.06-1.src.rpm
+		put scons-0.06.tar.gz
+		put scons-0.06.win32.exe
+		put scons-src-0.06.tar.gz
+		put scons_0.06-1_all.deb
 
 	Create the new release at the SourceForge project page:
 
@@ -134,7 +134,7 @@ Things to do to release a new version of SCons:
 
 		=> Add Release
 
-		New release name:  0.05
+		New release name:  0.06
 
 		Cut-and-paste or upload the RELEASE.txt file.
 
@@ -149,12 +149,12 @@ Things to do to release a new version of SCons:
 
 		Edit the file info:
 
-			scons-0.05-1.noarch.rpm		Any	.rpm
-			scons-0.05-1.src.rpm		Any	Source .rpm
-			scons-0.05.tar.gz		Any	.gz
-			scons-0.05.win32.exe		i386	Other
-			scons-src-0.05.tar.gz		Any	Source .gz
-			scons_0.05-1_all.deb		Any	.deb
+			scons-0.06-1.noarch.rpm		Any	.rpm
+			scons-0.06-1.src.rpm		Any	Source .rpm
+			scons-0.06.tar.gz		Any	.gz
+			scons-0.06.win32.exe		i386	Other
+			scons-src-0.06.tar.gz		Any	Source .gz
+			scons_0.06-1_all.deb		Any	.deb
 
 		(This has to be done one at a time.)
 
@@ -183,7 +183,7 @@ Things to do to release a new version of SCons:
 
 
 
-	In the Bugs Tracker, add a Group for the new release (0.05)
+	In the Bugs Tracker, add a Group for the new release (0.06)
 
 
 
@@ -255,7 +255,7 @@ Version 0.XXX of SCons contains the following important changes:
 
   - XXX
 
-For a complete list of changes in version 0.05, see the CHANGES.txt
+For a complete list of changes in version 0.06, see the CHANGES.txt
 file in the release itself.
 
 
diff --git a/SConstruct b/SConstruct
index c358cb2..9c1fd83 100644
--- a/SConstruct
+++ b/SConstruct
@@ -34,7 +34,7 @@ import sys
 import time
 
 project = 'scons'
-default_version = '0.05'
+default_version = '0.06'
 
 Default('.')
 
@@ -169,6 +169,10 @@ def SCons_revision(target, source, env):
     This is used to copy files into a tree that gets packaged up
     into the source file package.
     """
+    # Note:  We don't use $VERSION from the environment so that
+    # this routine will change when the version number changes
+    # and things will get rebuilt properly.
+    global version
     print "SCons_revision() < %s > %s" % (source[0], target)
     inf = open(source[0], 'rb')
     outf = open(target, 'wb')
@@ -180,7 +184,7 @@ def SCons_revision(target, source, env):
         line = string.replace(line, '_' + '_DEVELOPER__', env['DEVELOPER'])
         line = string.replace(line, '_' + '_FILE__', source[0])
         line = string.replace(line, '_' + '_REVISION__', env['REVISION'])
-        line = string.replace(line, '_' + '_VERSION__', env['VERSION'])
+        line = string.replace(line, '_' + '_VERSION__', version)
         outf.write(line)
     inf.close()
     outf.close()
@@ -444,8 +448,7 @@ for p in [ scons ]:
     ]
     setup_py = os.path.join(build, 'setup.py')
     commands = [
-        "rm -rf %s && python %s bdist" %
-            (string.join(map(lambda x: str(x), bdist_dirs)), setup_py),
+        "rm -rf %s && python %s bdist" % (string.join(bdist_dirs), setup_py),
         "python %s sdist" % setup_py,
         "python %s bdist_wininst" % setup_py,
     ]
diff --git a/debian/changelog b/debian/changelog
index 6e2b6bd..c9201e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scons (0.06-1) unstable; urgency=low
+
+  * Sixth Release.
+
+ -- Steven Knight <knight@baldmt.com>  Thu, 21 Feb 2002 16:50:03 -0600
+
+
 scons (0.05-1) unstable; urgency=low
 
   * Fifth Release.
diff --git a/debian/scons.postinst b/debian/scons.postinst
index 1d127da..9015080 100644
--- a/debian/scons.postinst
+++ b/debian/scons.postinst
@@ -6,7 +6,7 @@
 #
 
 PACKAGE=scons
-DIRLIST="/usr/lib/scons-0.05"
+DIRLIST="/usr/lib/scons-0.06"
 
 case "$1" in
     configure|abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/etc/SConscript b/etc/SConscript
index ce835b8..a55fe67 100644
--- a/etc/SConscript
+++ b/etc/SConscript
@@ -40,6 +40,10 @@ def copy(target, source, env):
     open(target, 'wb').write(open(source[0], 'rb').read())
 
 for file in files:
-    env.Command(os.path.join('#build', 'etc', file),
-                file,
-		copy)
+    # Guarantee that real copies of these files always exist in
+    # build/etc.  If there's a symlink there, then this is an Aegis
+    # build and we blow them away now so that they'll get "built" later.
+    p = os.path.join('build', 'etc', file)
+    if os.path.islink(p):
+        os.unlink(p)
+    env.Command(os.path.join('#' + p), file, copy)
diff --git a/rpm/scons.spec b/rpm/scons.spec
index 74e83aa..5953842 100644
--- a/rpm/scons.spec
+++ b/rpm/scons.spec
@@ -1,5 +1,5 @@
 %define name scons
-%define version 0.05
+%define version 0.06
 %define release 1
 
 Summary: an Open Source software construction tool
diff --git a/src/script/scons.py b/src/script/scons.py
index 3490873..8e64d1d 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -37,6 +37,10 @@ import os
 # followed by generic) so we pick up the right version of the build
 # engine modules if they're in either directory.
 
+selfdir = os.path.abspath(sys.argv[0])
+if selfdir in sys.path:
+    sys.path.remove(selfdir)
+
 libs = []
 
 if os.environ.has_key("SCONS_LIB_DIR"):