X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/aa1d47e72ee23aa38bbd9d216d68c8ebef351420..e8e1f295f15fa56660a2c460d422795b1a31bed8:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 7cc46d4ac2..618d1653e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,17 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès # Copyright © 2013 Andreas Enge # Copyright © 2015, 2017 Alex Kost -# Copyright © 2016 Mathieu Lirzin -# Copyright © 2016, 2017 Mark H Weaver +# Copyright © 2016, 2018 Mathieu Lirzin +# Copyright © 2016, 2017, 2018 Mark H Weaver # Copyright © 2017 Mathieu Othacehe # Copyright © 2017 Leo Famulari # Copyright © 2017 Ricardo Wurmus # Copyright © 2017 Jan Nieuwenhuizen # Copyright © 2017 Arun Isaac +# Copyright © 2018 Nils Gillmann +# Copyright © 2018 Julien Lepiller +# Copyright © 2018 Oleg Pykhalov # # This file is part of GNU Guix. # @@ -25,8 +28,22 @@ # You should have received a copy of the GNU General Public License # along with GNU Guix. If not, see . -bin_SCRIPTS = \ - scripts/guix +MSGMERGE_UPDATE = @MSGMERGE@ --update + +bin_SCRIPTS = scripts/guix + +# Handle substitution of fully-expanded Autoconf variables. +do_subst = $(SED) \ + -e 's,[@]GUILE[@],$(GUILE),g' \ + -e 's,[@]guilemoduledir[@],$(guilemoduledir),g' \ + -e 's,[@]guileobjectdir[@],$(guileobjectdir),g' \ + -e 's,[@]localedir[@],$(localedir),g' + +scripts/guix: scripts/guix.in Makefile + $(AM_V_at)rm -f $@ $@-t + $(AM_V_at)$(MKDIR_P) "$(@D)" + $(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t" + $(AM_V_at)chmod a+x,a-w "$@-t" && mv -f "$@-t" "$@" nodist_noinst_SCRIPTS = \ pre-inst-env \ @@ -34,9 +51,11 @@ nodist_noinst_SCRIPTS = \ # Modules that are not compiled but are installed nonetheless, such as # build-side modules with unusual dependencies. -MODULES_NOT_COMPILED = +MODULES_NOT_COMPILED = \ + guix/man-db.scm include gnu/local.mk +include po/doc/local.mk MODULES = \ guix/base16.scm \ @@ -67,8 +86,10 @@ MODULES = \ guix/derivations.scm \ guix/grafts.scm \ guix/gnu-maintenance.scm \ + guix/self.scm \ guix/upstream.scm \ guix/licenses.scm \ + guix/glob.scm \ guix/git.scm \ guix/graph.scm \ guix/cache.scm \ @@ -76,6 +97,7 @@ MODULES = \ guix/workers.scm \ guix/zlib.scm \ guix/build-system.scm \ + guix/build-system/android-ndk.scm \ guix/build-system/ant.scm \ guix/build-system/cargo.scm \ guix/build-system/cmake.scm \ @@ -102,11 +124,13 @@ MODULES = \ guix/http-client.scm \ guix/gnupg.scm \ guix/elf.scm \ + guix/profiling.scm \ guix/store.scm \ guix/cvs-download.scm \ guix/svn-download.scm \ guix/i18n.scm \ guix/ui.scm \ + guix/build/android-ndk-build-system.scm \ guix/build/ant-build-system.scm \ guix/build/download.scm \ guix/build/download-nar.scm \ @@ -188,7 +212,6 @@ MODULES = \ guix/scripts/import/texlive.scm \ guix/scripts/environment.scm \ guix/scripts/publish.scm \ - guix/scripts/weather.scm \ guix/scripts/edit.scm \ guix/scripts/size.scm \ guix/scripts/graph.scm \ @@ -200,6 +223,7 @@ MODULES = \ if HAVE_GUILE_JSON MODULES += \ + guix/ci.scm \ guix/docker.scm \ guix/import/cpan.scm \ guix/import/crate.scm \ @@ -207,13 +231,16 @@ MODULES += \ guix/import/github.scm \ guix/import/gnome.scm \ guix/import/json.scm \ + guix/import/opam.scm \ guix/import/pypi.scm \ guix/import/stackage.scm \ guix/scripts/import/crate.scm \ guix/scripts/import/gem.scm \ guix/scripts/import/json.scm \ + guix/scripts/import/opam.scm \ guix/scripts/import/pypi.scm \ - guix/scripts/import/stackage.scm + guix/scripts/import/stackage.scm \ + guix/scripts/weather.scm endif @@ -233,12 +260,23 @@ MODULES += \ endif BUILD_DAEMON_OFFLOAD +# Scheme implementation of the build daemon and related functionality. +STORE_MODULES = \ + guix/store/database.scm \ + guix/store/deduplication.scm + +MODULES += $(STORE_MODULES) + # Internal modules with test suite support. dist_noinst_DATA = guix/tests.scm guix/tests/http.scm # Auxiliary files for packages. AUX_FILES = \ gnu/packages/aux-files/emacs/guix-emacs.el \ + gnu/packages/aux-files/linux-libre/4.17-arm.conf \ + gnu/packages/aux-files/linux-libre/4.17-arm64.conf \ + gnu/packages/aux-files/linux-libre/4.17-i686.conf \ + gnu/packages/aux-files/linux-libre/4.17-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.14-arm.conf \ gnu/packages/aux-files/linux-libre/4.14-i686.conf \ gnu/packages/aux-files/linux-libre/4.14-x86_64.conf \ @@ -246,12 +284,12 @@ AUX_FILES = \ gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.4-i686.conf \ gnu/packages/aux-files/linux-libre/4.4-x86_64.conf \ - gnu/packages/aux-files/linux-libre/4.1-i686.conf \ - gnu/packages/aux-files/linux-libre/4.1-x86_64.conf + gnu/packages/aux-files/run-in-namespace.c # Templates, examples. EXAMPLES = \ gnu/system/examples/bare-bones.tmpl \ + gnu/system/examples/beaglebone-black.tmpl \ gnu/system/examples/desktop.tmpl \ gnu/system/examples/lightweight-desktop.tmpl \ gnu/system/examples/vm-image.tmpl @@ -259,6 +297,7 @@ EXAMPLES = \ GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go) nobase_dist_guilemodule_DATA = \ + guix/store/schema.sql \ $(MODULES) $(MODULES_NOT_COMPILED) $(AUX_FILES) $(EXAMPLES) \ $(MISC_DISTRO_FILES) nobase_nodist_guilemodule_DATA = guix/config.scm @@ -295,6 +334,7 @@ SCM_TESTS = \ tests/substitute.scm \ tests/builders.scm \ tests/derivations.scm \ + tests/glob.scm \ tests/grafts.scm \ tests/ui.scm \ tests/records.scm \ @@ -336,12 +376,15 @@ SCM_TESTS = \ tests/scripts-build.scm \ tests/containers.scm \ tests/pack.scm \ - tests/import-utils.scm + tests/import-utils.scm \ + tests/store-database.scm \ + tests/store-deduplication.scm if HAVE_GUILE_JSON SCM_TESTS += \ tests/pypi.scm \ + tests/opam.scm \ tests/cpan.scm \ tests/gem.scm \ tests/crate.scm @@ -353,6 +396,7 @@ SH_TESTS = \ tests/guix-download.sh \ tests/guix-gc.sh \ tests/guix-hash.sh \ + tests/guix-pack.sh \ tests/guix-package.sh \ tests/guix-package-net.sh \ tests/guix-system.sh \ @@ -363,13 +407,6 @@ SH_TESTS = \ tests/guix-graph.sh \ tests/guix-lint.sh -if BUILD_DAEMON - -SH_TESTS += tests/guix-register.sh - -endif BUILD_DAEMON - - TESTS = $(SCM_TESTS) $(SH_TESTS) AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0 @@ -407,7 +444,7 @@ check-local: endif !CAN_RUN_TESTS -check-system: $(GOBJECTS) $(BOOTSTRAP_GUILE_TARBALLS) +check-system: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env \ $(GUILE) --no-auto-compile \ -e '(@@ (run-system-tests) run-system-tests)' \ @@ -416,29 +453,41 @@ check-system: $(GOBJECTS) $(BOOTSTRAP_GUILE_TARBALLS) # Public key used to sign substitutes from hydra.gnu.org & co. dist_pkgdata_DATA = \ hydra.gnu.org.pub \ - bayfront.guixsd.org.pub + berlin.guixsd.org.pub # Bash completion file. -dist_bashcompletion_DATA = etc/completion/bash/guix +dist_bashcompletion_DATA = etc/completion/bash/guix \ + etc/completion/bash/guix-daemon # Zsh completion file. dist_zshcompletion_DATA = etc/completion/zsh/_guix -EXTRA_DIST = \ +# Fish completion file. +dist_fishcompletion_DATA = etc/completion/fish/guix.fish + +# SELinux policy +dist_selinux_policy_DATA = etc/guix-daemon.cil + +EXTRA_DIST += \ HACKING \ ROADMAP \ TODO \ CODE-OF-CONDUCT \ .dir-locals.el \ + scripts/guix.in \ + etc/guix-install.sh \ build-aux/build-self.scm \ build-aux/compile-all.scm \ build-aux/hydra/evaluate.scm \ build-aux/hydra/gnu-system.scm \ build-aux/hydra/guix.scm \ build-aux/hydra/guix-modular.scm \ + build-aux/cuirass/gnu-system.scm \ + build-aux/cuirass/guix-modular.scm \ + build-aux/cuirass/hydra-to-cuirass.scm \ build-aux/check-available-binaries.scm \ build-aux/check-final-inputs-self-contained.scm \ - build-aux/download.scm \ + build-aux/compile-as-derivation.scm \ build-aux/generate-authors.scm \ build-aux/test-driver.scm \ build-aux/update-guix-package.scm \ @@ -466,6 +515,7 @@ endif !BUILD_DAEMON_OFFLOAD CLEANFILES = \ + $(bin_SCRIPTS) \ $(GOBJECTS) \ $(SCM_TESTS:tests/%.scm=%.log) @@ -503,6 +553,13 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA install-data-hook: set-bootstrap-executable-permissions touch "$(DESTDIR)$(guileobjectdir)/guix/config.go" +# Assuming Guix is already installed and the daemon is up and running, this +# rule builds from $(srcdir), creating and building derivations. +as-derivation: + $(AM_V_at)echo "Building Guix in Guix..." ; \ + $(GUILE) --no-auto-compile \ + "$(top_srcdir)/build-aux/compile-as-derivation.scm" \ + "$(abs_top_srcdir)" SUBDIRS = po/guix po/packages BUILT_SOURCES = @@ -693,6 +750,7 @@ assert-no-store-file-names: $(distdir)/ChangeLog $(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info \ --exclude=*.info-[0-9] --exclude=*.dot \ --exclude=*.eps --exclude-dir=bootstrap \ + --exclude=guix-manual.pot --exclude=guix-manual.*.po \ --exclude=guix-prettify.el \ --exclude=ChangeLog \ -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ @@ -731,7 +789,7 @@ cuirass-jobs.scm: $(GOBJECTS) .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version .PHONY: assert-no-store-file-names assert-binaries-available .PHONY: assert-final-inputs-self-contained -.PHONY: clean-go make-go +.PHONY: clean-go make-go as-derivation .PHONY: update-guix-package update-NEWS release ## -------------- ## @@ -749,3 +807,11 @@ AM_V_DOT_0 = @echo " DOT " $@; AM_V_HELP2MAN = $(AM_V_HELP2MAN_$(V)) AM_V_HELP2MAN_ = $(AM_V_HELP2MAN_$(AM_DEFAULT_VERBOSITY)) AM_V_HELP2MAN_0 = @echo " HELP2MAN" $@; + +AM_V_PO4A = $(AM_V_PO4A_$(V)) +AM_V_PO4A_ = $(AM_V_PO4A_$(AM_DEFAULT_VERBOSITY)) +AM_V_PO4A_0 = @echo " PO4A" $@; + +AM_V_POXREF = $(AM_V_POXREF_$(V)) +AM_V_POXREF_ = $(AM_V_POXREF_$(AM_DEFAULT_VERBOSITY)) +AM_V_POXREF_0 = @echo " POXREF" $@;