nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

generate asciidoc.conf via autoconf 

…instead of updating it in release.sh.
This commit is contained in:
Michael Stapelberg 2016-10-16 17:23:51 +02:00
parent cfe9824c1d
commit 05e5901bca
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -86,7 +86,7 @@ EXTRA_DIST = \
libi3/README \ libi3/README \
$(asciidoc_MANS:.1=.man) \ $(asciidoc_MANS:.1=.man) \
$(asciidoc_MANS:.1=.man) \ $(asciidoc_MANS:.1=.man) \
man/asciidoc.conf \ man/asciidoc.conf.in \
DEPENDS \ DEPENDS \
I3_VERSION \ I3_VERSION \
LICENSE \ LICENSE \
@ -200,7 +200,7 @@ $(asciidoc_MANS): man/%.1: man/%.xml man/$(dirstamp)
@stamp='$@'; $(MKDIR_P) "$${stamp%/*}" @stamp='$@'; $(MKDIR_P) "$${stamp%/*}"
man/%.xml: man/%.man man/asciidoc.conf man/$(dirstamp) man/%.xml: man/%.man man/asciidoc.conf man/$(dirstamp)
$(AM_V_GEN) @PATH_ASCIIDOC@ -d manpage -b docbook -f $(top_srcdir)/man/asciidoc.conf -o $@ $< $(AM_V_GEN) @PATH_ASCIIDOC@ -d manpage -b docbook -f $(top_builddir)/man/asciidoc.conf -o $@ $<
$(pod_MANS): man/%.1: % man/$(dirstamp) $(pod_MANS): man/%.1: % man/$(dirstamp)
$(AM_V_GEN) @PATH_POD2MAN@ --utf8 $< > $@ $(AM_V_GEN) @PATH_POD2MAN@ --utf8 $< > $@

2
configure.ac
View File

@ -118,7 +118,7 @@ AC_SUBST(AM_CFLAGS)
# Checks for header files. # Checks for header files.
AC_CHECK_HEADERS([fcntl.h float.h inttypes.h limits.h locale.h netinet/in.h paths.h stddef.h stdint.h stdlib.h string.h sys/param.h sys/socket.h sys/time.h unistd.h], , [AC_MSG_FAILURE([cannot find the $ac_header header, which i3 requires])]) AC_CHECK_HEADERS([fcntl.h float.h inttypes.h limits.h locale.h netinet/in.h paths.h stddef.h stdint.h stdlib.h string.h sys/param.h sys/socket.h sys/time.h unistd.h], , [AC_MSG_FAILURE([cannot find the $ac_header header, which i3 requires])])
AC_CONFIG_FILES([Makefile testcases/lib/i3test.pm]) AC_CONFIG_FILES([Makefile testcases/lib/i3test.pm man/asciidoc.conf])
AC_CONFIG_FILES([testcases/complete-run.pl], [chmod +x testcases/complete-run.pl]) AC_CONFIG_FILES([testcases/complete-run.pl], [chmod +x testcases/complete-run.pl])
# Enable address sanitizer for non-release builds. The performance hit is a # Enable address sanitizer for non-release builds. The performance hit is a

2
man/asciidoc.conf → man/asciidoc.conf.in
View File

@ -7,7 +7,7 @@ template::[header-declarations]
<refentrytitle>{mantitle}</refentrytitle> <refentrytitle>{mantitle}</refentrytitle>
<manvolnum>{manvolnum}</manvolnum> <manvolnum>{manvolnum}</manvolnum>
<refmiscinfo class="source">i3</refmiscinfo> <refmiscinfo class="source">i3</refmiscinfo>
<refmiscinfo class="version">4.12</refmiscinfo> <refmiscinfo class="version">@PACKAGE_VERSION@</refmiscinfo>
<refmiscinfo class="manual">i3 Manual</refmiscinfo> <refmiscinfo class="manual">i3 Manual</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>

1
release.sh
View File

@ -57,7 +57,6 @@ git add RELEASE-NOTES-${RELEASE_VERSION}
git rm RELEASE-NOTES-${PREVIOUS_VERSION} git rm RELEASE-NOTES-${PREVIOUS_VERSION}
sed -i "s,RELEASE-NOTES-${PREVIOUS_VERSION},RELEASE-NOTES-${RELEASE_VERSION},g" Makefile.am sed -i "s,RELEASE-NOTES-${PREVIOUS_VERSION},RELEASE-NOTES-${RELEASE_VERSION},g" Makefile.am
sed -i "s/AC_INIT(\[i3\], \[${PREVIOUS_VERSION}\]/AC_INIT([i3], [${RELEASE_VERSION}]/" configure.ac sed -i "s/AC_INIT(\[i3\], \[${PREVIOUS_VERSION}\]/AC_INIT([i3], [${RELEASE_VERSION}]/" configure.ac
sed -i "s,<refmiscinfo class=\"version\">[^<]*</refmiscinfo>,<refmiscinfo class=\"version\">${RELEASE_VERSION}</refmiscinfo>,g" man/asciidoc.conf
echo "${RELEASE_VERSION} ($(date +%F))" > I3_VERSION echo "${RELEASE_VERSION} ($(date +%F))" > I3_VERSION
git add I3_VERSION git add I3_VERSION
git commit -a -m "release i3 ${RELEASE_VERSION}" git commit -a -m "release i3 ${RELEASE_VERSION}"