From: Jani Nikula <jani.nikula@intel.com>
To: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>
Subject: Re: [maintainer-tools PATCH 3/5] doc: use window.onload to call WaveDrom.ProcessAll()
Date: Thu, 10 Aug 2017 11:32:27 +0300 [thread overview]
Message-ID: <878tiru8kk.fsf@intel.com> (raw)
In-Reply-To: <CABVU7+uPkR4oLJFj0pMy+mL-rFT066Un_Egq2p9DLXPVedOLXA@mail.gmail.com>
On Thu, 10 Aug 2017, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
> I don't know WaveDrom much... but it works so
>
> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Thanks, pushed the first three.
BR,
Jani.
>
> On Wed, Aug 9, 2017 at 2:08 PM, Jani Nikula <jani.nikula@intel.com> wrote:
>> Simplify the build by doing the WaveDrom processing from the rst file
>> (albeit raw html block) instead of post-processing the output html.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> Makefile | 6 ------
>> drm-intel-timeline.rst | 4 ++++
>> drm-misc-timeline.rst | 4 ++++
>> 3 files changed, 8 insertions(+), 6 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 8bbabae56741..7059eec42720 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -12,15 +12,9 @@ all: drm-intel.html dim.html drm-misc.html
>> %.html: %.rst
>> rst2html $< > $@
>>
>> -# the sed bit here is a hack to make wavedrom process the timeline
>> drm-intel.html: drm-intel.rst drm-intel-flow.svg drm-intel-timeline.rst drm-intel-timeline.json
>> - rst2html $< > $@
>> - sed -i 's/<body/<body onload="WaveDrom.ProcessAll()"/' $@
>>
>> -# the sed bit here is a hack to make wavedrom process the timeline
>> drm-misc.html: drm-misc.rst drm-misc-timeline.rst drm-misc-timeline.json drm-misc-commit-flow.svg
>> - rst2html $< > $@
>> - sed -i 's/<body/<body onload="WaveDrom.ProcessAll()"/' $@
>>
>> dim.html: dim.rst
>>
>> diff --git a/drm-intel-timeline.rst b/drm-intel-timeline.rst
>> index e1766a5df98b..3ab39afd5788 100644
>> --- a/drm-intel-timeline.rst
>> +++ b/drm-intel-timeline.rst
>> @@ -17,6 +17,10 @@
>>
>> .. raw:: html
>>
>> + function init() {
>> + WaveDrom.ProcessAll();
>> + }
>> + window.onload = init;
>> </script>
>> <script type="WaveDrom">
>>
>> diff --git a/drm-misc-timeline.rst b/drm-misc-timeline.rst
>> index 697277774362..a9a80d6a4cfb 100644
>> --- a/drm-misc-timeline.rst
>> +++ b/drm-misc-timeline.rst
>> @@ -8,6 +8,10 @@
>>
>> .. raw:: html
>>
>> + function init() {
>> + WaveDrom.ProcessAll();
>> + }
>> + window.onload = init;
>> </script>
>> <script type="text/javascript">
>> /* Embedded WaveDrom engine from http://wavedrom.com/WaveDrom.js */
>> --
>> 2.11.0
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-08-10 8:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-09 21:08 [maintainer-tools PATCH 0/5] add Sphinx doc build to maintainer tools Jani Nikula
2017-08-09 21:08 ` [maintainer-tools PATCH 1/5] mancheck: run dim.rst through rst2man Jani Nikula
2017-08-09 22:45 ` Rodrigo Vivi
2017-08-09 21:08 ` [maintainer-tools PATCH 2/5] build: add drm-misc-commit-flow.svg to clean target Jani Nikula
2017-08-09 22:45 ` Rodrigo Vivi
2017-08-09 21:08 ` [maintainer-tools PATCH 3/5] doc: use window.onload to call WaveDrom.ProcessAll() Jani Nikula
2017-08-09 22:49 ` Rodrigo Vivi
2017-08-10 8:32 ` Jani Nikula [this message]
2017-08-09 21:08 ` [maintainer-tools PATCH 4/5] doc: build documentation using Sphinx Jani Nikula
2017-08-09 22:56 ` Rodrigo Vivi
2017-08-10 6:49 ` Jani Nikula
2017-08-09 21:08 ` [maintainer-tools PATCH 5/5] doc: use Sphinx bizstyle builtin html theme Jani Nikula
2017-08-09 23:09 ` Rodrigo Vivi
2017-08-10 7:22 ` Jani Nikula
2017-08-10 15:11 ` Rodrigo Vivi
2017-08-09 21:33 ` [maintainer-tools PATCH 6/5] doc: load WaveDrom scripts directly from CDN instead of bundling Jani Nikula
2017-08-09 23:00 ` Rodrigo Vivi
2017-08-10 6:43 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878tiru8kk.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.