Re: WML Development Recommenced
Denis Barbier <[email protected]> Thu, 8 Dec 2005 15:18:10 +0100
| Newsgroups | gmane.comp.web.wml |
|---|---|
| Message-ID | <[email protected]> |
--ew6BAiZeqk4r7MaW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Wed, Dec 07, 2005 at 11:19:44PM +0200, Shlomi Fish wrote:
> Hi all!
>
> I recommenced working on the Web Meta Language core. See:
>
> http://svn.berlios.de/svnroot/repos/thewml/web-meta-lang/branches/maintenance/2.0.x/
>
> What was done so far was:
>
> *) Patched the config/Makefile to delete the autom4te.cache directory.
>
> *) Applied patch from Mandriva's RPM .spec file to fix compilation under
> gcc4.
>
> *) Added many svn:ignore's to the directories to make svn status inside the
> working copy happy.
Hi Shlomi,
the version of txt2html shipped in WML is dead upstream, but there is
a forked version at txt2html.sourceforge.net. Weblint should also
certainly be replaced by http://www.htmlhelp.com/tools/validator/
Here is a patch I applied to the Debian package to move
architecture-independent file
$(prefix)/lib/data --> $(prefix)/share
$(prefix)/lib/include --> $(prefix)/share/include
I was not sure if it should be applied upstream as well, so you
decide now ;)
Some parts of WML have their own Debian packages, so this patch
may be incomplete, but I believe that it is fine.
Denis
--ew6BAiZeqk4r7MaW
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename="datadir.patch"
Content-Transfer-Encoding: quoted-printable
Index: Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile.in (r=E9vision 20)
+++ Makefile.in (copie de travail)
@@ -28,6 +28,7 @@
bindir =3D $(prefix)/bin
libsubdir =3D @libsubdir@
libdir =3D $(prefix)/lib$(libsubdir)
+datadir =3D $(prefix)/share$(libsubdir)
mandir =3D $(prefix)/man
catdir =3D @catdir@
tmpdir =3D @tmpdir@
@@ -99,10 +100,10 @@
@[ -f .build-ok ] || $(MAKE) all
@echo "___ INSTALL: prepare directory structure ___"
$(MKDIR) $(bindir)
+ $(MKDIR) $(datadir)
+ $(MKDIR) $(datadir)/include
$(MKDIR) $(libdir)
- $(MKDIR) $(libdir)/data
$(MKDIR) $(libdir)/exec
- $(MKDIR) $(libdir)/include
$(MKDIR) $(libdir)/perl
$(MKDIR) $(mandir)
$(MKDIR) $(mandir)/man1
@@ -120,9 +121,9 @@
$(INSTALL_DATA) wml_frontend/wml.1 $(mandir)/man1/wml.1
$(INSTALL_SCRIPT) wml_frontend/wmd.pl $(bindir)/wmd
$(INSTALL_DATA) wml_frontend/wmd.1 $(mandir)/man1/wmd.1
- $(INSTALL_DATA) wml_frontend/wmd.txt $(libdir)/data/wmd.txt
+ $(INSTALL_DATA) wml_frontend/wmd.txt $(datadir)/wmd.txt
if [ -f wml_frontend/wmd.map ]; then \
- $(INSTALL_DATA) wml_frontend/wmd.map $(libdir)/data/wmd.=
map; \
+ $(INSTALL_DATA) wml_frontend/wmd.map $(datadir)/wmd.map;=
\
else :; fi
$(INSTALL_DATA) wml_frontend/wmd_missing.1 $(mandir)/man1/wmd_missing.1
$(INSTALL_SCRIPT) wml_frontend/wmb.pl $(bindir)/wmb
@@ -185,7 +186,7 @@
$(INSTALL_DATA) wml_aux/map2html/map2html.1 $(mandir)/man1/wml_aux_map2=
html.1
$(INSTALL_SCRIPT) wml_aux/txt2html/txt2html.pl $(libdir)/exec/wml_aux_t=
xt2html
$(INSTALL_DATA) wml_aux/txt2html/txt2html.txt $(mandir)/$(catdir)1/wml_=
aux_txt2html.1
- $(INSTALL_DATA) wml_aux/txt2html/txt2html.dict $(libdir)/data/txt2html.=
dict
+ $(INSTALL_DATA) wml_aux/txt2html/txt2html.dict $(datadir)/txt2html.dict
$(INSTALL_PROGRAM) wml_aux/tidy/tidy@EXEEXT@ $(libdir)/exec/wml_aux_tid=
y@EXEEXT@
$(INSTALL_DATA) wml_aux/tidy/tidy.txt $(mandir)/$(catdir)1/wml_aux_tidy=
.1
$(INSTALL_SCRIPT) wml_aux/htmlinfo/htmlinfo.pl $(libdir)/exec/wml_aux_h=
tmlinfo
@@ -194,7 +195,7 @@
$(INSTALL_DATA) wml_aux/linklint/linklint.1 $(mandir)/man1/wml_aux_link=
lint.1
$(INSTALL_SCRIPT) wml_aux/weblint/weblint.pl $(libdir)/exec/wml_aux_web=
lint
$(INSTALL_DATA) wml_aux/weblint/weblint.1 $(mandir)/man1/wml_aux_weblin=
t.1
- $(INSTALL_DATA) wml_aux/weblint/weblintrc $(libdir)/data/weblintrc
+ $(INSTALL_DATA) wml_aux/weblint/weblintrc $(datadir)/weblintrc
$(INSTALL_SCRIPT) wml_aux/freetable/freetable.pl $(libdir)/exec/wml_aux=
_freetable
$(INSTALL_DATA) wml_aux/freetable/freetable.1 $(mandir)/man1/wml_aux_fr=
eetable.1
=20
Index: wml_frontend/Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- wml_frontend/Makefile.in (r=E9vision 20)
+++ wml_frontend/Makefile.in (copie de travail)
@@ -19,7 +19,8 @@
bindir =3D $(prefix)/bin
libsubdir =3D @libsubdir@
libdir =3D $(prefix)/lib$(libsubdir)
-mandir =3D $(prefix)/man
+datadir =3D $(prefix)/share$(libsubdir)
+mandir =3D @mandir@
=20
WML_VERSION =3D @WML_VERSION@
WML_CONFIG_ARGS =3D @WML_CONFIG_ARGS@
@@ -58,6 +59,7 @@
-e 's|\@prefix\@|$(prefix)|g' \
-e 's|\@bindir\@|$(bindir)|g' \
-e 's|\@libdir\@|$(libdir)|g' \
+ -e 's|\@datadir\@|$(datadir)|g' \
-e 's|\@mandir\@|$(mandir)|g' \
-e 's|\@PATH_PERL\@|$(PATH_PERL)|g' \
-e 's|\@INSTALLPRIVLIB\@|$(INSTALLPRIVLIB)|g' \
Index: wml_frontend/wml.src
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- wml_frontend/wml.src (r=E9vision 20)
+++ wml_frontend/wml.src (copie de travail)
@@ -423,6 +423,7 @@
print STDERR " Prefix: ".'@prefix@'."\n";
print STDERR " BinDir: ".'@bindir@'."\n";
print STDERR " LibDir: ".'@libdir@'."\n";
+ print STDERR " DataDir: ".'@datadir@'."\n";
print STDERR " ManDir: ".'@mandir@'."\n";
}
if ($opt_V > 2) {
@@ -1004,6 +1005,7 @@
unshift(@opt_D, "WML_LOC_PREFIX=3D@prefix@");
unshift(@opt_D, "WML_LOC_BINDIR=3D@bindir@");
unshift(@opt_D, "WML_LOC_LIBDIR=3D@libdir@");
+unshift(@opt_D, "WML_LOC_DATADIR=3D@datadir@");
unshift(@opt_D, "WML_LOC_MANDIR=3D@mandir@");
unshift(@opt_D, "WML_VERSION=3D$VERSION");
unshift(@opt_D, "WML_TMPDIR=3D$tmpdir");
@@ -1062,7 +1064,7 @@
$preload =3D '';
foreach $p (@p) {
$preload .=3D " -s 'sys/bootp${p}.wml'"
- if -f "@libdir@/include/sys/bootp${p}.wml" and $p =3D~ m/^[34]$/;
+ if -f "@datadir@/include/sys/bootp${p}.wml" and $p =3D~ m/^[34]$/;
}
foreach $i (@opt_i) {
if ($i =3D~ m|^<(.+)>$|) {
@@ -1187,7 +1189,7 @@
$out_istmp =3D 1;
}
=20
-$opt_pass1 =3D "$defipp $verbose -S @libdir@/include -n $src $inc $prelo=
ad $prolog";
+$opt_pass1 =3D "$defipp $verbose -S @datadir@/include -n $src $inc $prel=
oad $prolog";
$opt_pass2 =3D "$defmp4h";
$opt_pass3 =3D "$defeperl";
$opt_pass4 =3D "$defgm4";
@@ -1719,6 +1721,10 @@
=20
The directory where WML's library files were installed to at built time.
=20
+=3Ditem WML_LOC_DATADIR
+
+The directory where WML's data files were installed to at built time.
+
=3Ditem WML_LOC_MANDIR
=20
The directory where WML's manual pages were installed to at built time.
Index: wml_frontend/wmd.src
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- wml_frontend/wmd.src (r=E9vision 20)
+++ wml_frontend/wmd.src (copie de travail)
@@ -110,8 +110,8 @@
## manpage.
## By default there is no mapping
%map =3D ();
-if (-r "@libdir@/data/wmd.map") {
- if (open(MAP, "< @libdir@/data/wmd.map")) {
+if (-r "@datadir@/wmd.map") {
+ if (open(MAP, "< @datadir@/wmd.map")) {
while (<MAP>) {
s/^\s*(.*?)\s*=3D\s*(.*?)\s*$/$map{$1} =3D $2/e;
}
@@ -124,7 +124,7 @@
##
=20
$browser =3D '@libdir@/exec/wml_aux_iselect';
-$browser_file =3D '@libdir@/data/wmd.txt';
+$browser_file =3D '@datadir@/wmd.txt';
=20
$reader_man =3D 'MANPATH=3D"@mandir@:$MANPATH"; export MANPATH; man';
=20
Index: wml_include/Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- wml_include/Makefile.in (r=E9vision 20)
+++ wml_include/Makefile.in (copie de travail)
@@ -24,6 +24,7 @@
bindir =3D $(prefix)/bin
libsubdir =3D @libsubdir@
libdir =3D $(prefix)/lib$(libsubdir)
+datadir =3D $(prefix)/share$(libsubdir)
mandir =3D $(prefix)/man
=20
INSTALLPRIVLIB =3D @INSTALLPRIVLIB@
@@ -69,13 +70,13 @@
base=3D`echo $$file | sed -e 's/\.wml$$//g'`; \
dir=3D`echo $$file | sed -e 's/[a-zA-Z0-9_]*.wml$$//g'`; \
name=3D`echo wml/$$base | sed -e 's/\//$(DCOLON)/g'`; \
- if [ ! -d "$(libdir)/include/$$dir" ]; then \
- echo "$(MKDIR) $(libdir)/include/$$dir"; \
- $(MKDIR) $(libdir)/include/$$dir; \
+ if [ ! -d "$(datadir)/include/$$dir" ]; then \
+ echo "$(MKDIR) $(datadir)/include/$$dir"; \
+ $(MKDIR) $(datadir)/include/$$dir; \
else :; \
fi; \
- echo "$(INSTALL_DATA) $$file $(libdir)/include/$$file"; \
- $(INSTALL_DATA) $$file $(libdir)/include/$$file; \
+ echo "$(INSTALL_DATA) $$file $(datadir)/include/$$file"; \
+ $(INSTALL_DATA) $$file $(datadir)/include/$$file; \
echo "$(INSTALL_DATA) $$base.3 $(mandir)/man3/$$name.3"; \
$(INSTALL_DATA) $$base.3 $(mandir)/man3/$$name.3; \
done
Index: wml_include/std/logo.src
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- wml_include/std/logo.src (r=E9vision 20)
+++ wml_include/std/logo.src (copie de travail)
@@ -27,8 +27,8 @@
my $target =3D '<get-var target />';
my $notag =3D (qq|<get-var notag />| eq '' ? 1 : 0);
=20
- my $imgfile =3D "$(WML_LOC_LIBDIR)/data/logos/logo-$name.$ext";
- my $infofile =3D "$(WML_LOC_LIBDIR)/data/logos/logo-$name.info";
+ my $imgfile =3D "$(WML_LOC_DATADIR)/logos/logo-$name.$ext";
+ my $infofile =3D "$(WML_LOC_DATADIR)/logos/logo-$name.info";
=20
# make sure the logo exists
if (! -f $imgfile or ! -f $infofile) {
Index: wml_misc/Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- wml_misc/Makefile.in (r=E9vision 20)
+++ wml_misc/Makefile.in (copie de travail)
@@ -23,7 +23,7 @@
exec_prefix =3D $(prefix)
bindir =3D $(prefix)/bin
libsubdir =3D @libsubdir@
-libdir =3D $(prefix)/lib$(libsubdir)
+datadir =3D $(prefix)/share$(libsubdir)
mandir =3D $(prefix)/man
=20
# ------------------------------------------------
@@ -33,12 +33,12 @@
all:=20
=20
install:
- $(MKDIR) $(libdir)/data/logos
+ $(MKDIR) $(datadir)/logos
@set -e; \
files=3D`echo logo-*`; \
for file in $$files; do \
- echo "$(INSTALL_DATA) $$file $(libdir)/data/logos/$$file"; \
- $(INSTALL_DATA) $$file $(libdir)/data/logos/$$file; \
+ echo "$(INSTALL_DATA) $$file $(datadir)/logos/$$file"; \
+ $(INSTALL_DATA) $$file $(datadir)/logos/$$file; \
done
=20
clean:
Index: wml_aux/weblint/weblint.src
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- wml_aux/weblint/weblint.src (r=E9vision 20)
+++ wml_aux/weblint/weblint.src (copie de travail)
@@ -23,7 +23,7 @@
($PROGRAM =3D $0) =3D~ s@.*/@@;
@TMPDIR_OPTIONS =3D ('/usr/tmp', '/tmp', '/var/tmp', '/temp');
$TMPDIR =3D &PickTmpdir(@TMPDIR_OPTIONS);
-$SITE_DIR =3D '@libdir@/data';
+$SITE_DIR =3D '@datadir@';
$USER_RCFILE =3D $ENV{'WEBLINTRC'} || "$ENV{'HOME'}/.weblintrc";
$SITE_RCFILE =3D $SITE_DIR.'/weblintrc' if $SITE_DIR;
=20
--ew6BAiZeqk4r7MaW--
_____________________________________________________________________
Website META Language (WML) http://thewml.org
User Support Mailing List [email protected]
Automated List Manager [email protected]