X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/a96524cc7d302ad6a8f2cd2e970a148b360f629a..b92d02d9783f6a3f16fb4384dbc1c695f714154a:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 9a810e4ebd..50cde52701 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +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. # @@ -25,7 +27,7 @@ nodist_noinst_SCRIPTS = \ pre-inst-env \ test-env -include gnu-system.am +include gnu/local.mk MODULES = \ guix/base32.scm \ @@ -36,6 +38,7 @@ MODULES = \ guix/hash.scm \ guix/pk-crypto.scm \ guix/pki.scm \ + guix/combinators.scm \ guix/utils.scm \ guix/sets.scm \ guix/download.scm \ @@ -47,9 +50,14 @@ 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 \ @@ -69,6 +77,7 @@ MODULES = \ 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 \ @@ -93,6 +102,7 @@ MODULES = \ 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 \ @@ -102,6 +112,7 @@ MODULES = \ 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 \ @@ -115,6 +126,7 @@ MODULES = \ 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 \ @@ -125,9 +137,24 @@ MODULES = \ 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 += \ @@ -145,20 +172,20 @@ 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-4.6-i686.conf \ + gnu/packages/linux-libre-4.6-x86_64.conf \ + gnu/packages/linux-libre-4.4-i686.conf \ + gnu/packages/linux-libre-4.4-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/examples/bare-bones.tmpl \ - gnu/system/examples/desktop.tmpl + gnu/system/examples/desktop.tmpl \ + gnu/system/examples/lightweight-desktop.tmpl GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go @@ -184,6 +211,11 @@ 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 \ @@ -192,11 +224,15 @@ SCM_TESTS = \ tests/pk-crypto.scm \ tests/pki.scm \ tests/sets.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/combinators.scm \ tests/utils.scm \ tests/build-utils.scm \ tests/packages.scm \ @@ -212,23 +248,23 @@ SCM_TESTS = \ tests/profiles.scm \ tests/syscalls.scm \ tests/gremlin.scm \ + tests/bournish.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/containers.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/gem.scm \ - guix/import/gem.scm - SCM_TESTS += \ tests/pypi.scm \ tests/cpan.scm \ @@ -247,6 +283,7 @@ SH_TESTS = \ 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 @@ -259,12 +296,14 @@ endif BUILD_DAEMON TESTS = $(SCM_TESTS) $(SH_TESTS) -TEST_EXTENSIONS = .scm .sh +AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0 -AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" +SCM_LOG_DRIVER = \ + $(top_builddir)/test-env --quiet-stderr \ + $(GUILE) --no-auto-compile -e main \ + $(top_srcdir)/build-aux/test-driver.scm -SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE) -AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)" +AM_SCM_LOG_DRIVER_FLAGS = --brief=yes SH_LOG_COMPILER = $(top_builddir)/test-env $(SHELL) AM_SH_LOG_FLAGS = -x -e @@ -276,6 +315,29 @@ 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 + +check-system: $(GOBJECTS) + $(AM_V_at)echo "Running system tests..." + $(AM_V_at)$(top_builddir)/pre-inst-env \ + $(GUILE) --no-auto-compile \ + -e '(@@ (run-system-tests) run-system-tests)' \ + $(top_srcdir)/build-aux/run-system-tests.scm + # Public key used to sign substitutes from hydra.gnu.org. dist_pkgdata_DATA = hydra.gnu.org.pub @@ -286,8 +348,11 @@ EXTRA_DIST = \ HACKING \ ROADMAP \ TODO \ + CODE-OF-CONDUCT \ .dir-locals.el \ build-aux/build-self.scm \ + build-aux/compile-all.scm \ + build-aux/hydra/evaluate.scm \ build-aux/hydra/gnu-system.scm \ build-aux/hydra/demo-os.scm \ build-aux/hydra/guix.scm \ @@ -296,12 +361,15 @@ EXTRA_DIST = \ build-aux/download.scm \ build-aux/make-binary-tarball.scm \ build-aux/generate-authors.scm \ + build-aux/test-driver.scm \ + build-aux/run-system-tests.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 \ @@ -326,28 +394,21 @@ 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" $@; - # 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. -# -# XXX: Use the C locale for when Guile lacks -# . -.scm.go: - $(AM_V_GUILEC)$(MKDIR_P) `dirname "$@"` ; \ +%.go: make-go ; @: +make-go: $(MODULES) guix/config.scm guix/tests.scm + $(AM_V_at)echo "Compiling Scheme modules..." ; \ unset GUILE_LOAD_COMPILED_PATH ; \ - LC_ALL=C \ + 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 @@ -369,16 +430,20 @@ install-data-hook: set-bootstrap-executable-permissions SUBDIRS = po/guix po/packages BUILT_SOURCES = -include doc.am +include doc/local.mk if BUILD_DAEMON -include daemon.am +include nix/local.mk endif BUILD_DAEMON ACLOCAL_AMFLAGS = -I m4 + +# Pass an explicit '--localstatedir' so that configure does not error out if +# it finds an existing installation with a different localstatedir. AM_DISTCHECK_CONFIGURE_FLAGS = \ + --localstatedir="$$dc_install_base/var" \ --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \ --with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \ --with-nix-prefix="$(NIX_PREFIX)" \ @@ -386,11 +451,11 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ dist_emacsui_DATA = emacs/guix-main.scm nodist_emacsui_DATA = emacs/guix-helper.scm -include emacs.am +include emacs/local.mk # The self-contained tarball. guix-binary.%.tar.xz: - -GUIX_PACKAGE_PATH= \ + $(AM_V_GEN)GUIX_PACKAGE_PATH= \ $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/make-binary-tarball.scm" "$*" "$@" @@ -401,11 +466,11 @@ dist-hook: assert-no-store-file-names distcheck-hook: assert-binaries-available assert-final-inputs-self-contained sync-descriptions: - -GUIX_PACKAGE_PATH= \ + $(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; \ @@ -413,7 +478,7 @@ gen-ChangeLog: fi gen-AUTHORS: - if test -d .git; then \ + $(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" \ @@ -422,7 +487,7 @@ gen-AUTHORS: # 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 ; \ @@ -430,15 +495,43 @@ assert-no-store-file-names: fi # Make sure hydra.gnu.org has the important binaries. -assert-binaries-available: - $(top_builddir)/pre-inst-env "$(GUILE)" \ +assert-binaries-available: $(GOBJECTS) + $(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)" \ +assert-final-inputs-self-contained: $(GOBJECTS) + $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm" -.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go +# Compute the Hydra jobs and write them in the target file. +hydra-jobs.scm: $(GOBJECTS) + $(AM_V_at)$(MKDIR_P) "`dirname "$@"`" + $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)" \ + "$(top_srcdir)/build-aux/hydra/evaluate.scm" \ + "$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp" + $(AM_V_at)mv "$@.tmp" "$@" + +.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" $@;