File tree 8 files changed +22
-66
lines changed
8 files changed +22
-66
lines changed Original file line number Diff line number Diff line change @@ -143,7 +143,7 @@ AC_CONFIG_FILES([
143
143
arrow-gpu-glib/arrow-gpu-glib.pc
144
144
doc/Makefile
145
145
doc/reference/Makefile
146
- doc/reference/xml/Makefile
146
+ doc/reference/entities. xml
147
147
example/Makefile
148
148
example/lua/Makefile
149
149
tool/Makefile
Original file line number Diff line number Diff line change 15
15
# specific language governing permissions and limitations
16
16
# under the License.
17
17
18
- SUBDIRS = \
19
- xml
20
-
21
18
DOC_MODULE = arrow-glib
22
19
23
20
DOC_MAIN_SGML_FILE = $(DOC_MODULE ) -docs.xml
@@ -72,4 +69,5 @@ CLEANFILES += \
72
69
$(DOC_MODULE ) .types
73
70
74
71
EXTRA_DIST += \
72
+ entities.xml.in \
75
73
meson.build
Original file line number Diff line number Diff line change 21
21
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
22
22
[
23
23
<!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 " >
25
25
%gtkdocentities;
26
26
]>
27
- <book id =" index" >
27
+ <book id =" index" xmlns : xi = " http://www.w3.org/2003/XInclude " >
28
28
<bookinfo >
29
29
<title >&package_name; Reference Manual</title >
30
30
<releaseinfo >
Original file line number Diff line number Diff line change 16
16
specific language governing permissions and limitations
17
17
under the License.
18
18
-->
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 @">
Original file line number Diff line number Diff line change 17
17
# specific language governing permissions and limitations
18
18
# under the License.
19
19
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)
21
32
22
33
private_headers = [
23
34
]
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -87,8 +87,6 @@ if [ -f Makefile ]; then
87
87
# Ensure updating to prevent auto re-configure
88
88
touch configure ** /Makefile
89
89
make distclean
90
- # Work around for 'make distclean' removes doc/reference/xml/
91
- git checkout doc/reference/xml
92
90
fi
93
91
./autogen.sh
94
92
rm -rf build_docs
You can’t perform that action at this time.
0 commit comments