diff options
| -rw-r--r-- | doc/doxygen/meson.build | 12 | ||||
| -rw-r--r-- | doc/doxygen/xml/Client/meson.build | 1 | ||||
| -rw-r--r-- | doc/doxygen/xml/Server/meson.build | 1 | ||||
| -rw-r--r-- | doc/doxygen/xml/meson.build | 20 | ||||
| -rw-r--r-- | doc/publican/Architecture.xml (renamed from doc/publican/sources/Architecture.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Author_Group.xml (renamed from doc/publican/sources/Author_Group.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Book_Info.xml (renamed from doc/publican/sources/Book_Info.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Client.xml (renamed from doc/publican/sources/Client.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Color.xml (renamed from doc/publican/sources/Color.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Compositors.xml (renamed from doc/publican/sources/Compositors.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Foreword.xml (renamed from doc/publican/sources/Foreword.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Introduction.xml (renamed from doc/publican/sources/Introduction.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Preface.xml (renamed from doc/publican/sources/Preface.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Protocol.xml (renamed from doc/publican/sources/Protocol.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Revision_History.xml (renamed from doc/publican/sources/Revision_History.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Server.xml (renamed from doc/publican/sources/Server.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Wayland.ent (renamed from doc/publican/sources/Wayland.ent) | 0 | ||||
| -rw-r--r-- | doc/publican/Wayland.xml (renamed from doc/publican/sources/Wayland.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/Xwayland.xml (renamed from doc/publican/sources/Xwayland.xml) | 0 | ||||
| -rw-r--r-- | doc/publican/html/css/brand.css (renamed from doc/publican/sources/css/brand.css) | 0 | ||||
| -rw-r--r-- | doc/publican/html/css/common.css (renamed from doc/publican/sources/css/common.css) | 0 | ||||
| -rw-r--r-- | doc/publican/html/css/default.css (renamed from doc/publican/sources/css/default.css) | 0 | ||||
| -rw-r--r-- | doc/publican/html/css/epub.css (renamed from doc/publican/sources/css/epub.css) | 0 | ||||
| -rw-r--r-- | doc/publican/html/css/meson.build | 14 | ||||
| -rw-r--r-- | doc/publican/html/css/print.css (renamed from doc/publican/sources/css/print.css) | 0 | ||||
| -rw-r--r-- | doc/publican/html/images/icon.svg (renamed from doc/publican/sources/images/icon.svg) | 0 | ||||
| -rw-r--r-- | doc/publican/html/images/meson.build | 28 | ||||
| -rw-r--r-- | doc/publican/html/images/wayland-architecture.gv (renamed from doc/doxygen/dot/wayland-architecture.gv) | 0 | ||||
| -rw-r--r-- | doc/publican/html/images/wayland.png (renamed from doc/publican/sources/images/wayland.png) | bin | 5649 -> 5649 bytes | |||
| -rw-r--r-- | doc/publican/html/images/x-architecture.gv (renamed from doc/doxygen/dot/x-architecture.gv) | 0 | ||||
| -rw-r--r-- | doc/publican/html/images/xwayland-architecture.png (renamed from doc/publican/sources/images/xwayland-architecture.png) | bin | 7611 -> 7611 bytes | |||
| -rw-r--r-- | doc/publican/meson.build | 106 | ||||
| -rw-r--r-- | doc/publican/sources/meson.build | 114 | ||||
| -rw-r--r-- | doc/publican/xsl/doxygen-to-publican.xsl (renamed from doc/publican/doxygen-to-publican.xsl) | 0 | ||||
| -rw-r--r-- | doc/publican/xsl/merge-mapcoords.xsl (renamed from doc/publican/merge-mapcoords.xsl) | 0 | ||||
| -rw-r--r-- | doc/publican/xsl/protocol-interfaces-to-docbook.xsl (renamed from doc/publican/protocol-interfaces-to-docbook.xsl) | 0 | ||||
| -rw-r--r-- | doc/publican/xsl/protocol-to-docbook.xsl (renamed from doc/publican/protocol-to-docbook.xsl) | 0 | ||||
| -rw-r--r-- | meson.build | 6 |
38 files changed, 138 insertions, 164 deletions
diff --git a/doc/doxygen/meson.build b/doc/doxygen/meson.build index 6112620..551bd4b 100644 --- a/doc/doxygen/meson.build +++ b/doc/doxygen/meson.build @@ -1,16 +1,5 @@ # Here be dragons -dot_gv = { - 'wayland-architecture': files('dot/wayland-architecture.gv'), - 'x-architecture': files('dot/x-architecture.gv'), -} - -# This is a workaround for Meson's custom_target() directive, which -# currently does not support outputs pointing to a sub-directory -# XXX: try turning these into maps, so they can be indexed with picture name -dot_png = [] -dot_map = [] - doxygen_conf = configuration_data() doxygen_conf.set('VERSION', meson.project_version()) doxygen_conf.set('top_builddir', meson.project_build_root()) @@ -91,7 +80,6 @@ foreach f_name, sections: formats ], input: s_files, output: '@0@.stamp'.format(t_name), - depends: [dot_png, dot_map], build_by_default: true, ) endforeach diff --git a/doc/doxygen/xml/Client/meson.build b/doc/doxygen/xml/Client/meson.build index 849c30d..e51fccb 100644 --- a/doc/doxygen/xml/Client/meson.build +++ b/doc/doxygen/xml/Client/meson.build @@ -11,7 +11,6 @@ tgt = custom_target( ], input: [ shared_files, client_files ], output: [ 'combine.xslt', 'index.xml' ], - depends: [dot_png, dot_map] ) doxygen_Client_combine_xslt = tgt[0] diff --git a/doc/doxygen/xml/Server/meson.build b/doc/doxygen/xml/Server/meson.build index 4792c1b..5df9744 100644 --- a/doc/doxygen/xml/Server/meson.build +++ b/doc/doxygen/xml/Server/meson.build @@ -11,7 +11,6 @@ tgt = custom_target( ], input: [ shared_files, server_files ], output: [ 'combine.xslt', 'index.xml' ], - depends: [dot_png, dot_map] ) doxygen_Server_combine_xslt = tgt[0] diff --git a/doc/doxygen/xml/meson.build b/doc/doxygen/xml/meson.build index 6d55c53..479af8e 100644 --- a/doc/doxygen/xml/meson.build +++ b/doc/doxygen/xml/meson.build @@ -1,22 +1,2 @@ -# dot_png: list of PNG targets -# dot_map: list of MAP targets -foreach name, infile: dot_gv - dot_png += custom_target( - name + '.png', - command: [ dot, '-Tpng', '-o@OUTPUT@', '@INPUT@' ], - input: infile, - output: name + '.png', - install: true, - install_dir: join_paths(publican_install_prefix, publican_html_dir, 'images') - ) - - dot_map += custom_target( - name + '.map', - command: [ dot, '-Tcmapx_np', '-o@OUTPUT@', '@INPUT@' ], - input: infile, - output: name + '.map', - ) -endforeach - subdir('Client') subdir('Server') diff --git a/doc/publican/sources/Architecture.xml b/doc/publican/Architecture.xml index b8a104c..b8a104c 100644 --- a/doc/publican/sources/Architecture.xml +++ b/doc/publican/Architecture.xml diff --git a/doc/publican/sources/Author_Group.xml b/doc/publican/Author_Group.xml index 2bdde62..2bdde62 100644 --- a/doc/publican/sources/Author_Group.xml +++ b/doc/publican/Author_Group.xml diff --git a/doc/publican/sources/Book_Info.xml b/doc/publican/Book_Info.xml index 897673a..897673a 100644 --- a/doc/publican/sources/Book_Info.xml +++ b/doc/publican/Book_Info.xml diff --git a/doc/publican/sources/Client.xml b/doc/publican/Client.xml index 19bf3e9..19bf3e9 100644 --- a/doc/publican/sources/Client.xml +++ b/doc/publican/Client.xml diff --git a/doc/publican/sources/Color.xml b/doc/publican/Color.xml index ceee779..ceee779 100644 --- a/doc/publican/sources/Color.xml +++ b/doc/publican/Color.xml diff --git a/doc/publican/sources/Compositors.xml b/doc/publican/Compositors.xml index 7a7bdaa..7a7bdaa 100644 --- a/doc/publican/sources/Compositors.xml +++ b/doc/publican/Compositors.xml diff --git a/doc/publican/sources/Foreword.xml b/doc/publican/Foreword.xml index 46fda2b..46fda2b 100644 --- a/doc/publican/sources/Foreword.xml +++ b/doc/publican/Foreword.xml diff --git a/doc/publican/sources/Introduction.xml b/doc/publican/Introduction.xml index f2a8274..f2a8274 100644 --- a/doc/publican/sources/Introduction.xml +++ b/doc/publican/Introduction.xml diff --git a/doc/publican/sources/Preface.xml b/doc/publican/Preface.xml index 17c6ebf..17c6ebf 100644 --- a/doc/publican/sources/Preface.xml +++ b/doc/publican/Preface.xml diff --git a/doc/publican/sources/Protocol.xml b/doc/publican/Protocol.xml index e4087e9..e4087e9 100644 --- a/doc/publican/sources/Protocol.xml +++ b/doc/publican/Protocol.xml diff --git a/doc/publican/sources/Revision_History.xml b/doc/publican/Revision_History.xml index 2c540fe..2c540fe 100644 --- a/doc/publican/sources/Revision_History.xml +++ b/doc/publican/Revision_History.xml diff --git a/doc/publican/sources/Server.xml b/doc/publican/Server.xml index 2333b1a..2333b1a 100644 --- a/doc/publican/sources/Server.xml +++ b/doc/publican/Server.xml diff --git a/doc/publican/sources/Wayland.ent b/doc/publican/Wayland.ent index da18a95..da18a95 100644 --- a/doc/publican/sources/Wayland.ent +++ b/doc/publican/Wayland.ent diff --git a/doc/publican/sources/Wayland.xml b/doc/publican/Wayland.xml index 7593097..7593097 100644 --- a/doc/publican/sources/Wayland.xml +++ b/doc/publican/Wayland.xml diff --git a/doc/publican/sources/Xwayland.xml b/doc/publican/Xwayland.xml index 7915559..7915559 100644 --- a/doc/publican/sources/Xwayland.xml +++ b/doc/publican/Xwayland.xml diff --git a/doc/publican/sources/css/brand.css b/doc/publican/html/css/brand.css index d86cba9..d86cba9 100644 --- a/doc/publican/sources/css/brand.css +++ b/doc/publican/html/css/brand.css diff --git a/doc/publican/sources/css/common.css b/doc/publican/html/css/common.css index a05648e..a05648e 100644 --- a/doc/publican/sources/css/common.css +++ b/doc/publican/html/css/common.css diff --git a/doc/publican/sources/css/default.css b/doc/publican/html/css/default.css index bf38ebb..bf38ebb 100644 --- a/doc/publican/sources/css/default.css +++ b/doc/publican/html/css/default.css diff --git a/doc/publican/sources/css/epub.css b/doc/publican/html/css/epub.css index b0ffd43..b0ffd43 100644 --- a/doc/publican/sources/css/epub.css +++ b/doc/publican/html/css/epub.css diff --git a/doc/publican/html/css/meson.build b/doc/publican/html/css/meson.build new file mode 100644 index 0000000..699d70e --- /dev/null +++ b/doc/publican/html/css/meson.build @@ -0,0 +1,14 @@ +foreach src : files([ + 'brand.css', + 'common.css', + 'default.css', + 'epub.css', + 'print.css', +]) + name = fs.name(src) + publican_inputs += fs.copyfile( + name, + install: true, + install_dir: publican_install_prefix + '/html/css', + ) +endforeach diff --git a/doc/publican/sources/css/print.css b/doc/publican/html/css/print.css index 54088f4..54088f4 100644 --- a/doc/publican/sources/css/print.css +++ b/doc/publican/html/css/print.css diff --git a/doc/publican/sources/images/icon.svg b/doc/publican/html/images/icon.svg index b2f16d0..b2f16d0 100644 --- a/doc/publican/sources/images/icon.svg +++ b/doc/publican/html/images/icon.svg diff --git a/doc/publican/html/images/meson.build b/doc/publican/html/images/meson.build new file mode 100644 index 0000000..98e5b93 --- /dev/null +++ b/doc/publican/html/images/meson.build @@ -0,0 +1,28 @@ +foreach src : files([ + 'icon.svg', + 'wayland.png', +]) + name = fs.name(src) + publican_inputs += fs.copyfile( + name, + install: true, + install_dir: publican_install_prefix + '/html/images', + ) +endforeach + +foreach src : files([ + 'wayland-architecture.gv', + 'x-architecture.gv', +]) + input = fs.name(src) + output = fs.stem(src) + '.png' + + publican_inputs += custom_target( + input + '.png', + command: [ dot, '-Tpng', '-o@OUTPUT@', '@INPUT@' ], + input: input, + output: output, + install: true, + install_dir: publican_install_prefix + '/html/images', + ) +endforeach diff --git a/doc/doxygen/dot/wayland-architecture.gv b/doc/publican/html/images/wayland-architecture.gv index f2c3507..f2c3507 100644 --- a/doc/doxygen/dot/wayland-architecture.gv +++ b/doc/publican/html/images/wayland-architecture.gv diff --git a/doc/publican/sources/images/wayland.png b/doc/publican/html/images/wayland.png Binary files differindex c993792..c993792 100644 --- a/doc/publican/sources/images/wayland.png +++ b/doc/publican/html/images/wayland.png diff --git a/doc/doxygen/dot/x-architecture.gv b/doc/publican/html/images/x-architecture.gv index b223d1d..b223d1d 100644 --- a/doc/doxygen/dot/x-architecture.gv +++ b/doc/publican/html/images/x-architecture.gv diff --git a/doc/publican/sources/images/xwayland-architecture.png b/doc/publican/html/images/xwayland-architecture.png Binary files differindex f24dc18..f24dc18 100644 --- a/doc/publican/sources/images/xwayland-architecture.png +++ b/doc/publican/html/images/xwayland-architecture.png diff --git a/doc/publican/meson.build b/doc/publican/meson.build index eac3e9b..83556f0 100644 --- a/doc/publican/meson.build +++ b/doc/publican/meson.build @@ -1,6 +1,92 @@ -merge_mapcoords_xsl = files('merge-mapcoords.xsl') +proto_to_docboox_xsl = files('xsl/protocol-to-docbook.xsl') +proto_iface_to_docboox_xsl = files('xsl/protocol-interfaces-to-docbook.xsl') +merge_mapcoords_xsl = files('xsl/merge-mapcoords.xsl') +to_publican_xsl = files('xsl/doxygen-to-publican.xsl') -subdir('sources') +publican_inputs = [] + +foreach src : files([ + 'Wayland.xml', # must be first in publican_inputs + 'Wayland.ent', + 'Book_Info.xml', + 'Author_Group.xml', + 'Foreword.xml', + 'Preface.xml', + 'Revision_History.xml', + 'Protocol.xml', + 'Xwayland.xml', + 'Compositors.xml', + 'Color.xml', + 'Client.xml', + 'Server.xml', +]) + name = fs.name(src) + publican_inputs += fs.copyfile(name) +endforeach + +publican_inputs += custom_target( + 'ProtocolSpec.xml', + command: [ xsltproc, '-o', '@OUTPUT@', proto_to_docboox_xsl, '@INPUT@' ], + input: wayland_protocol_xml, + output: 'ProtocolSpec.xml' +) + +publican_inputs += custom_target( + 'ProtocolInterfaces.xml', + command: [ xsltproc, '-o', '@OUTPUT@', proto_iface_to_docboox_xsl, '@INPUT@' ], + input: wayland_protocol_xml, + output: 'ProtocolInterfaces.xml' +) + +ClientAPI_combined = custom_target( + 'ClientAPI-combined', + command: [ xsltproc, '-o', '@OUTPUT@', '@INPUT@' ], + input: [ doxygen_Client_combine_xslt, doxygen_Client_index_xml ], + output: 'ClientAPI-combined.xml' +) + +publican_inputs += custom_target( + 'ClientAPI.xml', + command: [ xsltproc, '-o', '@OUTPUT@', '--stringparam', 'which', 'Client', to_publican_xsl, '@INPUT@' ], + input: ClientAPI_combined, + output: 'ClientAPI.xml' +) + +ServerAPI_combined = custom_target( + 'ServerAPI-combined', + command: [ xsltproc, '-o', '@OUTPUT@', '@INPUT@' ], + input: [ doxygen_Server_combine_xslt, doxygen_Server_index_xml ], + output: 'ServerAPI-combined.xml' +) + +publican_inputs += custom_target( + 'ServerAPI.xml', + command: [ xsltproc, '-o', '@OUTPUT@', '--stringparam', 'which', 'Server', to_publican_xsl, '@INPUT@' ], + input: ServerAPI_combined, + output: 'ServerAPI.xml' +) + +foreach src : files([ + 'Architecture.xml', + 'Introduction.xml' +]) + name = fs.name(src) + publican_inputs += custom_target( + name, + command: [ + xsltproc, + '-o', '@OUTPUT@', + '--stringparam', 'basedir', '.', + merge_mapcoords_xsl, + '@INPUT@', + ], + input: [name], + output: [name], + ) +endforeach + +subdir('html/css') +subdir('html/images') custom_target( 'Wayland-docbook-html', @@ -14,19 +100,11 @@ custom_target( '--stringparam', 'html.stylesheet=css/default.css', '-o', '@OUTPUT@', 'html', - '@INPUT@' - ], - input: publican_processed_main, - output: publican_html_dir, - depend_files: publican_copied_sources, - depends: [ - publican_processed_targets, - ClientAPI_xml, - ServerAPI_xml, - ProtocolSpec_xml, - ProtocolInterfaces_xml + '@INPUT0@' ], + input: publican_inputs, + output: 'html', build_by_default: true, install: true, - install_dir: publican_install_prefix + install_dir: publican_install_prefix, ) diff --git a/doc/publican/sources/meson.build b/doc/publican/sources/meson.build deleted file mode 100644 index a53b389..0000000 --- a/doc/publican/sources/meson.build +++ /dev/null @@ -1,114 +0,0 @@ -ProtocolSpec_xml = custom_target( - 'ProtocolSpec.xml', - command: [ xsltproc, '-o', '@OUTPUT@', files('../protocol-to-docbook.xsl'), '@INPUT@' ], - input: wayland_protocol_xml, - output: 'ProtocolSpec.xml' -) - -ProtocolInterfaces_xml = custom_target( - 'ProtocolInterfaces.xml', - command: [ xsltproc, '-o', '@OUTPUT@', files('../protocol-interfaces-to-docbook.xsl'), '@INPUT@' ], - input: wayland_protocol_xml, - output: 'ProtocolInterfaces.xml' -) - -ClientAPI_combined = custom_target( - 'ClientAPI-combined', - command: [ xsltproc, '-o', '@OUTPUT@', '@INPUT@' ], - input: [ doxygen_Client_combine_xslt, doxygen_Client_index_xml ], - output: 'ClientAPI-combined.xml' -) - -to_publican_xsl = files('../doxygen-to-publican.xsl') - -ClientAPI_xml = custom_target( - 'ClientAPI.xml', - command: [ xsltproc, '-o', '@OUTPUT@', '--stringparam', 'which', 'Client', to_publican_xsl, '@INPUT@' ], - input: ClientAPI_combined, - output: 'ClientAPI.xml' -) - -ServerAPI_combined = custom_target( - 'ServerAPI-combined', - command: [ xsltproc, '-o', '@OUTPUT@', '@INPUT@' ], - input: [ doxygen_Server_combine_xslt, doxygen_Server_index_xml ], - output: 'ServerAPI-combined.xml' -) - -ServerAPI_xml = custom_target( - 'ServerAPI.xml', - command: [ xsltproc, '-o', '@OUTPUT@', '--stringparam', 'which', 'Server', to_publican_xsl, '@INPUT@' ], - input: ServerAPI_combined, - output: 'ServerAPI.xml' -) - - -publican_sources = [ - 'Wayland.ent', - # 'Wayland.xml', # handled specially - 'Book_Info.xml', - 'Author_Group.xml', - 'Foreword.xml', - 'Preface.xml', - 'Revision_History.xml', - 'Protocol.xml', - 'Xwayland.xml', - 'Compositors.xml', - 'Color.xml', - 'Client.xml', - 'Server.xml' -] - -publican_processed_main = configure_file( - input: 'Wayland.xml', - output: 'Wayland.xml', - copy: true -) - -publican_copied_sources = [] -foreach src: publican_sources - publican_copied_sources += configure_file( - input: src, - output: src, - copy: true - ) -endforeach - -publican_processed_sources = [ - 'Architecture.xml', - 'Introduction.xml' -] - -publican_processed_targets = [] -foreach src: publican_processed_sources - publican_processed_targets += custom_target( - src, - command: [ xsltproc, '-o', '@OUTPUT@', '--stringparam', 'basedir', '.', merge_mapcoords_xsl, '@INPUT@' ], - input: src, - output: src - ) -endforeach - -publican_css_sources = files([ - 'css/brand.css', - 'css/common.css', - 'css/default.css', - 'css/epub.css', - 'css/print.css' -]) - -install_data( - publican_css_sources, - install_dir: join_paths(publican_install_prefix, publican_html_dir, 'css') -) - -publican_img_sources = files([ - 'images/icon.svg', - 'images/wayland.png', - 'images/xwayland-architecture.png' -]) - -install_data( - publican_img_sources, - install_dir: join_paths(publican_install_prefix, publican_html_dir, 'images') -) diff --git a/doc/publican/doxygen-to-publican.xsl b/doc/publican/xsl/doxygen-to-publican.xsl index e13dcd7..e13dcd7 100644 --- a/doc/publican/doxygen-to-publican.xsl +++ b/doc/publican/xsl/doxygen-to-publican.xsl diff --git a/doc/publican/merge-mapcoords.xsl b/doc/publican/xsl/merge-mapcoords.xsl index 7adaca3..7adaca3 100644 --- a/doc/publican/merge-mapcoords.xsl +++ b/doc/publican/xsl/merge-mapcoords.xsl diff --git a/doc/publican/protocol-interfaces-to-docbook.xsl b/doc/publican/xsl/protocol-interfaces-to-docbook.xsl index f68216d..f68216d 100644 --- a/doc/publican/protocol-interfaces-to-docbook.xsl +++ b/doc/publican/xsl/protocol-interfaces-to-docbook.xsl diff --git a/doc/publican/protocol-to-docbook.xsl b/doc/publican/xsl/protocol-to-docbook.xsl index 79c938b..79c938b 100644 --- a/doc/publican/protocol-to-docbook.xsl +++ b/doc/publican/xsl/protocol-to-docbook.xsl diff --git a/meson.build b/meson.build index c96ca29..7ad5ac0 100644 --- a/meson.build +++ b/meson.build |
