mirror of https://github.com/djcb/mu.git
build: bump version 1.7.13
And some small tweaks, cleanups
This commit is contained in:
parent
b21263da4a
commit
9c853acfa3
|
@ -19,7 +19,11 @@
|
||||||
NINJA ?= ninja
|
NINJA ?= ninja
|
||||||
BUILDDIR ?= $(CURDIR)/build
|
BUILDDIR ?= $(CURDIR)/build
|
||||||
MESON ?= meson
|
MESON ?= meson
|
||||||
|
V ?= 0
|
||||||
|
|
||||||
|
ifneq ($(V),0)
|
||||||
|
VERBOSE=--verbose
|
||||||
|
endif
|
||||||
|
|
||||||
# MESON_FLAGS, e.g. "-Dreadline=enabled"
|
# MESON_FLAGS, e.g. "-Dreadline=enabled"
|
||||||
|
|
||||||
|
@ -28,7 +32,7 @@ MESON ?= meson
|
||||||
# make clean all MESON_FLAGS="-Db_sanitize=thread" CXX=clang++ CC=clang
|
# make clean all MESON_FLAGS="-Db_sanitize=thread" CXX=clang++ CC=clang
|
||||||
|
|
||||||
all: $(BUILDDIR)
|
all: $(BUILDDIR)
|
||||||
$(NINJA) -C $(BUILDDIR)
|
$(NINJA) -C $(BUILDDIR) $(VERBOSE)
|
||||||
|
|
||||||
$(BUILDDIR):
|
$(BUILDDIR):
|
||||||
$(MESON) $(MESON_FLAGS) $(BUILDDIR)
|
$(MESON) $(MESON_FLAGS) $(BUILDDIR)
|
||||||
|
@ -36,10 +40,7 @@ $(BUILDDIR):
|
||||||
check: test
|
check: test
|
||||||
|
|
||||||
test: all
|
test: all
|
||||||
$(MESON) test -C $(BUILDDIR)
|
$(MESON) test $(VERBOSE) -C $(BUILDDIR)
|
||||||
|
|
||||||
test-verbose: all
|
|
||||||
$(MESON) test --verbose -C $(BUILDDIR)
|
|
||||||
|
|
||||||
test-verbose-if-fail: all
|
test-verbose-if-fail: all
|
||||||
@cd $(BUILDDIR); $(MESON) test || $(MESON) test --verbose
|
@cd $(BUILDDIR); $(MESON) test || $(MESON) test --verbose
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
AC_PREREQ([2.68])
|
AC_PREREQ([2.68])
|
||||||
AC_INIT([mu],[1.7.12],[https://github.com/djcb/mu/issues],[mu])
|
AC_INIT([mu],[1.7.13],[https://github.com/djcb/mu/issues],[mu])
|
||||||
AC_COPYRIGHT([Copyright (C) 2008-2021 Dirk-Jan C. Binnema])
|
AC_COPYRIGHT([Copyright (C) 2008-2021 Dirk-Jan C. Binnema])
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
AC_CONFIG_SRCDIR([mu/mu.cc])
|
AC_CONFIG_SRCDIR([mu/mu.cc])
|
||||||
|
|
|
@ -23,45 +23,24 @@ lib_mu=static_library(
|
||||||
'mu',
|
'mu',
|
||||||
[
|
[
|
||||||
'mu-bookmarks.cc',
|
'mu-bookmarks.cc',
|
||||||
'mu-bookmarks.hh',
|
|
||||||
'mu-contacts-cache.cc',
|
'mu-contacts-cache.cc',
|
||||||
'mu-contacts-cache.hh',
|
|
||||||
'mu-data.hh',
|
|
||||||
'mu-parser.cc',
|
'mu-parser.cc',
|
||||||
'mu-parser.hh',
|
|
||||||
'mu-query.cc',
|
'mu-query.cc',
|
||||||
'mu-query.hh',
|
|
||||||
'mu-query-results.hh',
|
|
||||||
'mu-query-match-deciders.cc',
|
'mu-query-match-deciders.cc',
|
||||||
'mu-query-match-deciders.hh',
|
|
||||||
'mu-query-threads.cc',
|
'mu-query-threads.cc',
|
||||||
'mu-query-threads.hh',
|
|
||||||
'mu-runtime.cc',
|
'mu-runtime.cc',
|
||||||
'mu-runtime.hh',
|
|
||||||
'mu-script.cc',
|
'mu-script.cc',
|
||||||
'mu-script.hh',
|
|
||||||
'mu-server.cc',
|
'mu-server.cc',
|
||||||
'mu-server.hh',
|
|
||||||
'mu-store.cc',
|
'mu-store.cc',
|
||||||
'mu-store.hh',
|
|
||||||
'mu-tokenizer.cc',
|
'mu-tokenizer.cc',
|
||||||
'mu-tokenizer.hh',
|
|
||||||
'mu-tree.hh',
|
|
||||||
'mu-xapian.cc',
|
'mu-xapian.cc',
|
||||||
'mu-xapian.hh',
|
|
||||||
'mu-maildir.cc',
|
'mu-maildir.cc',
|
||||||
'mu-maildir.hh',
|
|
||||||
'mu-msg-crypto.cc',
|
'mu-msg-crypto.cc',
|
||||||
'mu-msg-doc.cc',
|
'mu-msg-doc.cc',
|
||||||
'mu-msg-doc.hh',
|
|
||||||
'mu-msg-file.cc',
|
'mu-msg-file.cc',
|
||||||
'mu-msg-file.hh',
|
|
||||||
'mu-msg-part.cc',
|
'mu-msg-part.cc',
|
||||||
'mu-msg-part.hh',
|
|
||||||
'mu-msg-priv.hh',
|
|
||||||
'mu-msg-sexp.cc',
|
'mu-msg-sexp.cc',
|
||||||
'mu-msg.cc',
|
'mu-msg.cc',
|
||||||
'mu-msg.hh',
|
|
||||||
],
|
],
|
||||||
dependencies: [
|
dependencies: [
|
||||||
glib_dep,
|
glib_dep,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
## Copyright (C) 2021 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
|
## Copyright (C) 2022 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
|
||||||
##
|
##
|
||||||
## This program is free software; you can redistribute it and/or modify
|
## This program is free software; you can redistribute it and/or modify
|
||||||
## it under the terms of the GNU General Public License as published by
|
## it under the terms of the GNU General Public License as published by
|
||||||
|
@ -19,22 +19,14 @@ lib_mu_message=static_library(
|
||||||
'mu-message',
|
'mu-message',
|
||||||
[
|
[
|
||||||
'mu-message.cc',
|
'mu-message.cc',
|
||||||
'mu-message.hh',
|
|
||||||
'mu-message-part.cc',
|
'mu-message-part.cc',
|
||||||
'mu-message-part.hh',
|
|
||||||
'mu-message-sexp.cc',
|
'mu-message-sexp.cc',
|
||||||
'mu-contact.hh',
|
|
||||||
'mu-contact.cc',
|
'mu-contact.cc',
|
||||||
'mu-document.cc',
|
'mu-document.cc',
|
||||||
'mu-document.hh',
|
|
||||||
'mu-fields.hh',
|
|
||||||
'mu-fields.cc',
|
'mu-fields.cc',
|
||||||
'mu-flags.hh',
|
|
||||||
'mu-flags.cc',
|
'mu-flags.cc',
|
||||||
'mu-priority.hh',
|
|
||||||
'mu-priority.cc',
|
'mu-priority.cc',
|
||||||
'mu-mime-object.cc',
|
'mu-mime-object.cc',
|
||||||
'mu-mime-object.hh'
|
|
||||||
],
|
],
|
||||||
dependencies: [
|
dependencies: [
|
||||||
glib_dep,
|
glib_dep,
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
# project setup
|
# project setup
|
||||||
#
|
#
|
||||||
project('mu', ['c', 'cpp'],
|
project('mu', ['c', 'cpp'],
|
||||||
version: '1.7.12',
|
version: '1.7.13',
|
||||||
meson_version: '>= 0.52.0', # debian 10
|
meson_version: '>= 0.52.0', # debian 10
|
||||||
license: 'GPL-3.0-or-later',
|
license: 'GPL-3.0-or-later',
|
||||||
default_options : [
|
default_options : [
|
||||||
|
@ -45,7 +45,6 @@ extra_flags = [
|
||||||
'-Wno-#warnings'
|
'-Wno-#warnings'
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
if get_option('buildtype') == 'debug'
|
if get_option('buildtype') == 'debug'
|
||||||
extra_flags += [
|
extra_flags += [
|
||||||
'-ggdb',
|
'-ggdb',
|
||||||
|
|
Loading…
Reference in New Issue