[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated (e475309e4 -> 16411a7df)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] branch master updated (e475309e4 -> 16411a7df) |
|
Date: |
Sun, 10 Sep 2017 19:35:35 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a change to branch master
in repository gnunet.
from e475309e4 contrib: Add nssswitch.conf as used by the Gentoo ebuild.
new 207d8bbd2 contrib: guix changes.
new 16411a7df doc: start to integrate images. figs/*.pdf -> images/.png
converted.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../packages/guix/{guix-env.scm => gnunet-doc.scm} | 99 +++++++--------------
contrib/packages/guix/guix-env.scm | 15 +++-
doc/Makefile.am | 61 +++++++------
doc/figs/Service.pdf | Bin 7303 -> 0 bytes
doc/figs/System.pdf | Bin 7897 -> 0 bytes
doc/gnunet-c-tutorial.texi | 6 ++
doc/images/gnunet-tutorial-service.png | Bin 0 -> 40142 bytes
doc/images/gnunet-tutorial-system.png | Bin 0 -> 46982 bytes
8 files changed, 84 insertions(+), 97 deletions(-)
copy contrib/packages/guix/{guix-env.scm => gnunet-doc.scm} (61%)
delete mode 100644 doc/figs/Service.pdf
delete mode 100644 doc/figs/System.pdf
create mode 100644 doc/images/gnunet-tutorial-service.png
create mode 100644 doc/images/gnunet-tutorial-system.png
diff --git a/contrib/packages/guix/guix-env.scm
b/contrib/packages/guix/gnunet-doc.scm
similarity index 61%
copy from contrib/packages/guix/guix-env.scm
copy to contrib/packages/guix/gnunet-doc.scm
index cf7ccb85a..a2a9a2393 100644
--- a/contrib/packages/guix/guix-env.scm
+++ b/contrib/packages/guix/gnunet-doc.scm
@@ -16,28 +16,6 @@
;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
;;; Boston, MA 02110-1301, USA.
;;;
-;; Guix package for GNUnet development
-;;
-;; INSTALL
-;; -------
-;;
-;; To build and install the package in the user environment, use:
-;;
-;; guix package --install-from-file=guix-env.scm
-;;
-;; BUILD ONLY
-;; ----------
-;;
-;; Precondition for using this file is that you run Guix and have a
-;; development setup for this setup, which involves a version of Guile in
-;; your PATH.
-;;
-;; cd contrib/packages/guix
-;; guix build -f guix-env.scm
-;;
-;; We'd like to provide advanced functions such as guix environment specific
-;; gnunet-git package and usage of gnunet-gtk-git, but this is subject
-;; to tests right now.
(use-modules
(ice-9 popen)
@@ -81,6 +59,7 @@
(gnu packages python)
(gnu packages tex)
(gnu packages texinfo)
+ (gnu packages tex)
(gnu packages tls)
(gnu packages video)
(gnu packages web)
@@ -90,14 +69,14 @@
(define %source-dir (string-append (current-source-directory)
"/../../../"))
-(define gnunet-git
- (let* ((revision "2")
+(define gnunet-doc
+ (let* ((revision "1")
(select? (delay (or (git-predicate
(string-append (current-source-directory)
"/../../../"))
source-file?))))
(package
- (name "gnunet-git")
+ (name "gnunet-doc")
(version (string-append "0.10.1-" revision "." "dev"))
(source
(local-file ;;"../../.."
@@ -131,12 +110,12 @@
("python" ,python) ; tests and gnunet-qr
("jansson" ,jansson)
("nss" ,nss)
+ ("glib" ,glib "bin")
("gmp" ,gmp)
("bluez" ,bluez) ; for optional bluetooth feature
("glib" ,glib)
- ;; There are currently no binary substitutes for texlive on
- ;; hydra.gnu.org or its mirrors due to its size. Uncomment if you
need it.
;;("texlive-minimal" ,texlive-minimal) ; optional.
+ ("texlive" ,texlive)
("libogg" ,libogg)))
(native-inputs
`(("pkg-config" ,pkg-config)
@@ -145,54 +124,42 @@
("gnu-gettext" ,gnu-gettext)
("texinfo" ,texinfo)
("libtool" ,libtool)))
- ;; TODO: To make use of out:debug, which carries the symbols,
- ;; this file needs to fixed.
- (outputs '("out" "debug"))
(arguments
- `(#:configure-flags
- (list (string-append "--with-nssdir=" %output "/lib")
- "--enable-gcc-hardening"
- "--enable-linker-hardening"
-
- "--enable-poisoning"
- "--enable-sanitizer"
- "--enable-experimental"
- "--enable-logging=verbose"
- "CFLAGS=-ggdb -O0")
- ;;#:parallel-tests? #f ; parallel building seems to fail
- ;;#:tests? #f ; fail: test_gnunet_statistics.py
+ `(#:tests? #f ;Don't run tests
#:phases
- ;; swap check and install phases and set paths to installed bin
(modify-phases %standard-phases
- (add-after 'unpack 'patch-bin-sh
+ (add-after 'unpack 'autoconf
(lambda _
(substitute* "bootstrap"
(("contrib/pogen.sh") "sh contrib/pogen.sh"))
(for-each (lambda (f) (chmod f #o755))
(find-files "po" ""))
- #t))
- (add-after 'patch-bin-sh 'bootstrap
- (lambda _
(zero? (system* "sh" "bootstrap"))))
- (delete 'check))))
- ;; XXX: https://gnunet.org/bugs/view.php?id=4619
- ;; (add-after 'install 'set-path-for-check
- ;; (lambda* (#:key outputs #:allow-other-keys)
- ;; (let* ((out (assoc-ref outputs "out"))
- ;; (bin (string-append out "/bin"))
- ;; (lib (string-append out "/lib")))
- ;; (setenv "GNUNET_PREFIX" lib)
- ;; (setenv "PATH" (string-append (getenv "PATH") ":" bin))
- ;; (zero? (system* "make" "check"))))))))
- (synopsis "Secure, decentralized, peer-to-peer networking framework")
+ (replace 'build
+ (lambda _
+ (chdir "doc")
+ (zero? (system* "make" "doc-all-give-me-the-noise"))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (string-append out "/share/doc/gnunet")))
+ (mkdir-p doc)
+ (mkdir-p (string-append doc "/gnunet"))
+ (install-file "gnunet.pdf" doc)
+ (install-file "gnunet.info" doc)
+ (copy-recursively "gnunet"
+ (string-append doc
+ "/gnunet"))
+ (install-file "gnunet-c-tutorial.pdf" doc)
+ (install-file "gnunet-c-tutorial.info" doc)
+ (copy-recursively "gnunet-c-tutorial"
+ (string-append doc
+ "/gnunet-c-tutorial")))
+ #t)))))
+ (synopsis "Documentation of GNUnet")
(description
- "GNUnet is a framework for secure peer-to-peer networking. The
-high-level goal is to provide a strong foundation of free software for a
-global, distributed network that provides security and privacy. GNUnet in
-that sense aims to replace the current internet protocol stack. Along with
-an application for secure publication of files, it has grown to include all
-kinds of basic applications for the foundation of a GNU internet.")
- (license license:gpl3+)
+ "GNUnet documentation build")
+ (license (list license:fdl1.3+ license:gpl3+))
(home-page "https://gnunet.org/";))))
-gnunet-git
+gnunet-doc
diff --git a/contrib/packages/guix/guix-env.scm
b/contrib/packages/guix/guix-env.scm
index cf7ccb85a..6946fee57 100644
--- a/contrib/packages/guix/guix-env.scm
+++ b/contrib/packages/guix/guix-env.scm
@@ -81,6 +81,7 @@
(gnu packages python)
(gnu packages tex)
(gnu packages texinfo)
+ (gnu packages tex)
(gnu packages tls)
(gnu packages video)
(gnu packages web)
@@ -91,7 +92,7 @@
"/../../../"))
(define gnunet-git
- (let* ((revision "2")
+ (let* ((revision "3")
(select? (delay (or (git-predicate
(string-append (current-source-directory)
"/../../../"))
@@ -131,12 +132,14 @@
("python" ,python) ; tests and gnunet-qr
("jansson" ,jansson)
("nss" ,nss)
+ ("glib" ,glib "bin")
("gmp" ,gmp)
("bluez" ,bluez) ; for optional bluetooth feature
("glib" ,glib)
;; There are currently no binary substitutes for texlive on
;; hydra.gnu.org or its mirrors due to its size. Uncomment if you
need it.
;;("texlive-minimal" ,texlive-minimal) ; optional.
+ ("texlive" ,texlive)
("libogg" ,libogg)))
(native-inputs
`(("pkg-config" ,pkg-config)
@@ -150,7 +153,7 @@
(outputs '("out" "debug"))
(arguments
`(#:configure-flags
- (list (string-append "--with-nssdir=" %output "/lib")
+ (list (string-append "--with-nssdir=" %output
"/lib");"/lib/gnunet/nss")
"--enable-gcc-hardening"
"--enable-linker-hardening"
@@ -174,6 +177,14 @@
(add-after 'patch-bin-sh 'bootstrap
(lambda _
(zero? (system* "sh" "bootstrap"))))
+ ;; (add-after 'install 'install-lib-nss
+ ;; (lambda* (#:key outputs #:allow-other-keys)
+ ;; (let* ((out (assoc-ref outputs "out"))
+ ;; (lib (string-append out "/lib/nss/")))
+ ;; (mkdir-p lib)
+ ;; (copy-recursively "src/gns/nss/" lib)
+ ;; (install-file "ping" "combobreak"))
+ ;; #t))
(delete 'check))))
;; XXX: https://gnunet.org/bugs/view.php?id=4619
;; (add-after 'install 'set-path-for-check
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c97e0f6d9..8463c7129 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,34 +3,38 @@ SUBDIRS = man doxygen
docdir = $(datadir)/doc/gnunet/
-gnunet_doc_images = \
- images/gnunet-gtk-0-10-gns-a-done.png \
- images/gnunet-gtk-0-10-gns-a.png \
- images/daemon_lego_block.png \
- images/gnunet-gtk-0-10-gns.png \
- images/gnunet-0-10-peerinfo.png \
- images/gnunet-gtk-0-10-identity.png \
- images/gnunet-fs-gtk-0-10-star-tab.png \
- images/gnunet-gtk-0-10.png \
- images/gnunet-gtk-0-10-download-area.png \
- images/gnunet-gtk-0-10-search-selected.png \
- images/gnunet-gtk-0-10-fs-menu.png \
- images/gnunet-gtk-0-10-traffic.png \
- images/gnunet-gtk-0-10-fs.png \
- images/gnunet-namestore-gtk-phone.png \
- images/gnunet-gtk-0-10-fs-publish-editing.png \
- images/gnunet-namestore-gtk-vpn.png \
- images/gnunet-gtk-0-10-fs-published.png \
- images/gnunet-setup-exit.png \
- images/gnunet-gtk-0-10-fs-publish.png \
- images/iceweasel-preferences.png \
- images/gnunet-gtk-0-10-fs-publish-select.png \
- images/iceweasel-proxy.png \
- images/gnunet-gtk-0-10-fs-publish-with-file_0.png \
- images/service_lego_block.png \
- images/gnunet-gtk-0-10-fs-publish-with-file.png \
- images/service_stack.png \
- images/gnunet-gtk-0-10-fs-search.png
+infoimagedir = $(infodir)/images
+
+dist_infoimage_DATA = \
+ %D%/images/gnunet-gtk-0-10-gns-a-done.png \
+ %D%/images/gnunet-gtk-0-10-gns-a.png \
+ %D%/images/daemon_lego_block.png \
+ %D%/images/gnunet-gtk-0-10-gns.png \
+ %D%/images/gnunet-0-10-peerinfo.png \
+ %D%/images/gnunet-gtk-0-10-identity.png \
+ %D%/images/gnunet-fs-gtk-0-10-star-tab.png \
+ %D%/images/gnunet-gtk-0-10.png \
+ %D%/images/gnunet-gtk-0-10-download-area.png \
+ %D%/images/gnunet-gtk-0-10-search-selected.png \
+ %D%/images/gnunet-gtk-0-10-fs-menu.png \
+ %D%/images/gnunet-gtk-0-10-traffic.png \
+ %D%/images/gnunet-gtk-0-10-fs.png \
+ %D%/images/gnunet-namestore-gtk-phone.png \
+ %D%/images/gnunet-gtk-0-10-fs-publish-editing.png \
+ %D%/images/gnunet-namestore-gtk-vpn.png \
+ %D%/images/gnunet-gtk-0-10-fs-published.png \
+ %D%/images/gnunet-setup-exit.png \
+ %D%/images/gnunet-gtk-0-10-fs-publish.png \
+ %D%/images/iceweasel-preferences.png \
+ %D%/images/gnunet-gtk-0-10-fs-publish-select.png \
+ %D%/images/iceweasel-proxy.png \
+ %D%/images/gnunet-gtk-0-10-fs-publish-with-file_0.png \
+ %D%/images/service_lego_block.png \
+ %D%/images/gnunet-gtk-0-10-fs-publish-with-file.png \
+ %D%/images/service_stack.png \
+ %D%/images/gnunet-gtk-0-10-fs-search.png \
+ %D%/images/gnunet-tutorial-service.png \
+ %D%/images/gnunet-tutorial-system.png
gnunet_tutorial_examples = \
001.c \
@@ -74,7 +78,6 @@ gnunet_TEXINFOS = \
EXTRA_DIST = \
$(gnunet_TEXINFOS) \
- $(gnunet_doc_images) \
$(gnunet_tutorial_examples) \
outdated-and-old-installation-instructions.txt \
gnunet-c-tutorial-v1.pdf \
diff --git a/doc/figs/Service.pdf b/doc/figs/Service.pdf
deleted file mode 100644
index e9569cc7a..000000000
Binary files a/doc/figs/Service.pdf and /dev/null differ
diff --git a/doc/figs/System.pdf b/doc/figs/System.pdf
deleted file mode 100644
index 70dc6ff2b..000000000
Binary files a/doc/figs/System.pdf and /dev/null differ
diff --git a/doc/gnunet-c-tutorial.texi b/doc/gnunet-c-tutorial.texi
index 2e4bd9a45..4f56ae5c4 100644
--- a/doc/gnunet-c-tutorial.texi
+++ b/doc/gnunet-c-tutorial.texi
@@ -228,6 +228,12 @@ a DHT).
@c** FXIME: See comment above.
@c** See figure ~\ref{fig:interaction} for an illustration of this approach.
address@hidden ** @image{filename[, width[, height[, alttext[, extension]]]]}
+
address@hidden/gnunet-tutorial-service,,5in,Service with API and network
protocol,.png}
+
address@hidden/gnunet-tutorial-system,,5in,The layered system architecture of
GNUnet,.png}
+
@c \begin{figure}[!h]
@c \begin{center}
@c % \begin{subfigure}
diff --git a/doc/images/gnunet-tutorial-service.png
b/doc/images/gnunet-tutorial-service.png
new file mode 100644
index 000000000..6daed2f35
Binary files /dev/null and b/doc/images/gnunet-tutorial-service.png differ
diff --git a/doc/images/gnunet-tutorial-system.png
b/doc/images/gnunet-tutorial-system.png
new file mode 100644
index 000000000..8b54e16cf
Binary files /dev/null and b/doc/images/gnunet-tutorial-system.png differ
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (e475309e4 -> 16411a7df),
gnunet <=