From 2147b96c9da5a649dae06c66a0fba779abc2906a Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Sat, 28 Dec 2019 18:58:13 +0100 Subject: Drop autotools-based build Our official instructions only tell how to build with Meson, our CI is only done with Meson and I wouldn't be surprised if most developers only used Meson as well. In other words, the autotools build is outdated. Let's say our goodbye and drop it in the next stable release. --- Makefile.am | 198 ----------------- autogen.sh | 116 ---------- build/Makefile.redirect | 9 - build/gcrypt.supp | 12 -- build/glib.supp | 335 ----------------------------- build/m4/vapigen.m4 | 96 --------- build/pthread.supp | 7 - build/tap-gtester | 5 - build/tap-unittest | 84 -------- build/unknown.supp | 391 ---------------------------------- configure.ac | 311 --------------------------- docs/man/Makefile.am | 15 -- docs/reference/libsecret/Makefile.am | 109 ---------- libsecret/Makefile.am | 401 ----------------------------------- libsecret/libsecret-unstable.pc.in | 13 -- libsecret/libsecret.pc.in | 15 -- tool/Makefile.am | 13 -- 17 files changed, 2130 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 build/Makefile.redirect delete mode 100644 build/gcrypt.supp delete mode 100644 build/glib.supp delete mode 100644 build/m4/vapigen.m4 delete mode 100644 build/pthread.supp delete mode 100755 build/tap-gtester delete mode 100755 build/tap-unittest delete mode 100644 build/unknown.supp delete mode 100644 configure.ac delete mode 100644 docs/man/Makefile.am delete mode 100644 docs/reference/libsecret/Makefile.am delete mode 100644 libsecret/Makefile.am delete mode 100644 libsecret/libsecret-unstable.pc.in delete mode 100644 libsecret/libsecret.pc.in delete mode 100644 tool/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 909a44e..0000000 --- a/Makefile.am +++ /dev/null @@ -1,198 +0,0 @@ -## Process this file with automake to produce Makefile.in -NULL = - -ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS} - -SUBDIRS = \ - . \ - po \ - docs/reference/libsecret - -DISTCHECK_CONFIGURE_FLAGS = \ - --enable-debug=yes \ - --disable-coverage \ - --disable-strict \ - --disable-silent-rules \ - --enable-gtk-doc \ - --enable-vala - -dist-hook: - @if test -d "$(srcdir)/.git"; \ - then \ - echo Creating ChangeLog && \ - ( cd "$(top_srcdir)" && \ - echo '# Generate automatically. Do not edit.'; echo; \ - $(top_srcdir)/missing --run git log --stat --date=short ) > ChangeLog.tmp \ - && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ - || ( rm -f ChangeLog.tmp ; \ - echo Failed to generate ChangeLog >&2 ); \ - else \ - echo A git clone is required to generate a ChangeLog >&2; \ - fi - -upload-release: $(DIST_ARCHIVES) - gpg --detach-sign --local-user 'stef@thewalter.net' $(DIST_ARCHIVES) - scp $(DIST_ARCHIVES) $(DIST_ARCHIVES).sig master.gnome.org: - ssh master.gnome.org ftpadmin install $(DIST_ARCHIVES) $(DIST_ARCHIVES).sig - -upload-docs: - rsync -Hvax docs/reference/libsecret/html/./ master.gnome.org:public_html/libsecret-docs/ - -if HAVE_VALAC -dist-check-valac: - -else -dist-check-valac: - @echo "*** valac must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-valac - -distcleancheck_listfiles = \ - find . -name '*.gc[dn][oa]' -prune -o -type f -print - -TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(builddir)/.libs \ - GI_TYPELIB_PATH=$(builddir) \ - abs_top_builddir=$(abs_top_builddir) -TEST_EXTENSIONS = .py .js - -# Default executable tests -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ - $(top_srcdir)/build/litter/tap-driver.sh -LOG_DRIVER_FLAGS = --comments --ignore-exit -LOG_COMPILER = $(srcdir)/build/tap-gtester - -# Python tests -PY_LOG_COMPILER = $(srcdir)/build/tap-unittest - -# Javascript tests -JS_LOG_COMPILER = gjs - -VALGRIND_ARGS = --trace-children=no --quiet --error-exitcode=33 \ - --suppressions=valgrind-suppressions --gen-suppressions=all \ - --num-callers=16 -VALGRIND_SUPPRESSIONS = \ - build/gcrypt.supp \ - build/glib.supp \ - build/pthread.supp \ - build/unknown.supp \ - $(NULL) - -valgrind-suppressions: $(VALGRIND_SUPPRESSIONS) - $(AM_V_GEN) cat $^ > $@ - -check-memory: valgrind-suppressions - $(MAKE) LOG_FLAGS="-- libtool --mode=execute valgrind $(VALGRIND_ARGS)" \ - PY_LOG_DRIVER_FLAGS="--missing=no-python-valgrind" \ - JS_LOG_DRIVER_FLAGS="--missing=no-gjs-valgrind" \ - $(AM_MAKEFLAGS) check -recheck-memory: valgrind-suppressions - $(MAKE) LOG_FLAGS="-- libtool --mode=execute valgrind $(VALGRIND_ARGS)" \ - PY_LOG_DRIVER_FLAGS="--missing=no-python-valgrind" \ - JS_LOG_DRIVER_FLAGS="--missing=no-gjs-valgrind" \ - $(AM_MAKEFLAGS) recheck - -if WITH_COVERAGE -coverage: - mkdir -p $(top_builddir)/build/coverage - $(LCOV) --directory . --capture --output-file $(top_builddir)/build/coverage.info - $(GENHTML) --output-directory $(top_builddir)/build/coverage $(top_builddir)/build/coverage.info - $(LCOV) --directory . --zerocounters - @echo "file://$(abs_top_builddir)/build/coverage/index.html" - -clear-coverage: - $(LCOV) --directory . --zerocounters - -endif - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/build \ - -DSRCDIR="\"@abs_srcdir@\"" \ - -DLOCALEDIR=\""$(datadir)/locale"\" \ - -DWITH_VALGRIND \ - -DSECRET_COMPILATION \ - $(LIBGCRYPT_CFLAGS) \ - $(GLIB_CFLAGS) - -bin_PROGRAMS = -BUILT_SOURCES = -check_PROGRAMS = -check_SCRIPTS = -DISTCLEANFILES = -lib_LTLIBRARIES = -man_MANS = -nodist_noinst_DATA = -noinst_DATA = -noinst_LTLIBRARIES = -TESTS = - -noinst_PROGRAMS = - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = - -if HAVE_INTROSPECTION - -include $(INTROSPECTION_MAKEFILE) - -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all \ - --add-include-path=$(srcdir) --add-include-path=$(builddir) -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(builddir) - -girdir = $(datadir)/gir-1.0 -gir_DATA = - -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = $(gir_DATA:.gir=.typelib) - -if ENABLE_VAPIGEN - -include $(VAPIGEN_MAKEFILE) - -VAPIGEN_VAPIS = - -vapidir = $(datadir)/vala/vapi -vapi_DATA = - -endif - -endif - -CLEANFILES = \ - $(pkgconfig_DATA) \ - $(gir_DATA) \ - $(typelibs_DATA) \ - $(BUILT_SOURCES) \ - $(vapi_DATA) \ - $(man_MANS) \ - valgrind-suppressions - -EXTRA_DIST = \ - README.md \ - COPYING.TESTS \ - meson_options.txt \ - meson.build \ - docs/meson.build \ - docs/man/meson.build \ - docs/reference/libsecret/meson.build \ - egg/meson.build \ - libsecret/meson.build \ - po/meson.build \ - tool/meson.build \ - build/valgrind \ - build/tap-gtester \ - build/tap-unittest \ - $(VALGRIND_SUPPRESSIONS) \ - $(check_SCRIPTS) - -include egg/Makefile.am -include libsecret/Makefile.am -include tool/Makefile.am - -if WITH_MANPAGES -include docs/man/Makefile.am -endif diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 360f36c..0000000 --- a/autogen.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir -PROJECT=libsecret -TEST_TYPE=-f -FILE=libsecret/secret-value.c - -DIE=0 - -have_libtool=false -if libtoolize --version < /dev/null > /dev/null 2>&1 ; then - libtool_version=`libtoolize --version | - head -1 | - sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \ - -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` - case $libtool_version in - 2.2*) - have_libtool=true - ;; - 2.4*) - have_libtool=true - ;; - esac -fi -if $have_libtool ; then : ; else - echo - echo "You must have libtool >= 2.2 installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" - DIE=1 -fi - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" - DIE=1 -} - -AUTOMAKE_VERSIONS="1.16 1.15 1.14 1.13 1.12 1.11 1.10" -for version in $AUTOMAKE_VERSIONS; do - if automake-$version --version < /dev/null > /dev/null 2>&1 ; then - AUTOMAKE=automake-$version - ACLOCAL=aclocal-$version - break - fi -done - -if test -z "$AUTOMAKE"; then - echo - echo "You must have one of automake $AUTOMAKE_VERSIONS to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" - DIE=1 -fi - -if test "$DIE" -eq 1; then - exit 1 -fi - -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" - exit 1 -} - -# NOCONFIGURE is used by gnome-common; support both -if ! test -z "$AUTOGEN_SUBDIR_MODE"; then - NOCONFIGURE=1 -fi - -if test -z "$NOCONFIGURE"; then - if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." - fi -fi - -rm -rf autom4te.cache - -# README and INSTALL are required by automake, but may be deleted by clean -# up rules. to get automake to work, simply touch these here, they will be -# regenerated from their corresponding *.in files by ./configure anyway. -touch README INSTALL - -$ACLOCAL -I build/m4 $ACLOCAL_FLAGS || exit $? - -libtoolize --force || exit $? - -autopoint --force || exit $? - -gtkdocize || exit $? - -autoheader || exit $? - -$AUTOMAKE --add-missing || exit $? -autoconf || exit $? -cd $ORIGDIR || exit $? - -if test -z "$NOCONFIGURE"; then - $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? - - # Put a redirect makefile here - if [ ! -f $srcdir/Makefile ]; then - cat $srcdir/build/Makefile.redirect > $srcdir/Makefile - printf "\nREDIRECT = %s\n" "$(realpath $ORIGDIR)" >> $srcdir/Makefile - fi - - echo - echo "Now type 'make' to compile $PROJECT." -fi diff --git a/build/Makefile.redirect b/build/Makefile.redirect deleted file mode 100644 index db371eb..0000000 --- a/build/Makefile.redirect +++ /dev/null @@ -1,9 +0,0 @@ -# This redirects all make targets to builddir -all: - $(MAKE) -C $(REDIRECT) all -%: - $(MAKE) -C $(REDIRECT) $@ -ifeq ($(MAKEFLAGS), ) -JOBARG = -j4 -endif -# REDIRECT=build diff --git a/build/gcrypt.supp b/build/gcrypt.supp deleted file mode 100644 index 5eb9b52..0000000 --- a/build/gcrypt.supp +++ /dev/null @@ -1,12 +0,0 @@ -{ - gpg_err_init - Memcheck:Leak - ... - fun:gpg_err_init -} -{ - _gcry_module_add - Memcheck:Leak - ... - fun:_gcry_module_add -} diff --git a/build/glib.supp b/build/glib.supp deleted file mode 100644 index 8ec5dd8..0000000 --- a/build/glib.supp +++ /dev/null @@ -1,335 +0,0 @@ -{ - g_type_register_static_1 - Memcheck:Leak - ... - fun:g_type_register_static -} -{ - g_type_register_fundamental - Memcheck:Leak - ... - fun:g_type_register_fundamental -} -{ - g_type_init_with_debug_flags - Memcheck:Leak - ... - fun:g_type_init_with_debug_flags -} -{ - g_type_class_ref_1 - Memcheck:Leak - ... - fun:type_iface_vtable_base_init_Wm - ... - fun:g_type_class_ref -} -{ - g_type_class_ref_2 - Memcheck:Leak - ... - fun:type_class_init_Wm - ... - fun:g_type_class_ref -} -{ - g_type_add_interface_static - Memcheck:Leak - ... - fun:g_type_add_interface_static -} -{ - g_param_spec_internal - Memcheck:Leak - ... - fun:g_type_class_ref - fun:g_type_create_instance - fun:g_param_spec_internal -} -{ - g_param_spec_enum - Memcheck:Leak - ... - fun:g_type_class_ref - fun:g_param_spec_enum -} -{ - g_param_spec_flags - Memcheck:Leak - ... - fun:g_type_class_ref - fun:g_param_spec_flags -} -{ - g_quark_from_static_string - Memcheck:Leak - ... - fun:g_quark_from_static_string -} -{ - g_quark_from_string - Memcheck:Leak - ... - fun:g_quark_from_string -} -{ - g_value_register_transform_func - Memcheck:Leak - ... - fun:g_value_register_transform_func -} -{ - test_run_seed - Memcheck:Leak - ... - fun:g_rand_new_with_seed_array - fun:test_run_seed - ... - fun:g_test_run_suite -} -{ - g_test_init - Memcheck:Leak - ... - fun:g_rand_new_with_seed_array - ... - fun:g_test_init -} -{ - g_intern_static_string - Memcheck:Leak - ... - fun:g_intern_static_string -} -{ - g_main_context_push_thread_default - Memcheck:Leak - ... - fun:g_queue_new - fun:g_main_context_push_thread_default -} -{ - g_dbus_error_register_error - Memcheck:Leak - ... - fun:g_dbus_error_register_error -} -{ - g_param_spec_pool_insert - Memcheck:Leak - ... - fun:g_param_spec_pool_insert -} -{ - g_main_context_default - Memcheck:Leak - ... - fun:g_main_context_default -} -{ - g_main_context_check - Memcheck:Leak - ... - fun:g_ptr_array_add - fun:g_main_context_check -} -{ - g_test_run_suite - Memcheck:Leak - ... - fun:g_slist_copy - fun:g_test_run_suite_internal - fun:g_test_run_suite -} -{ - g_dbus_interface_info_cache_build - Memcheck:Leak - ... - fun:g_dbus_interface_info_cache_build -} -{ - g_cancellable_push_current - Memcheck:Leak - ... - fun:thread_memory_from_self - ... - fun:g_cancellable_push_current -} -{ - g_io_scheduler_push_job - Memcheck:Leak - ... - fun:init_scheduler - fun:g_once_impl - fun:g_io_scheduler_push_job -} -{ - g_io_scheduler_push_job_2 - Memcheck:Leak - ... - fun:g_system_thread_new - ... - fun:g_io_scheduler_push_job -} -{ - g_bus_get_sync__available_connections - Memcheck:Leak - ... - fun:g_hash_table_new - fun:initable_init - fun:g_initable_init - fun:g_bus_get_sync -} -{ - g_socket_connection_factory_register_type - Memcheck:Leak - ... - fun:g_socket_connection_factory_register_type -} -{ - g_test_add_vtable - Memcheck:Leak - ... - fun:g_test_add_vtable -} -{ - g_mutex_lock - Memcheck:Leak - ... - fun:g_mutex_impl_new - fun:g_mutex_get_impl - fun:g_mutex_lock -} -{ - g_thread_self - Memcheck:Leak - ... - fun:g_thread_self -} -{ - g_rec_mutex_lock - Memcheck:Leak - ... - fun:g_rec_mutex_impl_new - fun:g_rec_mutex_get_impl - fun:g_rec_mutex_lock -} -{ - test_case_run - Memcheck:Leak - ... - fun:g_malloc0 - fun:test_case_run - ... - fun:g_test_run_suite -} -{ - g_get_charset - Memcheck:Leak - ... - fun:g_get_charset -} -{ - g_test_run_suite__timer_new - Memcheck:Leak - ... - fun:g_timer_new - fun:test_case_run - ... - fun:g_test_run_suite -} -{ - g_test_run_suite__timer_new2 - Memcheck:Leak - ... - fun:g_timer_new - fun:test_case_run_suite_internal - ... - fun:g_test_run_suite -} -{ - g_test_run_suite__strconcat - Memcheck:Leak - ... - fun:g_strconcat - fun:test_case_run - ... - fun:g_test_run_suite - fun:g_test_run -} -{ - g_type_interface_add_prerequisite - Memcheck:Leak - ... - fun:g_type_interface_add_prerequisite -} -{ - - Memcheck:Leak - ... - fun:g_slist_copy - fun:g_test_run_suite_internal - ... - fun:g_test_run_suite -} -{ - g_set_prgname - Memcheck:Leak - ... - fun:g_set_prgname -} -{ - g_test_run_suite__strconcat_2 - Memcheck:Leak - ... - fun:g_strconcat - fun:g_test_run_suite_internal -} -{ - g_test_run_suite__strdup - Memcheck:Leak - ... - fun:g_strdup - fun:g_test_run_suite_internal -} -{ - g_private_get - Memcheck:Leak - ... - fun:g_private_get -} -{ - g_private_set - Memcheck:Leak - ... - fun:g_private_set -} -{ - g_static_mutex_get_mutex_impl - Memcheck:Leak - ... - fun:g_static_mutex_get_mutex_impl -} -{ - g_variant_type_info_unref - Memcheck:Leak - ... - fun:g_hash_table_remove - fun:g_variant_type_info_unref -} -{ - g_rw_lock_reader_lock - Memcheck:Leak - ... - fun:g_rw_lock_impl_new - fun:g_rw_lock_get_impl - fun:g_rw_lock_reader_lock -} -{ - g_child_watch_finalize__rt_sigaction - Memcheck:Param - rt_sigaction(act->sa_flags) - fun:__libc_sigaction - ... - fun:g_child_watch_finalize -} diff --git a/build/m4/vapigen.m4 b/build/m4/vapigen.m4 deleted file mode 100644 index 17558df..0000000 --- a/build/m4/vapigen.m4 +++ /dev/null @@ -1,96 +0,0 @@ -dnl vapigen.m4 -dnl -dnl Copyright 2012 Evan Nemerson -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT]) -# -------------------------------------- -# Check vapigen existence and version -# -# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation -AC_DEFUN([VAPIGEN_CHECK], -[ - AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0]) - AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0]) - - AC_ARG_ENABLE([vala], - [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[ - AS_IF([test "x$4" = "x"], [ - enable_vala=auto - ], [ - enable_vala=$4 - ]) - ]) - - AS_CASE([$enable_vala], [no], [enable_vala=no], - [yes], [ - AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ - AC_MSG_ERROR([Vala bindings require GObject Introspection]) - ]) - ], [auto], [ - AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ - enable_vala=no - ]) - ], [ - AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@]) - ]) - - AS_IF([test "x$2" = "x"], [ - vapigen_pkg_name=vapigen - ], [ - vapigen_pkg_name=vapigen-$2 - ]) - AS_IF([test "x$1" = "x"], [ - vapigen_pkg="$vapigen_pkg_name" - ], [ - vapigen_pkg="$vapigen_pkg_name >= $1" - ]) - - PKG_PROG_PKG_CONFIG - - PKG_CHECK_EXISTS([$vapigen_pkg], [ - AS_IF([test "$enable_vala" = "auto"], [ - enable_vala=yes - ]) - ], [ - AS_CASE([$enable_vala], [yes], [ - AC_MSG_ERROR([$vapigen_pkg not found]) - ], [auto], [ - enable_vala=no - ]) - ]) - - AC_MSG_CHECKING([for vapigen]) - - AS_CASE([$enable_vala], - [yes], [ - VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen - AS_IF([test "x$2" = "x"], [ - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` - ], [ - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` - ]) - ]) - - AC_MSG_RESULT([$enable_vala]) - - AC_SUBST([VAPIGEN]) - AC_SUBST([VAPIGEN_VAPIDIR]) - AC_SUBST([VAPIGEN_MAKEFILE]) - - AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes") -]) diff --git a/build/pthread.supp b/build/pthread.supp deleted file mode 100644 index a04bfc1..0000000 --- a/build/pthread.supp +++ /dev/null @@ -1,7 +0,0 @@ -{ - _dl_allocate_tls - Memcheck:Leak - ... - fun:_dl_allocate_tls - fun:pthread_create* -} diff --git a/build/tap-gtester b/build/tap-gtester deleted file mode 100755 index 481e333..0000000 --- a/build/tap-gtester +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -# run a GTest in tap mode. The test binary is passed as $1 - -$1 -k --tap diff --git a/build/tap-unittest b/build/tap-unittest deleted file mode 100755 index aafafde..0000000 --- a/build/tap-unittest +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env python3 - -# -# This is a TAP compiler for python unittest -# -# It hooks into python's standard unittest module, and produces TAP output. -# -# This produces the Test Anything Protocol (ie: TAP) -# https://metacpan.org/pod/release/PETDANCE/Test-Harness-2.64/lib/Test/Harness/TAP.pod -# -# Based on code from here: -# https://github.com/vit1251/unittest-tap-reporting -# - -import argparse -import imp -import os -import sys -import time -import traceback -import unittest - -def write_line(format, *args): - sys.stdout.write(format % args) - sys.stdout.write("\n") - sys.stdout.flush() - -class TAPTestResult(unittest.result.TestResult): - def __init__(self): - unittest.result.TestResult.__init__(self) - self.number = 0 - - def addSuccess(self, test): - self.number += 1 - write_line("ok %d %s", self.number, test.id()) - - def addSkip(self, test, reason): - self.number += 1 - write_line("not ok %d # skip %s", self.number, test.id()) - write_line("# %s", reason) - - def addError(self, test, exc): - (etype, evalue, etraceback) = exc - traceback.print_exception(etype, evalue, etraceback, file=sys.stderr) - self.number += 1 - write_line("not ok %d %s", self.number, test.id()) - - def addFailure(self, test, err): - (etype, evalue, etraceback) = exc - traceback.print_exception(etype, evalue, etraceback, limit=1, file=sys.stderr) - self.number += 1 - write_line("not ok %d %s", self.number, test.id()) - -class TAPTestRunner(object): - def __init__(self): - pass - - def run(self, test): - write_line("1..%d", test.countTestCases()) - result = TAPTestResult() - startTestRun = getattr(result, 'startTestRun', lambda : None) - startTestRun() - try: - test(result) - finally: - stopTestRun = getattr(result, 'stopTestRun', lambda : None) - stopTestRun() - return result - -def main(argv): - parser = argparse.ArgumentParser(description='Python unittest TAP driver') - parser.add_argument('module', nargs=1, - help="A unittest test module to run") - args = parser.parse_args(argv[1:]) - - (name, ext) = os.path.splitext(os.path.basename(args.module[0])) - module = imp.load_source(name, args.module[0]) - loader = unittest.TestLoader() - tests = loader.loadTestsFromModule(module) - runner = TAPTestRunner() - runner.run(tests) - -if __name__ == "__main__": - sys.exit(main(sys.argv)) diff --git a/build/unknown.supp b/build/unknown.supp deleted file mode 100644 index 6938016..0000000 --- a/build/unknown.supp +++ /dev/null @@ -1,391 +0,0 @@ -{ - _g_dbus_shared_thread_ref - Memcheck:Leak - ... - fun:_g_dbus_shared_thread_ref -} -{ - - Memcheck:Leak - fun:malloc - fun:standard_malloc - fun:g_malloc - fun:g_slice_alloc - fun:g_slice_alloc0 - fun:g_type_create_instance - fun:g_object_constructor - fun:g_object_newv - fun:g_object_new - fun:g_dbus_message_new - fun:g_dbus_message_new_from_blob - fun:_g_dbus_worker_do_read_cb - fun:g_simple_async_result_complete - fun:complete_in_idle_cb - fun:g_idle_dispatch - fun:g_main_dispatch -} -{ - - Memcheck:Leak - fun:malloc - ... - obj:/lib64/libgcrypt.so.11.7.0 - fun:egg_dh_gen_pair -} -{ - - Memcheck:Leak - ... - fun:parse_value_from_blob - fun:g_dbus_message_new_from_blob - fun:_g_dbus_worker_do_read_cb -} -{ - - Memcheck:Leak - ... - fun:g_dbus_message_new - fun:g_dbus_message_new_from_blob - fun:_g_dbus_worker_do_read_cb - fun:g_simple_async_result_complete - fun:complete_in_idle_cb - fun:g_idle_dispatch -} -{ - - Memcheck:Leak - ... - fun:g_variant_get - fun:g_dbus_message_to_gerror - fun:decode_method_reply - fun:g_dbus_connection_call_done -} -{ - - Memcheck:Leak - ... - fun:g_dbus_message_set_header - fun:g_dbus_message_new_from_blob - fun:_g_dbus_worker_do_read_cb -} -{ - - Memcheck:Leak - fun:malloc - fun:standard_malloc - fun:g_malloc - fun:g_malloc_n - fun:g_main_context_iterate - fun:g_main_loop_run - fun:gdbus_shared_thread_func - fun:g_thread_proxy - fun:start_thread - fun:clone -} -{ - - Memcheck:Leak - fun:malloc - fun:standard_malloc - fun:g_malloc - fun:g_slice_alloc - fun:g_list_prepend - fun:g_queue_push_head - fun:g_main_context_push_thread_default - fun:gdbus_shared_thread_func - fun:g_thread_proxy - fun:start_thread - fun:clone -} -{ - - Memcheck:Leak - fun:malloc - fun:standard_malloc - fun:g_malloc - fun:g_slice_alloc - fun:g_slice_alloc0 - fun:get_dispatch - fun:g_main_dispatch - fun:g_main_context_dispatch - fun:g_main_context_iterate - fun:g_main_loop_run - fun:g_dbus_connection_send_message_with_reply_sync - fun:g_dbus_connection_call_sync_internal - fun:g_dbus_connection_call_sync - fun:initable_init - fun:g_initable_init - fun:g_bus_get_sync -} -{ - - Memcheck:Leak - fun:malloc - fun:standard_malloc - fun:g_malloc - fun:g_slice_alloc - fun:g_slice_alloc0 - fun:get_dispatch - fun:g_main_dispatch - fun:g_main_context_dispatch - fun:g_main_context_iterate - fun:g_main_loop_run - fun:gdbus_shared_thread_func - fun:g_thread_proxy - fun:start_thread - fun:clone -} -{ - - Memcheck:Leak - fun:malloc - fun:standard_malloc - fun:g_malloc - fun:g_malloc_n - fun:g_main_context_iterate -} -{ - - Memcheck:Leak - fun:malloc - fun:realloc - fun:standard_realloc - fun:g_realloc - fun:_g_dbus_worker_do_read_unlocked - fun:_g_dbus_worker_do_initial_read -} -{ - - Memcheck:Leak - ... - fun:_g_socket_output_stream_new - fun:g_socket_connection_get_output_stream - fun:g_io_stream_get_output_stream - fun:_g_dbus_auth_run_client -} -{ - _g_dbus_worker_do_initial_read - Memcheck:Leak - ... - fun:_g_dbus_worker_do_read_unlocked - fun:_g_dbus_worker_do_initial_read -} -{ - - Memcheck:Leak - ... - fun:g_unix_socket_address_new_with_type - fun:g_dbus_address_connect - fun:g_dbus_address_try_connect_one - fun:g_dbus_address_get_stream_sync -} -{ - - Memcheck:Leak - ... - fun:_g_socket_input_stream_new - fun:g_socket_connection_get_input_stream - fun:g_io_stream_get_input_stream - fun:_g_dbus_auth_run_client -} -{ - - Memcheck:Leak - ... - fun:_g_dbus_worker_close - fun:_g_dbus_worker_stop -} -{ - - Memcheck:Leak - ... - fun:g_simple_async_result_complete_in_idle - fun:_g_socket_read_with_control_messages_ready - fun:_g_socket_read_with_control_messages - fun:_g_dbus_worker_do_read_unlocked - fun:_g_dbus_worker_do_read_cb -} -{ - - Memcheck:Leak - ... - fun:g_source_new - fun:g_idle_source_new - fun:g_simple_async_result_complete_in_idle - fun:g_socket_connection_close_async - fun:g_io_stream_close_async - ... - fun:gdbus_shared_thread_func -} -{ - - Memcheck:Leak - ... - fun:g_simple_async_result_new - fun:g_socket_connection_close_async - fun:g_io_stream_close_async - fun:maybe_write_next_message - fun:write_message_in_idle_cb -} -{ - - Memcheck:Leak - ... - fun:g_socket_connection_factory_create_connection - ... - fun:initable_init -} -{ - - Memcheck:Leak - ... - fun:g_socket_client_connect - fun:g_dbus_address_connect - fun:g_dbus_address_try_connect_one -} -{ - - Memcheck:Leak - ... - fun:_g_dbus_worker_new -} -{ - - Memcheck:Leak - ... - fun:_g_socket_read_with_control_messages - fun:_g_dbus_worker_do_read_unlocked - fun:_g_dbus_worker_do_read_cb -} -{ - - Memcheck:Leak - ... - fun:g_socket_receive_message - fun:_g_socket_read_with_control_messages_ready - fun:_g_socket_read_with_control_messages - fun:_g_dbus_worker_do_read_unlocked - fun:_g_dbus_worker_do_read_cb -} -{ - - Memcheck:Leak - ... - fun:maybe_write_next_message - ... - fun:gdbus_shared_thread_func -} -{ - - Memcheck:Leak - ... - fun:remove_match_rule - fun:unsubscribe_id_internal -} -{ - - Memcheck:Leak - ... - fun:g_object_new - fun:get_uninitialized_connection - fun:g_bus_get_sync -} -{ - - Memcheck:Leak - ... - fun:g_dbus_connection_signal_subscribe - fun:async_initable_init_first -} -{ - - Memcheck:Leak - ... - fun:g_dbus_connection_send_message_with_reply_unlocked - fun:g_dbus_connection_send_message_with_reply - fun:g_dbus_connection_send_message_with_reply_sync - fun:g_dbus_connection_call_sync_internal - fun:g_dbus_connection_call_sync -} -{ - - Memcheck:Leak - ... - fun:_g_dbus_auth_new -} -{ - - Memcheck:Leak - ... - fun:_g_dbus_auth_run_client -} -{ - - Memcheck:Leak - ... - fun:_g_dbus_auth_init -} -{ - - Memcheck:Leak - ... - fun:g_variant_dup_string - ... - fun:g_variant_get - ... - fun:g_initable_init - fun:g_bus_get_sync -} -{ - - Memcheck:Leak - ... - fun:g_main_context_push_thread_default - ... - fun:gdbus_shared_thread_func -} -{ - - Memcheck:Leak - ... - fun:g_main_context_add_poll_unlocked - ... - fun:g_main_loop_run - fun:gdbus_shared_thread_func -} -{ - - Memcheck:Leak - ... - fun:g_set_error_literal - fun:g_cancellable_set_error_if_cancelled - fun:g_socket_receive_message - ... - fun:g_main_loop_run - fun:gdbus_shared_thread_func -} -{ - - Memcheck:Leak - ... - fun:g_source_new - fun:g_idle_source_new - fun:call_destroy_notify - fun:g_dbus_connection_signal_unsubscribe -} -{ - - Memcheck:Leak - ... - fun:g_source_set_callback - fun:call_destroy_notify - fun:g_dbus_connection_signal_unsubscribe -} -{ - - Memcheck:Leak - ... - fun:g_malloc0_n - fun:call_destroy_notify - fun:g_dbus_connection_signal_unsubscribe -} diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 4f9993e..0000000 --- a/configure.ac +++ /dev/null @@ -1,311 +0,0 @@ -AC_PREREQ(2.63) - -m4_define([libsecret_major_version], 0) -m4_define([libsecret_minor_version], 20) -m4_define([libsecret_micro_version], 4) -m4_define([libsecret_version], - [libsecret_major_version.libsecret_minor_version.libsecret_micro_version]) -AC_INIT([libsecret],[libsecret_version], - [https://gitlab.gnome.org/GNOME/libsecret/issues/], - [libsecret]) - -AC_SUBST(SECRET_MAJOR_VERSION, libsecret_major_version) -AC_SUBST(SECRET_MINOR_VERSION, libsecret_minor_version) -AC_SUBST(SECRET_MICRO_VERSION, libsecret_micro_version) - -dnl **************************************************************************** -dnl Dependency versions - -# Required - -GLIB_REQ=2.44.0 -GLIB_MIN=GLIB_VERSION_2_44 -GLIB_MAX=GLIB_VERSION_2_44 - -# Optional - -VALA_WANT=0.17.2.12 - -GCRYPT_WANT=1.2.2 - -GTKDOC_WANT=1.9 - -GIR_WANT=1.29 - -dnl **************************************************************************** -dnl Library package and libtool versioning -dnl -dnl Updating the libtool versions, follow these instructions sequentially: -dnl 1. If the library source code has changed at all since the last update, then increment revision (‘c:r:a’ becomes ‘c:r+1:a’). -dnl 2. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0. -dnl 3. If any interfaces have been added since the last public release, then increment age. -dnl 4. If any interfaces have been removed or changed since the last public release, then set age to 0. - -SECRET_MAJOR=1 -SECRET_MINOR=0 -SECRET_MICRO=0 - -SECRET_CURRENT=0 -SECRET_REVISION=0 -SECRET_AGE=0 - -# ----------------------------------------------------------------------------- - -AC_CONFIG_MACRO_DIR([build/m4]) -AC_CONFIG_AUX_DIR([build/litter]) -AC_REQUIRE_AUX_FILE([tap-driver.sh]) -AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar foreign -Wno-portability subdir-objects]) -AM_SANITY_CHECK -AC_CONFIG_HEADERS(config.h) -AC_CONFIG_SRCDIR([libsecret/secret-value.c]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AM_MAINTAINER_MODE([enable]) - -# ----------------------------------------------------------------------------- -# Basic tools - -AC_GNU_SOURCE -AC_ISC_POSIX -AC_PROG_CC -AC_PROG_CPP -AM_PROG_CC_C_O -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AM_PROG_LIBTOOL -PKG_PROG_PKG_CONFIG - -# -------------------------------------------------------------------- -# i18n - -AM_GNU_GETTEXT([external]) -# FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION -AM_GNU_GETTEXT_VERSION([0.19.8]) -m4_ifdef([AM_GNU_GETTEXT_REQUIRE_VERSION],[ -AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) -]) - -GETTEXT_PACKAGE=libsecret -AC_SUBST([GETTEXT_PACKAGE]) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name]) - -# -------------------------------------------------------------------- -# Checks for functions - -AC_CHECK_FUNCS(mlock) - -# -------------------------------------------------------------------- -# GLib - -PKG_CHECK_MODULES(GLIB, - glib-2.0 >= $GLIB_REQ - gio-2.0 - gio-unix-2.0) -LIBS="$LIBS $GLIB_LIBS" -CFLAGS="$CFLAGS $GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_MIN -DGLIB_VERSION_MAX_ALLOWED=$GLIB_MAX" - -GTK_DOC_CHECK($GTKDOC_WANT) - -GOBJECT_INTROSPECTION_CHECK($GIR_WANT) -AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) - -# -------------------------------------------------------------------- -# Manual pages - -AC_ARG_ENABLE(manpages, - AC_HELP_STRING([--disable-manpages], [Build manual pages])) -if test "$enable_manpages" != "no"; then - enable_manpages="yes" - AC_PATH_PROG([XSLTPROC], [xsltproc]) - if test x$XSLTPROC = x; then - AC_MSG_ERROR([xsltproc is required to build manual pages]) - fi -fi -AM_CONDITIONAL(WITH_MANPAGES, test x$enable_manpages = xyes) - -# -------------------------------------------------------------------- -# Vala - -VAPIGEN_CHECK($VALA_WANT) - -if test "$enable_vala" != "no"; then - AC_PATH_PROG([VALAC], [valac], []) -fi -AM_CONDITIONAL(HAVE_VALAC, test "x$VALAC" != "x") - -# -------------------------------------------------------------------- -# libgcrypt - -GCRYPT_LIBVER=1 - -AC_ARG_ENABLE(gcrypt, - [AC_HELP_STRING([--disable-gcrypt], - [without gcrypt and transport encryption]) - ]) - -if test "$enable_gcrypt" != "no"; then - - have_gcrypt="no" - m4_ifdef([AM_PATH_LIBGCRYPT], - [AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_WANT, have_gcrypt=yes)]) - - if test $have_gcrypt != "yes"; then - AC_MSG_ERROR([[ -*** -*** libgcrypt was not found. You may want to get it from -*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/ -*** - ]]) - fi - - AC_DEFINE(WITH_GCRYPT, 1, [Build with libgcypt and transport encryption]) - AC_DEFINE_UNQUOTED(LIBGCRYPT_VERSION, "$GCRYPT_WANT", - [Version of GCRYPT we expect]) - - AC_SUBST([LIBGCRYPT_CFLAGS]) - AC_SUBST([LIBGCRYPT_LIBS]) - - gcrypt_status="yes" - enable_gcrypt="yes" -else - gcrypt_status="no" -fi - -AM_CONDITIONAL(WITH_GCRYPT, test "$enable_gcrypt" = "yes") - -# -------------------------------------------------------------------- -# Compilation options - -if test "$GCC" = "yes"; then - CFLAGS="$CFLAGS \ - -Wall -Wmissing-declarations \ - -Wmissing-prototypes -Wnested-externs -Wpointer-arith \ - -Wdeclaration-after-statement -Wformat=2 -Winit-self \ - -Waggregate-return" - - for option in -Wmissing-include-dirs -Wundef; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], - [has_option=yes], - [has_option=no]) - AC_MSG_RESULT($has_option) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" - fi - done -fi - -AC_ARG_ENABLE(strict, [ - AS_HELP_STRING([--enable-strict], [Strict code compilation]) - ]) - -AC_MSG_CHECKING([build strict]) - -if test "$enable_strict" = "yes"; then - CFLAGS="$CFLAGS -Werror -DG_DISABLE_DEPRECATED" - INTROSPECTION_FLAGS="--warn-error" - TEST_MODE="thorough" -else - CFLAGS="$CFLAGS -Wno-error" - TEST_MODE="quick" - INTROSPECTION_FLAGS="" - enable_strict="no" -fi - -AC_MSG_RESULT($enable_strict) -AC_SUBST(INTROSPECTION_FLAGS) -AC_SUBST(TEST_MODE) - -AC_MSG_CHECKING([for debug mode]) -AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug=no/default/yes], - [Turn on or off debugging]) - ) - -if test "$enable_debug" != "no"; then - AC_DEFINE_UNQUOTED(WITH_DEBUG, 1, [Print debug output]) - AC_DEFINE_UNQUOTED(_DEBUG, 1, [In debug mode]) - CFLAGS="$CFLAGS -g" -fi -if test "$enable_debug" = "yes"; then - debug_status="yes" - CFLAGS="$CFLAGS -O0" -elif test "$enable_debug" = "no"; then - debug_status="no" - CFLAGS="$CFLAGS -O2" - AC_DEFINE_UNQUOTED(G_DISABLE_ASSERT, 1, [Disable glib assertions]) -else - debug_status="default" -fi - -AC_MSG_RESULT($debug_status) - -AC_MSG_CHECKING([whether to build with gcov testing]) -AC_ARG_ENABLE([coverage], - AS_HELP_STRING([--enable-coverage], - [Whether to enable coverage testing ]), - [], [enable_coverage=no]) -AC_MSG_RESULT([$enable_coverage]) - -if test "$enable_coverage" = "yes"; then - if test "$GCC" != "yes"; then - AC_MSG_ERROR(Coverage testing requires GCC) - fi - - AC_PATH_PROG(GCOV, gcov, no) - if test "$GCOV" = "no" ; then - AC_MSG_ERROR(gcov tool is not available) - fi - - AC_PATH_PROG(LCOV, lcov, no) - if test "$LCOV" = "no" ; then - AC_MSG_ERROR(lcov tool is not installed) - fi - - AC_PATH_PROG(GENHTML, genhtml, no) - if test "$GENHTML" = "no" ; then - AC_MSG_ERROR(lcov's genhtml tool is not installed) - fi - - CFLAGS="$CFLAGS -O0 -g -fprofile-arcs -ftest-coverage" - LDFLAGS="$LDFLAGS -lgcov" -fi - -AM_CONDITIONAL([WITH_COVERAGE], [test "$enable_coverage" = "yes"]) -AC_SUBST(LCOV) -AC_SUBST(GCOV) -AC_SUBST(GENHTML) - -# ------------------------------------------------------------------------------ -# Results -# - -SECRET_LT_RELEASE=$SECRET_CURRENT:$SECRET_REVISION:$SECRET_AGE -AC_SUBST(SECRET_LT_RELEASE) -AC_SUBST(SECRET_MAJOR) -AC_SUBST(SECRET_MINOR) - -AC_CONFIG_FILES([ - Makefile - docs/reference/libsecret/Makefile - docs/reference/libsecret/version.xml - po/Makefile.in - po/Makefile - libsecret/libsecret.pc - libsecret/libsecret-unstable.pc - libsecret/secret-version.h -]) -AC_OUTPUT - -echo -echo "CFLAGS: $CFLAGS" -echo -echo "OPTIONS:" -echo " libgcrypt: $gcrypt_status" -echo " vala: $enable_vala" -echo " Debug: $debug_status" -echo " Coverage: $enable_coverage" -echo " Manual Page: $enable_manpages" -echo diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am deleted file mode 100644 index 07bfd55..0000000 --- a/docs/man/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -XSLTPROC_FLAGS = \ - --nonet \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 - -secret-tool.1: docs/man/secret-tool.xml - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< - -man_MANS += \ - secret-tool.1 - -EXTRA_DIST += docs/man/secret-tool.xml diff --git a/docs/reference/libsecret/Makefile.am b/docs/reference/libsecret/Makefile.am deleted file mode 100644 index 26401e9..0000000 --- a/docs/reference/libsecret/Makefile.am +++ /dev/null @@ -1,109 +0,0 @@ -## Process this file with automake to produce Makefile.in - -# We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 - -# This is a blank Makefile.am for using gtk-doc. -# Copy this to your project's API docs directory and modify the variables to -# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples -# of using the various options. - -# The name the module, e.g. 'glib'. -DOC_MODULE=libsecret - -# Uncomment for versioned docs and specify the version of the module, e.g. '2'. -DOC_MODULE_VERSION=@SECRET_MAJOR@ - -# The top-level SGML file. You can change this if you want to. -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml - -# The directory containing the source code. Relative to $(srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting the functions and macros. -# e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=$(top_srcdir)/libsecret $(top_builddir)/libsecret - -# Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS= - -# Extra options to supply to gtkdoc-scan. -# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS=--deprecated-guards="SECRET_DISABLE_DEPRECATED" - -# Extra options to supply to gtkdoc-mkdb. -# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml -MKDB_OPTIONS=--sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS= - -# Extra options to supply to gtkdoc-mkhtml -MKHTML_OPTIONS= - -# Extra options to supply to gtkdoc-fixref. Not normally needed. -# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html -FIXXREF_OPTIONS= - -# Used for dependencies. The docs will be rebuilt if any of these change. -# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h -# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/libsecret/*.h -CFILE_GLOB=$(top_srcdir)/libsecret/*.c - -# Extra header to include when scanning, which are not under DOC_SOURCE_DIR -# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h -EXTRA_HFILES= - -# Header files to ignore when scanning. Use base file name, no paths -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES= \ - mock-service.h \ - secret-dbus-generated.h \ - secret-private.h \ - $(NULL) - -# Images to copy into HTML directory. -# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png -HTML_IMAGES= - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files = \ - libsecret-examples.sgml \ - libsecret-using.sgml \ - migrating-libgnome-keyring.xml - -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml -expand_content_files = \ - migrating-libgnome-keyring.xml - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) -# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) -Wno-error \ - -Wno-deprecated-declarations - -GTKDOC_LIBS= $(GLIB_LIBS) $(GOBJECT_LIBS) \ - $(top_builddir)/libsecret-@SECRET_MAJOR@.la - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += \ - version.xml.in - -# Files not to distribute -# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types -# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt -DISTCLEANFILES = tmpl/secret-unused.sgml - -# Comment this out if you want your docs-status tested during 'make check' -#TESTS_ENVIRONMENT = cd $(srcsrc) -#TESTS = $(GTKDOC_CHECK) diff --git a/libsecret/Makefile.am b/libsecret/Makefile.am deleted file mode 100644 index f760e6c..0000000 --- a/libsecret/Makefile.am +++ /dev/null @@ -1,401 +0,0 @@ - -lib_LTLIBRARIES += libsecret-@SECRET_MAJOR@.la - - -incdir = $(includedir)/libsecret-@SECRET_MAJOR@/libsecret - -libsecret_HEADS = \ - libsecret/secret.h \ - libsecret/secret-attributes.h \ - libsecret/secret-backend.h \ - libsecret/secret-collection.h \ - libsecret/secret-item.h \ - libsecret/secret-password.h \ - libsecret/secret-paths.h \ - libsecret/secret-prompt.h \ - libsecret/secret-retrievable.h \ - libsecret/secret-schema.h \ - libsecret/secret-schemas.h \ - libsecret/secret-service.h \ - libsecret/secret-types.h \ - libsecret/secret-value.h \ - $(NULL) - -inc_HEADERS = \ - $(libsecret_HEADS) \ - libsecret/secret-enum-types.h \ - libsecret/secret-version.h \ - $(NULL) - -libsecret_BUILT_ENUMS = \ - libsecret/secret-enum-types.c libsecret/secret-enum-types.h \ - $(NULL) - -libsecret_BUILT = \ - secret-dbus-generated.c secret-dbus-generated.h \ - $(libsecret_BUILT_ENUMS) \ - libsecret/secret-version.h \ - $(NULL) - -libsecret_PUBLIC = \ - libsecret/secret-attributes.h libsecret/secret-attributes.c \ - libsecret/secret-backend.h libsecret/secret-backend.c \ - libsecret/secret-collection.h libsecret/secret-collection.c \ - libsecret/secret-item.h libsecret/secret-item.c \ - libsecret/secret-methods.c \ - libsecret/secret-password.h libsecret/secret-password.c \ - libsecret/secret-prompt.h libsecret/secret-prompt.c \ - libsecret/secret-retrievable.h libsecret/secret-retrievable.c \ - libsecret/secret-schema.h libsecret/secret-schema.c \ - libsecret/secret-schemas.h libsecret/secret-schemas.c \ - libsecret/secret-service.h libsecret/secret-service.c \ - libsecret/secret-types.h \ - libsecret/secret-value.h libsecret/secret-value.c \ - libsecret/secret-paths.h libsecret/secret-paths.c \ - $(NULL) - -libsecret_PRIVATE = \ - libsecret/secret-private.h \ - libsecret/secret-session.c \ - libsecret/secret-util.c \ - $(NULL) - -if WITH_GCRYPT -libsecret_PRIVATE += \ - libsecret/secret-file-backend.h \ - libsecret/secret-file-backend.c \ - libsecret/secret-file-collection.h \ - libsecret/secret-file-collection.c \ - libsecret/secret-file-item.h \ - libsecret/secret-file-item.c \ - $(NULL) -endif - -libsecret_@SECRET_MAJOR@_la_SOURCES = \ - $(libsecret_PUBLIC) \ - $(libsecret_PRIVATE) \ - $(libsecret_BUILT) \ - $(NULL) - -libsecret_@SECRET_MAJOR@_la_CFLAGS = \ - -DSECRET_COMPILATION \ - $(LIBGCRYPT_CFLAGS) - -libsecret_@SECRET_MAJOR@_la_LDFLAGS = \ - -version-info $(SECRET_LT_RELEASE) \ - -no-undefined \ - -export-symbols-regex '^secret_|^SECRET_|^SECMEM_.*' - -libsecret_@SECRET_MAJOR@_la_LIBADD = \ - libegg.la \ - $(LIBGCRYPT_LIBS) \ - $(LIBS) - -BUILT_SOURCES += $(libsecret_BUILT) - -noinst_LTLIBRARIES += libsecret-testable.la -libsecret_testable_la_SOURCES = -libsecret_testable_la_LIBADD = \ - $(libsecret_@SECRET_MAJOR@_la_OBJECTS) \ - $(libsecret_@SECRET_MAJOR@_la_LIBADD) -libsecret_testable_la_DEPENDENCIES = \ - $(libsecret_@SECRET_MAJOR@_la_OBJECTS) \ - $(libsecret_@SECRET_MAJOR@_la_DEPENDENCIES) -libsecret_testable_la_LDFLAGS = -rpath /force/shared - -DBUS_XML_DEFINITIONS = \ - libsecret/org.freedesktop.Secrets.xml - -temp-dbus-generated.c: $(DBUS_XML_DEFINITIONS) Makefile.am - $(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.Secret. \ - --generate-c-code temp-dbus-generated --c-namespace SecretGen $< -secret-dbus-generated.c: temp-dbus-generated.c Makefile.am - $(AM_V_GEN) { echo '#define GLIB_DISABLE_DEPRECATION_WARNINGS'; \ - sed -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \ - -e 's/temp-dbus-generated.h/secret-dbus-generated.h/g' \ - temp-dbus-generated.c; } > secret-dbus-generated.c -secret-dbus-generated.h: temp-dbus-generated.c Makefile.am - $(AM_V_GEN) sed -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \ - temp-dbus-generated.h > secret-dbus-generated.h - -libsecret/secret-enum-types.h: libsecret/secret-enum-types.h.template $(libsecret_HEADS) - $(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@ - -libsecret/secret-enum-types.c: libsecret/secret-enum-types.c.template $(libsecret_HEADS) - $(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@ - -# ------------------------------------------------------------------ -# INTROSPECTION - -if HAVE_INTROSPECTION - -INTROSPECTION_GIRS += Secret-@SECRET_MAJOR@.gir - -Secret-@SECRET_MAJOR@.gir: libsecret-@SECRET_MAJOR@.la - -Secret_@SECRET_MAJOR@_gir_NAMESPACE = Secret -Secret_@SECRET_MAJOR@_gir_EXPORT_PACKAGES = libsecret-@SECRET_MAJOR@ -Secret_@SECRET_MAJOR@_gir_INCLUDES = GObject-2.0 Gio-2.0 -Secret_@SECRET_MAJOR@_gir_LIBS = libsecret-@SECRET_MAJOR@.la -Secret_@SECRET_MAJOR@_gir_CFLAGS = -I$(srcdir) -I$(builddir) -DSECRET_COMPILATION -Secret_@SECRET_MAJOR@_gir_FILES = \ - $(libsecret_PUBLIC) \ - $(libsecret_BUILT_ENUMS) \ - libsecret/secret-version.h \ - $(NULL) -Secret_@SECRET_MAJOR@_gir_SCANNERFLAGS = --c-include "libsecret/secret.h" - -gir_DATA += Secret-@SECRET_MAJOR@.gir - -if ENABLE_VAPIGEN - -libsecret-@SECRET_MAJOR@.vapi: Secret-@SECRET_MAJOR@.gir libsecret/Secret-@SECRET_MAJOR@.metadata libsecret-@SECRET_MAJOR@.deps - -VAPIGEN_VAPIS += libsecret-@SECRET_MAJOR@.vapi - -libsecret_@SECRET_MAJOR@_vapi_DEPS = glib-2.0 gio-2.0 -libsecret_@SECRET_MAJOR@_vapi_METADATADIRS = $(srcdir)/libsecret -libsecret_@SECRET_MAJOR@_vapi_FILES = Secret-@SECRET_MAJOR@.gir - -libsecret-$(SECRET_MAJOR).deps: Makefile.am - $(AM_V_GEN) echo $(libsecret_@SECRET_MAJOR@_vapi_DEPS) | tr ' ' '\n' > $@ - -vapi_DATA += \ - libsecret-@SECRET_MAJOR@.vapi \ - libsecret-@SECRET_MAJOR@.deps - -endif # ENABLE_VAPIGEN -endif # HAVE_INTROSPECTION - -# ------------------------------------------------------------------ -# PKG CONFIG - -libsecret-$(SECRET_MAJOR).pc: libsecret/libsecret.pc - $(AM_V_GEN) cp libsecret/libsecret.pc libsecret-$(SECRET_MAJOR).pc - -pkgconfig_DATA += \ - libsecret-$(SECRET_MAJOR).pc \ - libsecret/libsecret-unstable.pc - -EXTRA_DIST += \ - libsecret/secret-enum-types.h.template \ - libsecret/secret-enum-types.c.template \ - libsecret/org.freedesktop.Secrets.xml \ - libsecret/Secret-@SECRET_MAJOR@.metadata \ - $(NULL) - -CLEANFILES += \ - temp-dbus-generated.c \ - temp-dbus-generated.h \ - $(NULL) - -DISTCLEANFILES += \ - secret-dbus-generated.c \ - secret-dbus-generated.h \ - $(NULL) - -# ------------------------------------------------------------------ -# TESTS - -noinst_LTLIBRARIES += libmock_service.la - -libmock_service_la_SOURCES = \ - libsecret/mock-service.c \ - libsecret/mock-service.h \ - $(NULL) - -libmock_service_la_LDFLAGS = \ - -rpath /force/shared - -libmock_service_la_LIBADD = \ - $(LIBGCRYPT_LIBS) - -libsecret_LIBS = \ - libsecret-testable.la \ - libmock_service.la \ - $(NULL) - -C_TESTS = \ - test-attributes \ - test-value \ - test-prompt \ - test-service \ - test-session \ - test-paths \ - test-methods \ - test-password \ - test-item \ - test-collection \ - $(NULL) - -test_attributes_SOURCES = libsecret/test-attributes.c -test_attributes_LDADD = $(libsecret_LIBS) - -test_collection_SOURCES = libsecret/test-collection.c -test_collection_LDADD = $(libsecret_LIBS) - -test_item_SOURCES = libsecret/test-item.c -test_item_LDADD = $(libsecret_LIBS) - -test_methods_SOURCES = libsecret/test-methods.c -test_methods_LDADD = $(libsecret_LIBS) - -test_password_SOURCES = libsecret/test-password.c -test_password_LDADD = $(libsecret_LIBS) - -test_paths_SOURCES = libsecret/test-paths.c -test_paths_LDADD = $(libsecret_LIBS) - -test_prompt_SOURCES = libsecret/test-prompt.c -test_prompt_LDADD = $(libsecret_LIBS) - -test_service_SOURCES = libsecret/test-service.c -test_service_LDADD = $(libsecret_LIBS) - -test_session_SOURCES = libsecret/test-session.c -test_session_LDADD = $(libsecret_LIBS) - -test_value_SOURCES = libsecret/test-value.c -test_value_LDADD = $(libsecret_LIBS) - -if WITH_GCRYPT -C_TESTS += \ - test-file-collection \ - $(NULL) - -test_file_collection_SOURCES = libsecret/test-file-collection.c -test_file_collection_LDADD = $(libsecret_LIBS) -endif - -JS_TESTS = \ - libsecret/test-js-lookup.js \ - libsecret/test-js-clear.js \ - libsecret/test-js-store.js \ - $(NULL) - -PY_TESTS = \ - libsecret/test-py-lookup.py \ - libsecret/test-py-clear.py \ - libsecret/test-py-store.py \ - $(NULL) - -check_PROGRAMS += $(C_TESTS) -TESTS += $(C_TESTS) $(PY_TESTS) $(JS_TESTS) - -# ------------------------------------------------------------------ -# VALA TESTS - -if HAVE_VALAC - -VALA_V = $(VALA_V_$(V)) -VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY)) -VALA_V_0 = @echo " VALAC " $@; - -VALA_TESTS_FLAGS = \ - --Xcc=-w \ - --Xcc=-I$(srcdir) \ - --Xcc=-I$(builddir) \ - --Xcc=-I$(srcdir)/libsecret \ - -X -fPIC \ - --vapidir=$(builddir) \ - --pkg libsecret-@SECRET_MAJOR@ \ - --pkg mock-service-0 \ - --pkg gio-2.0 - -VALA_TESTS_VAPIS = \ - libsecret-@SECRET_MAJOR@.vapi \ - mock-service-0.vapi - -VALA_TESTS = \ - test-vala-lang \ - test-vala-unstable \ - $(NULL) - -SUFFIXES = .vala .vala.o - -test-vala-lang.vala.o: libsecret/test-vala-lang.vala $(VALA_TESTS_VAPIS) - $(VALA_V) $(VALAC) --compile $(VALA_TESTS_FLAGS) $< -test-vala-unstable.vala.o: libsecret/test-vala-unstable.vala $(VALA_TESTS_VAPIS) - $(VALA_V) $(VALAC) --compile --Xcc=-DSECRET_WITH_UNSTABLE=1 $(VALA_TESTS_FLAGS) $< - -test_vala_lang_SOURCES = -test_vala_lang_LDADD = \ - test-vala-lang.vala.o \ - libsecret-@SECRET_MAJOR@.la \ - libmock_service.la - -test_vala_unstable_SOURCES = -test_vala_unstable_LDADD = \ - test-vala-unstable.vala.o \ - libsecret-@SECRET_MAJOR@.la \ - libmock_service.la - -if HAVE_INTROSPECTION -if ENABLE_VAPIGEN - -check_PROGRAMS += $(VALA_TESTS) -TESTS += $(VALA_TESTS) - -endif # ENABLE_VAPIGEN -endif # HAVE_INTROSPECTION - -endif # HAVE_VALAC - -EXTRA_DIST += \ - libsecret/test-vala-lang.vala \ - libsecret/test-vala-unstable.vala - -# ------------------------------------------------------------------ -# TEST INTROSPECTION - -if HAVE_INTROSPECTION - -INTROSPECTION_GIRS += MockService-0.gir - -MockService-0.gir: libmock_service.la - -MockService_0_gir_PACKAGES = gobject-2.0 gio-2.0 -MockService_0_gir_EXPORT_PACKAGES = mock-service-0 -MockService_0_gir_INCLUDES = GObject-2.0 Gio-2.0 -MockService_0_gir_LIBS = libmock_service.la -MockService_0_gir_CFLAGS = -I$(builddir) -I$(srcdir) -MockService_0_gir_FILES = $(libmock_service_la_SOURCES) -MockService_0_gir_SCANNERFLAGS = --c-include "libsecret/mock-service.h" - -noinst_DATA += MockService-0.gir MockService-0.typelib -CLEANFILES += MockService-0.gir MockService-0.typelib - -if ENABLE_VAPIGEN - -mock-service-0.vapi: MockService-0.gir libsecret-@SECRET_MAJOR@.vapi - -mock-service-0.deps: - -VAPIGEN_VAPIS += mock-service-0.vapi - -mock_service_0_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@ -mock_service_0_vapi_METADATADIRS = $(builddir) -mock_service_0_vapi_VAPIDIRS = $(builddir) -mock_service_0_vapi_FILES = MockService-0.gir - -noinst_DATA += mock-service-0.vapi - -CLEANFILES += mock-service-0.vapi - -endif # ENABLE_VAPIGEN -endif # HAVE_INTROSPECTION - -#-------------------------------------------------------------------- - -EXTRA_DIST += \ - libsecret/mock \ - libsecret/mock-service-delete.py \ - libsecret/mock-service-empty.py \ - libsecret/mock-service-lock.py \ - libsecret/mock-service-normal.py \ - libsecret/mock-service-only-plain.py \ - libsecret/mock-service-prompt.py \ - $(JS_TESTS) \ - $(PY_TESTS) \ - libsecret/fixtures \ - $(NULL) diff --git a/libsecret/libsecret-unstable.pc.in b/libsecret/libsecret-unstable.pc.in deleted file mode 100644 index 44bb10f..0000000 --- a/libsecret/libsecret-unstable.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -datarootdir=@datarootdir@ -datadir=@datadir@ -sysconfdir=@sysconfdir@ - -Name: libsecret-unstable -Description: GObject bindings for Secret Service API (Unstable) -Version: @VERSION@ -Requires: libsecret-@SECRET_MAJOR@ -Cflags: -DSECRET_WITH_UNSTABLE diff --git a/libsecret/libsecret.pc.in b/libsecret/libsecret.pc.in deleted file mode 100644 index d99cf44..0000000 --- a/libsecret/libsecret.pc.in +++ /dev/null @@ -1,15 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -datarootdir=@datarootdir@ -datadir=@datadir@ -sysconfdir=@sysconfdir@ - -Name: libsecret-@SECRET_MAJOR@ -Description: GObject bindings for Secret Service API -Version: @VERSION@ -Requires: glib-2.0 gobject-2.0 gio-2.0 -Libs: -L${libdir} -lsecret-@SECRET_MAJOR@ -Libs.private: @LIBGCRYPT_LIBS@ -Cflags: -I${includedir}/libsecret-@SECRET_MAJOR@ diff --git a/tool/Makefile.am b/tool/Makefile.am deleted file mode 100644 index ae201b2..0000000 --- a/tool/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -bin_PROGRAMS += tool/secret-tool - -tool_secret_tool_SOURCES = \ - tool/secret-tool.c - -tool_secret_tool_LDADD = \ - libsecret-@SECRET_MAJOR@.la - -if WITH_GCRYPT -TESTS += tool/test-secret-tool.sh -endif - -check_SCRIPTS += tool/test-secret-tool.sh -- cgit v1.2.1