diff --exclude=CVS -Npur wwwdocs/bin/preproc_html.pl wwwdocs-new/bin/preproc_html.pl --- wwwdocs/bin/preproc_html.pl 1970-01-01 01:00:00.000000000 +0100 +++ wwwdocs-new/bin/preproc_html.pl 2007-09-29 19:37:45.000000000 +0100 @@ -0,0 +1,159 @@ +use strict; +use POSIX qw(strftime); + +my $input = $ARGV[0]; +my $tree = $ARGV[1]; +my ($file, $basedir, $xhtml, $navmenu, $backpath, $navdir); + +$file = $input; +$file =~ s/$tree(\/|)//; + +$basedir = $input; +$basedir =~ s/(\/|)[^\/]*$//; +if ($basedir !~ /^$/) { $basedir = $basedir . '/'; } + +# First, we output the doctype. +# +# The "install/" pages are HTML, all others are XHTML. +if ($file =~ /install\/.*/) { + print "\n"; + print "\n"; + $xhtml = 0; +} else { + print "\n"; + print "\n"; + $xhtml = 1; +} + +# Pages that have a navigation menu are: /index.html, and the pages in +# the java, libstdc++ and fortran directories. +$backpath = ''; +$navmenu = 0; +$navdir = ''; +if ($file =~ /index.html/) { $navmenu = 1; } +elsif ($file =~ /((fortran|java|libstdc\+\+))\/.*/) { + $navmenu = 1; + $backpath = '../'; + $navdir = $1; +} + + +open (IN, $input); +my @raw_lines = ; +close (IN); + +foreach $_ (@raw_lines) +{ + if (/##include "([^"]*)"/) { + # An inclusion directive + print $`; + &include_file ($basedir . $1); + print $'; + } elsif (// && $xhtml) { + s@@@; + print; + } elsif (//) { + print $`; + print "\n"; + if ($xhtml) { + print < + + + + +EOF + } else { + print < + + + +EOF + } + print $'; + } elsif (/

