6:53 a.m.
When looking at switching libvirt.org to use files output from gitlab CI
I discovered some missing static assets
Daniel P. Berrangé (3):
docs: fix handling of static assets in build dir
docs: add missing files to static asset list
docs: remove old unused favicon file
docs/32favicon.png | Bin 783 -> 0 bytes
docs/Makefile.am | 41 ++++++++++++++++++++++++-----------------
2 files changed, 24 insertions(+), 17 deletions(-)
delete mode 100644 docs/32favicon.png
--
2.25.2
6:53 a.m.
New subject: [libvirt PATCH 1/3] docs: fix handling of static assets in build dir
We previously added a hack to symlink CSS files from the source dir into
the build dir, to allow the website to be browsed locally. We should
have also done this for any images.
This change merges several variables into one "$(assets)" so that we
treat all static files in the root dir the same way.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/Makefile.am | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6860efc888..c6518d653e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -48,7 +48,7 @@ vpathhack:
do \
test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \
done
- @for file in $(css); \
+ @for file in $(assets); \
do \
test -e $$file || ln -s $(srcdir)/$$file $$file ; \
done
@@ -58,7 +58,7 @@ clean-local:
do \
rm -f $$dir ; \
done
- for file in $(css); \
+ for file in $(assets); \
do \
rm -f $$file ; \
done
@@ -104,12 +104,6 @@ apipng = \
apirefdir = $(HTML_DIR)/html
apiref_DATA = $(apihtml) $(apiadminhtml) $(apiqemuhtml) $(apilxchtml) $(apipng)
-css = \
- generic.css \
- libvirt.css \
- mobile.css \
- main.css
-
javascript = \
js/main.js \
$(NULL)
@@ -156,20 +150,23 @@ logofiles = \
logofilesdir = $(HTML_DIR)/logos
logofiles_DATA = $(logofiles)
-png = \
+assets = \
32favicon.png \
+ architecture.gif \
+ generic.css \
+ libvirt.css \
libvirt-daemon-arch.png \
libvirt-driver-arch.png \
libvirt-object-model.png \
+ main.css \
migration-managed-direct.png \
migration-managed-p2p.png \
migration-native.png \
migration-tunnel.png \
- migration-unmanaged-direct.png
-
-gif = \
- architecture.gif \
- node.gif
+ migration-unmanaged-direct.png \
+ mobile.css \
+ node.gif \
+ $(NULL)
internals_html_in = \
$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in))
@@ -326,7 +323,7 @@ dot_html = \
$(dot_rst_html_in:%.html.in=%.html)
htmldir = $(HTML_DIR)
-html_DATA = $(css) $(png) $(gif) $(dot_html)
+html_DATA = $(assets) $(dot_html)
apidir = $(pkgdatadir)/api
api_DATA = \
@@ -351,8 +348,8 @@ schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
EXTRA_DIST= \
site.xsl subsite.xsl newapi.xsl page.xsl \
wrapstring.xsl \
- $(dot_html_in) $(dot_rst) $(gif) $(apipng) \
- $(fig) $(png) $(css) \
+ $(dot_html_in) $(dot_rst) $(apipng) \
+ $(fig) $(assets) \
$(javascript) $(logofiles) \
$(internals_html_in) $(internals_rst) $(fonts) \
$(kbase_html_in) $(kbase_rst) \
--
2.25.2
6:53 a.m.
New subject: [libvirt PATCH 2/3] docs: add missing files to static asset list
The various favicon files were missing from the favicon list, so never
installed, as was an example code diagram.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/Makefile.am | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index c6518d653e..f7b565c250 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -152,19 +152,29 @@ logofiles_DATA = $(logofiles)
assets = \
32favicon.png \
+ android-chrome-192x192.png \
+ android-chrome-256x256.png \
+ apple-touch-icon.png \
architecture.gif \
+ browserconfig.xml \
+ favicon.ico \
+ favicon-16x16.png \
+ favicon-32x32.png \
generic.css \
libvirt.css \
libvirt-daemon-arch.png \
libvirt-driver-arch.png \
libvirt-object-model.png \
+ libvirt-virConnect-example.png \
main.css \
+ manifest.json \
migration-managed-direct.png \
migration-managed-p2p.png \
migration-native.png \
migration-tunnel.png \
migration-unmanaged-direct.png \
mobile.css \
+ mstile-150x150.png \
node.gif \
$(NULL)
--
2.25.2
6:53 a.m.
New subject: [libvirt PATCH 3/3] docs: remove old unused favicon file
The use of 32favicon.png was removed when the new favicons were
introduced in
commit 40cb5581c4ace6c4a5b68990aaac4dff1b656054
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Wed Jul 26 18:22:11 2017 +0100
docs: add full set of "favicon" files to support modern clients
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/32favicon.png | Bin 783 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 docs/32favicon.png
diff --git a/docs/32favicon.png b/docs/32favicon.png
deleted file mode 100644
index 1af7c70d71996d00317384d37def563b1eeeec25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 783
zcmV+q1MvKbP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!p-DtRRCwB~
zRzZjoQ5b$YwWxzAf`^nsDlia2*;^qggt1;UD~S%FhYoeoW2X>2bhPj!A!?^3SX2m>
zF50PsLQ3eZP)Q^x(Su83#Pn?=v$M{uGdlAzpzqCl|M&mz{r~q5x%++}&$UPQi2$uu
zi`g8hRElpz%l=#q?VYFT6#~ECKb=mAGAs#T{Yq$W<sGam=g@NhM1yFz+wpjOBa8ih
zUz`BeuRnP#+)$}hHsXL!r^eowFHDym+>qMY5#1Jx#pK*@uh-lDG<`nbWHMP#kjZ2e
zrG(q<7SG+^Wo8m%e)$To%|tnn=_jEqTFg&3Ga~F$KOpMBY&Iv8$=2sO^TW(p|FBOU
z+`9wtS89~dI4+XHtN*F_os`~@kDrLw>$O^~!{M;eXs8xSB9Sl}jqK21Fjy>>d_FHy
z2iw8vbdJYkyWP$XT`pHHmy1Lq;c!@;2;jTN<I(AKI2?8crGUFH6bfq(*WoCa%Lrc%
zN3mEel}fc*jUB>w5Y+2+iJFpLBq(yY#m%gU_A<Nif{TFN!_BM*T)|?vCB2Bd9OPN2
z(@Ce(GII$>%0(a!Tnk^VqS0tD7^Emluh%Qd0_vpXG@3vl&}=qGqtRe6=ytm{n+<#@
zoY`!qPR?bsS(C{Gi|ml5X$)yW7upD#m8wBMLMZe3+;@XK3=xVV_6y|M^J6hk2M}cM
z&E0B|a1sVNgQ!8;WR``DoIBuIhZHZC4FD1?lHFSXO#`jtxPhRJ2!MuzC>0T)?XB;N
z2t}f%)`L|mNt{*W{Lcn_PMi~7vP41h3X@g3mHEGm#cuNHrQ5f}`@u%%3l34;|MKST
zpQ9sj0-5gfIfOpJ`q%2AIvowg0hJV%$hYbt8-!MQTC*Hy1@TXS0RXFX9&P9;Y3%?2
N002ovPDHLkV1hUQZOi}w
--
2.25.2
7:03 a.m.
New subject: [libvirt PATCH 3/3] docs: remove old unused favicon file
On Thu, Apr 16, 2020 at 12:53:45PM +0100, Daniel P. Berrangé wrote:
The use of 32favicon.png was removed when the new favicons were
introduced in
commit 40cb5581c4ace6c4a5b68990aaac4dff1b656054
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Wed Jul 26 18:22:11 2017 +0100
docs: add full set of "favicon" files to support modern clients
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
docs/32favicon.png | Bin 783 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 docs/32favicon.png
Sorry, didn't "git add" a chunk - consider this patch to also contain
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f7b565c250..ce3d296b19 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -151,7 +151,6 @@ logofilesdir = $(HTML_DIR)/logos
logofiles_DATA = $(logofiles)
assets = \
- 32favicon.png \
android-chrome-192x192.png \
android-chrome-256x256.png \
apple-touch-icon.png \
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
10:23 a.m.
On 4/16/20 7:53 AM, Daniel P. Berrangé wrote:
When looking at switching libvirt.org to use files output from gitlab
CI
I discovered some missing static assets
Daniel P. Berrangé (3):
docs: fix handling of static assets in build dir
docs: add missing files to static asset list
docs: remove old unused favicon file
docs/32favicon.png | Bin 783 -> 0 bytes
docs/Makefile.am | 41 ++++++++++++++++++++++++-----------------
2 files changed, 24 insertions(+), 17 deletions(-)
delete mode 100644 docs/32favicon.png
It looks correct, and make rpm is successful on my system (after squashing in the bit you
forgot), so
Reviewed-by: Laine Stump <laine(a)redhat.com>
1723
days inactive
1723
days old
5 comments
2 participants
participants (2)
-
Daniel P. Berrangé -
Laine Stump