[Commits] [SCM] claws-win32-installer branch, master, updated. 3.18.0-2-5-gab93961
jonathan at claws-mail.org
jonathan at claws-mail.org
Mon Aug 23 16:34:53 UTC 2021
The branch, master has been updated
via ab93961df3b4da524a4aa38b3063855d9089d062 (commit)
via 60f56d6be378200a32ee92dfb8c2036473d6b0ed (commit)
from 8fa6105dc56a833eb8a0589f82b9a12dcc9d7cec (commit)
Summary of changes:
README | 12 ++++++++----
configure.ac | 21 ++++++++++++++++++---
src/Makefile.am | 12 +++++++++---
3 files changed, 35 insertions(+), 10 deletions(-)
- Log -----------------------------------------------------------------
commit ab93961df3b4da524a4aa38b3063855d9089d062
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Aug 20 03:03:46 2021 -0700
update readme
diff --git a/README b/README
index 0cce80d..6ed63a9 100644
--- a/README
+++ b/README
@@ -51,7 +51,7 @@ If any parameters are passed to autogen.sh, the first must be either
configure script.
-The configure script has three parameters for developers:
+The configure script has four parameters for developers:
--disable-fancy-plugin will skip building the fancy plugin and its dependencies
@@ -61,6 +61,8 @@ into separate .debug files
--enable-bzip2 will use faster bzip2 compression in the nsis installer instead
of smaller lzma
+--enable-debug will build packages with debug CFLAGS and configure options
+
The configure script looks for four environment variables:
@@ -84,7 +86,7 @@ Build examples
# Build an unstripped, 64-bit debug build suitable for use with cv2pdb
# cv2pdb will generate PDB symbols for use with native Microsoft tools
- $ ./autogen.sh --build-w64 --disable-strip CFLAGS="-Og -ggdb -pipe -mms-bitfields"
+ $ ./autogen.sh --build-w64 --disable-strip --enable-debug
Basic requirements
@@ -177,8 +179,10 @@ This requires editing a couple of files.
cm_pkg_<pkg>_make_args if the package needs special arguments to make
cm_pkg_<pkg>_make_args_inst if the package needs special arguments to make install
-4. Specify what files from the built package should be included in
- the installation (and uninstallation) in src/sections-(un)installer.nsi.
+4. Add a cm_pkg_<pkg>_version entry to src/config.nsi.in
+
+5. Specify what files from the built package should be included in
+the installation (and uninstallation) in src/sections-(un)installer.nsi.
Then follow the standard build instructions listed above.
commit 60f56d6be378200a32ee92dfb8c2036473d6b0ed
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Thu Aug 19 10:05:05 2021 -0700
add configure option to enable package debug flags
diff --git a/configure.ac b/configure.ac
index 4f4959f..cb80754 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,14 +95,28 @@ AC_SUBST(STRIP_BINARIES)
AC_ARG_ENABLE([bzip2],
AS_HELP_STRING([--enable-bzip2],[Use faster bzip2 compression for installer (default=no)]),
[nsis_bzip2=$enableval],
- [nsis_bzip2=$no])
+ [nsis_bzip2=no])
AS_IF([test "$nsis_bzip2" = yes],
[NSIS_COMPRESSOR=bzip2],
[NSIS_COMPRESSOR=lzma])
AC_SUBST(NSIS_COMPRESSOR)
-AS_IF([test -z "$CFLAGS"],
- [CM_CFLAGS="-O2 -pipe -ggdb -mms-bitfields"],
+AC_ARG_ENABLE([debug],
+ AS_HELP_STRING([--enable-debug],[Build packages with debug flags and options (default=no)]),
+ [build_debug=$enableval],
+ [build_debug=no])
+AS_IF([test "$build_debug" = yes],
+ [ENABLE_DEBUG_OPTS=yes],
+ [ENABLE_DEBUG_OPTS=no])
+AM_CONDITIONAL([ENABLE_DEBUG_OPTS], [test x$build_debug = xyes])
+
+rel_cflags="-O2 -pipe -ggdb -mms-bitfields"
+deb_cflags="-Og -pipe -ggdb -mms-bitfields"
+AS_IF([test "$ENABLE_DEBUG_OPTS" = yes],
+ [CM_CFLAGS=$deb_cflags],
+ [CM_CFLAGS=$rel_cflags])
+
+AS_IF([test -n "$CFLAGS"],
[CM_CFLAGS=$CFLAGS])
AS_IF([test -z "$CXXFLAGS"],
[CM_CXXFLAGS=$CM_CFLAGS],
@@ -306,6 +320,7 @@ echo "
Fancy plugin: $ENABLE_FANCY_PLUGIN
Strip binaries: $STRIP_BINARIES
NSIS compression: $NSIS_COMPRESSOR
+ Enable debug options: $ENABLE_DEBUG_OPTS
Default package CFLAGS: $CM_CFLAGS
Default package CXXFLAGS: $CM_CXXFLAGS
Default make jobs: $CM_MAKE_JOBS
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a619c2..5dc24f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,7 +70,11 @@ cm_pkg_regex_configure = \
cm_pkg_glib_configure = \
-Dinternal_pcre=true
+if ENABLE_DEBUG_OPTS
+cm_pkg_glib_meson_cppflags = -I$(idir)/include -DG_ENABLE_DEBUG
+else
cm_pkg_glib_meson_cppflags = -I$(idir)/include
+endif
cm_pkg_glib_meson_ldflags = -L$(idir)/lib
cm_pkg_gdk_pixbuf_configure = \
@@ -315,14 +319,16 @@ cm_pkg_libwebp_configure = \
CPPFLAGS=-I$(idir)/include
# --enable-debug-symbols=yes|full sets -ggdb which causes the ICE below
+if ENABLE_DEBUG_OPTS
webkitgtk_debug = \
--enable-debug \
--enable-debug-symbols=min \
--enable-developer-mode=no \
--enable-optimizations=no
-
-webkitgtk_release = \
+else
+webkitgtk_debug = \
--disable-debug
+endif
cm_pkg_webkitgtk_configure = \
--disable-webkit2 \
@@ -347,7 +353,7 @@ cm_pkg_webkitgtk_configure = \
--disable-gamepad \
--disable-webgl \
--disable-glibtest \
- $(webkitgtk_release) \
+ $(webkitgtk_debug) \
--disable-accelerated-compositing \
--enable-silent-rules \
CPPFLAGS="-I$(idir)/include -Wno-expansion-to-defined -Wno-class-memaccess" \
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list