summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-02-04 04:11:08 (GMT)
committerSteven Knight <knight@baldmt.com>2002-02-04 04:11:08 (GMT)
commitc6ee835808199bcd2bebecd7e463c6fe48b1bed1 (patch)
tree119376a891c8497b53f80f47a8085475b5cd34dc
parent5e8517111e036d0dfd191a8ad41e41bbf0950c2e (diff)
downloadSCons-c6ee835808199bcd2bebecd7e463c6fe48b1bed1.zip
SCons-c6ee835808199bcd2bebecd7e463c6fe48b1bed1.tar.gz
SCons-c6ee835808199bcd2bebecd7e463c6fe48b1bed1.tar.bz2
Finally, eat our own dog food: start using SCons to build its own packages.
-rw-r--r--Construct12
-rw-r--r--HOWTO/release.txt4
-rw-r--r--SConstruct7
-rw-r--r--config2
-rw-r--r--doc/SConscript12
5 files changed, 25 insertions, 12 deletions
diff --git a/Construct b/Construct
index fc93113..fce4470 100644
--- a/Construct
+++ b/Construct
@@ -27,6 +27,18 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
+print <<_EOF_;
+
+ Using Cons to build the SCons packages is no longer supported,
+ and this Construct file is deprecated.
+
+ Use SCons to build its own packages instead.
+
+ See the README file for details.
+
+_EOF_
+exit 0;
+
$project = 'scons';
Default qw( . );
diff --git a/HOWTO/release.txt b/HOWTO/release.txt
index 5fbd264..ca8bbed 100644
--- a/HOWTO/release.txt
+++ b/HOWTO/release.txt
@@ -83,9 +83,9 @@ Things to do to release a new version of SCons:
# Change the hard-coded package version numbers
# in the following files.
- aecp Construct debian/changelog rpm/scons.spec
+ aecp SConstruct debian/changelog rpm/scons.spec
- vi Construct debian/changelog rpm/scons.spec
+ vi SConstruct debian/changelog rpm/scons.spec
# Optionally, do the same in the following:
[optional] aecp HOWTO/change.txt
diff --git a/SConstruct b/SConstruct
index c07e020..5c09e43 100644
--- a/SConstruct
+++ b/SConstruct
@@ -34,6 +34,7 @@ import sys
import time
project = 'scons'
+default_version = '0.05'
Default('.')
@@ -96,7 +97,7 @@ except:
if aesub:
revision = os.popen(aesub + " \\$version", "r").read()[:-1]
else:
- revision = '0.04'
+ revision = default_version
a = string.split(revision, '.')
arr = [a[0]]
@@ -120,7 +121,7 @@ revision = string.join(arr, '.')
# return str
#arr = map(lambda x, xxx=xxx: xxx(x), arr)
#version = string.join(arr, '.')
-version = '0.04'
+version = default_version
try:
change = ARGUMENTS['change']
@@ -128,7 +129,7 @@ except:
if aesub:
change = os.popen(aesub + " \\$change", "r").read()[:-1]
else:
- change = '0.04'
+ change = default_version
python_ver = sys.version[0:3]
diff --git a/config b/config
index 445a1b1..53873e3 100644
--- a/config
+++ b/config
@@ -34,7 +34,7 @@
* if the file is not in the change. Look in aesub(5) for more information
* about command substitutions.
*/
-build_command = "cons date='${DAte %Y/%m/%d %H:%M:%S}' developer=${DEVeloper} version=${VERsion} change=${Change}";
+build_command = "SCONS_LIB_DIR=${Development_Directory}/src/engine python ${Source src/script/scons.py} date='${DAte %Y/%m/%d %H:%M:%S}' developer=${DEVeloper} version=${VERsion} change=${Change}";
/*
* The rules used in the User Guide all remove their targets before
diff --git a/doc/SConscript b/doc/SConscript
index cb9df1b..c706f1f 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -53,7 +53,7 @@ jw = whereis('jw')
tar_deps = []
tar_list = ""
-entity_re = re.compile(r'<!entity\s+(?:%\s+)?(?:\S+)\s+SYSTEM\s+"([^"]*)">/', re.I)
+entity_re = re.compile(r'<!entity\s+(?:%\s+)?(?:\S+)\s+SYSTEM\s+"([^"]*)">', re.I)
format_re = re.compile(r'<(?:graphic|imagedata)\s+fileref="([^"]*)"(?:\s+format="([^"]*)")?')
#
@@ -67,12 +67,12 @@ format_re = re.compile(r'<(?:graphic|imagedata)\s+fileref="([^"]*)"(?:\s+format=
# defined as a SYSTEM entity is, in fact, a file included
# somewhere in the document.
#
-def scansgml(contents, argument = None):
+def scansgml(node, env, argument = None):
includes = []
- matches = entity_re.findall(contents)
- for m in matches:
- includes.append(m[0])
+ contents = node.get_contents()
+
+ includes.extend(entity_re.findall(contents))
matches = format_re.findall(contents)
for m in matches:
@@ -173,7 +173,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
s = docs[doc].get('scan')
if s:
- File(os.path.join('build', 'doc', main)).scanner_set(s)
+ File(main).scanner_set(s)
if docs[doc].get('html'):
env.Command(htmlindex, main, [