X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/4c48878de889d45620ad79c6de077ac2b1984d6a..2947ff6430da5d60017b0c5c8c51fd2a1d85440b:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 768a8bd263..9d62f48024 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,7 @@ # Copyright © 2013 Andreas Enge # Copyright © 2015 Alex Kost # Copyright © 2016 Mathieu Lirzin +# Copyright © 2016 Mark H Weaver # # This file is part of GNU Guix. # @@ -26,7 +27,7 @@ nodist_noinst_SCRIPTS = \ pre-inst-env \ test-env -include gnu-system.am +include gnu/local.mk MODULES = \ guix/base32.scm \ @@ -37,10 +38,13 @@ MODULES = \ guix/hash.scm \ guix/pk-crypto.scm \ guix/pki.scm \ + guix/combinators.scm \ guix/utils.scm \ guix/sets.scm \ + guix/modules.scm \ guix/download.scm \ guix/git-download.scm \ + guix/hg-download.scm \ guix/monads.scm \ guix/monad-repl.scm \ guix/gexp.scm \ @@ -48,14 +52,18 @@ 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/zlib.scm \ guix/build-system.scm \ + guix/build-system/ant.scm \ guix/build-system/cmake.scm \ guix/build-system/emacs.scm \ + guix/build-system/asdf.scm \ guix/build-system/glib-or-gtk.scm \ guix/build-system/gnu.scm \ guix/build-system/haskell.scm \ @@ -73,10 +81,13 @@ 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 \ + guix/build/asdf-build-system.scm \ guix/build/git.scm \ + guix/build/hg.scm \ guix/build/glib-or-gtk-build-system.scm \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ @@ -94,9 +105,13 @@ MODULES = \ 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/lisp-utils.scm \ guix/build/graft.scm \ + guix/build/bournish.scm \ + guix/build/qt-utils.scm \ guix/search-paths.scm \ guix/packages.scm \ guix/import/utils.scm \ @@ -108,6 +123,7 @@ MODULES = \ guix/import/elpa.scm \ guix/scripts.scm \ guix/scripts/download.scm \ + guix/scripts/perform-download.scm \ guix/scripts/build.scm \ guix/scripts/archive.scm \ guix/scripts/import.scm \ @@ -139,6 +155,7 @@ MODULES = \ if HAVE_GUILE_JSON MODULES += \ + guix/import/github.scm \ guix/import/json.scm \ guix/import/pypi.scm \ guix/scripts/import/pypi.scm \ @@ -148,13 +165,6 @@ MODULES += \ endif -if BUILD_SYSCALLS_MODULE - -MODULES += \ - guix/build/syscalls.scm - -endif - if BUILD_DAEMON_OFFLOAD MODULES += \ @@ -162,20 +172,25 @@ MODULES += \ endif BUILD_DAEMON_OFFLOAD -# Internal module with test suite support. -dist_noinst_DATA = guix/tests.scm +# Internal modules with test suite support. +dist_noinst_DATA = guix/tests.scm guix/tests/http.scm # Linux-Libre configurations. KCONFIGS = \ - gnu/packages/linux-libre-i686.conf \ - gnu/packages/linux-libre-x86_64.conf + gnu/packages/linux-libre-4.8-i686.conf \ + gnu/packages/linux-libre-4.8-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 +GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go) nobase_dist_guilemodule_DATA = \ $(MODULES) $(KCONFIGS) $(EXAMPLES) \ @@ -197,6 +212,12 @@ endif INSTALL_SRFI_37 # Handy way to remove the .go files without removing all the rest. clean-go: -$(RM) -f $(GOBJECTS) + @find . -name '*.go' -print | \ + if test -t 1; then \ + xargs -r echo -e "\033[31mwarning:\033[0m stray .go files:"; \ + else \ + xargs -r echo "warning: stray .go files:"; \ + fi # Test extensions; has to be unconditional. @@ -212,12 +233,16 @@ SCM_TESTS = \ tests/pk-crypto.scm \ tests/pki.scm \ tests/sets.scm \ + tests/modules.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 \ @@ -233,6 +258,7 @@ SCM_TESTS = \ tests/profiles.scm \ tests/syscalls.scm \ tests/gremlin.scm \ + tests/bournish.scm \ tests/lint.scm \ tests/publish.scm \ tests/scripts.scm \ @@ -240,9 +266,11 @@ SCM_TESTS = \ tests/graph.scm \ tests/challenge.scm \ tests/cve.scm \ + tests/zlib.scm \ tests/file-systems.scm \ tests/system.scm \ tests/services.scm \ + tests/scripts-build.scm \ tests/containers.scm \ tests/import-utils.scm @@ -279,10 +307,14 @@ endif BUILD_DAEMON TESTS = $(SCM_TESTS) $(SH_TESTS) -AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" +AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0 + +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 @@ -310,12 +342,21 @@ check-local: endif !CAN_RUN_TESTS +check-system: $(GOBJECTS) + $(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 # Bash completion file. dist_bashcompletion_DATA = etc/completion/bash/guix +# Zsh completion file. +dist_zshcompletion_DATA = etc/completion/zsh/_guix + EXTRA_DIST = \ HACKING \ ROADMAP \ @@ -324,6 +365,7 @@ EXTRA_DIST = \ .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 \ @@ -332,6 +374,8 @@ 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 \ @@ -351,13 +395,6 @@ EXTRA_DIST += \ endif !BUILD_DAEMON_OFFLOAD -if !BUILD_SYSCALLS_MODULE - -EXTRA_DIST += \ - guix/build/syscalls.scm - -endif !BUILD_SYSCALLS_MODULE - CLEANFILES = \ $(GOBJECTS) \ @@ -368,11 +405,13 @@ CLEANFILES = \ # 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. +# the whole thing. Likewise, set 'XDG_CACHE_HOME' to avoid loading possibly +# stale files from ~/.cache/guile/ccache. %.go: make-go ; @: -make-go: $(MODULES) guix/config.scm guix/tests.scm +make-go: $(MODULES) guix/config.scm $(dist_noinst_DATA) $(AM_V_at)echo "Compiling Scheme modules..." ; \ unset GUILE_LOAD_COMPILED_PATH ; \ + XDG_CACHE_HOME=/nowhere \ host=$(host) srcdir="$(top_srcdir)" \ $(top_builddir)/pre-inst-env \ $(GUILE) -L "$(top_builddir)" -L "$(top_srcdir)" \ @@ -399,16 +438,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)" \ @@ -416,11 +459,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" "$*" "$@" @@ -431,11 +474,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; \ @@ -443,7 +486,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" \ @@ -452,23 +495,34 @@ 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 \ - "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ + $(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info \ + --exclude=*.info-[0-9] --exclude=*.dot \ + --exclude=*.eps --exclude-dir=bootstrap \ + --exclude=guix-prettify.el \ + -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ then \ echo "error: store file names embedded in the distribution" >&2 ; \ exit 1 ; \ 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" +# 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 @@ -484,3 +538,11 @@ 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" $@;