variable to point to http://www.FreeBSD.org/ - This is very useful for
when you e.g. are building part of the website, like we do for
http://security.FreeBSD.org/, and do not want broken links.
This knob only works for SGML files, which is enough for what I need.
We do not run XML files through sed so the same hack as used for SGML
cannot be used.
these cases we get urls like 'http://www.FreeBSD.org///ru//java/', etc.
On such urls webcheck fails immediately with 403 error code. So, cleanup
multiple slashes.
. Make 'checkmissing' output more compact and readable. Avoid
printing '===>' in case if current directory does not have anything
to report. Also print each missing entry on separate line to make
output more readable.
instead of ${.CURDIR}
. Add 'obj' target depending on _PROGSUBDIR, so 'make obj' for web tree
is processed recursively for SUBDIRs
. Remove 'cleandir' target. bsd.obj.mk declares it unconditionally and
it does absolutely same things. Removing of target from this makefile
reduces spawning of ${MAKE} by factor *6* when called from 'www/en'
directory!
. Move variable declarations from suffix transformation declaration area
to appropriate place
. Move spellcheck target to place where it belongs
. Fix/add some comments
. remove unused (ever used?) docb -> html suffix transformation rule
. remove long time unused ${LOCAL}. It's handled with ${DATA} now.
. extend comment to be more clear
. fail build if ORPHANS check failed. I.e. fail as early as possible.
. remove DIRS_TO_CLEAN related workaround (unused since 2001)
. rewrite "cleandir" target to be more consistent with /usr/share/mk
. remove DOCSUBDIR related logic. Last consumer of this logic (www/zh/FAQ)
was converted to use new methods, so no need to leave this spam
PS: It removes more than 30% of actual logic of this makefile
- The structure of transtable.xml is revised. <word> should be
bracketed with <group>.
- A sorting order of the FreeBSD mirror sites rendered using
mirrors.xml has been determined by sort(1).
- A template "transtable-lookup" has been added for localization on
word-by-word basis.
- Replace English month names in news.xml, press.xml, and
advisories.xml with numbers that correspond to the names.
The number->name translation is performed on the fly.
- Since information in mirrors.xml is used in www/ tree, it depends on
doc/ tree now. When WITHOUT_DOC is defined it can be built without
doc/ tree, but some information becomes unavailable. For example,
a list of the mirror sites generated in index.html becomes a dummy
one, and calling "transtable-lookup" with a word returns the word
itself.
Neither www/ nor doc/ build should be broken due to this commit, but
until the necessary changes are applied in the localized directories,
the transtable does not work; it simply generates non-localized contents
even if transtable.xsl is used.
- add doc.common.mk, which defines variables, targets, and
dependencies commonly used in www/ and doc/.
- move www/<lang>/includes.xsl to the language independent
directory and split into several files.
- add transtable*.xsl and transtable.xml to support localized
mirror names.
- make doc/{en_US.ISO8859-1,ja_JP.eucJP}/books/handbook/ use
mirrors.xml (mirrors and eresources).
- make www/{en,ja}/index.xsl use mirrors.xml.
For details, please see doc/share/sgml/README.mirrors for the moment.
Reviewed by: simon and Alex Dupre <sysadmin@alexdupre.com>
web.site.mk includes bsd.subdir.mk via bsd.obj.mk which is responsible
for processing of 'SUBDIR' make variable. But since we are handling
'SUBDIR' here explicitly, doing same thing (second time!) via
bsd.subdir.mk's rules makes no sense and only adds disk IO overhead.
Some numbers... (for 'make -DENGLISH_ONLY -DWEB_ONLY' in www/en):
[before]
$ grep ^=== out.make | wc -l
272
$ grep ^=== out.make | sort -u | wc -l
78
[after]
$ grep ^=== out.make | wc -l
78
to process generated HTML. This not cause any side effects except
leaving some character entities in their numeric form instead
converting them into alphabetical notation (< instead of <),
but since all browsers understand such cases it is not a problem.
This commit should make all translations tidy clean, since
tidy should not arise entities conversion problem as it did
for long time before. Therefore all occurences of manual settings
of TIDYFLAGS and NO_TIDY declarations for translations are removed.
Also clean *OPTS/*FLAGS variables declaration like it was done in doc/ tree
some time ago. Currently all local additions to commands parameters that used
in make process should be passed thru *FLAGS variables. All variables
with OPTS suffix are reserved for internal use of web.site.mk now.
Cleanup part is based on work done by Cyrille Lefevre <clefevre-lists@noos.fr>
No objections from: -doc
Requested by: Russian and Japanese translation teams
* Use make variables instead of hard coding commands, paths, and
options.
* Wrap some long lines.
* Replace shell loops with make for loops, etc.
PR: docs/31132
Submitted by: Cyrille Lefevre <clefevre@citeweb.net>
obj-clean.
This basically entails putting ${.CURDIR} in front of the occasional
source file, script, or directory.
Also adds '.include <bsd.obj.mk>' to web.mk so 'make obj' works.
Change gencommercial script to take a '-s' flag pointing to the source
directory, and the portindex script to take an optional additional
parameter indicating the source directory.
Add -D ${.CURDIR} to sgmlformat to follow includes properly.
1. Add .sgml -> .revinc rule in web.mk. This tells how to make SGML
include file which contains revision information.
2. Add ja/revcheck script. This script makes revision information
from English SGML file and localized one.
3. Add *.revinc files into GENDOCS in localized Makefile. This will
generate *.revinc files from each *.sgml files.
4. Add %rev.diff entity into localized includes.sgml.
5. Add statement to include *.revinc for each *.sgml files.
(this will be followed separately.)
Reviewed and not objected by: Doc Team
