From f9c923bb2d87711235312e8085964372d7480ce4 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Mon, 6 May 2019 16:08:26 +0200 Subject: [PATCH] python: Make EXTRA_DIST files explicit * configure.ac: Configure new Makefiles. * lang/python/Makefile.am: Remove dirs from extra dist and use subdirs. * lang/python/examples/Makefile.am, lang/python/src/Makefile.am, lang/python/doc/Makefile.am: New. Files that list EXTRA_DIST files. -- This is similar to what lang/js does by explicitly listing the files. This ensures that we have clean distribution tarballs without accidentall additions that just lay in the directory. GnuPG-Bug-Id: T4481 --- configure.ac | 5 ++- lang/python/Makefile.am | 7 +-- lang/python/doc/Makefile.am | 48 +++++++++++++++++++++ lang/python/examples/Makefile.am | 74 ++++++++++++++++++++++++++++++++ lang/python/src/Makefile.am | 47 ++++++++++++++++++++ 5 files changed, 175 insertions(+), 6 deletions(-) create mode 100644 lang/python/doc/Makefile.am create mode 100644 lang/python/examples/Makefile.am create mode 100644 lang/python/src/Makefile.am diff --git a/configure.ac b/configure.ac index d69cc82d..9c6767f8 100644 --- a/configure.ac +++ b/configure.ac @@ -922,7 +922,10 @@ AC_CONFIG_FILES([lang/js/Makefile lang/js/src/Makefile AC_CONFIG_FILES(lang/qt/doc/Makefile) AC_CONFIG_FILES([lang/python/Makefile lang/python/version.py - lang/python/tests/Makefile]) + lang/python/tests/Makefile + lang/python/src/Makefile + lang/python/examples/Makefile + lang/python/doc/Makefile]) AC_CONFIG_FILES([lang/python/setup.py], [chmod a+x lang/python/setup.py]) AC_OUTPUT diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am index c888448f..845b7b17 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am @@ -21,12 +21,9 @@ EXTRA_DIST = \ README \ MANIFEST.in \ gpgme.i \ - helpers.c helpers.h private.h \ - examples \ - doc \ - src + helpers.c helpers.h private.h -SUBDIRS = . tests +SUBDIRS = . tests examples doc src .PHONY: prepare prepare: copystamp diff --git a/lang/python/doc/Makefile.am b/lang/python/doc/Makefile.am new file mode 100644 index 00000000..3abc9e66 --- /dev/null +++ b/lang/python/doc/Makefile.am @@ -0,0 +1,48 @@ +# Makefile.am for the Python bindings. +# Copyright (C) 2019 g10 Code GmbH +# +# This file is part of GPGME. +# +# GPGME is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of the +# License, or (at your option) any later version. +# +# GPGME is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General +# Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, see . +# SPDX-License-Identifier: LGPL-2.1-or-later + +# Created by: +# find . -type f -print | sed 's/^.\// /;$q;s/$/ \\/' | sort +EXTRA_DIST = texinfo/what-was-new.texi \ + meta/old-commits.log \ + meta/TODO.org \ + README \ + rst/_build/README \ + rst/conf.py \ + rst/gpgme-python-howto.rst \ + rst/index.rst \ + rst/maintenance-mode.rst \ + rst/short-history.rst \ + rst/_static/README \ + rst/_templates/README \ + rst/what-is-new.rst \ + rst/what-was-new.rst \ + src/gpgme-python-howto \ + src/index \ + src/maintenance-mode \ + src/short-history \ + src/what-is-new \ + src/what-was-new \ + texinfo/gpgme-python-howto.texi \ + texinfo/index.texi \ + texinfo/maintenance-mode.texi \ + texinfo/short-history.texi \ + texinfo/texinfo.tex \ + texinfo/what-is-new.texi \ + texinfo/what-was-new.texi diff --git a/lang/python/examples/Makefile.am b/lang/python/examples/Makefile.am new file mode 100644 index 00000000..bd4319ee --- /dev/null +++ b/lang/python/examples/Makefile.am @@ -0,0 +1,74 @@ +# Makefile.am for the Python bindings. +# Copyright (C) 2019 g10 Code GmbH +# +# This file is part of GPGME. +# +# GPGME is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of the +# License, or (at your option) any later version. +# +# GPGME is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General +# Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, see . +# SPDX-License-Identifier: LGPL-2.1-or-later + +# Created by: +# find . -type f -print | sed 's/^.\// /;$q;s/$/ \\/' | sort +EXTRA_DIST = assuan.py \ + decryption-filter.py \ + delkey.py \ + exportimport.py \ + genkey.py \ + howto/add-userid.py \ + howto/advanced/cython/keycount.pyx \ + howto/advanced/cython/requirements.txt \ + howto/advanced/cython/setup.py \ + howto/clear-sign-file.py \ + howto/create-key.py \ + howto/decrypt-file.py \ + howto/detach-sign-file.py \ + howto/encrypt-file.py \ + howto/encrypt-sign-file.py \ + howto/encrypt-to-group-gullible.py \ + howto/encrypt-to-group.py \ + howto/encrypt-to-group-trustno1.py \ + howto/export-key.py \ + howto/export-minimised-key.py \ + howto/export-secret-key.py \ + howto/export-secret-keys.py \ + howto/groups.py \ + howto/import-keybasekey.py \ + howto/import-key.py \ + howto/import-keys-hkp.py \ + howto/import-keys.py \ + howto/import-mailvelope-keys.py \ + howto/keycount.py \ + howto/local-sign-group.py \ + howto/mutt-groups.py \ + howto/pmkey-import-alt.py \ + howto/pmkey-import-hkp-alt.py \ + howto/pmkey-import-hkp.py \ + howto/pmkey-import.py \ + howto/post_installer.py \ + howto/README.org \ + howto/requirements.txt \ + howto/revoke-userid.py \ + howto/send-key-to-keyserver.py \ + howto/sign-file.py \ + howto/sign-key.py \ + howto/symcrypt-file.py \ + howto/temp-homedir-config.py \ + howto/verify-signatures.py \ + howto/verify-signed-file.py \ + inter-edit.py \ + low_level-encrypt_to_all.py \ + sign.py \ + signverify.py \ + simple.py \ + testCMSgetkey.py \ + verifydetails.py diff --git a/lang/python/src/Makefile.am b/lang/python/src/Makefile.am new file mode 100644 index 00000000..dc7f7685 --- /dev/null +++ b/lang/python/src/Makefile.am @@ -0,0 +1,47 @@ +# Makefile.am for the Python bindings. +# Copyright (C) 2019 g10 Code GmbH +# +# This file is part of GPGME. +# +# GPGME is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of the +# License, or (at your option) any later version. +# +# GPGME is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General +# Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, see . +# SPDX-License-Identifier: LGPL-2.1-or-later + +# Created by: +# find . -type f -print | sed 's/^.\// /;$q;s/$/ \\/' | sort +EXTRA_DIST = callbacks.py \ + constants/create.py \ + constants/data/encoding.py \ + constants/data/__init__.py \ + constants/event.py \ + constants/import_type.py \ + constants/__init__.py \ + constants/keylist/__init__.py \ + constants/keylist/mode.py \ + constants/keysign.py \ + constants/md.py \ + constants/pk.py \ + constants/protocol.py \ + constants/sig/__init__.py \ + constants/sig/mode.py \ + constants/sig/notation.py \ + constants/sigsum.py \ + constants/status.py \ + constants/tofu/__init__.py \ + constants/tofu/policy.py \ + constants/validity.py \ + core.py \ + errors.py \ + __init__.py \ + results.py \ + util.py