Page MenuHome GnuPG
Files F18824832

No OneTemporary
Actions

View Options

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5f161a96..db8a1a21 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,62 +1,62 @@
# doc - Automake template
# Copyright (C) 2001, 2004 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, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
## Process this file with automake to produce Makefile.in
DISTCLEANFILES = gpgme.tmp
CLEANFILES = mkdefsinc defs.inc
EXTRA_DIST = module-overview.sk HACKING DCO ChangeLog-2011 \
mkdefsinc.c defsincdate \
examples/gpgme-mozilla.json examples/gpgme-chrome.json
BUILT_SOURCES = defsincdate defs.inc
info_TEXINFOS = gpgme.texi
gpgme_TEXINFOS = uiserver.texi lesser.texi gpl.texi
gpgme.texi : defs.inc
mkdefsinc: mkdefsinc.c Makefile ../config.h
$(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \
-o $@ $(srcdir)/mkdefsinc.c
dist-hook: defsincdate
defsincdate: $(gpgme_TEXINFOS)
: >defsincdate ; \
if test -e $(top_srcdir)/.git; then \
(cd $(srcdir) && git log -1 --format='%ct' -- \
$(info_TEXINFOS) $(gpgme_TEXINFOS) 2>/dev/null) >>defsincdate; \
fi
defs.inc: defsincdate Makefile mkdefsinc
incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
$(info_TEXINFOS) $(gpgme_TEXINFOS) >$@
-online: gpgme.html gpgme.pdf gpgme-python-howto.html gpgme-python-howto.pdf
+online: gpgme.html gpgme.pdf
set -e; \
echo "Uploading current manuals to www.gnupg.org ..."; \
user=werner ; \
(cd gpgme.html && rsync -vr --exclude='.svn' . \
$${user}@ftp.gnupg.org:webspace/manuals/gpgme/ ); \
rsync -v gpgme.pdf $${user}@ftp.gnupg.org:webspace/manuals/
diff --git a/lang/python/MANIFEST.in b/lang/python/MANIFEST.in
index bd7462a5..f4def417 100644
--- a/lang/python/MANIFEST.in
+++ b/lang/python/MANIFEST.in
@@ -1,10 +1,11 @@
-recursive-include docs *.org *.texi *.info *.rst
-recursive-include docs src *.org
-recursive-include docs rst *.rst
-recursive-include docs texinfo *.texi *.infok
+recursive-include doc *.org
+recursive-include doc *.rst
+recursive-include doc *.tex
+recursive-include doc *.texi
+recursive-include doc *.info
recursive-include examples *.py *.pyx
include README README.org
include gpgme.i
include helpers.c helpers.h private.h
include version.py
recursive-include gpg *.py
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 86453054..6df17ceb 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -1,107 +1,104 @@
# Makefile.am for the Python bindings.
# Copyright (C) 2016 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 <http://www.gnu.org/licenses/>.
EXTRA_DIST = \
README \
MANIFEST.in \
gpgme.i \
helpers.c helpers.h private.h \
examples \
- docs \
+ doc \
src
-dist-hook:
- cp -pr "$(srcdir)/docs" "$(DESTDIR)/docs"
-
SUBDIRS = . tests
.PHONY: prepare
prepare: copystamp
# For VPATH builds we need to copy some files because Python's
# distutils are not VPATH-aware.
copystamp:
ln -sf "$(top_srcdir)/src/data.h" .
ln -sf "$(top_builddir)/config.h" .
ln -sf "$(srcdir)/src" gpg
touch $@
all-local: copystamp
set -e ; for PYTHON in $(PYTHONS); do \
CPP="$(CPP)" \
CFLAGS="$(CFLAGS)" \
srcdir="$(srcdir)" \
top_builddir="$(top_builddir)" \
$$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" ; \
done
python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp
$(MKDIR_P) python$(PYTHON_VERSION)-gpg-dist
CPP="$(CPP)" \
CFLAGS="$(CFLAGS)" \
srcdir="$(srcdir)" \
top_builddir="$(top_builddir)" \
$(PYTHON) setup.py sdist --verbose --dist-dir=python$(PYTHON_VERSION)-gpg-dist \
--manifest=python$(PYTHON_VERSION)-gpg-dist/MANIFEST
gpgbin=gpgconf --list-components | grep OpenPGP | sed -e 's/gpg:OpenPGP://g'
$(gpgbin) --detach-sign --armor python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz
.PHONY: sdist
sdist: python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc
.PHONY: upload
upload: python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz \
python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz.asc
twine upload $^
CLEANFILES = copystamp \
config.h \
data.h \
gpg
# Remove the rest.
#
# 'make distclean' clears the write bit, breaking rm -rf. Fix the
# permissions.
clean-local:
rm -rf -- build
for PYTHON in $(PYTHONS); do \
find "$$(basename "$${PYTHON}")-gpg" -type d ! -perm -200 -exec chmod u+w {} ';' ; \
rm -rf -- "$$(basename "$${PYTHON}")-gpg" ; \
done
install-exec-local:
set -e ; for PYTHON in $(PYTHONS); do \
CPP="$(CPP)" \
CFLAGS="$(CFLAGS)" \
srcdir="$(srcdir)" \
top_builddir="$(top_builddir)" \
$$PYTHON setup.py \
build \
--build-base="$$(basename "$${PYTHON}")-gpg" \
install \
--prefix "$(DESTDIR)$(prefix)" \
--verbose ; \
done
uninstall-local:
set -x; GV=$$(echo $(VERSION) | tr - _); for PYTHON in $(PYTHONS); do \
PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_config_var("prefix")))')" ; \
rm -rf -- "$(DESTDIR)$${PLATLIB}/gpg" \
"$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info ; \
done
diff --git a/lang/python/docs/README b/lang/python/doc/README
similarity index 100%
rename from lang/python/docs/README
rename to lang/python/doc/README
diff --git a/lang/python/docs/meta/TODO.org b/lang/python/doc/meta/TODO.org
similarity index 100%
rename from lang/python/docs/meta/TODO.org
rename to lang/python/doc/meta/TODO.org
diff --git a/lang/python/docs/meta/old-commits.log b/lang/python/doc/meta/old-commits.log
similarity index 100%
rename from lang/python/docs/meta/old-commits.log
rename to lang/python/doc/meta/old-commits.log
diff --git a/lang/python/docs/rst/gpgme-python-howto.rst b/lang/python/doc/rst/gpgme-python-howto.rst
similarity index 100%
rename from lang/python/docs/rst/gpgme-python-howto.rst
rename to lang/python/doc/rst/gpgme-python-howto.rst
diff --git a/lang/python/docs/rst/short-history.rst b/lang/python/doc/rst/short-history.rst
similarity index 100%
rename from lang/python/docs/rst/short-history.rst
rename to lang/python/doc/rst/short-history.rst
diff --git a/lang/python/docs/src/gpgme-python-howto.org b/lang/python/doc/src/gpgme-python-howto.org
similarity index 100%
rename from lang/python/docs/src/gpgme-python-howto.org
rename to lang/python/doc/src/gpgme-python-howto.org
diff --git a/lang/python/docs/src/short-history.org b/lang/python/doc/src/short-history.org
similarity index 100%
rename from lang/python/docs/src/short-history.org
rename to lang/python/doc/src/short-history.org
diff --git a/lang/python/docs/texinfo/gpgme-python-howto.texi b/lang/python/doc/texinfo/gpgme-python-howto.texi
similarity index 100%
rename from lang/python/docs/texinfo/gpgme-python-howto.texi
rename to lang/python/doc/texinfo/gpgme-python-howto.texi
diff --git a/lang/python/docs/texinfo/short-history.texi b/lang/python/doc/texinfo/short-history.texi
similarity index 100%
rename from lang/python/docs/texinfo/short-history.texi
rename to lang/python/doc/texinfo/short-history.texi
diff --git a/lang/python/docs/texinfo/texinfo.tex b/lang/python/doc/texinfo/texinfo.tex
similarity index 100%
rename from lang/python/docs/texinfo/texinfo.tex
rename to lang/python/doc/texinfo/texinfo.tex

File Metadata

Mime Type
text/x-diff
Expires
Mon, Dec 23, 1:28 PM (6 h, 2 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
40/ad/e89ae5fa761e299e024b37b72a84

Event Timeline