From 8e515c321b541cac991052c3e880ddf9e69da3fc Mon Sep 17 00:00:00 2001 From: GregNoel Date: Wed, 27 Aug 2008 16:30:06 +0000 Subject: [PATCH] Issue 2159: Man page formatting errors for Packaging() git-svn-id: http://scons.tigris.org/svn/scons/trunk@3317 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- bin/scons-proc.py | 2 ++ src/engine/SCons/Tool/packaging/__init__.xml | 27 ++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/bin/scons-proc.py b/bin/scons-proc.py index 1de0caa9..9880ef30 100644 --- a/bin/scons-proc.py +++ b/bin/scons-proc.py @@ -213,6 +213,8 @@ class SCons_XML_to_man(SCons_XML): body = re.sub('\.EE\n\n+(?!\.IP)', '.EE\n.IP\n', body) body = re.sub('&(scons|SConstruct|SConscript|jar);', r'\\fB\1\\fP', body) body = string.replace(body, '&Dir;', r'\fBDir\fP') + body = string.replace(body, '⌖', r'\fItarget\fP') + body = string.replace(body, '&source;', r'\fIsource\fP') body = re.sub('&b(-link)?-([^;]*);', r'\\fB\2\\fP()', body) body = re.sub('&cv(-link)?-([^;]*);', r'$\2', body) body = re.sub(r'<(command|envar|filename|literal|option)>([^<]*)', diff --git a/src/engine/SCons/Tool/packaging/__init__.xml b/src/engine/SCons/Tool/packaging/__init__.xml index bf4e96ef..91bd9d3d 100644 --- a/src/engine/SCons/Tool/packaging/__init__.xml +++ b/src/engine/SCons/Tool/packaging/__init__.xml @@ -16,19 +16,20 @@ Sets construction variables for the &b-Package; Builder. -Builds software distribution packages. Packages consist of files -to install and packaging information. The former may be specified -with the &source; parameter and may be left out, in which case the -&FindInstalledFiles; function will collect all files that have an -&b-Install; or &b-InstallAs; Builder attached. If the ⌖, is -not specified it will be deduced from additional information given to -this Builder. - -The packaging information is specified with the help of construction -variables documented below. This information is called a tag to stress -that some of them can also be attached to files with the &Tag; function. -The mandatory ones will complain if they were not specified. They vary -depending on chosen target packager. +Builds software distribution packages. +Packages consist of files to install and packaging information. +The former may be specified with the &source; parameter and may be left out, +in which case the &b-FindInstalledFiles; function will collect +all files that have an &b-Install; or &b-InstallAs; Builder attached. +If the ⌖ is not specified +it will be deduced from additional information given to this Builder. + +The packaging information is specified +with the help of construction variables documented below. +This information is called a tag to stress that +some of them can also be attached to files with the &b-Tag; function. +The mandatory ones will complain if they were not specified. +They vary depending on chosen target packager. The target packager may be selected with the "PACKAGETYPE" command line option or with the &cv-PACKAGETYPE; construction variable. Currently -- 2.26.2