diff options
author | ng0 <ng0@n0.is> | 2019-03-19 16:42:33 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-03-19 17:07:20 +0000 |
commit | c5d729bcff1471a357e75f10f5a782154983fd8f (patch) | |
tree | 37c8c810e5e3d23d5693e61a77ec41f38c9d99c7 | |
parent | 466dd42d2bd71820bf28b0d8404157db339c6dc7 (diff) | |
download | gnunet-c5d729bcff1471a357e75f10f5a782154983fd8f.tar.gz gnunet-c5d729bcff1471a357e75f10f5a782154983fd8f.zip |
contrib: Move scripts content to scripts/Makefile
Actually build the contrib perl script.
Add an m4 script for perl.
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | contrib/Makefile.am | 37 | ||||
-rw-r--r-- | contrib/scripts/Makefile.am | 43 | ||||
-rw-r--r-- | contrib/scripts/documentation/gnunet-doc.scm | 182 | ||||
-rw-r--r-- | contrib/scripts/gnunet-logread/Makefile.am | 22 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in (renamed from contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit) | 0 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-logread/gnunet-logread.in (renamed from contrib/scripts/gnunet-logread/gnunet-logread) | 0 | ||||
-rw-r--r-- | m4/perl.m4 | 48 |
8 files changed, 121 insertions, 218 deletions
diff --git a/configure.ac b/configure.ac index d69683ff8..a8c80eb7d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -214,6 +214,11 @@ AM_PATH_PYTHON([3.7],, [:]) | |||
214 | AC_SUBST([PYTHON]) | 214 | AC_SUBST([PYTHON]) |
215 | AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) | 215 | AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) |
216 | 216 | ||
217 | # perl | ||
218 | AC_PATH_PROG( PERL, perl, , | ||
219 | $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin ) | ||
220 | AC_SUBST([PERL]) | ||
221 | |||
217 | # iptables is a soft requirement to run tests | 222 | # iptables is a soft requirement to run tests |
218 | AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false) | 223 | AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false) |
219 | 224 | ||
@@ -1722,6 +1727,8 @@ AC_DEFINE_UNQUOTED(VCS_VERSION, [$vcs_version], [VCS revision/hash or tarball ve | |||
1722 | AC_CONFIG_FILES([ | 1727 | AC_CONFIG_FILES([ |
1723 | Makefile | 1728 | Makefile |
1724 | contrib/Makefile | 1729 | contrib/Makefile |
1730 | contrib/scripts/Makefile | ||
1731 | contrib/scripts/gnunet-logread/Makefile | ||
1725 | doc/Makefile | 1732 | doc/Makefile |
1726 | doc/man/Makefile | 1733 | doc/man/Makefile |
1727 | doc/doxygen/Makefile | 1734 | doc/doxygen/Makefile |
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 49aa36dfd..ff1d1fbbb 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am | |||
@@ -5,13 +5,7 @@ tap32dir = $(pkgdatadir)/openvpn-tap32/tapw32/ | |||
5 | 5 | ||
6 | tap64dir = $(pkgdatadir)/openvpn-tap32/tapw64/ | 6 | tap64dir = $(pkgdatadir)/openvpn-tap32/tapw64/ |
7 | 7 | ||
8 | noinst_SCRIPTS = \ | 8 | SUBDIRS = scripts |
9 | scripts/terminate.py \ | ||
10 | scripts/pydiffer.py \ | ||
11 | scripts/removetrailingwhitespace.py \ | ||
12 | scripts/gnunet_pyexpect.py \ | ||
13 | scripts/gnunet_janitor.py \ | ||
14 | scripts/gnunet-chk.py | ||
15 | 9 | ||
16 | dist_pkgdata_DATA = \ | 10 | dist_pkgdata_DATA = \ |
17 | gns/gns-bcd.html \ | 11 | gns/gns-bcd.html \ |
@@ -46,14 +40,6 @@ EXTRA_DIST = \ | |||
46 | conf/gnunet/no_autostart_above_core.conf \ | 40 | conf/gnunet/no_autostart_above_core.conf \ |
47 | conf/nss/nssswitch.conf \ | 41 | conf/nss/nssswitch.conf \ |
48 | conf/wireshark/wireshark.lua \ | 42 | conf/wireshark/wireshark.lua \ |
49 | scripts/coverage.sh \ | ||
50 | scripts/terminate.py.in \ | ||
51 | scripts/gnunet_pyexpect.py.in \ | ||
52 | scripts/gnunet_janitor.py.in \ | ||
53 | scripts/gnunet-chk.py.in \ | ||
54 | scripts/gnunet-bugreport \ | ||
55 | scripts/removetrailingwhitespace.py.in \ | ||
56 | scripts/pydiffer.py.in \ | ||
57 | packages/nix/default.nix \ | 43 | packages/nix/default.nix \ |
58 | packages/nix/gnunet-dev.nix \ | 44 | packages/nix/gnunet-dev.nix \ |
59 | 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \ | 45 | 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \ |
@@ -67,27 +53,6 @@ EXTRA_DIST = \ | |||
67 | 3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip \ | 53 | 3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip \ |
68 | $(INITD_FILES) | 54 | $(INITD_FILES) |
69 | 55 | ||
70 | CLEANFILES = \ | ||
71 | $(noinst_SCRIPTS) | ||
72 | |||
73 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | ||
74 | |||
75 | # Use SUFFIX Extension rules, they are more portable for every | ||
76 | # implementation of 'make'. | ||
77 | # You'll also run into the "'%' is a GNU make extension warning" | ||
78 | # if you use this: | ||
79 | # | ||
80 | #%.py: %.py.in Makefile | ||
81 | # $(do_subst) < $< > $@ | ||
82 | # chmod +x $@ | ||
83 | # | ||
84 | # instead of this: | ||
85 | SUFFIXES = .py.in .py | ||
86 | |||
87 | .py.in.py: | ||
88 | $(do_subst) < $< > $@ | ||
89 | chmod +x $@ | ||
90 | |||
91 | check_PROGRAMS = \ | 56 | check_PROGRAMS = \ |
92 | test_gnunet_prefix | 57 | test_gnunet_prefix |
93 | 58 | ||
diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am new file mode 100644 index 000000000..a9eadf337 --- /dev/null +++ b/contrib/scripts/Makefile.am | |||
@@ -0,0 +1,43 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include | ||
3 | |||
4 | SUBDIRS = gnunet-logread | ||
5 | |||
6 | noinst_SCRIPTS = \ | ||
7 | terminate.py \ | ||
8 | pydiffer.py \ | ||
9 | removetrailingwhitespace.py \ | ||
10 | gnunet_pyexpect.py \ | ||
11 | gnunet_janitor.py \ | ||
12 | gnunet-chk.py | ||
13 | |||
14 | EXTRA_DIST = \ | ||
15 | coverage.sh \ | ||
16 | terminate.py.in \ | ||
17 | gnunet_pyexpect.py.in \ | ||
18 | gnunet_janitor.py.in \ | ||
19 | gnunet-chk.py.in \ | ||
20 | gnunet-bugreport \ | ||
21 | removetrailingwhitespace.py.in \ | ||
22 | pydiffer.py.in | ||
23 | |||
24 | CLEANFILES = \ | ||
25 | $(noinst_SCRIPTS) | ||
26 | |||
27 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | ||
28 | |||
29 | # Use SUFFIX Extension rules, they are more portable for every | ||
30 | # implementation of 'make'. | ||
31 | # You'll also run into the "'%' is a GNU make extension warning" | ||
32 | # if you use this: | ||
33 | # | ||
34 | #%.py: %.py.in Makefile | ||
35 | # $(do_subst) < $< > $@ | ||
36 | # chmod +x $@ | ||
37 | # | ||
38 | # instead of this: | ||
39 | SUFFIXES = .py.in .py | ||
40 | |||
41 | .py.in.py: | ||
42 | $(do_subst) < $< > $@ | ||
43 | chmod +x $@ | ||
diff --git a/contrib/scripts/documentation/gnunet-doc.scm b/contrib/scripts/documentation/gnunet-doc.scm deleted file mode 100644 index 077efacad..000000000 --- a/contrib/scripts/documentation/gnunet-doc.scm +++ /dev/null | |||
@@ -1,182 +0,0 @@ | |||
1 | ;;; This file is part of GNUnet. | ||
2 | ;;; Copyright (C) 2016, 2017 GNUnet e.V. | ||
3 | ;;; | ||
4 | ;;; GNUnet is free software: you can redistribute it and/or modify it | ||
5 | ;;; under the terms of the GNU Affero General Public License as published | ||
6 | ;;; by the Free Software Foundation, either version 3 of the License, or | ||
7 | ;;; (at your option) any later version. | ||
8 | ;;; | ||
9 | ;;; GNUnet is distributed in the hope that it will be useful, but | ||
10 | ;;; WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | ;;; Affero General Public License for more details. | ||
13 | ;;; | ||
14 | ;;; You should have received a copy of the GNU Affero General Public License | ||
15 | ;;; along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
16 | ;;; | ||
17 | |||
18 | (use-modules | ||
19 | (ice-9 popen) | ||
20 | (ice-9 match) | ||
21 | (ice-9 rdelim) | ||
22 | (guix packages) | ||
23 | (guix build-system gnu) | ||
24 | (guix gexp) | ||
25 | ((guix build utils) #:select (with-directory-excursion)) | ||
26 | (guix git-download) | ||
27 | (guix utils) ; current-source-directory | ||
28 | (gnu packages) | ||
29 | (gnu packages aidc) | ||
30 | (gnu packages autotools) | ||
31 | (gnu packages backup) | ||
32 | (gnu packages base) | ||
33 | (gnu packages compression) | ||
34 | (gnu packages curl) | ||
35 | (gnu packages databases) | ||
36 | (gnu packages file) | ||
37 | (gnu packages gettext) | ||
38 | (gnu packages glib) | ||
39 | (gnu packages gnome) | ||
40 | (gnu packages gnunet) | ||
41 | (gnu packages gnupg) | ||
42 | (gnu packages gnuzilla) | ||
43 | (gnu packages groff) | ||
44 | (gnu packages gstreamer) | ||
45 | (gnu packages gtk) | ||
46 | (gnu packages guile) | ||
47 | (gnu packages graphviz) | ||
48 | (gnu packages image) | ||
49 | (gnu packages image-viewers) | ||
50 | (gnu packages libidn) | ||
51 | (gnu packages libunistring) | ||
52 | (gnu packages linux) | ||
53 | (gnu packages maths) | ||
54 | (gnu packages multiprecision) | ||
55 | (gnu packages perl) | ||
56 | (gnu packages pkg-config) | ||
57 | (gnu packages pulseaudio) | ||
58 | (gnu packages python) | ||
59 | (gnu packages tex) | ||
60 | (gnu packages texinfo) | ||
61 | (gnu packages tex) | ||
62 | (gnu packages tls) | ||
63 | (gnu packages video) | ||
64 | (gnu packages web) | ||
65 | (gnu packages xiph) | ||
66 | ;;(gnunet packages texlive) ;GNUnet module including texlive-2012 WIP | ||
67 | ((guix licenses) #:prefix license:)) | ||
68 | |||
69 | ;;(define %source-dir (string-append (current-source-directory) | ||
70 | ;; "/../../../")) | ||
71 | (define %source-dir (dirname (current-filename))) | ||
72 | |||
73 | (define gnunet-doc | ||
74 | (let* ((revision "2") | ||
75 | (select? (delay (or (git-predicate | ||
76 | (string-append (current-source-directory) | ||
77 | "/../../../")) | ||
78 | source-file?)))) | ||
79 | (package | ||
80 | (name "gnunet-doc") | ||
81 | (version (string-append "0.10.1-" revision "." "dev")) | ||
82 | (source | ||
83 | (local-file ;;"../../.." | ||
84 | ;;%source-dir | ||
85 | ;;(string-append (getcwd) "/../../../") | ||
86 | (string-append (getcwd)) ;drrty hack and this assumes one static position FIXME! | ||
87 | #:recursive? #t)) | ||
88 | ;;#:select? (git-predicate %source-dir))) | ||
89 | ;;#:select? (force select?))) | ||
90 | (build-system gnu-build-system) | ||
91 | (inputs | ||
92 | `(("glpk" ,glpk) | ||
93 | ("gnurl" ,gnurl) | ||
94 | ("gstreamer" ,gstreamer) | ||
95 | ("gst-plugins-base" ,gst-plugins-base) | ||
96 | ("gnutls/dane" ,gnutls/dane) | ||
97 | ("libextractor" ,libextractor) | ||
98 | ("libgcrypt" ,libgcrypt) | ||
99 | ("libidn" ,libidn) | ||
100 | ("libmicrohttpd" ,libmicrohttpd) | ||
101 | ("libltdl" ,libltdl) | ||
102 | ("libunistring" ,libunistring) | ||
103 | ("openssl" ,openssl) | ||
104 | ("opus" ,opus) | ||
105 | ("pulseaudio" ,pulseaudio) | ||
106 | ("sqlite" ,sqlite) | ||
107 | ("postgresql" ,postgresql) | ||
108 | ("mysql" ,mariadb) | ||
109 | ("zlib" ,zlib) | ||
110 | ("perl" ,perl) | ||
111 | ("python-2" ,python-2) ; tests and gnunet-qr | ||
112 | ("jansson" ,jansson) | ||
113 | ("nss" ,nss) | ||
114 | ("glib" ,glib "bin") | ||
115 | ("gmp" ,gmp) | ||
116 | ("bluez" ,bluez) ; for optional bluetooth feature | ||
117 | ("glib" ,glib) | ||
118 | ;;("texlive-minimal" ,texlive-minimal) ; optional. | ||
119 | ("texlive" ,texlive) ;TODO: Stabilize Texlive-2012 package | ||
120 | ("libogg" ,libogg))) | ||
121 | (native-inputs | ||
122 | `(("pkg-config" ,pkg-config) | ||
123 | ("autoconf" ,autoconf) | ||
124 | ("automake" ,automake) | ||
125 | ("gnu-gettext" ,gnu-gettext) | ||
126 | ("graphviz" ,graphviz) ; dot | ||
127 | ("texinfo-5" ,texinfo-5) ; Debian stable | ||
128 | ("which" ,which) | ||
129 | ("libtool" ,libtool))) | ||
130 | (arguments | ||
131 | `(#:configure-flags | ||
132 | (list "--enable-documentation") | ||
133 | #:tests? #f ;Don't run tests | ||
134 | #:phases | ||
135 | (modify-phases %standard-phases | ||
136 | (add-after 'unpack 'autoconf | ||
137 | (lambda _ | ||
138 | (substitute* "bootstrap" | ||
139 | (("contrib/pogen.sh") "sh contrib/pogen.sh")) | ||
140 | (for-each (lambda (f) (chmod f #o755)) | ||
141 | (find-files "po" "")) | ||
142 | (zero? (system* "sh" "bootstrap")))) | ||
143 | (add-after 'build 'run-gendocs | ||
144 | (lambda _ | ||
145 | (chdir "doc/documentation") | ||
146 | ;;(zero? (system* "make" "dev-build")))) | ||
147 | (zero? (system* "sh" "run-gendocs.sh")))) | ||
148 | ;; (zero? (system* "make" "pdf")) | ||
149 | ;; (zero? (system* "make" "html")) | ||
150 | ;; (zero? (system* "make" "info")))) | ||
151 | ;;(zero? (system* "make" "doc-all-give-me-the-noise")))) | ||
152 | (replace 'install | ||
153 | (lambda _ | ||
154 | (zero? (system* "make" "doc-gendoc-install"))))))) | ||
155 | ;;(lambda* (#:key outputs #:allow-other-keys) | ||
156 | ;; (let* ((out (assoc-ref outputs "out")) | ||
157 | ;; (doc (string-append out "/share/doc/gnunet"))) | ||
158 | ;; (mkdir-p doc) | ||
159 | ;; (copy-recursively "images" | ||
160 | ;; (string-append doc | ||
161 | ;; "/images")) | ||
162 | ;; (mkdir-p (string-append doc "/gnunet")) | ||
163 | ;; (install-file "gnunet.pdf" doc) | ||
164 | ;; (install-file "gnunet.info" doc) | ||
165 | ;; (install-file "gnunet.log" doc) ;TODO: Move to 'dev' output? | ||
166 | ;; (copy-recursively "gnunet" | ||
167 | ;; (string-append doc | ||
168 | ;; "/gnunet")) | ||
169 | ;; (install-file "gnunet-c-tutorial.pdf" doc) | ||
170 | ;; (install-file "gnunet-c-tutorial.info" doc) | ||
171 | ;; (install-file "gnunet-c-tutorial.log" doc) ;TODO: Move to 'dev' output? | ||
172 | ;; (copy-recursively "gnunet-c-tutorial" | ||
173 | ;; (string-append doc | ||
174 | ;; "/gnunet-c-tutorial"))) | ||
175 | ;; #t))))) | ||
176 | (synopsis "Documentation of GNUnet") | ||
177 | (description | ||
178 | "GNUnet documentation build") | ||
179 | (license (list license:fdl1.3+ license:gpl3+)) | ||
180 | (home-page "https://gnunet.org/")))) | ||
181 | |||
182 | gnunet-doc | ||
diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am new file mode 100644 index 000000000..82c99494c --- /dev/null +++ b/contrib/scripts/gnunet-logread/Makefile.am | |||
@@ -0,0 +1,22 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include | ||
3 | |||
4 | do_subst = $(SED) -e 's,[@]PERL[@],$(PERL),g' | ||
5 | |||
6 | SUFFIXES = .in | ||
7 | |||
8 | gnunet-logread: gnunet-logread.in Makefile | ||
9 | $(do_subst) < $(srcdir)/gnunet-logread.in > gnunet-logread | ||
10 | chmod +x gnunet-logread | ||
11 | |||
12 | gnunet-logread-ipc-sdedit: gnunet-logread-ipc-sdedit.in Makefile | ||
13 | $(do_subst) < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit | ||
14 | chmod +x gnunet-logread-ipc-sdedit | ||
15 | |||
16 | CLEANFILES= \ | ||
17 | gnunet-logread \ | ||
18 | gnunet-logread-ipc-sdedit | ||
19 | |||
20 | noinst_SCRIPTS = \ | ||
21 | $(CLEANFILES) \ | ||
22 | gnunet-logread-ipc | ||
diff --git a/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in index f8b7dc735..f8b7dc735 100755 --- a/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit +++ b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in | |||
diff --git a/contrib/scripts/gnunet-logread/gnunet-logread b/contrib/scripts/gnunet-logread/gnunet-logread.in index 9b1c65401..9b1c65401 100755 --- a/contrib/scripts/gnunet-logread/gnunet-logread +++ b/contrib/scripts/gnunet-logread/gnunet-logread.in | |||
diff --git a/m4/perl.m4 b/m4/perl.m4 new file mode 100644 index 000000000..6f855c7a6 --- /dev/null +++ b/m4/perl.m4 | |||
@@ -0,0 +1,48 @@ | |||
1 | # serial 9 | ||
2 | |||
3 | dnl From Jim Meyering. | ||
4 | dnl Find a new-enough version of Perl. | ||
5 | |||
6 | # Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2018 Free Software Foundation, | ||
7 | # Inc. | ||
8 | # | ||
9 | # This file is free software; the Free Software Foundation | ||
10 | # gives unlimited permission to copy and/or distribute it, | ||
11 | # with or without modifications, as long as this notice is preserved. | ||
12 | |||
13 | # GNUnet e.V. comment of origin: gnulib | ||
14 | |||
15 | AC_DEFUN([gl_PERL], | ||
16 | [ | ||
17 | dnl FIXME: don't hard-code 5.005 | ||
18 | AC_MSG_CHECKING([for perl5.005 or newer]) | ||
19 | if test "${PERL+set}" = set; then | ||
20 | # 'PERL' is set in the user's environment. | ||
21 | candidate_perl_names="$PERL" | ||
22 | perl_specified=yes | ||
23 | else | ||
24 | candidate_perl_names='perl perl5' | ||
25 | perl_specified=no | ||
26 | fi | ||
27 | |||
28 | found=no | ||
29 | AC_SUBST([PERL]) | ||
30 | PERL="$am_missing_run perl" | ||
31 | for perl in $candidate_perl_names; do | ||
32 | # Run test in a subshell; some versions of sh will print an error if | ||
33 | # an executable is not found, even if stderr is redirected. | ||
34 | if ( $perl -e 'require 5.005; use File::Compare' ) > /dev/null 2>&1; then | ||
35 | PERL=$perl | ||
36 | found=yes | ||
37 | break | ||
38 | fi | ||
39 | done | ||
40 | |||
41 | AC_MSG_RESULT([$found]) | ||
42 | test $found = no && AC_MSG_WARN([ | ||
43 | WARNING: You don't seem to have perl5.005 or newer installed, or you lack | ||
44 | a usable version of the Perl File::Compare module. As a result, | ||
45 | you may be unable to run a few tests or to regenerate certain | ||
46 | files if you modify the sources from which they are derived. | ||
47 | ] ) | ||
48 | ]) | ||