/) { + s/

/

/; + print; + } elsif (/<\/title>/) { + s/<\/title>/ - GNU Project - Free Software Foundation (FSF)<\/title>/; + print; + } elsif (/<\/body>/) { + # If needed, add the navigation bar. + if ($navmenu) { + print "\n"; + print "\n"; + + # First, the subdirectory menu + if ($navdir) { + &include_file ($tree . '/' . $navdir . '/navbar.ihtml'); + } + + # Then, the common menu + &include_file_subst ($tree . '/navbar.ihtml', '##BACKPATH##', $backpath); + + # End the table + print "
\n"; + } + + # Determine the modification date. + my $mtime; + (undef,undef,undef,undef,undef,undef,undef,undef,undef,$mtime, + undef,undef,undef) = stat ($input); + $mtime = strftime "%Y-%m-%d", localtime ($mtime); + + # Output our footer. First part is stored in footer.ihtml and the + # second part depend on wether we are in HTML or XHTML mode. + print $`; + &include_file ($tree . '/footer.ihtml'); + if ($xhtml) { + &include_file_subst ($tree . '/footer_xhtml.ihtml', '##MTIME##', $mtime); + } else { + &include_file_subst ($tree . '/footer_html.ihtml', '##MTIME##', $mtime); + } + print $'; + } elsif (//) { + # Substitute the body tag to insert our default colors. If needed, + # put the whole page into a frame, so that we can add the navigation + # bar at the end of the file. + print $`; + print "\n"; + if ($navmenu) { + print "\n"; + print " diff --exclude=CVS -Npur wwwdocs/htdocs/index.html wwwdocs-new/htdocs/index.html --- wwwdocs/htdocs/index.html 2007-09-16 21:10:58.000000000 +0100 +++ wwwdocs-new/htdocs/index.html 2007-09-29 01:40:41.000000000 +0100 @@ -6,7 +6,6 @@ -

GCC, the GNU Compiler Collection

@@ -141,7 +140,7 @@ mission statement.

Search our site

- +##include "searchbox.ihtml"

Get our announcements

diff --exclude=CVS -Npur wwwdocs/htdocs/java/navbar.ihtml wwwdocs-new/htdocs/java/navbar.ihtml --- wwwdocs/htdocs/java/navbar.ihtml 1970-01-01 01:00:00.000000000 +0100 +++ wwwdocs-new/htdocs/java/navbar.ihtml 2007-09-29 12:48:58.000000000 +0100 @@ -0,0 +1,16 @@ + diff --exclude=CVS -Npur wwwdocs/htdocs/libstdc++/navbar.ihtml wwwdocs-new/htdocs/libstdc++/navbar.ihtml --- wwwdocs/htdocs/libstdc++/navbar.ihtml 1970-01-01 01:00:00.000000000 +0100 +++ wwwdocs-new/htdocs/libstdc++/navbar.ihtml 2007-09-29 12:49:12.000000000 +0100 @@ -0,0 +1,12 @@ + diff --exclude=CVS -Npur wwwdocs/htdocs/lists.html wwwdocs-new/htdocs/lists.html --- wwwdocs/htdocs/lists.html 2007-08-25 16:58:44.000000000 +0100 +++ wwwdocs-new/htdocs/lists.html 2007-09-29 00:20:17.000000000 +0100 @@ -49,8 +49,8 @@ before subscribing<

Recruiting postings, including recruiting for GCC or other free software jobs, are not permitted on this list, or on any of the other GCC mailing lists. If you are interested in hiring a GCC - developer, please visit the - FSF jobs page.

+ developer, please visit the FSF + jobs page.

All major decisions and changes, like abandoning ports or front ends, should be announced and discussed here. Ideally, this list should be @@ -312,7 +312,7 @@ the lists.

This search will allow you to search the contents gcc.gnu.org.

- +##include "searchbox.ihtml" diff --exclude=CVS -Npur wwwdocs/htdocs/navbar.ihtml wwwdocs-new/htdocs/navbar.ihtml --- wwwdocs/htdocs/navbar.ihtml 1970-01-01 01:00:00.000000000 +0100 +++ wwwdocs-new/htdocs/navbar.ihtml 2007-09-29 12:49:46.000000000 +0100 @@ -0,0 +1,78 @@ + + + + + + + + + + + diff --exclude=CVS -Npur wwwdocs/htdocs/projects/beginner.html wwwdocs-new/htdocs/projects/beginner.html --- wwwdocs/htdocs/projects/beginner.html 2005-03-19 22:51:40.000000000 +0000 +++ wwwdocs-new/htdocs/projects/beginner.html 2007-09-29 01:46:33.000000000 +0100 @@ -903,8 +903,6 @@ huge (432KB on i386).

Here's some dialogue on the subject, which unfortunately may only confuse you.

- -
Michael Meissner:
@@ -935,8 +933,6 @@ parallels, yet the code appears to.
- -
  • Find all the places that simplify RTL and make them use diff --exclude=CVS -Npur wwwdocs/htdocs/search.html wwwdocs-new/htdocs/search.html --- wwwdocs/htdocs/search.html 2007-09-01 11:36:02.000000000 +0100 +++ wwwdocs-new/htdocs/search.html 2007-09-29 01:47:16.000000000 +0100 @@ -1396,16 +1396,6 @@ parentheses () are separated by t Note that the operator not is binary, having the meaning of 'without'. -
    - -Database last updated - - - - x -> ->--
    diff --exclude=CVS -Npur wwwdocs/htdocs/style.mhtml wwwdocs-new/htdocs/style.mhtml --- wwwdocs/htdocs/style.mhtml 2007-07-25 17:06:33.000000000 +0100 +++ wwwdocs-new/htdocs/style.mhtml 1970-01-01 01:00:00.000000000 +0100 @@ -1,305 +0,0 @@ -;;; Set a couple of site-wide defaults, some of which we'll override in the -;;; following. - - - - class="td_title" - class="td_con" - -;;; The "install/" pages are HTML, not XHTML. - - "install/.*"> - -> - -;;; For the "java/" pages, we want the navigation bar. - - "java/[^/]*.html"> - - - > -> - - "libstdc../[^/]*.html"> - - - > -> - -;;; Note that the line really needs to start in the first column. - - - - - > - - - > -> - -;;; Redefine the tag so that we can put XHTML attributes inside. - - - - - - - %body - - - - > -> - -;;; Redefine the tag so that we can add default headers. - - - - - - - - - - - - > - - - - - > - > - %body - - - - - -;;; Redefine the tag to comply with the GNU style. - -<define-container title> -<verbatim><title></verbatim> -%body -<verbatim>- GNU Project - Free Software Foundation (FSF) - - -;;; Redefine the

    tag to add our own style. - - -

    -%body -

     -     - -;;; Redefine the tag introducing our own color scheme and adding an -;;; "about" link and a "last modified" at the bottom. - - - - - - - - -

    • - - - - -
    \n"; + } + print $'; + } else { + print; + } +} + + + +# Function to include an external file into the output +sub include_file { + open (INCL, $_[0]) || die ('Impossible to open file "' . $_[0] . '"'); + my @incllines = ; + close (INCL); + print @incllines; +} + + +# Function to include an external file while substituting all occurences +# of a given string. +sub include_file_subst { + my $lookfor = $_[1]; + my $replace = $_[2]; + my $line; + + open (INCL, $_[0]) || die ('Impossible to open file "' . $_[0] . '"'); + my @incllines = ; + close (INCL); + foreach $line (@incllines) { + $line =~ s/$lookfor/$replace/; + print $line; + } +} diff --exclude=CVS -Npur wwwdocs/bin/preprocess wwwdocs-new/bin/preprocess --- wwwdocs/bin/preprocess 2007-08-19 23:04:49.000000000 +0100 +++ wwwdocs-new/bin/preprocess 2007-09-29 01:08:44.000000000 +0100 @@ -5,14 +5,10 @@ # tree. If filenames are passed on the command-line, only those files # are processed. # -# HTML files are processed by means of MetaHTML using the style sheet -# $STYLE. HTML files in the destination tree are overwritten if and only if -# the new version is different from the old version modulo lines containing -# the string indicated by $IGNORE_DIFF_MARKER. -# -# When processing HTML files, the environment variable PREPROCESS_FILE -# is set to the name of the current file (relative to the document root) -# and can be accessed by MetaHTML commands. +# HTML files are processed by means of our own special preprocessor. HTML +# files in the destination tree are overwritten if and only if the new +# version is different from the old version modulo lines containing the +# string indicated by $IGNORE_DIFF_MARKER. # # Files called .htaccess or .htpasswd are copied if the copy in the # destination tree differs from the one in the source tree (or does @@ -33,12 +29,10 @@ # # By Gerald Pfeifer 1999-12-29. -MHC=${MHC-/usr/local/bin/mhc} +SOURCETREE=${SOURCETREE-/www/gcc/htdocs-preformatted} +DESTTREE=${DESTTREE-/www/gcc/htdocs} -SOURCETREE=${SOURCETREE-/www/gcc/htdocs-preformatted} -DESTTREE=${DESTTREE-/www/gcc/htdocs} - -STYLE=$SOURCETREE/style.mhtml +PERL_SCRIPT=$SOURCETREE/../bin/preproc_html.pl IGNORE_DIFF_MARKER="IGNORE DIFF" ########## @@ -101,24 +95,10 @@ process_html_file() f=$1 fdest=$2 - # Set environment variable PREPROCESS_FILE, which will then be - # accessible by MetaHTML. - - PREPROCESS_FILE=$f - export PREPROCESS_FILE - - # Prepend the MetaHTML style, set the MetaHTML include directory, - # and process the page; then remove leading blank lines and single - # line comments. - - cat $STYLE > $TMPDIR/input - printf '\n' `pwd` >> $TMPDIR/input - cat $f >> $TMPDIR/input # Use sed to work around makeinfo 4.7 brokenness. - # Use sed to work around MetaHTML brokenness wrt.
    . - ${MHC} $TMPDIR/input \ + # Use awk to remove leading blank lines and single line comments. + perl -w ${PERL_SCRIPT} $f $SOURCETREE \ | sed -e 's/_002d/-/g' -e 's/_002a/*/g' \ - | sed -e 's/
    $/ { if( ! body ) next } \ @@ -126,7 +106,8 @@ process_html_file() > $TMPDIR/output # Copy the page only if it's new or there has been a change, and, - # first of all, if there was no problem when running MetaHTML. + # first of all, if there was no problem when running the + # preprocessor. if [ $? -ne 0 ]; then echo " Problem processing $f; not updated!" elif [ ! -f $fdest ]; then diff --exclude=CVS -Npur wwwdocs/htdocs/footer.ihtml wwwdocs-new/htdocs/footer.ihtml --- wwwdocs/htdocs/footer.ihtml 1970-01-01 01:00:00.000000000 +0100 +++ wwwdocs-new/htdocs/footer.ihtml 2007-09-29 11:45:53.000000000 +0100 @@ -0,0 +1,27 @@ + + +
    + +

    Please send FSF & GNU inquiries & questions to +gnu@gnu.org. +There are also other ways +to contact the FSF.

    + +

    These pages are maintained by +the GCC team.

    + +
    For questions related to the use of GCC, please consult these web +pages and the GCC manuals. If +that fails, the gcc-help@gcc.gnu.org +mailing list might help.
    +Please send comments on these web pages and the development of GCC to our +developer mailing list at gcc@gnu.org +or gcc@gcc.gnu.org. All of our lists +have public archives. +
    + +

    Copyright (C) Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110, USA.

    +

    Verbatim copying and distribution of this entire article is +permitted in any medium, provided this notice is preserved.

    + diff --exclude=CVS -Npur wwwdocs/htdocs/footer_html.ihtml wwwdocs-new/htdocs/footer_html.ihtml --- wwwdocs/htdocs/footer_html.ihtml 1970-01-01 01:00:00.000000000 +0100 +++ wwwdocs-new/htdocs/footer_html.ihtml 2007-09-29 19:14:32.000000000 +0100 @@ -0,0 +1,8 @@ +
    + Last modified ##MTIME## + + + Valid HTML 4.01 +
    + diff --exclude=CVS -Npur wwwdocs/htdocs/footer_xhtml.ihtml wwwdocs-new/htdocs/footer_xhtml.ihtml --- wwwdocs/htdocs/footer_xhtml.ihtml 1970-01-01 01:00:00.000000000 +0100 +++ wwwdocs-new/htdocs/footer_xhtml.ihtml 2007-09-29 19:14:36.000000000 +0100 @@ -0,0 +1,8 @@ +
    + Last modified ##MTIME## + + + Valid XHTML 1.0 +
    + diff --exclude=CVS -Npur wwwdocs/htdocs/fortran/navbar.ihtml wwwdocs-new/htdocs/fortran/navbar.ihtml --- wwwdocs/htdocs/fortran/navbar.ihtml 1970-01-01 01:00:00.000000000 +0100 +++ wwwdocs-new/htdocs/fortran/navbar.ihtml 2007-09-29 19:17:16.000000000 +0100 @@ -0,0 +1,16 @@ +
    + + +
    + GCJ +
    +

    + GCJ Home
    + GCC Home
    + Status
    + FAQ
    + Documentation
    + Contributing
    + Done with GCJ
    +

    +
    + + +
    + GCJ +
    +

    + GCJ Home
    + GCC Home
    + Status
    + FAQ
    + Documentation
    + Contributing
    + Done with GCJ
    +

    +
    + + +
    + libstdc++ v3 +
    + libstdc++ Home
    + GCC Home
    + FAQ +(text)
    + Documentation +
    + + +
    + About GCC +
    + Mission Statement
    + Releases
    + Snapshots
    + Mailing lists
    + Contributors
    + Steering Committee
    +
    + + +
    + Documentation +
    + Installation
    + · Platforms
    + · Testing
    + Manual
    + FAQ
    + Wiki
    + Further Readings +
    + + +
    + Download +
    + Mirror sites
    + Binaries +
    + + +
    + "Live" Sources +
    + SVN read access
    + Rsync read access
    + SVN write access
    +
    + + +
    + Development +
    + Development Plan
    + · Tentative Timeline
    + Contributing
    + Why contribute?
    + Open projects
    + Front ends
    + Back ends
    + Extensions
    + Benchmarks
    +
    + + +
    + Bugs +
    + Known bugs
    + How to report
    + Bug database
    + · Management +
    - > -> - -%body - - - - - - - - "java/[^/]*.html"> - - > - > - - "libstdc../[^/]*.html"> - - > - > - - - - - - - - - - - - - -
    - > - -
    - GCJ -
    > -

    - GCJ Home
    - GCC Home
    - Status
    - FAQ
    - Documentation
    - Contributing
    - Done with GCJ
    -

    -
    - - -
    > - libstdc++ v3 -
    > - libstdc++ Home
    - GCC Home
    - FAQ -(text)
    - Documentation -
    - - -
    > - About GCC -
    > - Mission Statement
    - Releases
    - Snapshots
    - Mailing lists
    - Contributors
    - Steering Committee
    -
    - - -
    > - Documentation -
    > - Installation
    - · Platforms
    - · Testing
    - Manual
    - FAQ
    - Wiki
    - Further Readings -
    - - -
    > - Download -
    > - Mirror sites
    - Binaries -
    - - -
    > - "Live" Sources -
    > - SVN read access
    - Rsync read access
    - SVN write access
    -
    - - -
    > - Development -
    > - Development Plan
    - · Tentative Timeline
    - Contributing
    - Why contribute?
    - Open projects
    - Front ends
    - Back ends
    - Extensions
    - Benchmarks
    -
    - - -
    > - Bugs -
    > - Known bugs
    - How to report
    - Bug database
    - · Management -
    -
    - > -> - - - -
    - -

    Please send FSF & GNU inquiries & questions to -gnu@gnu.org. -There are also other ways -to contact the FSF.

    - -

    These pages are maintained by -the GCC team.

    - -
    For questions related to the use of GCC, please consult these web -pages and the GCC manuals. If -that fails, the gcc-help@gcc.gnu.org -mailing list might help.
    -Please send comments on these web pages and the development of GCC to our -developer mailing list at gcc@gnu.org -or gcc@gcc.gnu.org. All of our lists -have public archives. -
    - -

    Copyright (C) Free Software Foundation, Inc., -51 Franklin St, Fifth Floor, Boston, MA 02110, USA.

    -

    Verbatim copying and distribution of this entire article is -permitted in any medium, provided this notice is preserved.

    - -
    - Last modified - - - - - > - - > - > - -
    - -
    - - - - - - -