Skip to content

Commit ed27243

Browse files
committed
ARROW-2012: [GLib] Support "make distclean"
Author: Kouhei Sutou <kou@clear-code.com> Closes apache#1494 from kou/glib-support-distclean and squashes the following commits: d660e0f [Kouhei Sutou] [GLib] Support "make distclean"
1 parent 1bbaf7e commit ed27243

File tree

8 files changed

+22
-66
lines changed

8 files changed

+22
-66
lines changed

c_glib/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ AC_CONFIG_FILES([
143143
arrow-gpu-glib/arrow-gpu-glib.pc
144144
doc/Makefile
145145
doc/reference/Makefile
146-
doc/reference/xml/Makefile
146+
doc/reference/entities.xml
147147
example/Makefile
148148
example/lua/Makefile
149149
tool/Makefile

c_glib/doc/reference/Makefile.am

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
SUBDIRS = \
19-
xml
20-
2118
DOC_MODULE = arrow-glib
2219

2320
DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
@@ -72,4 +69,5 @@ CLEANFILES += \
7269
$(DOC_MODULE).types
7370

7471
EXTRA_DIST += \
72+
entities.xml.in \
7573
meson.build

c_glib/doc/reference/arrow-glib-docs.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
2222
[
2323
<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
24-
<!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
24+
<!ENTITY % gtkdocentities SYSTEM "entities.xml">
2525
%gtkdocentities;
2626
]>
27-
<book id="index">
27+
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
2828
<bookinfo>
2929
<title>&package_name; Reference Manual</title>
3030
<releaseinfo>

c_glib/doc/reference/xml/gtkdocentities.ent.in c_glib/doc/reference/entities.xml.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
specific language governing permissions and limitations
1717
under the License.
1818
-->
19-
<!ENTITY package "@package@">
20-
<!ENTITY package_bugreport "@package_bugreport@">
21-
<!ENTITY package_name "@package_name@">
22-
<!ENTITY package_string "@package_string@">
23-
<!ENTITY package_url "@package_url@">
24-
<!ENTITY package_version "@package_version@">
19+
<!ENTITY package "@PACKAGE@">
20+
<!ENTITY package_bugreport "@PACKAGE_BUGREPORT@">
21+
<!ENTITY package_name "@PACKAGE_NAME@">
22+
<!ENTITY package_string "@PACKAGE_STRING@">
23+
<!ENTITY package_url "@PACKAGE_URL@">
24+
<!ENTITY package_version "@PACKAGE_VERSION@">

c_glib/doc/reference/meson.build

+12-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,18 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
subdir('xml')
20+
entities_conf = configuration_data()
21+
entities_conf.set('PACKAGE', meson.project_name())
22+
entities_conf.set('PACKAGE_BUGREPORT',
23+
'https://issues.apache.org/jira/browse/ARROW')
24+
entities_conf.set('PACKAGE_NAME', meson.project_name())
25+
entities_conf.set('PACKAGE_STRING',
26+
' '.join([meson.project_name(), version]))
27+
entities_conf.set('PACKAGE_URL', 'https://arrow.apache.org/')
28+
entities_conf.set('PACKAGE_VERSION', version)
29+
configure_file(input: 'entities.xml.in',
30+
output: 'entities.xml',
31+
configuration: entities_conf)
2132

2233
private_headers = [
2334
]

c_glib/doc/reference/xml/Makefile.am

-20
This file was deleted.

c_glib/doc/reference/xml/meson.build

-31
This file was deleted.

dev/gen_apidocs/create_documents.sh

-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ if [ -f Makefile ]; then
8787
# Ensure updating to prevent auto re-configure
8888
touch configure **/Makefile
8989
make distclean
90-
# Work around for 'make distclean' removes doc/reference/xml/
91-
git checkout doc/reference/xml
9290
fi
9391
./autogen.sh
9492
rm -rf build_docs

0 commit comments

Comments
 (0)