packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: DevelBuild=yes to `ostree --version` for devel builds 

And use it in `test-symbols.sh`, to fix the `distcheck` case;
the previous change stopped distributing `libostree-devel.sym`
in release builds.

Closes: #944
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-06-19 11:23:45 -04:00 committed by Atomic Bot
parent 6729b7c264
commit 2a082b20b8
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -460,7 +460,10 @@ AS_IF([test x$enable_experimental_api = xyes],
) )
AM_CONDITIONAL([ENABLE_EXPERIMENTAL_API],[test x$enable_experimental_api = xyes]) AM_CONDITIONAL([ENABLE_EXPERIMENTAL_API],[test x$enable_experimental_api = xyes])
AM_CONDITIONAL([BUILDOPT_IS_DEVEL_BUILD],[test x$is_release_build != xyes]) AM_CONDITIONAL([BUILDOPT_IS_DEVEL_BUILD],[test x$is_release_build != xyes])
AM_COND_IF([BUILDOPT_IS_DEVEL_BUILD], release_build_type=devel, release_build_type=release) AM_COND_IF([BUILDOPT_IS_DEVEL_BUILD],
AC_DEFINE([BUILDOPT_IS_DEVEL_BUILD], [1], [Define if doing a development build])
release_build_type=devel,
release_build_type=release)
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile

3
src/ostree/ot-main.c
View File

@ -242,6 +242,9 @@ ostree_option_context_parse (GOptionContext *context,
g_print (" Version: %s\n", PACKAGE_VERSION); g_print (" Version: %s\n", PACKAGE_VERSION);
if (strlen (OSTREE_GITREV) > 0) if (strlen (OSTREE_GITREV) > 0)
g_print (" Git: %s\n", OSTREE_GITREV); g_print (" Git: %s\n", OSTREE_GITREV);
#ifdef BUILDOPT_IS_DEVEL_BUILD
g_print (" DevelBuild: yes\n");
#endif
g_print (" Features:\n"); g_print (" Features:\n");
for (char **iter = features; iter && *iter; iter++) for (char **iter = features; iter && *iter; iter++)
g_print (" - %s\n", *iter); g_print (" - %s\n", *iter);

4
tests/test-symbols.sh
View File

@ -22,7 +22,11 @@ set -xeuo pipefail
echo '1..3' echo '1..3'
released_syms=${G_TEST_SRCDIR}/src/libostree/libostree-released.sym released_syms=${G_TEST_SRCDIR}/src/libostree/libostree-released.sym
if echo "$OSTREE_FEATURES" | grep --quiet --no-messages "DevelBuild"; then
devel_syms=${G_TEST_SRCDIR}/src/libostree/libostree-devel.sym devel_syms=${G_TEST_SRCDIR}/src/libostree/libostree-devel.sym
else
devel_syms=
fi
if echo "$OSTREE_FEATURES" | grep --quiet --no-messages "experimental"; then if echo "$OSTREE_FEATURES" | grep --quiet --no-messages "experimental"; then
experimental_sym="${G_TEST_SRCDIR}/src/libostree/libostree-experimental.sym" experimental_sym="${G_TEST_SRCDIR}/src/libostree/libostree-experimental.sym"
experimental_sections="${G_TEST_SRCDIR}/apidoc/ostree-experimental-sections.txt" experimental_sections="${G_TEST_SRCDIR}/apidoc/ostree-experimental-sections.txt"