diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-11-19 13:00:17 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-11-26 11:00:15 -0800 |
commit | eb47cc29d45c86e5b1c4235fca7498811203d1b0 (patch) | |
tree | effc056cd58f5add3ad47ca1b6dfef17c6f76b7b | |
parent | cc540a018d2b05b30542b1f147d04fc80dd5b7e2 (diff) |
Add a meson build system
Includes CI checks comparing installed files based on those from xorgproto
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r-- | .gitlab-ci.yml | 64 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | masterdb/Makefile.am | 4 | ||||
-rw-r--r-- | masterdb/masterdb.xml | 126 | ||||
-rw-r--r-- | meson.build | 47 |
5 files changed, 174 insertions, 69 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e794fb2..55e25c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,8 +32,8 @@ variables: # The tag should be updated each time the list of packages is updated. # Changing a tag forces the associated image to be rebuilt. # Note: the tag has no meaning, we use a date format purely for readability - FDO_DISTRIBUTION_TAG: '2023-10-13.0' - FDO_DISTRIBUTION_PACKAGES: 'git pkgconf autoconf automake make xz-utils xutils-dev xmlto w3m xsltproc fop' + FDO_DISTRIBUTION_TAG: '2023-11-19.0' + FDO_DISTRIBUTION_PACKAGES: 'git pkgconf autoconf automake make xz-utils xutils-dev xmlto w3m xsltproc fop meson ninja-build jq' # @@ -108,7 +108,7 @@ install-macros: # The default build, runs on the image built above. # Sets ACLOCAL to use macros from "install macros" stage above. # -build: +autotools: stage: build extends: - .fdo.distribution-image@debian @@ -123,11 +123,13 @@ build: - make check - make install - make distcheck + - mv xorg-sgml-doctools-*.tar.xz .. - popd > /dev/null variables: artifacts: paths: - _inst + - xorg-sgml-doctools-*.tar.xz # # Make sure xorg-docs builds with the xorg-sgml-doctools package built above @@ -157,3 +159,59 @@ docs-build: artifacts: paths: - _inst + +meson: + extends: + - .fdo.distribution-image@debian + + stage: build + script: + - mkdir -p ../_inst + - meson setup builddir --prefix="$PWD/../_inst" + - meson install -C builddir + +meson from tarball: + extends: + - .fdo.distribution-image@debian + + stage: test + script: + - mkdir -p _tarball_build + - tar xf xorg-sgml-doctools-*.tar.xz -C _tarball_build + - pushd _tarball_build/xorg-sgml-doctools-* + - meson setup builddir + - meson install -C builddir + needs: + - autotools + variables: + GIT_STRATEGY: none + +compare meson and autotools: + extends: + - .fdo.distribution-image@debian + + stage: test + script: + - mkdir -p $PWD/_meson_inst + - mkdir -p $PWD/_autotools_inst + - meson setup builddir --prefix=/usr/X11 + - DESTDIR=$PWD/_meson_inst meson install -C builddir + - export INSTDIR="$PWD/_inst" + - export ACLOCAL="aclocal -I $INSTDIR/share/aclocal" + - autoreconf -ivf + - ./configure --prefix=/usr/X11 + - make && DESTDIR=$PWD/_autotools_inst make install + - diff --brief --recursive $PWD/_meson_inst $PWD/_autotools_inst + +check versions are in sync: + extends: + - .fdo.distribution-image@debian + + stage: test + script: + - export INSTDIR="$PWD/_inst" + - export ACLOCAL="aclocal -I $INSTDIR/share/aclocal" + - autoreconf -ivf + - ./configure --version | head -n 1 | sed -e 's/xorg-sgml-doctools configure //' > autotools.version + - meson introspect meson.build --projectinfo | jq -r '.version' > meson.version + - diff -u autotools.version meson.version || (echo "ERROR - autotools and meson versions not in sync" && false) diff --git a/Makefile.am b/Makefile.am index b5d5ac4..63a9c60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,4 +43,4 @@ ChangeLog: dist-hook: ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build diff --git a/masterdb/Makefile.am b/masterdb/Makefile.am index fd571b0..2154845 100644 --- a/masterdb/Makefile.am +++ b/masterdb/Makefile.am @@ -9,10 +9,10 @@ CLEANFILES = $(sgmldbs_DATA) %.html.xml: %.xml $(AM_V_GEN)$(SED) \ - -e 's|__db__|html|g' \ + -e 's|@db@|html|g' \ -e 's|@datarootdir[@]|$(datarootdir)|g' < $< > $@ %.pdf.xml: %.xml $(AM_V_GEN)$(SED) \ - -e 's|__db__|pdf|g' \ + -e 's|@db@|pdf|g' \ -e 's|@datarootdir[@]|$(datarootdir)|g' < $< > $@ diff --git a/masterdb/masterdb.xml b/masterdb/masterdb.xml index c40f597..4628f64 100644 --- a/masterdb/masterdb.xml +++ b/masterdb/masterdb.xml @@ -38,24 +38,24 @@ listed here. This allows crosslinking between documents. <!-- Libraries --> <dir name="libICE"> <document targetdoc="ICElib"> - <xi:include href="@datarootdir@/doc/libICE/ICElib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libICE/ICElib.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="ice"> - <xi:include href="@datarootdir@/doc/libICE/ice.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libICE/ice.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="libSM"> <document targetdoc="SMlib"> - <xi:include href="@datarootdir@/doc/libSM/SMlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libSM/SMlib.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="xsmp"> - <xi:include href="@datarootdir@/doc/libSM/xsmp.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libSM/xsmp.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> @@ -63,7 +63,7 @@ listed here. This allows crosslinking between documents. <dir name="libX11"> <dir name="libX11"> <document targetdoc="libX11"> - <xi:include href="@datarootdir@/doc/libX11/libX11/libX11.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libX11/libX11/libX11.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> @@ -71,28 +71,28 @@ listed here. This allows crosslinking between documents. <dir name="i18n"> <dir name="compose"> <document targetdoc="libX11-keys"> - <xi:include href="@datarootdir@/doc/libX11/i18n/compose/libX11-keys.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libX11/i18n/compose/libX11-keys.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="framework"> <document targetdoc="framework"> - <xi:include href="@datarootdir@/doc/libX11/i18n/framework/framework.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libX11/i18n/framework/framework.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="localedb"> <document targetdoc="localedb"> - <xi:include href="@datarootdir@/doc/libX11/i18n/localedb/localedb.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libX11/i18n/localedb/localedb.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="trans"> <document targetdoc="trans"> - <xi:include href="@datarootdir@/doc/libX11/i18n/trans/trans.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libX11/i18n/trans/trans.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> @@ -100,14 +100,14 @@ listed here. This allows crosslinking between documents. </dir> <dir name="XIM"> <document targetdoc="xim"> - <xi:include href="@datarootdir@/doc/libX11/XIM/xim.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libX11/XIM/xim.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="XKB"> <document targetdoc="xkblib"> - <xi:include href="@datarootdir@/doc/libX11/XKB/xkblib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libX11/XKB/xkblib.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> @@ -115,81 +115,81 @@ listed here. This allows crosslinking between documents. </dir> <dir name="libXaw"> <document targetdoc="libXaw"> - <xi:include href="@datarootdir@/doc//libXaw/libXaw.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc//libXaw/libXaw.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="libXdmcp"> <document targetdoc="xdmcp"> - <xi:include href="@datarootdir@/doc//libXdmcp/xdmcp.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc//libXdmcp/xdmcp.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="libXext"> <document targetdoc="dbelib"> - <xi:include href="@datarootdir@/doc/libXext/dbelib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libXext/dbelib.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="dpmslib"> - <xi:include href="@datarootdir@/doc/libXext/dpmslib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libXext/dpmslib.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="shapelib"> - <xi:include href="@datarootdir@/doc/libXext/shapelib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libXext/shapelib.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="synclib"> - <xi:include href="@datarootdir@/doc/libXext/synclib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libXext/synclib.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="xtest1"> - <xi:include href="@datarootdir@/doc/libXext/xtest1.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libXext/xtest1.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="libXi"> <document targetdoc="inputlib"> - <xi:include href="@datarootdir@/doc/libXi/inputlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libXi/inputlib.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="libXmu"> <document targetdoc="Xmu"> - <xi:include href="@datarootdir@/doc/libXmu/Xmu.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libXmu/Xmu.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="libXt"> <document targetdoc="intrinsics"> - <xi:include href="@datarootdir@/doc/libXt/intrinsics.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libXt/intrinsics.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="libXtst"> <document targetdoc="recordlib"> - <xi:include href="@datarootdir@/doc/libXtst/recordlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libXtst/recordlib.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="xtestlib"> - <xi:include href="@datarootdir@/doc/libXtst/xtestlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/libXtst/xtestlib.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="xtrans"> <document targetdoc="xtrans"> - <xi:include href="@datarootdir@/doc/xtrans/xtrans.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xtrans/xtrans.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> @@ -197,116 +197,116 @@ listed here. This allows crosslinking between documents. <!-- Protocols --> <dir name="bigreqsproto"> <document targetdoc="bigreq"> - <xi:include href="@datarootdir@/doc/bigreqsproto/bigreq.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/bigreqsproto/bigreq.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="fontsproto"> <document targetdoc="fsproto"> - <xi:include href="@datarootdir@/doc/fontsproto/fsproto.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/fontsproto/fsproto.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="kbproto"> <document targetdoc="xkbproto"> - <xi:include href="@datarootdir@/doc/kbproto/xkbproto.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/kbproto/xkbproto.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="recordproto"> <document targetdoc="record"> - <xi:include href="@datarootdir@/doc/recordproto/record.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/recordproto/record.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="scrnsaverproto"> <document targetdoc="saver"> - <xi:include href="@datarootdir@/doc/scrnsaverproto/saver.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/scrnsaverproto/saver.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="xcmiscproto"> <document targetdoc="xc-misc"> - <xi:include href="@datarootdir@/doc/xcmiscproto/xc-misc.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xcmiscproto/xc-misc.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="xextproto"> <document targetdoc="appgrp"> - <xi:include href="@datarootdir@/doc/xextproto/appgrp.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/appgrp.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="dbe"> - <xi:include href="@datarootdir@/doc/xextproto/dbe.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/dbe.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="dpms"> - <xi:include href="@datarootdir@/doc/xextproto/dpms.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/dpms.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="evi"> - <xi:include href="@datarootdir@/doc/xextproto/evi.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/evi.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="geproto"> - <xi:include href="@datarootdir@/doc/xextproto/geproto.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/geproto.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="lbx"> - <xi:include href="@datarootdir@/doc/xextproto/lbx.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/lbx.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="multibuf"> - <xi:include href="@datarootdir@/doc/xextproto/multibuf.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/multibuf.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="security"> - <xi:include href="@datarootdir@/doc/xextproto/security.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/security.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="shape"> - <xi:include href="@datarootdir@/doc/xextproto/shape.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/shape.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="shm"> - <xi:include href="@datarootdir@/doc/xextproto/shm.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/shm.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="sync"> - <xi:include href="@datarootdir@/doc/xextproto/sync.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/sync.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="tog-cup"> - <xi:include href="@datarootdir@/doc/xextproto/tog-cup.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/tog-cup.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="xtest"> - <xi:include href="@datarootdir@/doc/xextproto/xtest.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xextproto/xtest.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="xproto"> <document targetdoc="x11protocol"> - <xi:include href="@datarootdir@/doc/xproto/x11protocol.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xproto/x11protocol.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> @@ -314,109 +314,109 @@ listed here. This allows crosslinking between documents. <!-- X.Org System Documentation --> <dir name="xorg-docs"> <document targetdoc="License"> - <xi:include href="@datarootdir@/doc/xorg-docs/License.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/License.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="README"> - <xi:include href="@datarootdir@/doc/xorg-docs/README.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/README.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="ReleaseNotes"> - <xi:include href="@datarootdir@/doc/xorg-docs/ReleaseNotes.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/ReleaseNotes.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="Versions"> - <xi:include href="@datarootdir@/doc/xorg-docs/Versions.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/Versions.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <dir name="fonts"> <document targetdoc="fonts"> - <xi:include href="@datarootdir@/doc/xorg-docs/fonts/fonts.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/fonts/fonts.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="graphics"> <document targetdoc="dps"> - <xi:include href="@datarootdir@/doc/xorg-docs/graphics/dps.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/graphics/dps.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="input"> <document targetdoc="XKB-Config"> - <xi:include href="@datarootdir@/doc/xorg-docs/input/XKB-Config.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/input/XKB-Config.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="XKB-Enhancing"> - <xi:include href="@datarootdir@/doc/xorg-docs/input/XKB-Enhancing.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/input/XKB-Enhancing.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="platforms"> <document targetdoc="Darwin"> - <xi:include href="@datarootdir@/doc/xorg-docs/platforms/Darwin.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/platforms/Darwin.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="Solaris"> - <xi:include href="@datarootdir@/doc/xorg-docs/platforms/Solaris.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/platforms/Solaris.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="ctext"> <document targetdoc="ctext"> - <xi:include href="@datarootdir@/doc/xorg-docs/ctext/ctext.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/ctext/ctext.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="icccm"> <document targetdoc="icccm"> - <xi:include href="@datarootdir@/doc/xorg-docs/icccm/icccm.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/icccm/icccm.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="xext"> <document targetdoc="lbxalg"> - <xi:include href="@datarootdir@/doc/xorg-docs/xext/lbxalg.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/xext/lbxalg.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="xlfd"> <document targetdoc="xlfd"> - <xi:include href="@datarootdir@/doc/xorg-docs/xlfd/xlfd.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/xlfd/xlfd.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> </dir> <dir name="Xserver"> <document targetdoc="appgroup"> - <xi:include href="@datarootdir@/doc/xorg-docs/Xserver/appgroup.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/Xserver/appgroup.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="analysis"> - <xi:include href="@datarootdir@/doc/xorg-docs/Xserver/analysis.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/Xserver/analysis.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="secint"> - <xi:include href="@datarootdir@/doc/xorg-docs/Xserver/secint.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/Xserver/secint.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> <document targetdoc="XACE-Spec"> - <xi:include href="@datarootdir@/doc/xorg-docs/Xserver/XACE-Spec.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-docs/Xserver/XACE-Spec.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> @@ -425,7 +425,7 @@ listed here. This allows crosslinking between documents. <!-- X Server --> <dir name="xorg-server"> <document targetdoc="Xserver-DTrace"> - <xi:include href="@datarootdir@/doc/xorg-server/Xserver-DTrace.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="@datarootdir@/doc/xorg-server/Xserver-DTrace.@db@.db" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback></xi:fallback> </xi:include> </document> diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..5b38853 --- /dev/null +++ b/meson.build @@ -0,0 +1,47 @@ +project('xorg-sgml-doctools', + version: '1.12', + meson_version: '>= 0.49.0', + license: 'MIT' +) + +datarootdir = get_option('prefix') / get_option('datadir') +sgmlrootdir = datarootdir / 'sgml' +sgmlx11dir = sgmlrootdir / 'X11' +sgmldbsdir = sgmlx11dir / 'dbs' + +pc_conf = configuration_data({ + 'prefix': get_option('prefix'), + 'datarootdir': '${prefix}/share', + 'sgmlrootdir': '${datarootdir}/sgml', + 'PACKAGE_VERSION': meson.project_version() +}) +configure_file(input: 'xorg-sgml-doctools.pc.in', + output: 'xorg-sgml-doctools.pc', + install_dir: get_option('datadir') / 'pkgconfig', + configuration: pc_conf) + +sgmlx11_files = [ + 'defs.ent', + 'xorg.css', + 'xorg.xsl', + 'xorg-xhtml.xsl', + 'xorg-chunk.xsl', + 'xorg-fo.xsl' +] +install_data(sgmlx11_files, install_dir: sgmlx11dir) + +configure_file(output: 'masterdb.html.xml', + input: 'masterdb/masterdb.xml', + configuration: { + 'datarootdir': datarootdir, + 'db': 'html' + }, + install_dir: sgmldbsdir) + +configure_file(output: 'masterdb.pdf.xml', + input: 'masterdb/masterdb.xml', + configuration: { + 'datarootdir': datarootdir, + 'db': 'pdf' + }, + install_dir: sgmldbsdir) |