diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-01-23 15:22:14 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-01-23 15:22:14 +0100 |
| commit | aa2da1d1213172ca46db9b6fc6effca70df85981 (patch) | |
| tree | 27ac30cce760e7959c8face762d06e10bcf9cf8e /doc/SConscript | |
| parent | 478c10eaf20dcb9c0b7eeb4693a5f3dea9964ec7 (diff) | |
| parent | 48f19e9e5ecc069f379ad433fdaf280ac9b54e16 (diff) | |
Merge commit 'upstream/1.2.0.d20100117'
Diffstat (limited to 'doc/SConscript')
| -rw-r--r-- | doc/SConscript | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/SConscript b/doc/SConscript index fd18ef4..9ad4d12 100644 --- a/doc/SConscript +++ b/doc/SConscript @@ -3,7 +3,7 @@ # # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -102,8 +102,8 @@ s = Scanner(name = 'xml', function = scanxml, skeys = ['.xml', '.mod']) orig_env = env env = orig_env.Clone(SCANNERS = [s], - SCONS_PROC_PY = File('#bin/scons-proc.py').rfile(), - SCONSOUTPUT_PY = File('#bin/sconsoutput.py').rfile()) + SCONS_DOC_PY = File('#bin/scons-doc.py').rfile(), + SCONS_PROC_PY = File('#bin/scons-proc.py').rfile()) # Fetch the list of files in the build engine that contain # SCons documentation XML for processing. @@ -231,7 +231,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. 'SCons-win32-install-3.jpg', 'SCons-win32-install-4.jpg', ], - 'sconsoutput' : 1, + 'scons-doc' : 1, }, } @@ -257,7 +257,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. manifest = File(os.path.join(doc, 'MANIFEST')).rstr() src_files = map(lambda x: x[:-1], open(manifest).readlines()) - build_doc = docs[doc].get('sconsoutput') and int(ARGUMENTS.get('BUILDDOC', 0)) + build_doc = docs[doc].get('scons-doc') and int(ARGUMENTS.get('BUILDDOC', 0)) for s in src_files: doc_s = os.path.join(doc, s) build_s = os.path.join(build, doc, s) @@ -268,7 +268,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. if build_doc and ext == '.xml': env.Command(doc_s, base + '.in', - "$PYTHON $SCONSOUTPUT_PY $SOURCE > $TARGET") + "$PYTHON $SCONS_DOC_PY $SOURCE > $TARGET") orig_env.SCons_revision(build_s, doc_s) Local(build_s) |