summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-12-11 13:04:21 +0900
committerHermet Park <hermetpark@gmail.com>2019-12-11 13:04:21 +0900
commit421836c1166dbc2c5c54fe9497766bab2cb979bc (patch)
treef9809f606fa9a7e1341781cdf5042016c4db895e /doc
parent6fa91c71d8c63573883f57e397e788606029ba43 (diff)
parent3359e03500d63eb7b0384e6cf10e92e0f3a736ef (diff)
Merge branch 'master' into devs/hermet/lottie
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 @@
813 * 813 *
814 * This example will start a server and start accepting connections from clients, as 814 * This example will start a server and start accepting connections from clients, as
815 * demonstrated in the following diagram: 815 * demonstrated in the following diagram:
816 * @htmlonly
817 * <img src="ecore_con-client-server-example.png" style="max-width: 400px"/>
818 * <a href="ecore_con-client-server-example.png">Full size</a>
819 * @endhtmlonly
820 * 816 *
821 * @image rtf ecore_con-client-server-example.png 817 * @image rtf ecore_con-client-server-example.png
818 * @image html ecore_con-client-server-example.png
822 * @image latex ecore_con-client-server-example.eps width=\textwidth 819 * @image latex ecore_con-client-server-example.eps width=\textwidth
823 * 820 *
824 * @note This example contains a serious security flaw: it doesn't check for the 821 * @note This example contains a serious security flaw: it doesn't check for the
@@ -877,12 +874,9 @@
877 * 874 *
878 * This example will connect to the server and start comunicating with it, as 875 * This example will connect to the server and start comunicating with it, as
879 * demonstrated in the following diagram: 876 * demonstrated in the following diagram:
880 * @htmlonly
881 * <img src="ecore_con-client-server-example2.png" style="max-width: 400px"/>
882 * <a href="ecore_con-client-server-example2.png">Full size</a>
883 * @endhtmlonly
884 * 877 *
885 * @image rtf ecore_con-client-server-example2.png 878 * @image rtf ecore_con-client-server-example2.png
879 * @image html ecore_con-client-server-example2.png
886 * @image latex ecore_con-client-server-example2.eps width=\textwidth 880 * @image latex ecore_con-client-server-example2.eps width=\textwidth
887 * 881 *
888 * @note This example contains a serious security flaw: it doesn't check for the 882 * @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 @@
1cp $@
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',
104 104
105shot_sh = find_program('shot.sh') 105shot_sh = find_program('shot.sh')
106tar = find_program('tar') 106tar = find_program('tar')
107efl_copy = find_program('efl_copy.sh')
108
109foreach text_filter_property : text_filter_properties 107foreach text_filter_property : text_filter_properties
110 text = text_filter_property[0] 108 text = text_filter_property[0]
111 font = text_filter_property[1] 109 font = text_filter_property[1]
@@ -182,17 +180,10 @@ doc_target += custom_target('doxygen',
182 build_by_default: false 180 build_by_default: false
183) 181)
184 182
185# This is not pretty but meson does not seem to allow wildcards in plain cp commands
186copy_images = custom_target('documentation images',
187 command: [efl_copy, '-rf', join_paths(meson.current_source_dir(), 'img', '*.png'), 'html'],
188 output: ['empty_img_copy'],
189 build_by_default: false
190)
191
192compress_target = custom_target('package_doc_tar', 183compress_target = custom_target('package_doc_tar',
193 command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'], 184 command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'],
194 output: 'efl-'+meson.project_version()+'-doc.tar.xz', 185 output: 'efl-'+meson.project_version()+'-doc.tar.xz',
195 depends: [doc_target, copy_images], 186 depends: [doc_target],
196 build_by_default: false 187 build_by_default: false
197) 188)
198 189