Turn on debug if $VERSION is master rather than commenting and uncommenting.

This commit is contained in:
Nicholas Marriott 2017-04-20 12:06:39 +01:00
parent 48371216df
commit aebbb15fe2
3 changed files with 11 additions and 17 deletions

View File

@ -8,8 +8,6 @@ CLEANFILES = tmux.1.mdoc tmux.1.man
EXTRA_DIST = \ EXTRA_DIST = \
CHANGES FAQ README TODO COPYING example_tmux.conf compat/*.[ch] \ CHANGES FAQ README TODO COPYING example_tmux.conf compat/*.[ch] \
osdep-*.c mdoc2man.awk tmux.1 osdep-*.c mdoc2man.awk tmux.1
dist-hook:
grep "^#enable_debug=" configure
# Preprocessor flags. # Preprocessor flags.
AM_CPPFLAGS += @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\"" AM_CPPFLAGS += @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\""

24
SYNCING
View File

@ -140,16 +140,12 @@ to compat/ as and when appropriate.
Release tmux for next version Release tmux for next version
============================= =============================
1. Comment the "enable_debug=yes" line in configure.ac, since releases 1. Update and commit README and CHANGES. The former should be checked for
don't have debugging enabled, otherwise make(1) aborts when
preparing the distribution.
2. Update and commit README and CHANGES. The former should be checked for
anything outdated and updated with a list of things that might break anything outdated and updated with a list of things that might break
upgrades and the latter should mention all the major changes since upgrades and the latter should mention all the major changes since
the last version. the last version.
3. Tag with: 2. Tag with:
% git tag -a 2.X % git tag -a 2.X
@ -157,20 +153,20 @@ Release tmux for next version
Push the tag out with: Push the tag out with:
% git push 2.X % git push --tags
4. Build the tarball with 'make dist'. 3. Build the tarball with 'make dist'.
5. Check the tarball. If it's good, go here to select the tag just pushed: 4. Check the tarball. If it's good, go here to select the tag just pushed:
https://github.com/tmux/tmux/tags https://github.com/tmux/tmux/tags
Click the "Add release notes", upload the tarball and add a link in the Click the "Add release notes", upload the tarball and add a link in the
description field to the CHANGES file. description field to the CHANGES file.
7. Clone the tmux.github.io repository, and change the RELEASE version in 5. Clone the tmux.github.io repository, and change the RELEASE version in the
the Makefile. Commit it, and run 'make' to replace %%VERSION%%. Push Makefile. Commit it, and run 'make' to replace %%VERSION%%. Push the
the result out. result out.
8. Bump version in tmux/tmux.git configure.ac and uncomment "enable_debug=yes" to 6. Bump version in tmux/tmux.git configure.ac and uncomment "enable_debug=yes"
create a debug build by default. to create a debug build by default.

View File

@ -35,7 +35,7 @@ AC_USE_SYSTEM_EXTENSIONS
test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
# Is this --enable-debug? # Is this --enable-debug?
enable_debug=yes test "x$VERSION" = xmaster && enable_debug=yes
AC_ARG_ENABLE( AC_ARG_ENABLE(
debug, debug,
AC_HELP_STRING(--enable-debug, enable debug build flags), AC_HELP_STRING(--enable-debug, enable debug build flags),