From 69072a0f7434d37e4b0ec8ec4e22bd1aed7df167 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Sat, 7 May 2005 21:56:43 +0000 Subject: [PATCH] Fix a User's Guide example. (Sanjoy Mahajan) git-svn-id: http://scons.tigris.org/svn/scons/trunk@1289 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- SConstruct | 4 +++- doc/SConscript | 10 +++++++++- doc/man/scons.1 | 2 ++ doc/user/scanners.in | 4 ++-- doc/user/scanners.sgml | 4 ++-- src/CHANGES.txt | 3 ++- 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/SConstruct b/SConstruct index 4ea2246b..be557ef5 100644 --- a/SConstruct +++ b/SConstruct @@ -720,6 +720,8 @@ for p in [ scons ]: topdir = os.path.join(os.getcwd(), build, 'build', 'bdist.' + platform, 'rpm') + buildroot = os.path.join(os.getcwd(), 'build', 'rpm-buildroot') + BUILDdir = os.path.join(topdir, 'BUILD', pkg + '-' + version) RPMSdir = os.path.join(topdir, 'RPMS', 'noarch') SOURCESdir = os.path.join(topdir, 'SOURCES') @@ -753,7 +755,7 @@ for p in [ scons ]: Local(sourcefile) targets = [ noarch_rpm, src_rpm ] - cmd = "$RPMBUILD --define '_topdir $(%s$)' -ba $SOURCES" % topdir + cmd = "$RPMBUILD --define '_topdir $(%s$)' --buildroot %s -ba $SOURCES" % (topdir, buildroot) if not os.path.isdir(BUILDdir): cmd = ("$( mkdir -p %s; $)" % BUILDdir) + cmd env.Command(targets, specfile, cmd) diff --git a/doc/SConscript b/doc/SConscript index 008f2058..a51dd796 100644 --- a/doc/SConscript +++ b/doc/SConscript @@ -158,13 +158,21 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. variables_gen = os.path.join(build, 'user', 'variables.gen') variables_mod = os.path.join(build, 'user', 'variables.mod') + # We put $( - $) around $SOURCES in the command line below because + # the path names will change when a given input file is found in + # a repository one run and locally the next, and we don't want + # to rebuild documentation just because it's found in one location + # vs. the other. The *.gen and *.mod targets will still be dependent + # on the list of the files themselves. b = env.Command([builders_gen, builders_mod, tools_gen, tools_mod, variables_gen, variables_mod], scons_doc_files, - "python $SCONS_PROC_PY -b ${TARGETS[0]},${TARGETS[1]} -t ${TARGETS[2]},${TARGETS[3]} -v ${TARGETS[4]},${TARGETS[5]} $SOURCES") + "python $SCONS_PROC_PY -b ${TARGETS[0]},${TARGETS[1]} -t ${TARGETS[2]},${TARGETS[3]} -v ${TARGETS[4]},${TARGETS[5]} $( $SOURCES $)") env.Depends(b, "$SCONS_PROC_PY") + env.Local(b) + # # Each document will live in its own subdirectory. List them here # as hash keys, with a hash of the info to control its build. diff --git a/doc/man/scons.1 b/doc/man/scons.1 index 986c14be..c627a19f 100644 --- a/doc/man/scons.1 +++ b/doc/man/scons.1 @@ -9737,6 +9737,8 @@ env['BUILDERS]['PDFBuilder'] = bld .ES import re +'\" Note: the \\ in the following are for the benefit of nroff/troff, +'\" not inappropriate doubled escape characters within the r'' raw string. include_re = re.compile(r'^include\\s+(\\S+)$', re.M) def kfile_scan(node, env, path, arg): diff --git a/doc/user/scanners.in b/doc/user/scanners.in index a0029ef4..63c07227 100644 --- a/doc/user/scanners.in +++ b/doc/user/scanners.in @@ -167,7 +167,7 @@ over the file scanning rather than being called for each input line: import re - include_re = re.compile(r'^include\\s+(\\S+)$', re.M) + include_re = re.compile(r'^include\s+(\S+)$', re.M) def kfile_scan(node, env, path, arg): contents = node.get_contents() @@ -278,7 +278,7 @@ over the file scanning rather than being called for each input line: import re - include_re = re.compile(r'^include\\s+(\\S+)$', re.M) + include_re = re.compile(r'^include\s+(\S+)$', re.M) def kfile_scan(node, env, path): contents = node.get_contents() diff --git a/doc/user/scanners.sgml b/doc/user/scanners.sgml index b4756c53..c068d037 100644 --- a/doc/user/scanners.sgml +++ b/doc/user/scanners.sgml @@ -167,7 +167,7 @@ over the file scanning rather than being called for each input line: import re - include_re = re.compile(r'^include\\s+(\\S+)$', re.M) + include_re = re.compile(r'^include\s+(\S+)$', re.M) def kfile_scan(node, env, path, arg): contents = node.get_contents() @@ -277,7 +277,7 @@ over the file scanning rather than being called for each input line: import re - include_re = re.compile(r'^include\\s+(\\S+)$', re.M) + include_re = re.compile(r'^include\s+(\S+)$', re.M) def kfile_scan(node, env, path): contents = node.get_contents() diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 0fb6e712..cc3538f7 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -283,7 +283,8 @@ RELEASE 0.97 - XXX From Sanjoy Mahajan: - - Fix a bad use of Copy() in an example in the man page. + - Fix a bad use of Copy() in an example in the man page, and a + bad regular expression example in the man page and User's Guide. From Michael McCracken: -- 2.26.2