openstack
/
openstack-doc-tools
Code Issues Proposed changes

Remove docbook 

From autohelp-wrapper and autohelp.py, as it's no longer used.

Change-Id: I44d5c37c70b8b4fc0b938b6ba0c2fed5a448c265
This commit is contained in:
Alexis Lee 2016-11-21 14:18:16 +00:00
parent 0f01f52ef9
commit 855daa63f6
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
autogenerate_config_docs/autohelp-wrapper
View File

@ -32,11 +32,10 @@ QUIET=0
usage() { usage() {
echo "Wrapper for autohelp.py" echo "Wrapper for autohelp.py"
echo "Usage:" echo "Usage:"
echo " $(basename $0) [ OPTIONS ] update|docbook|rst|setup [ project... ]" echo " $(basename $0) [ OPTIONS ] update|rst|setup [ project... ]"
echo echo
echo "Subcommands:" echo "Subcommands:"
echo " update: Update or create the flagmapping files" echo " update: Update or create the flagmapping files"
echo " docbook: Generate the options tables in docbook format"
echo " rst: Generate the options tables in RST format" echo " rst: Generate the options tables in RST format"
echo " setup: Install the environment only" echo " setup: Install the environment only"
echo echo
@ -149,7 +148,7 @@ if [ $QUIET -eq 1 ]; then
fi fi
case $ACTION in case $ACTION in
update|docbook|rst|dump|setup) ;; update|rst|dump|setup) ;;
*) *)
usage usage
exit 1 exit 1
@ -249,14 +248,6 @@ for project in $PROJECTS; do
$extra_flags $AUTOOPT $extra_flags $AUTOOPT
mv $project.flagmappings.new $project.flagmappings mv $project.flagmappings.new $project.flagmappings
;; ;;
docbook)
if [ "$project" = "swift" ]; then
$EXTRACT_SWIFT docbook -m $MANUALSREPO -s $SOURCESDIR/swift
else
$AUTOHELP docbook $project -i $SOURCESDIR/$project/$project \
$extra_flags $AUTOOPT
fi
;;
rst) rst)
if [ "$project" = "swift" ]; then if [ "$project" = "swift" ]; then
$EXTRACT_SWIFT rst -m $MANUALSREPO -s $SOURCESDIR/swift $EXTRACT_SWIFT rst -m $MANUALSREPO -s $SOURCESDIR/swift

8
autogenerate_config_docs/autohelp.py
View File

@ -565,8 +565,8 @@ def main():
description='Manage flag files, to aid in updating documentation.', description='Manage flag files, to aid in updating documentation.',
usage='%(prog)s <cmd> <package> [options]') usage='%(prog)s <cmd> <package> [options]')
parser.add_argument('subcommand', parser.add_argument('subcommand',
help='Action (update, docbook, rst, dump).', help='Action (update, rst, dump).',
choices=['update', 'docbook', 'rst', 'dump']) choices=['update', 'rst', 'dump'])
parser.add_argument('package', parser.add_argument('package',
help='Name of the top-level package.') help='Name of the top-level package.')
parser.add_argument('-v', '--verbose', parser.add_argument('-v', '--verbose',
@ -586,7 +586,7 @@ def main():
dest='target', dest='target',
help='Directory or file in which data will be saved.\n' help='Directory or file in which data will be saved.\n'
'Defaults to ../../doc/common/tables/ ' 'Defaults to ../../doc/common/tables/ '
'for "docbook".\n' 'for "rst".\n'
'Defaults to stdout for "dump"', 'Defaults to stdout for "dump"',
required=False, required=False,
type=str,) type=str,)
@ -621,7 +621,7 @@ def main():
if args.subcommand == 'update': if args.subcommand == 'update':
update_flagmappings(args.package, options, verbose=args.verbose) update_flagmappings(args.package, options, verbose=args.verbose)
elif args.subcommand in ('docbook', 'rst'): elif args.subcommand == 'rst':
write_files(args.package, options, args.target, args.subcommand) write_files(args.package, options, args.target, args.subcommand)
elif args.subcommand == 'dump': elif args.subcommand == 'dump':