X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/47956fa0c24efcdcba3493f0231c30e9a39ec7df..0e564b5e18154fe5450a62ccb583591919b46286:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 50839fcb27..b1f33946c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,7 @@ # Copyright © 2018 Julien Lepiller # Copyright © 2018 Oleg Pykhalov # Copyright © 2018 Alex Vong +# Copyright © 2019 Efraim Flashner # # This file is part of GNU Guix. # @@ -53,6 +54,7 @@ nodist_noinst_SCRIPTS = \ # Modules that are not compiled but are installed nonetheless, such as # build-side modules with unusual dependencies. MODULES_NOT_COMPILED = \ + guix/build/po.scm \ guix/man-db.scm include gnu/local.mk @@ -66,6 +68,7 @@ MODULES = \ guix/cpio.scm \ guix/deprecation.scm \ guix/docker.scm \ + guix/json.scm \ guix/records.scm \ guix/pki.scm \ guix/progress.scm \ @@ -76,6 +79,7 @@ MODULES = \ guix/modules.scm \ guix/download.scm \ guix/discovery.scm \ + guix/bzr-download.scm \ guix/git-download.scm \ guix/hg-download.scm \ guix/swh.scm \ @@ -87,6 +91,7 @@ MODULES = \ guix/nar.scm \ guix/derivations.scm \ guix/grafts.scm \ + guix/repl.scm \ guix/inferior.scm \ guix/describe.scm \ guix/channels.scm \ @@ -94,6 +99,7 @@ MODULES = \ guix/self.scm \ guix/upstream.scm \ guix/licenses.scm \ + guix/lint.scm \ guix/glob.scm \ guix/git.scm \ guix/graph.scm \ @@ -101,6 +107,7 @@ MODULES = \ guix/cve.scm \ guix/workers.scm \ guix/zlib.scm \ + guix/lzlib.scm \ guix/build-system.scm \ guix/build-system/android-ndk.scm \ guix/build-system/ant.scm \ @@ -119,11 +126,15 @@ MODULES = \ guix/build-system/gnu.scm \ guix/build-system/guile.scm \ guix/build-system/haskell.scm \ + guix/build-system/julia.scm \ + guix/build-system/linux-module.scm \ + guix/build-system/node.scm \ guix/build-system/perl.scm \ guix/build-system/python.scm \ guix/build-system/ocaml.scm \ guix/build-system/waf.scm \ guix/build-system/r.scm \ + guix/build-system/rakudo.scm \ guix/build-system/ruby.scm \ guix/build-system/scons.scm \ guix/build-system/texlive.scm \ @@ -136,7 +147,9 @@ MODULES = \ guix/store.scm \ guix/cvs-download.scm \ guix/svn-download.scm \ + guix/colors.scm \ guix/i18n.scm \ + guix/diagnostics.scm \ guix/ui.scm \ guix/status.scm \ guix/build/android-ndk-build-system.scm \ @@ -154,22 +167,28 @@ MODULES = \ guix/build/font-build-system.scm \ guix/build/go-build-system.scm \ guix/build/asdf-build-system.scm \ + guix/build/bzr.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 \ guix/build/guile-build-system.scm \ + guix/build/node-build-system.scm \ guix/build/perl-build-system.scm \ guix/build/python-build-system.scm \ guix/build/ocaml-build-system.scm \ guix/build/r-build-system.scm \ + guix/build/rakudo-build-system.scm \ guix/build/ruby-build-system.scm \ guix/build/scons-build-system.scm \ guix/build/texlive-build-system.scm \ guix/build/waf-build-system.scm \ guix/build/haskell-build-system.scm \ + guix/build/julia-build-system.scm \ + guix/build/linux-module-build-system.scm \ guix/build/store-copy.scm \ + guix/build/json.scm \ guix/build/utils.scm \ guix/build/union.scm \ guix/build/profiles.scm \ @@ -202,6 +221,8 @@ MODULES = \ guix/import/gnu.scm \ guix/import/hackage.scm \ guix/import/json.scm \ + guix/import/kde.scm \ + guix/import/launchpad.scm \ guix/import/opam.scm \ guix/import/print.scm \ guix/import/pypi.scm \ @@ -216,6 +237,11 @@ MODULES = \ guix/scripts/archive.scm \ guix/scripts/import.scm \ guix/scripts/package.scm \ + guix/scripts/install.scm \ + guix/scripts/remove.scm \ + guix/scripts/upgrade.scm \ + guix/scripts/search.scm \ + guix/scripts/show.scm \ guix/scripts/gc.scm \ guix/scripts/hash.scm \ guix/scripts/pack.scm \ @@ -228,6 +254,7 @@ MODULES = \ guix/scripts/describe.scm \ guix/scripts/system.scm \ guix/scripts/system/search.scm \ + guix/scripts/system/reconfigure.scm \ guix/scripts/lint.scm \ guix/scripts/challenge.scm \ guix/scripts/import/crate.scm \ @@ -250,6 +277,7 @@ MODULES = \ guix/scripts/weather.scm \ guix/scripts/container.scm \ guix/scripts/container/exec.scm \ + guix/scripts/deploy.scm \ guix.scm \ $(GNU_SYSTEM_MODULES) @@ -257,6 +285,7 @@ if HAVE_GUILE_SSH MODULES += \ guix/ssh.scm \ + guix/remote.scm \ guix/scripts/copy.scm \ guix/store/ssh.scm @@ -272,21 +301,31 @@ endif BUILD_DAEMON_OFFLOAD # Scheme implementation of the build daemon and related functionality. STORE_MODULES = \ guix/store/database.scm \ - guix/store/deduplication.scm + guix/store/deduplication.scm \ + guix/store/roots.scm MODULES += $(STORE_MODULES) # Internal modules with test suite support. -dist_noinst_DATA = guix/tests.scm guix/tests/http.scm +dist_noinst_DATA = \ + guix/tests.scm \ + guix/tests/http.scm \ + guix/tests/git.scm # Auxiliary files for packages. AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ - gnu/packages/aux-files/linux-libre/5.0-arm.conf \ - gnu/packages/aux-files/linux-libre/5.0-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.0-i686.conf \ - gnu/packages/aux-files/linux-libre/5.0-x86_64.conf \ + gnu/packages/aux-files/linux-libre/5.3-arm.conf \ + gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf \ + gnu/packages/aux-files/linux-libre/5.3-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.3-i686.conf \ + gnu/packages/aux-files/linux-libre/5.3-x86_64.conf \ + gnu/packages/aux-files/linux-libre/5.2-arm.conf \ + gnu/packages/aux-files/linux-libre/5.2-arm-veyron.conf \ + gnu/packages/aux-files/linux-libre/5.2-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.2-i686.conf \ + gnu/packages/aux-files/linux-libre/5.2-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.19-arm.conf \ gnu/packages/aux-files/linux-libre/4.19-arm64.conf \ gnu/packages/aux-files/linux-libre/4.19-i686.conf \ @@ -302,10 +341,12 @@ AUX_FILES = \ # Templates, examples. EXAMPLES = \ + gnu/system/examples/asus-c201.tmpl \ 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/docker-image.tmpl \ gnu/system/examples/vm-image.tmpl GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go) @@ -334,74 +375,79 @@ TEST_EXTENSIONS = .scm .sh if CAN_RUN_TESTS SCM_TESTS = \ + tests/accounts.scm \ tests/base16.scm \ tests/base32.scm \ tests/base64.scm \ + tests/bournish.scm \ + tests/builders.scm \ + tests/build-utils.scm \ + tests/cache.scm \ + tests/challenge.scm \ tests/channels.scm \ + tests/combinators.scm \ + tests/containers.scm \ tests/cpan.scm \ tests/cpio.scm \ + tests/cran.scm \ tests/crate.scm \ - tests/gem.scm \ - tests/pki.scm \ - tests/print.scm \ - tests/sets.scm \ - tests/modules.scm \ - tests/gnu-maintenance.scm \ - tests/substitute.scm \ - tests/builders.scm \ - tests/derivations.scm \ - tests/glob.scm \ - tests/grafts.scm \ - tests/ui.scm \ - tests/status.scm \ - tests/records.scm \ - tests/processes.scm \ - tests/upstream.scm \ - tests/combinators.scm \ + tests/cve.scm \ + tests/debug-link.scm \ + tests/derivations.scm \ tests/discovery.scm \ - tests/utils.scm \ - tests/build-utils.scm \ - tests/packages.scm \ - tests/snix.scm \ - tests/hackage.scm \ - tests/cran.scm \ tests/elpa.scm \ - tests/texlive.scm \ - tests/store.scm \ - tests/monads.scm \ + tests/file-systems.scm \ + tests/gem.scm \ tests/gexp.scm \ - tests/nar.scm \ - tests/union.scm \ - tests/profiles.scm \ - tests/search-paths.scm \ - tests/syscalls.scm \ - tests/inferior.scm \ + tests/git.scm \ + tests/glob.scm \ + tests/gnu-maintenance.scm \ + tests/grafts.scm \ + tests/graph.scm \ tests/gremlin.scm \ - tests/debug-link.scm \ - tests/bournish.scm \ + tests/hackage.scm \ + tests/import-utils.scm \ + tests/inferior.scm \ tests/lint.scm \ - tests/publish.scm \ - tests/scripts.scm \ - tests/size.scm \ - tests/graph.scm \ - tests/challenge.scm \ - tests/cache.scm \ - tests/cve.scm \ - tests/workers.scm \ - tests/zlib.scm \ - tests/file-systems.scm \ - tests/uuid.scm \ - tests/system.scm \ - tests/accounts.scm \ - tests/services.scm \ - tests/scripts-build.scm \ - tests/containers.scm \ + tests/lzlib.scm \ + tests/modules.scm \ + tests/monads.scm \ + tests/nar.scm \ + tests/networking.scm \ tests/opam.scm \ + tests/packages.scm \ tests/pack.scm \ + tests/pki.scm \ + tests/print.scm \ + tests/processes.scm \ + tests/profiles.scm \ + tests/publish.scm \ tests/pypi.scm \ - tests/import-utils.scm \ + tests/records.scm \ + tests/scripts.scm \ + tests/scripts-build.scm \ + tests/search-paths.scm \ + tests/services.scm \ + tests/sets.scm \ + tests/size.scm \ + tests/snix.scm \ + tests/status.scm \ tests/store-database.scm \ - tests/store-deduplication.scm + tests/store-deduplication.scm \ + tests/store-roots.scm \ + tests/store.scm \ + tests/substitute.scm \ + tests/swh.scm \ + tests/syscalls.scm \ + tests/system.scm \ + tests/texlive.scm \ + tests/ui.scm \ + tests/union.scm \ + tests/upstream.scm \ + tests/utils.scm \ + tests/uuid.scm \ + tests/workers.scm \ + tests/zlib.scm SH_TESTS = \ tests/guix-build.sh \ @@ -413,6 +459,7 @@ SH_TESTS = \ tests/guix-pack-localstatedir.sh \ tests/guix-pack-relocatable.sh \ tests/guix-package.sh \ + tests/guix-package-aliases.sh \ tests/guix-package-net.sh \ tests/guix-system.sh \ tests/guix-archive.sh \ @@ -466,10 +513,10 @@ check-system: $(GOBJECTS) -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 & co. +# Public keys used to sign substitutes. dist_pkgdata_DATA = \ - etc/substitutes/hydra.gnu.org.pub \ etc/substitutes/berlin.guixsd.org.pub \ + etc/substitutes/ci.guix.gnu.org.pub \ etc/substitutes/ci.guix.info.pub # Bash completion file. @@ -491,8 +538,10 @@ EXTRA_DIST += \ TODO \ CODE-OF-CONDUCT \ .dir-locals.el \ + .guix-channel \ scripts/guix.in \ etc/guix-install.sh \ + etc/news.scm \ build-aux/build-self.scm \ build-aux/compile-all.scm \ build-aux/hydra/evaluate.scm \ @@ -515,10 +564,10 @@ EXTRA_DIST += \ tests/test.drv \ tests/signing-key.pub \ tests/signing-key.sec \ - tests/cve-sample.xml \ + tests/cve-sample.json \ build-aux/config.rpath \ bootstrap \ - release.nix \ + doc/build.scm \ $(TESTS) if !BUILD_DAEMON_OFFLOAD @@ -565,7 +614,7 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA # The above trick doesn't work for 'config.go' because both 'config.scm' and # 'config.go' are listed in $(nobase_nodist_guileobject_DATA). Thus, give it # special treatment. -install-data-hook: set-bootstrap-executable-permissions +install-data-hook: touch "$(DESTDIR)$(guileobjectdir)/guix/config.go" # Assuming Guix is already installed and the daemon is up and running, this @@ -610,7 +659,7 @@ guix-binary.%.tar.xz: cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" -dist-hook: $(distdir)/ChangeLog gen-AUTHORS gen-tarball-version +dist-hook: gen-ChangeLog gen-AUTHORS gen-tarball-version dist-hook: assert-no-store-file-names dist-hook: doc-po-update @@ -624,12 +673,12 @@ $(top_srcdir)/.version: gen-tarball-version: echo $(VERSION) > "$(distdir)/.tarball-version" -gen-ChangeLog $(distdir)/ChangeLog: +gen-ChangeLog: $(AM_V_GEN)if test -d .git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ - > $(distdir)/cl-t; \ + > $(distdir)/ChangeLog.tmp; \ rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/cl-t $(distdir)/ChangeLog; \ + mv $(distdir)/ChangeLog.tmp $(distdir)/ChangeLog; \ fi gen-AUTHORS: @@ -673,6 +722,13 @@ GUIX_SYSTEM_IMAGE_BASE = guix-system-install-$(PACKAGE_VERSION) # Prefix of the Guix VM image file name. GUIX_SYSTEM_VM_IMAGE_BASE = guix-system-vm-image-$(PACKAGE_VERSION) +# Flags for 'guix system vm-image'. By default create a VM image that appears +# to have a 20G hard disk. +GUIX_SYSTEM_VM_IMAGE_FLAGS ?= --image-size=30G + +# Return the sequence of '-s' flags for the given systems. +system_flags = $(foreach system,$(1),-s $(system)) + # The release process works in several phases: # # 0. We assume the developer created a 'vX.Y' tag. @@ -702,6 +758,9 @@ release: dist "`git rev-parse HEAD`" "$(PACKAGE_VERSION)" git add $(top_srcdir)/gnu/packages/package-management.scm git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." + $(top_builddir)/pre-inst-env guix build guix \ + $(call system_flags,$(SUPPORTED_SYSTEMS)) \ + -v1 --no-grafts -K rm -f $(BINARY_TARBALLS) $(MAKE) $(BINARY_TARBALLS) for system in $(SUPPORTED_SYSTEMS) ; do \ @@ -713,6 +772,9 @@ release: dist "`git rev-parse HEAD`" git add $(top_srcdir)/gnu/packages/package-management.scm git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`." + $(top_builddir)/pre-inst-env guix build guix \ + $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ + -v1 --no-grafts -K for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ guix system disk-image \ @@ -729,7 +791,7 @@ release: dist done for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ - guix system vm-image \ + guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ --system=$$system \ gnu/system/examples/vm-image.tmpl` ; \ if [ ! -f "$$image" ] ; then \ @@ -760,13 +822,15 @@ update-NEWS: $(GOBJECTS) $(top_srcdir)/NEWS "$(GUIX_MAINTENANCE_DIRECTORY)/data" # Make sure we're not shipping a file that embeds a local /gnu/store file name. -assert-no-store-file-names: $(distdir)/ChangeLog +assert-no-store-file-names: $(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-manual.pot --exclude=guix-manual.*.po \ + --exclude=guix-cookbook.pot --exclude=guix-cookbook.*.po \ --exclude=guix-prettify.el \ - --exclude=ChangeLog \ + --exclude=ChangeLog* \ + --exclude=binutils-boot-2.20*.patch \ -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ then \ echo "error: store file names embedded in the distribution" >&2 ; \ @@ -806,6 +870,39 @@ cuirass-jobs.scm: $(GOBJECTS) .PHONY: clean-go make-go as-derivation .PHONY: update-guix-package update-NEWS release +# Downloading up-to-date PO files. + +# make-download-po-rule DOMAIN DIRECTORY [FILE-NAME-PREFIX] +define make-download-po-rule + +download-po.$(1): + if [ -f "$(top_srcdir)/$(2)/LINGUAS" ]; then \ + LINGUAS="`grep -v '^[[:blank:]]*#' < $(top_srcdir)/$(2)/LINGUAS`" ; \ + else \ + LINGUAS="`(cd $(top_srcdir)/$(2); \ + for i in *.po; do echo $$$$i; done) | cut -d . -f 2`" ; \ + fi ; \ + for lang in $$$$LINGUAS; do \ + if wget -nv -O "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" \ + "https://translationproject.org/latest/$(1)/$$$$lang.po" ; \ + then \ + mv "$(top_srcdir)/$(2)/$(3)$$$$lang.po"{.tmp,} ; \ + else \ + rm "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" ; \ + fi ; \ + done + +.PHONY: download-po.$(1) + +endef + +$(eval $(call make-download-po-rule,guix,po/guix)) +$(eval $(call make-download-po-rule,guix-packages,po/packages)) +$(eval $(call make-download-po-rule,guix-manual,po/doc,guix-manual.)) + +download-po: $(foreach domain,guix guix-packages guix-manual,download-po.$(domain)) +.PHONY: download-po + ## -------------- ## ## Silent rules. ## ## -------------- ##