From 2479d0f7efbfceb6a43eec7411a35ba13f58fc90 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Tue, 29 Jan 2002 15:15:05 +0000 Subject: Update Copyright lines for the new year. --- Construct | 2 +- SConstruct | 2 +- debian/copyright | 2 +- doc/Conscript | 183 +++++++++++++++++++---------- doc/SConscript | 2 +- doc/copyright.sgml | 4 +- doc/man/scons.1 | 2 +- etc/SConscript | 2 +- etc/TestSCons.py | 2 +- src/CHANGES.txt | 2 +- src/LICENSE.txt | 2 +- src/README.txt | 2 +- src/RELEASE.txt | 2 +- src/engine/README.txt | 2 +- src/engine/SCons/Action.py | 2 +- src/engine/SCons/ActionTests.py | 2 +- src/engine/SCons/Builder.py | 2 +- src/engine/SCons/BuilderTests.py | 2 +- src/engine/SCons/Defaults.py | 2 +- src/engine/SCons/Environment.py | 2 +- src/engine/SCons/EnvironmentTests.py | 2 +- src/engine/SCons/Errors.py | 2 +- src/engine/SCons/ErrorsTests.py | 2 +- src/engine/SCons/Job.py | 2 +- src/engine/SCons/JobTests.py | 2 +- src/engine/SCons/Node/FS.py | 2 +- src/engine/SCons/Node/FSTests.py | 2 +- src/engine/SCons/Node/NodeTests.py | 2 +- src/engine/SCons/Node/__init__.py | 2 +- src/engine/SCons/Scanner/C.py | 2 +- src/engine/SCons/Scanner/CTests.py | 2 +- src/engine/SCons/Scanner/Prog.py | 2 +- src/engine/SCons/Scanner/ProgTests.py | 2 +- src/engine/SCons/Scanner/ScannerTests.py | 2 +- src/engine/SCons/Scanner/__init__.py | 2 +- src/engine/SCons/Script/SConscript.py | 2 +- src/engine/SCons/Script/SConscriptTests.py | 2 +- src/engine/SCons/Script/__init__.py | 4 +- src/engine/SCons/Sig/MD5.py | 2 +- src/engine/SCons/Sig/MD5Tests.py | 2 +- src/engine/SCons/Sig/SigTests.py | 2 +- src/engine/SCons/Sig/TimeStamp.py | 2 +- src/engine/SCons/Sig/TimeStampTests.py | 2 +- src/engine/SCons/Sig/__init__.py | 2 +- src/engine/SCons/Taskmaster.py | 2 +- src/engine/SCons/TaskmasterTests.py | 2 +- src/engine/SCons/Util.py | 2 +- src/engine/SCons/UtilTests.py | 2 +- src/engine/SCons/__init__.py | 2 +- src/engine/SCons/exitfuncs.py | 2 +- src/engine/setup.py | 2 +- src/script/README.txt | 2 +- src/script/scons.py | 2 +- src/script/setup.py | 2 +- src/setup.py | 2 +- template/Tests.py | 2 +- template/__init__.py | 2 +- template/file.py | 2 +- template/test.py | 2 +- test/BuildDir.py | 2 +- test/CC.py | 2 +- test/CCFLAGS.py | 2 +- test/CPPPATH.py | 2 +- test/Command.py | 2 +- test/Default.py | 2 +- test/Depends.py | 2 +- test/ENV.py | 2 +- test/Help.py | 2 +- test/Ignore.py | 2 +- test/Install.py | 2 +- test/LEX.py | 2 +- test/LEXFLAGS.py | 2 +- test/LIBPATH.py | 2 +- test/LIBPREFIX.py | 2 +- test/LIBS.py | 2 +- test/LIBSUFFIX.py | 2 +- test/LINK.py | 2 +- test/LINKFLAGS.py | 2 +- test/Library.py | 2 +- test/Object.py | 2 +- test/Precious.py | 2 +- test/Program-j.py | 2 +- test/Program.py | 2 +- test/SCONSFLAGS.py | 2 +- test/SCONS_LIB_DIR.py | 2 +- test/SConscript.py | 2 +- test/SConstruct.py | 2 +- test/YACC.py | 2 +- test/YACCFLAGS.py | 2 +- test/actions.py | 2 +- test/build-errors.py | 2 +- test/builderrors.py | 2 +- test/dependency-cycle.py | 2 +- test/errors.py | 2 +- test/exceptions.py | 2 +- test/exitfns.py | 2 +- test/multiline.py | 2 +- test/nonexistent.py | 2 +- test/nonwritable-sconsign.py | 2 +- test/option--.py | 2 +- test/option--C.py | 2 +- test/option--H.py | 2 +- test/option--I.py | 2 +- test/option--R.py | 2 +- test/option--S.py | 2 +- test/option--W.py | 2 +- test/option--Y.py | 2 +- test/option--cd.py | 2 +- test/option--cf.py | 2 +- test/option--cs.py | 2 +- test/option--debug.py | 2 +- test/option--la.py | 2 +- test/option--ld.py | 2 +- test/option--lw.py | 2 +- test/option--npd.py | 2 +- test/option--override.py | 2 +- test/option--random.py | 2 +- test/option--wf.py | 2 +- test/option--wuv.py | 2 +- test/option-b.py | 2 +- test/option-c.py | 2 +- test/option-d.py | 2 +- test/option-e.py | 2 +- test/option-f.py | 2 +- test/option-h.py | 2 +- test/option-i.py | 2 +- test/option-j.py | 2 +- test/option-k.py | 2 +- test/option-l.py | 2 +- test/option-m.py | 2 +- test/option-n.py | 2 +- test/option-o.py | 2 +- test/option-p.py | 2 +- test/option-q.py | 2 +- test/option-r.py | 2 +- test/option-s.py | 2 +- test/option-t.py | 2 +- test/option-u.py | 2 +- test/option-unknown.py | 2 +- test/option-v.py | 4 +- test/option-w.py | 2 +- test/redirection.py | 2 +- test/subdir.py | 2 +- test/up-to-date.py | 2 +- 144 files changed, 270 insertions(+), 205 deletions(-) diff --git a/Construct b/Construct index aca1a0a..e1515ff 100644 --- a/Construct +++ b/Construct @@ -5,7 +5,7 @@ # # -# Copyright (c) 2001 Steven Knight +# Copyright (c) 2001, 2002 Steven Knight # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the diff --git a/SConstruct b/SConstruct index f1d75a4..edc3023 100644 --- a/SConstruct +++ b/SConstruct @@ -5,7 +5,7 @@ # # -# Copyright (c) 2001 Steven Knight +# Copyright (c) 2001, 2002 Steven Knight # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the diff --git a/debian/copyright b/debian/copyright index ec52b3c..612fa86 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ The package source can be downloaded from http://www.scons.org/ Upstream Author: Steven Knight -Copyright (c) 2001 Steven Knight +Copyright (c) 2001, 2002 Steven Knight Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/doc/Conscript b/doc/Conscript index a04d280..9eef3e6 100644 --- a/doc/Conscript +++ b/doc/Conscript @@ -3,7 +3,7 @@ # # -# Copyright (c) 2001 Steven Knight +# Copyright (c) 2001, 2002 Steven Knight # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -36,6 +36,7 @@ $doc_tar_gz = "#build/dist/scons-doc-${\$env->{VERSION}}.tar.gz"; # We'll only try to build text files (for some documents) # if lynx is available to do the dump. # +$fig2dev = cons::whereis('fig2dev'); $groff = cons::whereis('groff'); $lynx = cons::whereis('lynx'); $man2html = cons::whereis('man2html'); @@ -63,95 +64,159 @@ _EOF_ Ignore("version.sgml"); + # Find internal dependencies in .sgml files: + # + # + # + # + # + # This only finds one per line, and assumes that anything + # defined as a SYSTEM entity is, in fact, a file included + # somewhere in the document. + sub scansgml { + my $dir = shift; + my @includes = (); + do { + if (//i) { + push(@includes, $1); + } elsif (/<(?:graphic|imagedata)\s+fileref="([^"]*)"\s+format="([^"]*)"/) { + ($file, $format) = ($1, $2); + $file = "$file.$format" if ($file !~ /\.$format$/); + if ($dir && ! File::Spec->file_name_is_absolute($file)) { + $file = "build/doc/$dir/$file"; + } + push(@includes, $file); + } elsif (/<(?:graphic|imagedata)\s+fileref="([^"]*)"/) { + $file = $1; + if ($dir && ! File::Spec->file_name_is_absolute($file)) { + $file = "build/doc/$dir/$file"; + } + push(@includes, $file); + } + } while (); + @includes; + } + # # Each document will live in its own subdirectory. List them here # as hash keys, with a hash of the info to control its build. # - %doc_dirs = ( + %docs = ( 'design' => { - 'html' => 'book1.html', + 'htmlindex' => 'book1.html', + 'ps' => 1, + 'pdf' => 1, + 'text' => 0, + 'scan' => sub { scansgml("design") }, }, + 'python10' => { + 'htmlindex' => 't1.html', + 'html' => 1, + 'ps' => 1, + 'pdf' => 0, + 'text' => 0, + 'graphics' => [qw( arch builder job-task node scanner sig )], + 'scan' => sub { scansgml("python10") }, + }, 'user' => { - 'html' => 'book1.html', + 'htmlindex' => 'book1.html', + 'html' => 1, + 'ps' => 1, + 'pdf' => 1, + 'text' => 0, + 'scan' => sub { scansgml("user") }, }, ); - # Find internal dependencies in .sgml files: - # - # - # - # - # This only finds one per line, and assumes that anything - # defined as a SYSTEM entity is, in fact, a file included - # somewhere in the document. - sub scansgml { - my @includes = (); - do { - if (//i) { - push(@includes, $1); - } elsif (/]*\sfileref="([^"]*)"/) { - push(@includes, "design/$1"); - } - } while (); - @includes; - } - - # - # We have to tell Cons to QuickScan the top-level SGML files which - # get included by the document SGML files in the subdirectories. - # - @included_sgml = qw( - scons.mod - copyright.sgml - ); - - foreach $sgml (@included_sgml) { - $env->QuickScan(\&scansgml, $sgml); - } - - # - # For each document, build the document itself in HTML, Postscript, - # and PDF formats. - # - foreach $doc (keys %doc_dirs) { - my $main = "$doc/main.sgml"; - my $out = "main.out"; + # + # We have to tell Cons to QuickScan the top-level SGML files which + # get included by the document SGML files in the subdirectories. + # + @included_sgml = qw( + scons.mod + copyright.sgml + ); - my $htmldir = "HTML/scons-$doc"; - my $html = "$htmldir/" . $doc_dirs{$doc}->{'html'}; - my $ps = "PS/scons-$doc.ps"; - my $pdf = "PDF/scons-$doc.pdf"; - my $text = "TEXT/scons-$doc.txt"; + foreach $sgml (@included_sgml) { + $env->QuickScan(\&scansgml, $sgml); + } - $env->QuickScan(\&scansgml, $main); + # + # For each document, build the document itself in HTML, Postscript, + # and PDF formats. + # + foreach $doc (keys %docs) { + my $main = "$doc/main.sgml"; + my $out = "main.out"; + + my $htmldir = "HTML/scons-$doc"; + my $htmlindex = "$htmldir/" . $docs{$doc}->{'htmlindex'}; + my $html = "HTML/scons-$doc.html"; + my $ps = "PS/scons-$doc.ps"; + my $pdf = "PDF/scons-$doc.pdf"; + my $text = "TEXT/scons-$doc.txt"; + + if ($docs{$doc}->{'scan'}) { + $env->QuickScan($docs{$doc}->{'scan'}, $main); + } - $env->Command($html, $main, + if ($docs{$doc}->{'html'}) { + $env->Command($htmlindex, $main, qq(rm -f %>:d/*.html jw -b html -o %>:d %< mv -v %>:d/index.html %> || true )); - $env->Command($ps, $main, + $env->Command($html, $main, qq(jw -u -b html %< > %>)); + + push(@tar_deps, $html, $htmlindex); + push(@tar_list, $html, $htmldir); + if ($fig2dev) { + for $g (@{$docs{$doc}->{'graphics'}}) { + $fig = "$doc/$g.fig"; + $jpg = "$htmldir/$g.jpg"; + $env->Command($jpg, $fig, qq($fig2dev -L jpeg -q 100 %< %>)); + $env->Depends($ps, $jpg); + } + } + } + + if ($docs{$doc}->{'ps'}) { + $env->Command($ps, $main, qq(rm -f %>:d/$out jw -b ps -o %>:d %< mv %>:d/main.ps %> rm -f %>:d/$out )); + push(@tar_deps, $ps); + push(@tar_list, $ps); + if ($fig2dev) { + for $g (@{$docs{$doc}->{'graphics'}}) { + $fig = "$doc/$g.fig"; + $eps = "PS/$g.eps"; + $env->Command($eps, $fig, qq($fig2dev -L eps %< %>)); + $env->Depends($ps, $eps); + } + } + } - $env->Command($pdf, $main, + if ($docs{$doc}->{'pdf'}) { + $env->Command($pdf, $main, qq(rm -f %>:d/$out jw -b pdf -o %>:d %< mv %>:d/main.pdf %> rm -f %>:d/$out )); + push(@tar_deps, $pdf); + push(@tar_list, $pdf); + } - if ($doc_dirs{$doc}->{'text'} && $lynx) { - $env->Command($text, $html, qq(lynx -dump %<:a > %>)); - } - - push(@tar_deps, $html, $ps, $pdf); - push(@tar_list, $htmldir, $ps, $pdf); + if ($docs{$doc}->{'text'} && $lynx) { + $env->Command($text, $html, qq(lynx -dump %<:a > %>)); + push(@tar_deps, $text); + push(@tar_list, $text); } + } } # diff --git a/doc/SConscript b/doc/SConscript index aedefd1..cb9df1b 100644 --- a/doc/SConscript +++ b/doc/SConscript @@ -5,7 +5,7 @@ # # -# Copyright (c) 2001 Steven Knight +# Copyright (c) 2001, 2002 Steven Knight # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the diff --git a/doc/copyright.sgml b/doc/copyright.sgml index 94095ec..a7113ba 100644 --- a/doc/copyright.sgml +++ b/doc/copyright.sgml @@ -1,6 +1,6 @@