You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2018/01/21 13:12:17 UTC
[arrow] branch master updated: ARROW-2012: [GLib] Support "make
distclean"
This is an automated email from the ASF dual-hosted git repository.
kou 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 ed27243 ARROW-2012: [GLib] Support "make distclean"
ed27243 is described below
commit ed272430e310102c750cf997cc2ad5dace2d3323
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Sun Jan 21 22:10:34 2018 +0900
ARROW-2012: [GLib] Support "make distclean"
Author: Kouhei Sutou <ko...@clear-code.com>
Closes #1494 from kou/glib-support-distclean and squashes the following commits:
d660e0f8 [Kouhei Sutou] [GLib] Support "make distclean"
---
c_glib/configure.ac | 2 +-
c_glib/doc/reference/Makefile.am | 4 +--
c_glib/doc/reference/arrow-glib-docs.xml | 4 +--
.../{xml/gtkdocentities.ent.in => entities.xml.in} | 12 ++++-----
c_glib/doc/reference/meson.build | 13 ++++++++-
c_glib/doc/reference/xml/Makefile.am | 20 --------------
c_glib/doc/reference/xml/meson.build | 31 ----------------------
dev/gen_apidocs/create_documents.sh | 2 --
8 files changed, 22 insertions(+), 66 deletions(-)
diff --git a/c_glib/configure.ac b/c_glib/configure.ac
index eabe7ba..f4f2c99 100644
--- a/c_glib/configure.ac
+++ b/c_glib/configure.ac
@@ -143,7 +143,7 @@ AC_CONFIG_FILES([
arrow-gpu-glib/arrow-gpu-glib.pc
doc/Makefile
doc/reference/Makefile
- doc/reference/xml/Makefile
+ doc/reference/entities.xml
example/Makefile
example/lua/Makefile
tool/Makefile
diff --git a/c_glib/doc/reference/Makefile.am b/c_glib/doc/reference/Makefile.am
index 4c005c2..454c2b0 100644
--- a/c_glib/doc/reference/Makefile.am
+++ b/c_glib/doc/reference/Makefile.am
@@ -15,9 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-SUBDIRS = \
- xml
-
DOC_MODULE = arrow-glib
DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
@@ -72,4 +69,5 @@ CLEANFILES += \
$(DOC_MODULE).types
EXTRA_DIST += \
+ entities.xml.in \
meson.build
diff --git a/c_glib/doc/reference/arrow-glib-docs.xml b/c_glib/doc/reference/arrow-glib-docs.xml
index 51e7b2a..23d1e9a 100644
--- a/c_glib/doc/reference/arrow-glib-docs.xml
+++ b/c_glib/doc/reference/arrow-glib-docs.xml
@@ -21,10 +21,10 @@
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
- <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+ <!ENTITY % gtkdocentities SYSTEM "entities.xml">
%gtkdocentities;
]>
-<book id="index">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>&package_name; Reference Manual</title>
<releaseinfo>
diff --git a/c_glib/doc/reference/xml/gtkdocentities.ent.in b/c_glib/doc/reference/entities.xml.in
similarity index 76%
rename from c_glib/doc/reference/xml/gtkdocentities.ent.in
rename to c_glib/doc/reference/entities.xml.in
index dc0cf1a..aa5addb 100644
--- a/c_glib/doc/reference/xml/gtkdocentities.ent.in
+++ b/c_glib/doc/reference/entities.xml.in
@@ -16,9 +16,9 @@
specific language governing permissions and limitations
under the License.
-->
-<!ENTITY package "@package@">
-<!ENTITY package_bugreport "@package_bugreport@">
-<!ENTITY package_name "@package_name@">
-<!ENTITY package_string "@package_string@">
-<!ENTITY package_url "@package_url@">
-<!ENTITY package_version "@package_version@">
+<!ENTITY package "@PACKAGE@">
+<!ENTITY package_bugreport "@PACKAGE_BUGREPORT@">
+<!ENTITY package_name "@PACKAGE_NAME@">
+<!ENTITY package_string "@PACKAGE_STRING@">
+<!ENTITY package_url "@PACKAGE_URL@">
+<!ENTITY package_version "@PACKAGE_VERSION@">
diff --git a/c_glib/doc/reference/meson.build b/c_glib/doc/reference/meson.build
index 3374fbd..431aa0a 100644
--- a/c_glib/doc/reference/meson.build
+++ b/c_glib/doc/reference/meson.build
@@ -17,7 +17,18 @@
# specific language governing permissions and limitations
# under the License.
-subdir('xml')
+entities_conf = configuration_data()
+entities_conf.set('PACKAGE', meson.project_name())
+entities_conf.set('PACKAGE_BUGREPORT',
+ 'https://issues.apache.org/jira/browse/ARROW')
+entities_conf.set('PACKAGE_NAME', meson.project_name())
+entities_conf.set('PACKAGE_STRING',
+ ' '.join([meson.project_name(), version]))
+entities_conf.set('PACKAGE_URL', 'https://arrow.apache.org/')
+entities_conf.set('PACKAGE_VERSION', version)
+configure_file(input: 'entities.xml.in',
+ output: 'entities.xml',
+ configuration: entities_conf)
private_headers = [
]
diff --git a/c_glib/doc/reference/xml/Makefile.am b/c_glib/doc/reference/xml/Makefile.am
deleted file mode 100644
index 833cfdd..0000000
--- a/c_glib/doc/reference/xml/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-EXTRA_DIST = \
- gtkdocentities.ent.in \
- meson.build
diff --git a/c_glib/doc/reference/xml/meson.build b/c_glib/doc/reference/xml/meson.build
deleted file mode 100644
index 5b65042..0000000
--- a/c_glib/doc/reference/xml/meson.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- indent-tabs-mode: nil -*-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-entities_conf = configuration_data()
-entities_conf.set('package', meson.project_name())
-entities_conf.set('package_bugreport',
- 'https://issues.apache.org/jira/browse/ARROW')
-entities_conf.set('package_name', meson.project_name())
-entities_conf.set('package_string',
- ' '.join([meson.project_name(), version]))
-entities_conf.set('package_url', 'https://arrow.apache.org/')
-entities_conf.set('package_version', version)
-configure_file(input: 'gtkdocentities.ent.in',
- output: 'gtkdocentities.ent',
- configuration: entities_conf)
diff --git a/dev/gen_apidocs/create_documents.sh b/dev/gen_apidocs/create_documents.sh
index 5403126..3100d3b 100755
--- a/dev/gen_apidocs/create_documents.sh
+++ b/dev/gen_apidocs/create_documents.sh
@@ -87,8 +87,6 @@ if [ -f Makefile ]; then
# Ensure updating to prevent auto re-configure
touch configure **/Makefile
make distclean
- # Work around for 'make distclean' removes doc/reference/xml/
- git checkout doc/reference/xml
fi
./autogen.sh
rm -rf build_docs
--
To stop receiving notification emails like this one, please contact
['"commits@arrow.apache.org" <co...@arrow.apache.org>'].