X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/d326767e6417cbaad2856e6641e98dd80311b8c3..5f7a1a4def8494940a4a2bc3728fb9cd927a14f8:/Makefile.am diff --git a/Makefile.am b/Makefile.am index c482848fdf..92a3bc5f82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,9 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès # Copyright © 2013 Andreas Enge +# Copyright © 2015 Alex Kost +# Copyright © 2016 Mathieu Lirzin +# Copyright © 2016 Mark H Weaver # # This file is part of GNU Guix. # @@ -29,7 +32,9 @@ include gnu-system.am MODULES = \ guix/base32.scm \ guix/base64.scm \ + guix/cpio.scm \ guix/records.scm \ + guix/gcrypt.scm \ guix/hash.scm \ guix/pk-crypto.scm \ guix/pki.scm \ @@ -44,14 +49,23 @@ MODULES = \ guix/serialization.scm \ guix/nar.scm \ guix/derivations.scm \ + guix/grafts.scm \ guix/gnu-maintenance.scm \ + guix/upstream.scm \ guix/licenses.scm \ + guix/graph.scm \ + guix/cve.scm \ guix/build-system.scm \ + guix/build-system/ant.scm \ guix/build-system/cmake.scm \ + guix/build-system/emacs.scm \ guix/build-system/glib-or-gtk.scm \ guix/build-system/gnu.scm \ + guix/build-system/haskell.scm \ guix/build-system/perl.scm \ guix/build-system/python.scm \ + guix/build-system/waf.scm \ + guix/build-system/r.scm \ guix/build-system/ruby.scm \ guix/build-system/trivial.scm \ guix/ftp-client.scm \ @@ -59,30 +73,45 @@ MODULES = \ guix/gnupg.scm \ guix/elf.scm \ guix/store.scm \ + guix/cvs-download.scm \ guix/svn-download.scm \ guix/ui.scm \ + guix/build/ant-build-system.scm \ guix/build/download.scm \ guix/build/cmake-build-system.scm \ + guix/build/emacs-build-system.scm \ guix/build/git.scm \ guix/build/glib-or-gtk-build-system.scm \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ guix/build/perl-build-system.scm \ guix/build/python-build-system.scm \ + guix/build/r-build-system.scm \ guix/build/ruby-build-system.scm \ + guix/build/waf-build-system.scm \ + guix/build/haskell-build-system.scm \ guix/build/store-copy.scm \ guix/build/utils.scm \ guix/build/union.scm \ + guix/build/profiles.scm \ guix/build/pull.scm \ guix/build/rpath.scm \ + guix/build/cvs.scm \ guix/build/svn.scm \ - guix/build/syscalls.scm \ + guix/build/gremlin.scm \ guix/build/emacs-utils.scm \ guix/build/graft.scm \ + guix/build/bournish.scm \ + guix/search-paths.scm \ guix/packages.scm \ guix/import/utils.scm \ guix/import/gnu.scm \ guix/import/snix.scm \ + guix/import/cabal.scm \ + guix/import/cran.scm \ + guix/import/hackage.scm \ + guix/import/elpa.scm \ + guix/scripts.scm \ guix/scripts/download.scm \ guix/scripts/build.scm \ guix/scripts/archive.scm \ @@ -91,17 +120,47 @@ MODULES = \ guix/scripts/gc.scm \ guix/scripts/hash.scm \ guix/scripts/pull.scm \ - guix/scripts/substitute-binary.scm \ + guix/scripts/substitute.scm \ guix/scripts/authenticate.scm \ guix/scripts/refresh.scm \ guix/scripts/system.scm \ guix/scripts/lint.scm \ + guix/scripts/challenge.scm \ + guix/scripts/import/cran.scm \ guix/scripts/import/gnu.scm \ guix/scripts/import/nix.scm \ + guix/scripts/import/hackage.scm \ + guix/scripts/import/elpa.scm \ guix/scripts/environment.scm \ + guix/scripts/publish.scm \ + guix/scripts/edit.scm \ + guix/scripts/size.scm \ + guix/scripts/graph.scm \ + guix/scripts/container.scm \ + guix/scripts/container/exec.scm \ guix.scm \ $(GNU_SYSTEM_MODULES) +if HAVE_GUILE_JSON + +MODULES += \ + guix/import/github.scm \ + guix/import/json.scm \ + guix/import/pypi.scm \ + guix/scripts/import/pypi.scm \ + guix/import/cpan.scm \ + guix/scripts/import/gem.scm \ + guix/import/gem.scm + +endif + +if BUILD_SYSCALLS_MODULE + +MODULES += \ + guix/build/syscalls.scm + +endif + if BUILD_DAEMON_OFFLOAD MODULES += \ @@ -112,23 +171,23 @@ endif BUILD_DAEMON_OFFLOAD # Internal module with test suite support. dist_noinst_DATA = guix/tests.scm -# Because of the autoload hack in (guix build download), we must build it -# first to avoid errors on systems where (gnutls) is unavailable. -guix/scripts/download.go: guix/build/download.go -guix/download.go: guix/build/download.go - # Linux-Libre configurations. KCONFIGS = \ gnu/packages/linux-libre-i686.conf \ - gnu/packages/linux-libre-x86_64.conf + gnu/packages/linux-libre-x86_64.conf \ + gnu/packages/linux-libre-4.1-i686.conf \ + gnu/packages/linux-libre-4.1-x86_64.conf # Templates, examples. EXAMPLES = \ - gnu/system/os-config.tmpl + gnu/system/examples/bare-bones.tmpl \ + gnu/system/examples/desktop.tmpl GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go -nobase_dist_guilemodule_DATA = $(MODULES) $(KCONFIGS) $(EXAMPLES) +nobase_dist_guilemodule_DATA = \ + $(MODULES) $(KCONFIGS) $(EXAMPLES) \ + $(MISC_DISTRO_FILES) nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm # Do we need to provide our own non-broken (srfi srfi-37) module? @@ -148,22 +207,34 @@ clean-go: -$(RM) -f $(GOBJECTS) +# Test extensions; has to be unconditional. +TEST_EXTENSIONS = .scm .sh + +if CAN_RUN_TESTS + SCM_TESTS = \ tests/base32.scm \ tests/base64.scm \ + tests/cpio.scm \ tests/hash.scm \ tests/pk-crypto.scm \ tests/pki.scm \ tests/sets.scm \ - tests/substitute-binary.scm \ + tests/gnu-maintenance.scm \ + tests/substitute.scm \ tests/builders.scm \ tests/derivations.scm \ + tests/grafts.scm \ tests/ui.scm \ tests/records.scm \ + tests/upstream.scm \ tests/utils.scm \ tests/build-utils.scm \ tests/packages.scm \ tests/snix.scm \ + tests/hackage.scm \ + tests/cran.scm \ + tests/elpa.scm \ tests/store.scm \ tests/monads.scm \ tests/gexp.scm \ @@ -171,20 +242,27 @@ SCM_TESTS = \ tests/union.scm \ tests/profiles.scm \ tests/syscalls.scm \ - tests/lint.scm + tests/gremlin.scm \ + tests/lint.scm \ + tests/publish.scm \ + tests/scripts.scm \ + tests/size.scm \ + tests/graph.scm \ + tests/challenge.scm \ + tests/cve.scm \ + tests/file-systems.scm \ + tests/system.scm \ + tests/services.scm \ + tests/scripts-build.scm \ + tests/containers.scm \ + tests/import-utils.scm if HAVE_GUILE_JSON -MODULES += \ - guix/import/json.scm \ - guix/import/pypi.scm \ - guix/scripts/import/pypi.scm \ - guix/import/cpan.scm \ - guix/scripts/import/cpan.scm - SCM_TESTS += \ tests/pypi.scm \ - tests/cpan.scm + tests/cpan.scm \ + tests/gem.scm endif @@ -194,9 +272,13 @@ SH_TESTS = \ tests/guix-gc.sh \ tests/guix-hash.sh \ tests/guix-package.sh \ + tests/guix-package-net.sh \ tests/guix-system.sh \ tests/guix-archive.sh \ tests/guix-authenticate.sh \ + tests/guix-environment.sh \ + tests/guix-environment-container.sh \ + tests/guix-graph.sh \ tests/guix-lint.sh if BUILD_DAEMON @@ -208,8 +290,6 @@ endif BUILD_DAEMON TESTS = $(SCM_TESTS) $(SH_TESTS) -TEST_EXTENSIONS = .scm .sh - AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE) @@ -225,28 +305,51 @@ tests/guix-gc.log: \ $(patsubst %.sh,%.log,$(filter-out tests/guix-gc.sh,$(SH_TESTS))) \ $(SCM_TESTS:%.scm=%.log) +else !CAN_RUN_TESTS + +TESTS = +SH_TESTS = +SCM_TESTS = + +# Automake always generates a 'check' target, so better not override it. +check-local: + @echo + @echo "Cannot run tests because file name limits would be exceeded." >&2 + @echo "Look for 'length' in the 'config.log' file for details." >&2 + @echo + @exit 1 + +endif !CAN_RUN_TESTS + # Public key used to sign substitutes from hydra.gnu.org. dist_pkgdata_DATA = hydra.gnu.org.pub +# Bash completion file. +dist_bashcompletion_DATA = etc/completion/bash/guix + EXTRA_DIST = \ HACKING \ ROADMAP \ TODO \ + CODE-OF-CONDUCT \ .dir-locals.el \ build-aux/build-self.scm \ + build-aux/compile-all.scm \ build-aux/hydra/gnu-system.scm \ build-aux/hydra/demo-os.scm \ build-aux/hydra/guix.scm \ build-aux/check-available-binaries.scm \ build-aux/check-final-inputs-self-contained.scm \ build-aux/download.scm \ - build-aux/list-packages.scm \ + build-aux/make-binary-tarball.scm \ + build-aux/generate-authors.scm \ srfi/srfi-37.scm.in \ srfi/srfi-64.scm \ srfi/srfi-64.upstream.scm \ tests/test.drv \ tests/signing-key.pub \ tests/signing-key.sec \ + tests/cve-sample.xml \ build-aux/config.rpath \ bootstrap \ release.nix \ @@ -259,25 +362,33 @@ EXTRA_DIST += \ endif !BUILD_DAEMON_OFFLOAD +if !BUILD_SYSCALLS_MODULE + +EXTRA_DIST += \ + guix/build/syscalls.scm + +endif !BUILD_SYSCALLS_MODULE + CLEANFILES = \ $(GOBJECTS) \ $(SCM_TESTS:tests/%.scm=%.log) -AM_V_GUILEC = $(AM_V_GUILEC_$(V)) -AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY)) -AM_V_GUILEC_0 = @echo " GUILEC" $@; - -# XXX: Use the C locale for when Guile lacks -# . -.scm.go: - $(AM_V_GUILEC)$(MKDIR_P) `dirname "$@"` ; \ - LC_ALL=C \ +# Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if +# $GUILE_LOAD_COMPILED_PATH contains $(moduledir), we may find .go files in +# there that are newer than the local .scm files (for instance because the +# user ran 'make install' recently). When that happens, we end up loading +# those previously-installed .go files, which may be stale, thereby breaking +# the whole thing. +%.go: make-go ; @: +make-go: $(MODULES) guix/config.scm guix/tests.scm + $(AM_V_at)echo "Compiling Scheme modules..." ; \ + unset GUILE_LOAD_COMPILED_PATH ; \ + host=$(host) srcdir="$(top_srcdir)" \ $(top_builddir)/pre-inst-env \ - $(GUILD) compile -L "$(top_builddir)" -L "$(top_srcdir)" \ - -Wformat -Wunbound-variable -Warity-mismatch \ - --target="$(host)" \ - -o "$@" "$<" + $(GUILE) -L "$(top_builddir)" -L "$(top_srcdir)" \ + --no-auto-compile \ + -s "$(top_srcdir)"/build-aux/compile-all.scm $^ SUFFIXES = .go @@ -318,23 +429,41 @@ dist_emacsui_DATA = emacs/guix-main.scm nodist_emacsui_DATA = emacs/guix-helper.scm include emacs.am -dist-hook: sync-descriptions gen-ChangeLog assert-no-store-file-names +# The self-contained tarball. +guix-binary.%.tar.xz: + $(AM_V_GEN)GUIX_PACKAGE_PATH= \ + $(top_builddir)/pre-inst-env "$(GUILE)" \ + "$(top_srcdir)/build-aux/make-binary-tarball.scm" "$*" "$@" + + +dist-hook: sync-descriptions gen-ChangeLog gen-AUTHORS +dist-hook: assert-no-store-file-names + distcheck-hook: assert-binaries-available assert-final-inputs-self-contained sync-descriptions: - -$(top_builddir)/pre-inst-env guix lint --checkers=gnu-description + $(AM_V_at)GUIX_PACKAGE_PATH= \ + $(top_builddir)/pre-inst-env guix lint --checkers=gnu-description gen-ChangeLog: - if test -d .git; then \ + $(AM_V_GEN)if test -d .git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ > $(distdir)/cl-t; \ rm -f $(distdir)/ChangeLog; \ mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi +gen-AUTHORS: + $(AM_V_GEN)if test -d .git; then \ + rm -f "$(distdir)/AUTHORS"; \ + $(top_builddir)/pre-inst-env "$(GUILE)" \ + "$(top_srcdir)/build-aux/generate-authors.scm" \ + "$(top_srcdir)" "$(distdir)/AUTHORS"; \ + fi + # Make sure we're not shipping a file that embeds a local /gnu/store file name. assert-no-store-file-names: - if grep -r --exclude=*.texi --exclude=*.info \ + $(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info \ "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ then \ echo "error: store file names embedded in the distribution" >&2 ; \ @@ -343,14 +472,34 @@ assert-no-store-file-names: # Make sure hydra.gnu.org has the important binaries. assert-binaries-available: - $(top_builddir)/pre-inst-env "$(GUILE)" \ + $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/check-available-binaries.scm" # Make sure the final inputs don't refer to bootstrap tools. assert-final-inputs-self-contained: - $(top_builddir)/pre-inst-env "$(GUILE)" \ + $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm" -.PHONY: sync-descriptions gen-ChangeLog clean-go +.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go .PHONY: assert-no-store-file-names assert-binaries-available .PHONY: assert-final-inputs-self-contained + +## -------------- ## +## Silent rules. ## +## -------------- ## + +AM_V_DL = $(AM_V_DL_$(V)) +AM_V_DL_ = $(AM_V_DL_$(AM_DEFAULT_VERBOSITY)) +AM_V_DL_0 = @echo " DL " $@; + +AM_V_DOT = $(AM_V_DOT_$(V)) +AM_V_DOT_ = $(AM_V_DOT_$(AM_DEFAULT_VERBOSITY)) +AM_V_DOT_0 = @echo " DOT " $@; + +AM_V_EMACS = $(AM_V_EMACS_$(V)) +AM_V_EMACS_ = $(AM_V_EMACS_$(AM_DEFAULT_VERBOSITY)) +AM_V_EMACS_0 = @echo " EMACS " $@; + +AM_V_HELP2MAN = $(AM_V_HELP2MAN_$(V)) +AM_V_HELP2MAN_ = $(AM_V_HELP2MAN_$(AM_DEFAULT_VERBOSITY)) +AM_V_HELP2MAN_0 = @echo " HELP2MAN" $@;