From cb3425abe0bc2d05caf401ca24b82a25a81f009d Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Mon, 11 Mar 2013 22:33:28 +0100 Subject: Imported Upstream version 2.3.0 --- doc/SConscript | 7 +++++-- doc/design/scons.mod | 2 +- doc/developer/architecture.xml | 2 +- doc/developer/branches.xml | 2 +- doc/developer/copyright.xml | 2 +- doc/developer/cycle.xml | 2 +- doc/developer/main.xml | 2 +- doc/developer/packaging.xml | 2 +- doc/developer/preface.xml | 2 +- doc/developer/sourcetree.xml | 2 +- doc/developer/testing.xml | 2 +- doc/man/scons-time.1 | 6 +++--- doc/man/scons.1 | 6 +++--- doc/man/sconsign.1 | 6 +++--- doc/python10/scons.mod | 2 +- doc/scons.mod | 2 +- doc/user/README | 2 +- doc/user/actions.in | 2 +- doc/user/actions.xml | 2 +- doc/user/add-method.in | 2 +- doc/user/add-method.xml | 2 +- doc/user/alias.in | 2 +- doc/user/alias.xml | 2 +- doc/user/ant.in | 2 +- doc/user/ant.xml | 2 +- doc/user/build-install.in | 20 ++++++++++---------- doc/user/build-install.xml | 20 ++++++++++---------- doc/user/builders-built-in.in | 2 +- doc/user/builders-built-in.xml | 2 +- doc/user/builders-commands.in | 2 +- doc/user/builders-commands.xml | 2 +- doc/user/builders-writing.in | 2 +- doc/user/builders-writing.xml | 2 +- doc/user/builders.in | 2 +- doc/user/builders.xml | 2 +- doc/user/caching.in | 2 +- doc/user/caching.xml | 2 +- doc/user/command-line.in | 2 +- doc/user/command-line.xml | 2 +- doc/user/copyright.in | 2 +- doc/user/copyright.xml | 2 +- doc/user/depends.in | 2 +- doc/user/depends.xml | 2 +- doc/user/environments.in | 2 +- doc/user/environments.xml | 2 +- doc/user/errors.in | 2 +- doc/user/errors.xml | 2 +- doc/user/example.in | 2 +- doc/user/example.xml | 2 +- doc/user/factories.in | 2 +- doc/user/factories.xml | 2 +- doc/user/file-removal.in | 2 +- doc/user/file-removal.xml | 2 +- doc/user/functions.in | 2 +- doc/user/functions.xml | 2 +- doc/user/gettext.in | 2 +- doc/user/gettext.xml | 2 +- doc/user/hierarchy.in | 2 +- doc/user/hierarchy.xml | 2 +- doc/user/install.in | 2 +- doc/user/install.xml | 2 +- doc/user/java.in | 2 +- doc/user/java.xml | 2 +- doc/user/less-simple.in | 2 +- doc/user/less-simple.xml | 2 +- doc/user/libraries.in | 2 +- doc/user/libraries.xml | 2 +- doc/user/main.in | 2 +- doc/user/main.xml | 2 +- doc/user/make.in | 2 +- doc/user/make.xml | 2 +- doc/user/mergeflags.in | 2 +- doc/user/mergeflags.xml | 2 +- doc/user/misc.in | 2 +- doc/user/misc.xml | 2 +- doc/user/nodes.in | 2 +- doc/user/nodes.xml | 2 +- doc/user/output.in | 2 +- doc/user/output.xml | 2 +- doc/user/parseconfig.in | 2 +- doc/user/parseconfig.xml | 2 +- doc/user/parseflags.in | 2 +- doc/user/parseflags.xml | 2 +- doc/user/preface.in | 2 +- doc/user/preface.xml | 2 +- doc/user/python.in | 2 +- doc/user/python.xml | 2 +- doc/user/repositories.in | 2 +- doc/user/repositories.xml | 2 +- doc/user/run.in | 2 +- doc/user/run.xml | 2 +- doc/user/scanners.in | 2 +- doc/user/scanners.xml | 2 +- doc/user/sconf.in | 2 +- doc/user/sconf.xml | 2 +- doc/user/separate.in | 2 +- doc/user/separate.xml | 2 +- doc/user/sideeffect.in | 2 +- doc/user/sideeffect.xml | 2 +- doc/user/simple.in | 2 +- doc/user/simple.xml | 2 +- doc/user/sourcecode.in | 2 +- doc/user/sourcecode.xml | 2 +- doc/user/tasks.in | 2 +- doc/user/tasks.xml | 2 +- doc/user/tools.in | 2 +- doc/user/tools.xml | 2 +- doc/user/troubleshoot.in | 2 +- doc/user/troubleshoot.xml | 2 +- doc/user/variables.in | 2 +- doc/user/variables.xml | 2 +- doc/user/variants.in | 2 +- doc/user/variants.xml | 2 +- 113 files changed, 141 insertions(+), 138 deletions(-) (limited to 'doc') diff --git a/doc/SConscript b/doc/SConscript index 1206e6f..04f467c 100644 --- a/doc/SConscript +++ b/doc/SConscript @@ -3,7 +3,7 @@ # # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -436,6 +436,8 @@ for man_1 in man_page_list: tar_deps.extend([ps, text]) tar_list.extend([ps, text]) + else: + print "doc: WARNING: no groff, skipping text and PostScript versions of man pages" if man2html: html = os.path.join(build, 'HTML' , '%s-man.html' % man) @@ -460,6 +462,8 @@ for man_1 in man_page_list: tar_deps.append(html) tar_list.append(html) + else: + print "doc: WARNING: no man2html, skipping HTML versions of man pages" if not epydoc_cli: try: @@ -540,7 +544,6 @@ else: e = os.path.join('#src', 'engine') manifest_in = File(os.path.join(e, 'MANIFEST.in')).rstr() sources = [x[:-1] for x in open(manifest_in).readlines()] - sources = [x for x in sources if x.find('Optik') == -1] sources = [x for x in sources if x.find('Platform') == -1] sources = [x for x in sources if x.find('Tool') == -1] # XXX diff --git a/doc/design/scons.mod b/doc/design/scons.mod index d059d71..807f3cb 100644 --- a/doc/design/scons.mod +++ b/doc/design/scons.mod @@ -1,6 +1,6 @@