9:30 a.m.
This unclutters the top-level docs directory.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
docs/browserconfig.xml | 2 +-
docs/{ => icons}/android-chrome-192x192.png | Bin
docs/{ => icons}/android-chrome-256x256.png | Bin
docs/{ => icons}/apple-touch-icon.png | Bin
docs/{ => icons}/favicon-16x16.png | Bin
docs/{ => icons}/favicon-32x32.png | Bin
docs/{ => icons}/favicon.ico | Bin
docs/icons/meson.build | 19 +++++++++++++++++++
docs/{ => icons}/mstile-150x150.png | Bin
docs/manifest.json | 4 ++--
docs/meson.build | 8 +-------
docs/page.xsl | 8 ++++----
12 files changed, 27 insertions(+), 14 deletions(-)
rename docs/{ => icons}/android-chrome-192x192.png (100%)
rename docs/{ => icons}/android-chrome-256x256.png (100%)
rename docs/{ => icons}/apple-touch-icon.png (100%)
rename docs/{ => icons}/favicon-16x16.png (100%)
rename docs/{ => icons}/favicon-32x32.png (100%)
rename docs/{ => icons}/favicon.ico (100%)
create mode 100644 docs/icons/meson.build
rename docs/{ => icons}/mstile-150x150.png (100%)
diff --git a/docs/browserconfig.xml b/docs/browserconfig.xml
index e8b57e57b3..08fdcd7aaf 100644
--- a/docs/browserconfig.xml
+++ b/docs/browserconfig.xml
@@ -2,7 +2,7 @@
<browserconfig>
<msapplication>
<tile>
- <square150x150logo src="/mstile-150x150.png"/>
+ <square150x150logo src="/icons/mstile-150x150.png"/>
<TileColor>#b91d47</TileColor>
</tile>
</msapplication>
diff --git a/docs/android-chrome-192x192.png b/docs/icons/android-chrome-192x192.png
similarity index 100%
rename from docs/android-chrome-192x192.png
rename to docs/icons/android-chrome-192x192.png
diff --git a/docs/android-chrome-256x256.png b/docs/icons/android-chrome-256x256.png
similarity index 100%
rename from docs/android-chrome-256x256.png
rename to docs/icons/android-chrome-256x256.png
diff --git a/docs/apple-touch-icon.png b/docs/icons/apple-touch-icon.png
similarity index 100%
rename from docs/apple-touch-icon.png
rename to docs/icons/apple-touch-icon.png
diff --git a/docs/favicon-16x16.png b/docs/icons/favicon-16x16.png
similarity index 100%
rename from docs/favicon-16x16.png
rename to docs/icons/favicon-16x16.png
diff --git a/docs/favicon-32x32.png b/docs/icons/favicon-32x32.png
similarity index 100%
rename from docs/favicon-32x32.png
rename to docs/icons/favicon-32x32.png
diff --git a/docs/favicon.ico b/docs/icons/favicon.ico
similarity index 100%
rename from docs/favicon.ico
rename to docs/icons/favicon.ico
diff --git a/docs/icons/meson.build b/docs/icons/meson.build
new file mode 100644
index 0000000000..b9a1ef96f6
--- /dev/null
+++ b/docs/icons/meson.build
@@ -0,0 +1,19 @@
+docs_icon_files = [
+ 'android-chrome-192x192.png',
+ 'android-chrome-256x256.png',
+ 'apple-touch-icon.png',
+ 'favicon-16x16.png',
+ 'favicon-32x32.png',
+ 'favicon.ico',
+ 'mstile-150x150.png',
+]
+
+install_data(docs_icon_files, install_dir: docs_html_dir / 'icons')
+
+foreach file : docs_icon_files
+ # This hack enables us to view the web pages
+ # from within the uninstalled build tree
+ configure_file(input: file, output: file, copy: true)
+
+ install_web_files += '@0@:@1@'.format(meson.current_source_dir() / file,
docs_html_dir / 'icons')
+endforeach
diff --git a/docs/mstile-150x150.png b/docs/icons/mstile-150x150.png
similarity index 100%
rename from docs/mstile-150x150.png
rename to docs/icons/mstile-150x150.png
diff --git a/docs/manifest.json b/docs/manifest.json
index 9466390ee0..881137a8d5 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -2,12 +2,12 @@
"name": "Libvirt",
"icons": [
{
- "src": "/android-chrome-192x192.png",
+ "src": "/icons/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
- "src": "/android-chrome-256x256.png",
+ "src": "/icons/android-chrome-256x256.png",
"sizes": "256x256",
"type": "image/png"
}
diff --git a/docs/meson.build b/docs/meson.build
index 9abe70b45f..3795597234 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -6,19 +6,12 @@ docs_html_dir = docdir / 'html'
docs_builddir = join_paths(meson.current_build_dir(), '')
docs_assets = [
- 'android-chrome-192x192.png',
- 'android-chrome-256x256.png',
- 'apple-touch-icon.png',
'browserconfig.xml',
- 'favicon.ico',
- 'favicon-16x16.png',
- 'favicon-32x32.png',
'generic.css',
'libvirt.css',
'main.css',
'manifest.json',
'mobile.css',
- 'mstile-150x150.png',
]
docs_html_in_files = [
@@ -291,6 +284,7 @@ html_xslt_gen = []
subdir('fonts')
subdir('go')
subdir('html')
+subdir('icons')
subdir('images')
subdir('internals')
subdir('js')
diff --git a/docs/page.xsl b/docs/page.xsl
index 52716ba4a5..139c53e328 100644
--- a/docs/page.xsl
+++ b/docs/page.xsl
@@ -92,10 +92,10 @@
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width,
initial-scale=1"/>
<link rel="stylesheet" type="text/css"
href="{$href_base}main.css"/>
- <link rel="apple-touch-icon" sizes="180x180"
href="/apple-touch-icon.png"/>
- <link rel="shortcut icon" href="/favicon.ico"/>
- <link rel="icon" type="image/png" sizes="32x32"
href="/favicon-32x32.png"/>
- <link rel="icon" type="image/png" sizes="16x16"
href="/favicon-16x16.png"/>
+ <link rel="apple-touch-icon" sizes="180x180"
href="/icons/apple-touch-icon.png"/>
+ <link rel="shortcut icon" href="/icons/favicon.ico"/>
+ <link rel="icon" type="image/png" sizes="32x32"
href="/icons/favicon-32x32.png"/>
+ <link rel="icon" type="image/png" sizes="16x16"
href="/icons/favicon-16x16.png"/>
<link rel="manifest" href="/manifest.json"/>
<meta name="theme-color" content="#ffffff"/>
<title>libvirt: <xsl:value-of
select="html:html/html:body//html:h1"/></title>
--
2.31.1