diff --git a/configure.ac b/configure.ac index 5258a368..21146cc0 100644 --- a/configure.ac +++ b/configure.ac @@ -16,11 +16,12 @@ AC_PREREQ([2.63]) m4_define([flatpak_major_version], [0]) m4_define([flatpak_minor_version], [9]) m4_define([flatpak_micro_version], [98]) +m4_define([flatpak_extra_version], [.1]) m4_define([flatpak_interface_age], [98]) m4_define([flatpak_binary_age], [m4_eval(10000 * flatpak_major_version + 100 * flatpak_minor_version + flatpak_micro_version)]) m4_define([flatpak_version], - [flatpak_major_version.flatpak_minor_version.flatpak_micro_version]) + [flatpak_major_version.flatpak_minor_version.flatpak_micro_version()flatpak_extra_version]) AC_INIT([Flatpak], [flatpak_version], @@ -388,6 +389,7 @@ GLIB_TESTS FLATPAK_MAJOR_VERSION=flatpak_major_version FLATPAK_MINOR_VERSION=flatpak_minor_version FLATPAK_MICRO_VERSION=flatpak_micro_version +FLATPAK_EXTRA_VERSION=flatpak_extra_version FLATPAK_INTERFACE_AGE=flatpak_interface_age FLATPAK_VERSION=flatpak_version AC_SUBST(FLATPAK_MAJOR_VERSION) @@ -398,6 +400,7 @@ AC_SUBST(FLATPAK_VERSION) AC_DEFINE_UNQUOTED([PACKAGE_MAJOR_VERSION], $FLATPAK_MAJOR_VERSION, [Major version]) AC_DEFINE_UNQUOTED([PACKAGE_MINOR_VERSION], $FLATPAK_MINOR_VERSION, [Minor version]) AC_DEFINE_UNQUOTED([PACKAGE_MICRO_VERSION], $FLATPAK_MICRO_VERSION, [Micro version]) +AC_DEFINE_UNQUOTED([PACKAGE_EXTRA_VERSION], $FLATPAK_EXTRA_VERSION, [Extra version]) # libtool versioning #LT_RELEASE=$FLATPAK_MAJOR_VERSION.$FLATPAK_MINOR_VERSION diff --git a/tests/test-run.sh b/tests/test-run.sh index 4781f8a3..5f498fbf 100755 --- a/tests/test-run.sh +++ b/tests/test-run.sh @@ -314,7 +314,7 @@ ${FLATPAK} build-finish --require-version=0.6.10 --command=hello.sh ${DIR} ${FLATPAK} build-export ${FL_GPGARGS} repos/test ${DIR} DIR=`mktemp -d` ${FLATPAK} build-init ${DIR} org.test.NewVersion org.test.Platform org.test.Platform -${FLATPAK} build-finish --require-version=${VERSION}9 --command=hello.sh ${DIR} +${FLATPAK} build-finish --require-version=1${VERSION} --command=hello.sh ${DIR} ${FLATPAK} build-export ${FL_GPGARGS} repos/test ${DIR} update_repo diff --git a/tests/testlibrary.c b/tests/testlibrary.c index 34e75b89..2a4772a8 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c @@ -39,7 +39,7 @@ test_library_version (void) { g_autofree char *version = NULL; - version = g_strdup_printf ("%d.%d.%d", + version = g_strdup_printf ("%d.%d.%d" G_STRINGIFY(PACKAGE_EXTRA_VERSION), FLATPAK_MAJOR_VERSION, FLATPAK_MINOR_VERSION, FLATPAK_MICRO_VERSION);