You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by uw...@apache.org on 2017/11/15 12:26:33 UTC

[arrow] branch master updated: ARROW-1809: [GLib] Use .xml instead of .sgml for GTK-Doc main file

This is an automated email from the ASF dual-hosted git repository.

uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 1d951b5  ARROW-1809: [GLib] Use .xml instead of .sgml for GTK-Doc main file
1d951b5 is described below

commit 1d951b5d2799b08b9ce81902e525390054b05fe4
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Wed Nov 15 13:26:28 2017 +0100

    ARROW-1809: [GLib] Use .xml instead of .sgml for GTK-Doc main file
    
    .sgml is old extension:
    
    https://developer.gnome.org/gtk-doc-manual/unstable/settingup_firstrun.html.en
    
    > `<package>-docs.xml` (in the past `.sgml`)
    
    Author: Kouhei Sutou <ko...@clear-code.com>
    
    Closes #1318 from kou/glib-doc-use-xml and squashes the following commits:
    
    138c199 [Kouhei Sutou] [GLib] Use .xml instead of .sgml for GTK-Doc main file
---
 c_glib/doc/reference/Makefile.am                                   | 2 +-
 c_glib/doc/reference/{arrow-glib-docs.sgml => arrow-glib-docs.xml} | 0
 c_glib/doc/reference/meson.build                                   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/c_glib/doc/reference/Makefile.am b/c_glib/doc/reference/Makefile.am
index 896aff5..4c005c2 100644
--- a/c_glib/doc/reference/Makefile.am
+++ b/c_glib/doc/reference/Makefile.am
@@ -20,7 +20,7 @@ SUBDIRS =                                       \
 
 DOC_MODULE = arrow-glib
 
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 
 DOC_SOURCE_DIR =				\
 	$(top_srcdir)/arrow-glib
diff --git a/c_glib/doc/reference/arrow-glib-docs.sgml b/c_glib/doc/reference/arrow-glib-docs.xml
similarity index 100%
rename from c_glib/doc/reference/arrow-glib-docs.sgml
rename to c_glib/doc/reference/arrow-glib-docs.xml
diff --git a/c_glib/doc/reference/meson.build b/c_glib/doc/reference/meson.build
index 4c9552e..3374fbd 100644
--- a/c_glib/doc/reference/meson.build
+++ b/c_glib/doc/reference/meson.build
@@ -49,7 +49,7 @@ if arrow_gpu_dependency.found()
   ]
 endif
 gnome.gtkdoc(meson.project_name(),
-             main_xml: meson.project_name() + '-docs.sgml',
+             main_xml: meson.project_name() + '-docs.xml',
              src_dir: source_directories,
              dependencies: dependencies,
              gobject_typesfile: meson.project_name() + '.types',

-- 
To stop receiving notification emails like this one, please contact
['"commits@arrow.apache.org" <co...@arrow.apache.org>'].