summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWonki Kim <wonki_.kim@samsung.com>2019-12-10 12:37:49 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-12-10 12:53:39 +0100
commita8d7816782a1f48c12f2387a85168175f5baf7e2 (patch)
tree6f1c3ac1fcafe6690679488d6957b40b44b1c3dc /doc
parentcbd02d3d51c6cbb6c118467088c6cd40f8114820 (diff)
downloadefl-a8d7816782a1f48c12f2387a85168175f5baf7e2.tar.gz
docs: fix to make docs contain proper images
Summary: links to images that this patch is modifying would be included in doxy docs without pre or post process something in meson definition, if we applied this patch. Reviewers: segfaultxavi, bu5hm4n Reviewed By: segfaultxavi Subscribers: bu5hm4n, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10821
Diffstat (limited to 'doc')
-rw-r--r--doc/ecore_examples.dox10
-rwxr-xr-xdoc/efl_copy.sh1
-rw-r--r--doc/meson.build11
3 files changed, 3 insertions, 19 deletions
diff --git a/doc/ecore_examples.dox b/doc/ecore_examples.dox
index 64542779d5..c02de6f1d7 100644
--- a/doc/ecore_examples.dox
+++ b/doc/ecore_examples.dox
@@ -813,12 +813,9 @@
*
* This example will start a server and start accepting connections from clients, as
* demonstrated in the following diagram:
- * @htmlonly
- * <img src="ecore_con-client-server-example.png" style="max-width: 400px"/>
- * <a href="ecore_con-client-server-example.png">Full size</a>
- * @endhtmlonly
*
* @image rtf ecore_con-client-server-example.png
+ * @image html ecore_con-client-server-example.png
* @image latex ecore_con-client-server-example.eps width=\textwidth
*
* @note This example contains a serious security flaw: it doesn't check for the
@@ -877,12 +874,9 @@
*
* This example will connect to the server and start comunicating with it, as
* demonstrated in the following diagram:
- * @htmlonly
- * <img src="ecore_con-client-server-example2.png" style="max-width: 400px"/>
- * <a href="ecore_con-client-server-example2.png">Full size</a>
- * @endhtmlonly
*
* @image rtf ecore_con-client-server-example2.png
+ * @image html ecore_con-client-server-example2.png
* @image latex ecore_con-client-server-example2.eps width=\textwidth
*
* @note This example contains a serious security flaw: it doesn't check for the
diff --git a/doc/efl_copy.sh b/doc/efl_copy.sh
deleted file mode 100755
index af975fbd8f..0000000000
--- a/doc/efl_copy.sh
+++ /dev/null
@@ -1 +0,0 @@
-cp $@
diff --git a/doc/meson.build b/doc/meson.build
index 18b9aeecf4..5ad389828c 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -104,8 +104,6 @@ widget_preview_eps = custom_target('widget_preview_prefs_epc',
shot_sh = find_program('shot.sh')
tar = find_program('tar')
-efl_copy = find_program('efl_copy.sh')
-
foreach text_filter_property : text_filter_properties
text = text_filter_property[0]
font = text_filter_property[1]
@@ -182,17 +180,10 @@ doc_target += custom_target('doxygen',
build_by_default: false
)
-# This is not pretty but meson does not seem to allow wildcards in plain cp commands
-copy_images = custom_target('documentation images',
- command: [efl_copy, '-rf', join_paths(meson.current_source_dir(), 'img', '*.png'), 'html'],
- output: ['empty_img_copy'],
- build_by_default: false
-)
-
compress_target = custom_target('package_doc_tar',
command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'],
output: 'efl-'+meson.project_version()+'-doc.tar.xz',
- depends: [doc_target, copy_images],
+ depends: [doc_target],
build_by_default: false
)